From 314679caa0aad353185dc0417d8cfdbc7f6c6bc8 Mon Sep 17 00:00:00 2001 From: Fredrik Åslund Date: Mon, 23 Sep 2013 08:29:00 +0200 Subject: pingpong.ki.se SP added --- Makefile | 1 + scripts/get-metadata.sh | 8 ++++++-- swamid-sp-2.0.mxml | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d12e1813..2735e485 100644 --- a/Makefile +++ b/Makefile @@ -147,6 +147,7 @@ tidy: @for x in `find $(SRCDIRS) -name \*.xml`; do xsltproc xslt/clean-entitydescriptor.xsl $$x > $$x.c && mv $$x.c $$x; done commit: tidy test + @git diff @echo ; echo -n "Run 'git commit -a'? [Y/n/s] " ; read x ; case $$x in "Y"|"y"|"") git commit -a ;; s) ;; *) exit 1 ;; esac @git status -u @echo "Checking for not committed files in swamid-2.0/" ; if git status --porcelain --ignored | awk '{print $$2}' | grep "^swamid-2.0/" | sed 's/^/ /' | grep . ; then echo "Not committed files in swamid-2.0/, aborting" ; exit 1 ; fi diff --git a/scripts/get-metadata.sh b/scripts/get-metadata.sh index d47acfa5..78e68514 100755 --- a/scripts/get-metadata.sh +++ b/scripts/get-metadata.sh @@ -15,12 +15,16 @@ if [ -z "$metadataurl" ] ; then Usage: `basename $0` Ex: `basename $0` https://shibsp.mysite.com/Shibboleth.sso/Metadata `basename $0` https://shibidp.mysite.com/idp/profile/Metadata/SAML - `basename $0` file://some-downloaded-metadata.xml + `basename $0` some-downloaded-metadata.xml EOF exit 1 fi -metadata=`curl -s -k -f $metadataurl` +if echo "$metadataurl" | grep -qE '^http://|^https://' ; then + metadata=`curl -s -k -f $metadataurl` +else + metadata=`cat $metadataurl` +fi [ -n "$metadata" ] || error "Failed to fetch metadata from $metadataurl" entityid=`echo "$metadata" | sed -n 's/.*entityID=['\''"]\([^"]*\)['\''"].*/\1/p'` diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml index a0235caa..7ed991fb 100644 --- a/swamid-sp-2.0.mxml +++ b/swamid-sp-2.0.mxml @@ -266,4 +266,5 @@ + -- cgit v1.2.3 From 8b59f5dabc14274dffb28042b23c3f5bf1f67b47 Mon Sep 17 00:00:00 2001 From: Fredrik Åslund Date: Mon, 23 Sep 2013 08:29:29 +0200 Subject: pingpong.ki.se SP added SWAMIDOPS-7028 --- swamid-2.0/pingpong.ki.se-shibboleth.xml | 51 ++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 swamid-2.0/pingpong.ki.se-shibboleth.xml diff --git a/swamid-2.0/pingpong.ki.se-shibboleth.xml b/swamid-2.0/pingpong.ki.se-shibboleth.xml new file mode 100644 index 00000000..2c8e572e --- /dev/null +++ b/swamid-2.0/pingpong.ki.se-shibboleth.xml @@ -0,0 +1,51 @@ + + + + + + http://www.swamid.se/category/hei-service + http://www.swamid.se/category/research-and-education + + + + + + + Ping Pong för Karaolinska Institutet + Ping Pong at Karolinska Institutet + Ping Pong för Karaolinska Institutet + Ping Pong at Karolinska Institutet + + + + + + +MIIC8TCCAdmgAwIBAgIJAJRsfqnb5dadMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV +BAMTDnBpbmdwb25nLmtpLnNlMB4XDTEzMDkxNjEzNDM0N1oXDTIzMDkxNDEzNDM0 +N1owGTEXMBUGA1UEAxMOcGluZ3Bvbmcua2kuc2UwggEiMA0GCSqGSIb3DQEBAQUA +A4IBDwAwggEKAoIBAQDNcTge2C3djDCz0us+maMDKxRHA9p9khcf6XLYjnPYLYQ2 +s4GfGF+rz7FAxHvJoe9792ecpa91/TBoV/wnsyQfXLlAQd7eqNk/MzALugXjeL65 ++Frn6Wp6cbcnJasRmcxdiiplHYReln/KYkmC+fQ1PDfe5RpXaxNjB6RKWprJkU83 +iIqVL7aW/tY+hmDIEzYJpH5UjXFdqJwbOOmetuzCZxxLrCq6Er8whneqxEVjvlmf +QQG8OYsZVjba2iJuiGD9B8bnVvgb6WvzWAtUAxWi5tnjrWUo0Jvo0h0nTsG1uV0L +lP08Fu7Y12kuphUqKgKZ2q5PgxgzGIt3MDpTrHATAgMBAAGjPDA6MBkGA1UdEQQS +MBCCDnBpbmdwb25nLmtpLnNlMB0GA1UdDgQWBBS6tjhUSTBnGMltLrTV11n4WyNS +6TANBgkqhkiG9w0BAQUFAAOCAQEApmdue4DcHojlyrLK4XxSRXSuAQ0vADzZe9pF +Cs3mMApyUpT3ritm+Pn+QAvbNux3urijNWw/OWJ/sVsc6Jj59aIkRutV+r8AbqFO +SvTLPxlXLgIU+v90UJ/0WG3YxMLafujRrDs15vJLbJSc4ATgypIUOrNcq5ZhskGN +nVBA3mrjY5hhQpkl4816R3IYwzsxn1NWtbdg8c964Nm1hLrah1CIeOFlxycV8OF+ +qNmB+qBiK5APim+7qOT6QRnSzX3q2zIb8WYwE6Pvb9aVcM8GBmOvyZvITpBZik04 +ZqAEwFI6mSdqDAH/wGtQLWPtrVSKg/XmB9+G8JohgWpphQElSQ== + + + + + + + + + + + + -- cgit v1.2.3 From 92ab77bba9eff220bd5129269761edfa7a5d8c4f Mon Sep 17 00:00:00 2001 From: Fredrik Åslund Date: Mon, 23 Sep 2013 12:29:09 +0200 Subject: gih idp added to swamid-testing-1.0.xml SWAMIDOPS-7036 --- swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml | 93 ++++++++++++++++++++++ swamid-testing-idp-1.0.mxml | 2 +- 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml diff --git a/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml b/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml new file mode 100644 index 00000000..286e8b20 --- /dev/null +++ b/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml @@ -0,0 +1,93 @@ + + + + + + Gymnastik- och Idrottshögskolan + School of sport and health sciences + Identity Provider för Gymnastik- och Idrottshögskolan + Identity Provider for the Royal Swedish Academy of Sciences + + ihs.se + + + + + + +MIIDOzCCAiOgAwIBAgIUX4LM+yBFUKdFziHUCVyiPPGiL8YwDQYJKoZIhvcNAQEF +BQAwHzEdMBsGA1UEAxMUZ2loaWRlbnRpdHkwMS5paHMuc2UwHhcNMTMwOTIwMTA1 +NTIzWhcNMzMwOTIwMTA1NTIzWjAfMR0wGwYDVQQDExRnaWhpZGVudGl0eTAxLmlo +cy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjZBXC3TcY47KYX +t3n4IH6X8Jszyeinq+Zo6mtsJgzu9JPikIiG9jDJj+ylQiTDSSTBMSAUZ3p6ola/ ++/IlDu0q5oLFCMEe3m9AdJIwyT6CjIJOiLSzeaTOqQNtXowLFCxj+PPrVRaqJiYc ++7f3+5SMwn2iOLkr6/ZFW5cuhw9flzR/Qp7m9ByTIcs73XK1JcQPP1UoPgo8mUXj +/IHbxB/+P0NzjMXbKZEFEnZQzDoxNYDbARh6T/hJreIKBr+B0KnKogZnM9WgdJof +O6GKR1lETrGgmCITblP7dbrRIL2VxMmXQEMhdS78Y5GNRPnGxp00kT2h/tTA1Reb +52sROA0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUZ2loaWRlbnRpdHkwMS5paHMuc2WG +K2h0dHBzOi8vZ2loaWRlbnRpdHkwMS5paHMuc2UvaWRwL3NoaWJib2xldGgwHQYD +VR0OBBYEFIzCrjaWTfLensnYqTm/G3CNWsbNMA0GCSqGSIb3DQEBBQUAA4IBAQB7 +pVQO0Su0rB9WHWpitL0kNNfFQgapWHHZ8hYUDFWxiON7IGG6GlVsqgvwGCQwYgci +E+WrKirES8+tE/EWhNfSvydlBuHwkvBP2WqsjUVbG0U4xbguE3C1ZrcfKcjBkSDH +YmMuoYqX6RkHuwExl0xLr1ApVz8l2D9HVXdVi3aG31gMpo4/G1GukY8Pny8ZSbNP +cb9+7g88/LLBLc5cx1iccfK4h0Er5QAFjNd3uKD3p0sxQYKPGs5X2ZwOxJlmeAiU +3Ujhy7jzfaV7bFtz+GL8WTHoi2OfI1YqES5Jr3sQnlArhemcYUxnpBN4yvDF2QK1 +icptKTpDxrRjfCXibBT1 + + + + + + + + urn:mace:shibboleth:1.0:nameIdentifier + urn:oasis:names:tc:SAML:2.0:nameid-format:transient + + + + + + + + ihs.se + + + + + + +MIIDOzCCAiOgAwIBAgIUX4LM+yBFUKdFziHUCVyiPPGiL8YwDQYJKoZIhvcNAQEF +BQAwHzEdMBsGA1UEAxMUZ2loaWRlbnRpdHkwMS5paHMuc2UwHhcNMTMwOTIwMTA1 +NTIzWhcNMzMwOTIwMTA1NTIzWjAfMR0wGwYDVQQDExRnaWhpZGVudGl0eTAxLmlo +cy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjZBXC3TcY47KYX +t3n4IH6X8Jszyeinq+Zo6mtsJgzu9JPikIiG9jDJj+ylQiTDSSTBMSAUZ3p6ola/ ++/IlDu0q5oLFCMEe3m9AdJIwyT6CjIJOiLSzeaTOqQNtXowLFCxj+PPrVRaqJiYc ++7f3+5SMwn2iOLkr6/ZFW5cuhw9flzR/Qp7m9ByTIcs73XK1JcQPP1UoPgo8mUXj +/IHbxB/+P0NzjMXbKZEFEnZQzDoxNYDbARh6T/hJreIKBr+B0KnKogZnM9WgdJof +O6GKR1lETrGgmCITblP7dbrRIL2VxMmXQEMhdS78Y5GNRPnGxp00kT2h/tTA1Reb +52sROA0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUZ2loaWRlbnRpdHkwMS5paHMuc2WG +K2h0dHBzOi8vZ2loaWRlbnRpdHkwMS5paHMuc2UvaWRwL3NoaWJib2xldGgwHQYD +VR0OBBYEFIzCrjaWTfLensnYqTm/G3CNWsbNMA0GCSqGSIb3DQEBBQUAA4IBAQB7 +pVQO0Su0rB9WHWpitL0kNNfFQgapWHHZ8hYUDFWxiON7IGG6GlVsqgvwGCQwYgci +E+WrKirES8+tE/EWhNfSvydlBuHwkvBP2WqsjUVbG0U4xbguE3C1ZrcfKcjBkSDH +YmMuoYqX6RkHuwExl0xLr1ApVz8l2D9HVXdVi3aG31gMpo4/G1GukY8Pny8ZSbNP +cb9+7g88/LLBLc5cx1iccfK4h0Er5QAFjNd3uKD3p0sxQYKPGs5X2ZwOxJlmeAiU +3Ujhy7jzfaV7bFtz+GL8WTHoi2OfI1YqES5Jr3sQnlArhemcYUxnpBN4yvDF2QK1 +icptKTpDxrRjfCXibBT1 + + + + + + + + urn:mace:shibboleth:1.0:nameIdentifier + urn:oasis:names:tc:SAML:2.0:nameid-format:transient + + + School of sport and health sciences + Gymnastik- och Idrottshögskolan + School of sport and health sciences + http://www.gih.se + + diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml index df123d80..100241aa 100644 --- a/swamid-testing-idp-1.0.mxml +++ b/swamid-testing-idp-1.0.mxml @@ -147,5 +147,5 @@ + - -- cgit v1.2.3