From 24628f0e484143fd03e304eda1f56d5a323299e9 Mon Sep 17 00:00:00 2001 From: Fredrik Domeij Date: Wed, 15 Mar 2017 11:32:25 +0100 Subject: AttributeConsumingService removed for registry-test.swamid.se --- swamid-2.0/registry-test.swamid.se-saml2-metadata.xml | 6 ------ 1 file changed, 6 deletions(-) (limited to 'swamid-2.0') diff --git a/swamid-2.0/registry-test.swamid.se-saml2-metadata.xml b/swamid-2.0/registry-test.swamid.se-saml2-metadata.xml index 878a97bb..29cdf197 100644 --- a/swamid-2.0/registry-test.swamid.se-saml2-metadata.xml +++ b/swamid-2.0/registry-test.swamid.se-saml2-metadata.xml @@ -70,12 +70,6 @@ oMzgMjdgVTXdBPqXjdsunjPAiOZnJesxtLgWYEmQ - - PEER SP - - - - SWAMID -- cgit v1.2.3 From 174ad3683bfc6e659143116706479ec89118c9b0 Mon Sep 17 00:00:00 2001 From: Paul Scott Date: Wed, 15 Mar 2017 15:55:43 +0100 Subject: Add AL1 and SIRTFI tags to KAU.SE IdP --- swamid-2.0/weblogin.kau.se-idp-shibboleth.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'swamid-2.0') diff --git a/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml b/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml index 405550b3..6cc85f9c 100644 --- a/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml +++ b/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml @@ -1,5 +1,17 @@ + + + + http://www.swamid.se/policy/assurance/al1 + https://refeds.org/sirtfi + + + http://refeds.org/category/research-and-scholarship + http://www.geant.net/uri/dataprotection-code-of-conduct/v1 + + + kau.se @@ -218,4 +230,8 @@ cHgs7D1QiqGixbmFlSZyPcCPcIzPDzRaoXyb+yKQy31QP/VEt8VGXH5H2A== mailto:datasupport@kau.se +46 54 700 2525 + + Incident Response Team + mailto:irt@kau.se + -- cgit v1.2.3 From 033d20f87dfc10471b4a991727ac00c192cbe8a2 Mon Sep 17 00:00:00 2001 From: Paul Scott Date: Thu, 16 Mar 2017 12:53:22 +0100 Subject: Add KAU eduroam password reset portal --- swamid-2.0/eduroamkonto.kau.se.xml | 96 ++++++++++++++++++++++++++++++++++++++ swamid-sp-2.0.mxml | 1 + 2 files changed, 97 insertions(+) create mode 100644 swamid-2.0/eduroamkonto.kau.se.xml (limited to 'swamid-2.0') diff --git a/swamid-2.0/eduroamkonto.kau.se.xml b/swamid-2.0/eduroamkonto.kau.se.xml new file mode 100644 index 00000000..34b4b890 --- /dev/null +++ b/swamid-2.0/eduroamkonto.kau.se.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + http://www.swamid.se/category/research-and-education + http://www.swamid.se/category/hei-service + + + + + + + + + eduroam kontohantering - Karlstads universitet + eduroam account management - Karlstad University + Denna tjänst är till KAU anställda för återställning av eduroam lösenord + This service allows KAU employees to reset their eduroam password + + + + + eduroamkonto.kau.se + + CN=eduroamkonto.kau.se + MIIEADCCAmigAwIBAgIJAM8tIubXd3gYMA0GCSqGSIb3DQEBCwUAMB4xHDAaBgNV +BAMTE2VkdXJvYW1rb250by5rYXUuc2UwHhcNMTcwMzE1MTIzNjU4WhcNMjcwMzEz +MTIzNjU4WjAeMRwwGgYDVQQDExNlZHVyb2Fta29udG8ua2F1LnNlMIIBojANBgkq +hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAx7rpQNMClyCqWSgr0/Cm0k6x8p5csVDh +bcDQp4R4FntO7zOp4I7+0UzMIoxV7kZydYMm/0QDB/8/Xr6VEDSRXjcUK3YTpwm+ +kjZ+bSR/ZzgHH7tAAJ6pB+T4RRm0zfhRVOzHWfrJtOsH7LOh8Ie1LoSpe0yRaa4o +MhSjTGKg4lSMtt/YGNvVluQMci9LZM+s5LeodsJ7DFSvE9BI7eLw70uyCugETTT3 +LpPvanUbzagAgBc8gSolRDM0ioQc4CgAug6JrRFdB8N3BdkAhZhsQM6AnLW17wKE +WmzCP1Q8BQ/I0Ni6AVWd1BI92+5TmGbWxWh6zhVghcAJJw5EKQMy5xItwx4ua3ta +JneutMxibH0CBlSE7kl2xY4YinrkCjh7UfMzTDY9ap/dYifzBUugQF46BI8UlR9Q +ZoxR1VVkH9fD1s5jezdr28wPsSl8auT2pAbEJjhJPUJkdUB4kfptYKsw9v8xya/a +ZkIVJrcM7tlPdT7z5v+e3uk7ZHJAk8DLAgMBAAGjQTA/MB4GA1UdEQQXMBWCE2Vk +dXJvYW1rb250by5rYXUuc2UwHQYDVR0OBBYEFMnow17F7CuMpt/wY+9Se3MjYwXF +MA0GCSqGSIb3DQEBCwUAA4IBgQA49Qo4cQdRR1g+j1xyS6ZLEr+yY2uPQLW8gTja ++p/3NmYVnxh6/411k3XY+rlJVR9JoogIkRXkCzwv18Ws87IbK/d+thSxGxrqnST7 +YSKW3G44Rcbo7/uaB3wRNiyWOJ7T2nyeX4TJ3RnFUAFmP5lOUXkOL/S1zIx+FDhZ +sNY8w+FAj/AARgGfaXVmGjqv50xiJ89IhOGmRzvV92IG2kgwxE14IAbz+bS7fca9 +opdRQIH963X7qq6NLKPPv3qDz0oUAdnIjRX7Fr8vwbGN7hsGaaTnOkkucHVCx8te +bKwPXqk/9I2Gy4oXpfrO933Q2z01WAdNurHWD9Hkbt7JryaB4D4j0fQOQ5FPAGmQ +BwJvV7GTu/AZJT5WX/cc3FUivU+7WIk4BVBi0XVk6oeK60MPgSAaOqGVsbTgQxam +i+98vFKqxYI0xD5CAicJMQtgzyGx5tnTDvABuqf6jgp5XhneS3441LXsRuTMur54 +MipqdDjyQEIn6175q9gOmemKMbk= + + + + + + + + + + + + + + + + + + + + + + + + + + + + Erik + Lundin + mailto:erik.lundin@kau.se + + diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml index 6197bb03..519bfc92 100644 --- a/swamid-sp-2.0.mxml +++ b/swamid-sp-2.0.mxml @@ -644,4 +644,5 @@ + -- cgit v1.2.3 From 982d79e47a7fc6d5bd9e5473fa195afece2a4c7f Mon Sep 17 00:00:00 2001 From: Fredrik Domeij Date: Fri, 17 Mar 2017 07:58:03 +0100 Subject: jira-test.its.umu.se added --- scripts/get-metadata.sh | 45 +++++++++++++++++++--- swamid-2.0/jira-test.its.umu.se-shibboleth.xml | 53 ++++++++++++++++++++++++++ swamid-sp-2.0.mxml | 1 + 3 files changed, 94 insertions(+), 5 deletions(-) create mode 100644 swamid-2.0/jira-test.its.umu.se-shibboleth.xml (limited to 'swamid-2.0') diff --git a/scripts/get-metadata.sh b/scripts/get-metadata.sh index 88938b61..efc73c7d 100755 --- a/scripts/get-metadata.sh +++ b/scripts/get-metadata.sh @@ -22,6 +22,13 @@ EOF exit 1 fi +script_cwd=`dirname "$0"` +if test -d swamid-2.0 ; then + echo "Moving into swamid-2.0/" + cd swamid-2.0 + echo "$script_cwd" | grep -q ^/ || script_cwd=../$script_cwd +fi + if echo "$metadataurl" | grep -qE '^http://|^https://' ; then metadata=`curl -s -k -f "$metadataurl"` elif echo "$metadataurl" | grep -qE '^reep:' ; then @@ -48,19 +55,47 @@ entityid=`echo "$metadata" | sed -n 's/.*entityID=['\''"]\([^"]*\)['\''"].*/\1/p entityidfn=`echo "$entityid" | sed 's;https*://;;' | tr 'A-Z' 'a-z' | sed 's;/$;;' | sed 's/[^a-z0-9_.-]/-/g' | sed 's/\.xml$//;s/$/.xml/'` [ -n "$entityidfn" ] || error "Failed to generate filename from entityid $entityid" -if [ -r "$entityidfn" ] ; then - echo -n "Replace $entityidfn with metadata [Y/n]? " -else +[ -r "$entityidfn" ] && new=false || new=true +if $new ; then echo -n "Save metadata into $entityidfn [Y/n]? " +else + echo -n "Replace $entityidfn with metadata [Y/n]? " fi read x case $x in Y|y|"") + if $new ; then + echo -n "Add swamid-2.0/$entityidfn to swamid-sp-2.0.mxml [Y/n]? " + read x + case $x in + Y|y|"") + sed -i "s;^; \n&;" ../swamid-sp-2.0.mxml + echo -- + tail -n 10 ../swamid-sp-2.0.mxml | sed 's/^/ /' + echo -- + ;; + *) + echo "Not added" + ;; + esac + fi + echo "$metadata" > $entityidfn tmp=`mktemp` - xsltproc `dirname $0`/../xslt/clean-entitydescriptor.xsl ${entityidfn} > ${tmp} && mv ${tmp} ${entityidfn} + xsltproc $script_cwd/../xslt/clean-entitydescriptor.xsl ${entityidfn} > ${tmp} && mv ${tmp} ${entityidfn} - echo $entityidfn + if $new ; then + echo -n "Add swamid-2.0/$entityidfn to git [Y/n]? " + read x + case $x in + Y|y|"") + git add $entityidfn + ;; + *) + echo "Not added" + ;; + esac + fi ;; *) echo "Nothing done" diff --git a/swamid-2.0/jira-test.its.umu.se-shibboleth.xml b/swamid-2.0/jira-test.its.umu.se-shibboleth.xml new file mode 100644 index 00000000..3ff19eca --- /dev/null +++ b/swamid-2.0/jira-test.its.umu.se-shibboleth.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + http://www.swamid.se/category/hei-service + http://www.swamid.se/category/research-and-education + + + + + + + + + + Jira test, ITS, Umeå universitet + Jira test, ITS, Umeå University + Jira test, ITS, IT-stöd och systemutveckling, Umeå universitet + Jira test, ITS, ICT Services and System Development, Umeå University + + + + + + + + + + + + + + + + + + diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml index 519bfc92..962ad9a8 100644 --- a/swamid-sp-2.0.mxml +++ b/swamid-sp-2.0.mxml @@ -645,4 +645,5 @@ + -- cgit v1.2.3 From ee43e95506d0222198ce29d8c700cb47a5421777 Mon Sep 17 00:00:00 2001 From: Paul Scott Date: Fri, 17 Mar 2017 09:15:52 +0100 Subject: Switchover HiS to V3 IdP --- swamid-2.0/idp.his.se-idp-shibboleth.xml | 15 +++++++++++---- swamid-2.0/idp2.his.se-idp-shibboleth.xml | 15 ++++----------- swamid-edugain-idp-1.0.mxml | 2 +- swamid-idp-2.0.mxml | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) (limited to 'swamid-2.0') diff --git a/swamid-2.0/idp.his.se-idp-shibboleth.xml b/swamid-2.0/idp.his.se-idp-shibboleth.xml index ed12731a..a8c29d40 100644 --- a/swamid-2.0/idp.his.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.his.se-idp-shibboleth.xml @@ -1,11 +1,18 @@ + + + + http://refeds.org/category/hide-from-discovery + + + his.se - Högskolan i Skövde - University of Skövde + Högskolan i Skövde (gammal) + University of Skövde (old) Identity Provider för Högskolan i Skövde Identity Provider for University of Skövde http://www.his.se @@ -99,8 +106,8 @@ drVlFNv2EtdNX1C9u3EJYqslqtyXv2nZ HIS - Högskolan i Skövde - University of Skövde + Högskolan i Skövde (gammal) + University of Skövde (old) http://www.his.se diff --git a/swamid-2.0/idp2.his.se-idp-shibboleth.xml b/swamid-2.0/idp2.his.se-idp-shibboleth.xml index 0d537a21..64d7f5c8 100644 --- a/swamid-2.0/idp2.his.se-idp-shibboleth.xml +++ b/swamid-2.0/idp2.his.se-idp-shibboleth.xml @@ -1,18 +1,11 @@ - - - - http://refeds.org/category/hide-from-discovery - - - his.se - Högskolan i Skövde (ny) - University of Skövde (new) + Högskolan i Skövde + University of Skövde Identity Provider för Högskolan i Skövde Identity Provider for University of Skövde http://www.his.se @@ -200,8 +193,8 @@ lydgJ83mLCTu9Bueh30Fp3aQ64DAHbCABkgW HIS - Högskolan i Skövde (ny) - University of Skövde (new) + Högskolan i Skövde + University of Skövde http://www.his.se diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml index ecc3b93d..b6919833 100644 --- a/swamid-edugain-idp-1.0.mxml +++ b/swamid-edugain-idp-1.0.mxml @@ -25,7 +25,6 @@ - @@ -50,4 +49,5 @@ + diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml index 8e917c29..23ca493b 100644 --- a/swamid-idp-2.0.mxml +++ b/swamid-idp-2.0.mxml @@ -20,5 +20,5 @@ - + -- cgit v1.2.3