summaryrefslogtreecommitdiff
path: root/swamid-2.0
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-08-11 13:07:03 +0200
committerLeif Johansson <leifj@sunet.se>2015-08-11 13:07:03 +0200
commitb53085c02cf81855379eb460206ee5a45abc9163 (patch)
tree5040fae56dcafd89049c7be8accdb89892e433b9 /swamid-2.0
parente2781960bad421c50ee348dbf9300b8ea71d83b1 (diff)
parentd2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff)
resolve conflicts and merge
Diffstat (limited to 'swamid-2.0')
-rw-r--r--swamid-2.0/captivelan.it.su.se-shibboleth.sso.xml57
-rw-r--r--swamid-2.0/daisy.ict.kth.se-shibboleth.xml69
-rw-r--r--swamid-2.0/gih.pingpong.net-shibboleth.sso-metadata.xml81
-rw-r--r--swamid-2.0/lms.hig.se-shibboleth-sp.xml93
-rw-r--r--swamid-2.0/sp.wavelan.su.se-shibboleth.sso.xml75
-rw-r--r--swamid-2.0/test.bils.se-auth-metadata.xml124
-rw-r--r--swamid-2.0/testgih.pingpong.net-shibboleth.sso-metadata.xml79
-rw-r--r--swamid-2.0/urn-urkund-shibboleth-sp.xml8
8 files changed, 407 insertions, 179 deletions
diff --git a/swamid-2.0/captivelan.it.su.se-shibboleth.sso.xml b/swamid-2.0/captivelan.it.su.se-shibboleth.sso.xml
deleted file mode 100644
index 63bc6c1b..00000000
--- a/swamid-2.0/captivelan.it.su.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://captivelan.it.su.se/Shibboleth.sso">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <md:Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://captivelan.it.su.se/Shibboleth.sso/WAYF"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://captivelan.it.su.se/Shibboleth.sso/WAYF" index="1"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://captivelan.it.su.se/Shibboleth.sso/WAYF/wavelan"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://captivelan.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://captivelan.it.su.se/Shibboleth.sso/WAYF/idp.secure.su.se"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://captivelan.it.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://captivelan.it.su.se/Shibboleth.sso/SWAMID"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://captivelan.it.su.se/Shibboleth.sso/WAYF/wavelan-test"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://captivelan.it.su.se/Shibboleth.sso/WAYF/wavelan-test" index="3"/>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>captivelan-prod-carp1.it.su.se</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=captivelan-prod-carp1.it.su.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIDITCCAgmgAwIBAgIJAOj7uHDYhhhAMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHmNhcHRpdmVsYW4tcHJvZC1jYXJwMS5pdC5zdS5zZTAeFw0xMjA4MTYwNjQ3
-MDlaFw0yMjA4MTQwNjQ3MDlaMCkxJzAlBgNVBAMTHmNhcHRpdmVsYW4tcHJvZC1j
-YXJwMS5pdC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMzx
-w+bemmxOUna+e8r3EYf8K/lhbRqnIpvHBtCvQ8Hs9NPbeBdQU146UwEGGSm9eBsR
-OEekCXgjudorIvjt8O/wxmjCNmHzj/2qP+Adbj/0t7tY+Fq+SXZAvQHGnxX9yDbr
-opA8ge9pDhglakg/2L9qAS2ud0YH4tv43qL/60CVDBOrMmRNDWqqxYwB3scCiz9+
-R+dlbACube/4NWPma5oaezMwEQy0snBD8IgeEdvpp/l62RcrcI+7SWUNs6isgG0o
-9+TyRYBpmpcbG6Y+xhjWfYRN10XGXngNJ5VLcWnuJ35ryhQgKlviU4PJl7421Glw
-w3Uwk7f9w4Zy3UZ2lKUCAwEAAaNMMEowKQYDVR0RBCIwIIIeY2FwdGl2ZWxhbi1w
-cm9kLWNhcnAxLml0LnN1LnNlMB0GA1UdDgQWBBRj066uDCEkGZj71jtrxJ0RJvEt
-IDANBgkqhkiG9w0BAQUFAAOCAQEAcx8+oqL6kN2Fbl29VdMFOy2as/5porQVoHC8
-rkwQT86kuunaY5QaMSeo+NJ7RbwN8PGLP0syrrdhb9WdWOClD00ZEf0AqiPHJeQQ
-PLCoyyOQYarfWC2dSEZ8gbvJpU2nu3GZ1g5tf5rN6UWtzeTxtIRav6OiTuoojM0C
-qsBAyUcnBfNjtpa3swU7Vfd4MAOqyPqZHm/512/RSW+hYpOjMNcp1RkOy7ne1GK/
-mcsQPmRHkRImnweyygzpYMQ+1uLdEdi0wbmVQpMcSlrQ4Dt558PfmXAIrvXwd3of
-ROU2a0niXfGVaIomY/J7Xkazao4dQmFvwHY77hTp6Qhf3PlYOw==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://captivelan.it.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://captivelan.it.su.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://captivelan.it.su.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://captivelan.it.su.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://captivelan.it.su.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://captivelan.it.su.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://captivelan.it.su.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://captivelan.it.su.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://captivelan.it.su.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://captivelan.it.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://captivelan.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://captivelan.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://captivelan.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://captivelan.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://captivelan.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/daisy.ict.kth.se-shibboleth.xml b/swamid-2.0/daisy.ict.kth.se-shibboleth.xml
new file mode 100644
index 00000000..1496fb03
--- /dev/null
+++ b/swamid-2.0/daisy.ict.kth.se-shibboleth.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://daisy.ict.kth.se/shibboleth">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://daisy.ict.kth.se/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://daisy.ict.kth.se/Shibboleth.sso/Login/SU"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://daisy.ict.kth.se/Shibboleth.sso/DS/DSV"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://daisy.ict.kth.se/Shibboleth.sso/DS/DSV" index="1"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://daisy.ict.kth.se/Shibboleth.sso/DS/SU"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://daisy.ict.kth.se/Shibboleth.sso/DS/SU" index="2"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://daisy.ict.kth.se/Shibboleth.sso/DS/SWAMID"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://daisy.ict.kth.se/Shibboleth.sso/DS/SWAMID" index="3"/>
+ <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://inslaget.kau.se/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Daisy</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Daisy</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Studieadministrativt system för data- och systemvetenskap vid Stockholms universitet och ICT-skolan vid KTH.</mdui:Description>
+ <mdui:Description xml:lang="en">Administrative system for education used by the Department of Computer and Systems Sciences (DSV) at Stockholm University and the School of Information and Communication Technology (ICT) at KTH.</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>daisy.dsv.su.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=daisy.dsv.su.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJANH4LV/rSc9DMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2RhaXN5LmRzdi5zdS5zZTAeFw0xNDA5MDIxMTM0MzdaFw0yNDA4MzAxMTM0
+MzdaMBoxGDAWBgNVBAMTD2RhaXN5LmRzdi5zdS5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMYxuWKcPXDRuanmNtBs0LlEdh8z5Dx/x1w6ZxmlfI7n
+Ed8pZbNwQXh8Ve8oa+zE5h5ucUQaH4IXn/dggbhnX6YbtI6uY5nti7gcFCivDxJ0
+5QM4BkRJlpCDX9neSehXJD/qXEhClSVMbr97nW0tG9MZcQf/PpnMqpfEOFTdzewX
+0JrNTUQWqseTYgJ4FIyjXL1juz6UwmBI+0Dmm7qQbg9dqqTLE9eImUPgATr+HIeY
+RPhIMFAyDxHDTsRaots8zx8KqjEUxmpI1dwCflPEJRxTe1dy+o/A00qUKrBWNdVN
+V0jahE0vSuHnpxskB5f9ZcMiUgwf84/qyKTGefoiomkCAwEAAaM9MDswGgYDVR0R
+BBMwEYIPZGFpc3kuZHN2LnN1LnNlMB0GA1UdDgQWBBS9Ss3+oqLHzza+tYncMvHI
+DfBVUzANBgkqhkiG9w0BAQUFAAOCAQEAHSqZjB17aP2sDkSEfqSbui2yMXwPcZSW
+2kKR6hZv1r7HnHDoGJYRmj7/qjVnaWJxSwZkeUvDykZpl1Vn42Ik0UgtipZ245Si
+SHhrmDQo9lpms1YwVFyHXamSU/6zbG0W/sTpcM5FB3hqUgWOLkO+bRutZZKE8T9N
++T0zv7S1FTWBttLA6iYOd/ODVe+Px2UMbadlk4iGZHZUI/4T4aRcNUInNhEdYXDK
+AA4QdpJkL9NWpra1nc5H/Z+Xs+KwciCDhmuu+QGwuynKuoJwSxRnlsGBar9K/5ra
+QhkStwIG6VXQAVJpMKGblsSIk+TqRD1okkUSY5BHAob80RAoOCmbhw==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://daisy.ict.kth.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://daisy.ict.kth.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://daisy.ict.kth.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://daisy.ict.kth.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://daisy.ict.kth.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://daisy.ict.kth.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://daisy.ict.kth.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://daisy.ict.kth.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://daisy.ict.kth.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://daisy.ict.kth.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://daisy.ict.kth.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://daisy.ict.kth.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://daisy.ict.kth.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://daisy.ict.kth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/gih.pingpong.net-shibboleth.sso-metadata.xml b/swamid-2.0/gih.pingpong.net-shibboleth.sso-metadata.xml
new file mode 100644
index 00000000..dfb91799
--- /dev/null
+++ b/swamid-2.0/gih.pingpong.net-shibboleth.sso-metadata.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gih.pingpong.se/Shibboleth.sso/Metadata">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv"> PING PONG vid GIH </mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en"> PING PONG at GIH </mdui:DisplayName>
+ <mdui:Description xml:lang="sv"> Lärplattformen PING PONG vid Gymnastik- och idrottshögskolan. </mdui:Description>
+ <mdui:Description xml:lang="en"> The learning platform PING PONG at The Swedish School of Sport and Health Sciences. </mdui:Description>
+ <mdui:Logo height="168" width="50">https://gih.pingpong.se/login/pingpong-logo-168x50.png </mdui:Logo>
+ <mdui:Logo height="16" width="16">https://gih.pingpong.se/login/pingpong-logo-16x16.png</mdui:Logo>
+ </mdui:UIInfo>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gih.pingpong.se/Shibboleth.sso/Login"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://lillaedet.pingpong.se/shibboleth</ds:KeyName>
+ <ds:KeyName>lillaedet.pingpong.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=lillaedet.pingpong.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAMNpqZY0cUukMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+BAMTFWxpbGxhZWRldC5waW5ncG9uZy5zZTAeFw0xMjAxMTgxMDU4MjZaFw0yMjAx
+MTUxMDU4MjZaMCAxHjAcBgNVBAMTFWxpbGxhZWRldC5waW5ncG9uZy5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM8GQM1LnsvyXPnZh9ZlWhG3gkJB
+0H8I7kkVO017B7AmQvFingsCaIHBFnglKRyTml5lw5My4NGi9QVWLSd5IIoDD9Is
+uRR5tEU0+G6eyxQy08MZMB0XwamC+8BsU/0rOc5zmA+iAS3LDZO4m+gLOwWYorbg
+a6ViHplIrOUOBeUT1j4D3MJs5LBpJ/Ruvf4sAzP/eA8uCr7Wo13Geq+8lJodV917
+D+/KbGbOHZMkhCb9iCZpdJVvnVGWWuQbYMfAxaRcGkIMKZOcFiseCJ1tUlrb9YFD
+WuPcF7kFr0nzGmqVyqFd7zedMNzIEyBVlEa3YwcwxQSlopVf9FBm5FNGi88CAwEA
+AaNtMGswSgYDVR0RBEMwQYIVbGlsbGFlZGV0LnBpbmdwb25nLnNlhihodHRwczov
+L2xpbGxhZWRldC5waW5ncG9uZy5zZS9zaGliYm9sZXRoMB0GA1UdDgQWBBQS1rOl
+mFqPheIlLCkc2f6dkjPjGDANBgkqhkiG9w0BAQUFAAOCAQEAYJ+J6GqQXCjnDI4j
+jeT1SSEpDmEgH4JtaJbth2Ymz1lw8DAwF51aXK+9ylY239V2tQ7cVYdYdeNLsK8S
+i8WGFEPepAJevRES3TbZmBkx63vg6KFtONBFa4FiDAHv7Ja7fGPC/jo4+7V+174j
+wdfS6g4c1YW8xMNOHgdAbeMVk365DD3vYv796T6m9oaZfp41fOkvQ2Ly7lD1P53d
+kYPtN92O/M+IGG8b3FF4UQ3tTnC8N9D6YF18X5GK+W1tSQfZ7jAf3sAK9yrXuZv2
+AyhVkxRiEnLD4tvVDNFseCCzGAomlzCuOU2QY5TyK6VbtwKvxZvUc6GQF5y7h1aN
+UIZtDw==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gih.pingpong.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gih.pingpong.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gih.pingpong.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gih.pingpong.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gih.pingpong.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gih.pingpong.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/lms.hig.se-shibboleth-sp.xml b/swamid-2.0/lms.hig.se-shibboleth-sp.xml
new file mode 100644
index 00000000..0eb10cb4
--- /dev/null
+++ b/swamid-2.0/lms.hig.se-shibboleth-sp.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lms.hig.se/shibboleth-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Blackboard (Learning Management System)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Blackboard lärplattform</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Blackboard is a web based learning management system, for courses at the University of Gävle. The system is used for both campus courses and distance learning. </mdui:Description>
+ <mdui:Description xml:lang="sv">Blackboard är ett webbaserat system för hantering av kurser vid Högskolan i Gävle, en så kallad lärplattform. Systemet kan användas för både campus- och distanskurser.</mdui:Description>
+ <mdui:Logo height="45" width="50">https://webkonto.student.hig.se/img/cencolor-50.gif</mdui:Logo>
+ <mdui:Logo xml:lang="sv" height="44" width="50">https://webkonto.student.hig.se/img/cenfarg-50.gif</mdui:Logo>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.blackboard.com/Footer/Privacy-Center.aspx</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lms.hig.se/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lms.hig.se/Shibboleth.sso/Login" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>fgprd-137892-sf108273-app001</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=fgprd-137892-sf108273-app001</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIJAJjJj09+G/e9MA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+BAMTHGZncHJkLTEzNzg5Mi1zZjEwODI3My1hcHAwMDEwHhcNMTUwNDIwMTYwMzE3
+WhcNMjUwNDE3MTYwMzE3WjAnMSUwIwYDVQQDExxmZ3ByZC0xMzc4OTItc2YxMDgy
+NzMtYXBwMDAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuCKelXjL
+3oStYmCPuLadSQ9VoUVsoUDVvG/KZMyqGffZFnecykjIR98UrmfP0HyTVSJKrTyZ
+oRMKgs+lLFFO6VXlBz8psHBjLbF/ZUk3Vz361iU1eWK9TZ2I0zQT+DEYqGY2iYGf
+QDM3tpzuuqm9cez/XlGINZK5Yxzt31+JirDTx5BwGgkTqNl34WO4LWcGSybMrIcM
+1kHqQ1j2vWe5/1QBVskIABEtZK3m798XcLAaGPvyFxl9iO9aBbpXGIyR9F0t2row
+lPAsEXkJ1pli/aLSq2EaGdXd+jHm9avhzvqqd1EgB8W4rbk99znNhOAOR8tBV8G5
+pC4gPZFmXTNi4wIDAQABo0owSDAnBgNVHREEIDAeghxmZ3ByZC0xMzc4OTItc2Yx
+MDgyNzMtYXBwMDAxMB0GA1UdDgQWBBT97eKp2I/NaaU7VpgTGmVhNQTsmDANBgkq
+hkiG9w0BAQUFAAOCAQEAPzOmg2K4XVoCrfGgaLk911O0Ok0aIs99HdBZ00Z1/7Qo
+qSZhZwas6HZdxkx2KA/RLztfbE71V33RVYlOhtH47lGLCvaEd5bsrrDeVnXsxPVS
+Nzdp17br+kLxyTqwSG2rvMVwHjFuDBS1Ar/Admm+k5Szj6UfuPBBIXDw8F33GwOT
+hzAuvpNmZKE5MpDOE97gtvAKAfPzL/St1off5DiCc1fC/AIYusUtcxh9hGdIZ5X8
+Lk4WW3xh7ISn0oT7Dd4ySiBaxYc1XWalRa082HDRHKW0xHZC+yywn+yiloN+t3sj
+Xiuyn7D35GBAgkGy+kU+hqB2fHQUrvnx3tn6wfL7BA==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lms.hig.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lms.hig.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lms.hig.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lms.hig.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lms.hig.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lms.hig.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lms.hig.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lms.hig.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lms.hig.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lms.hig.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lms.hig.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lms.hig.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lms.hig.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lms.hig.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lms.hig.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lms.hig.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lms.hig.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lms.hig.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lms.hig.se/Shibboleth.sso/SAML2/POST" index="7"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lms.hig.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lms.hig.se/Shibboleth.sso/SAML2/ECP" index="10"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lms.hig.se/Shibboleth.sso/SAML/POST" index="11"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lms.hig.se/Shibboleth.sso/SAML/Artifact" index="12"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/sp.wavelan.su.se-shibboleth.sso.xml b/swamid-2.0/sp.wavelan.su.se-shibboleth.sso.xml
deleted file mode 100644
index f067f0d1..00000000
--- a/swamid-2.0/sp.wavelan.su.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.wavelan.su.se/Shibboleth.sso">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <md:Extensions>
- <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.wavelan.su.se/Shibboleth.sso/WAYF" index="1"/>
- <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.wavelan.su.se/Shibboleth.sso/WAYF/wavelan" index="1"/>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>wavelan-prod-sp1.it.su.se</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=wavelan-prod-sp1.it.su.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIDEjCCAfqgAwIBAgIJANU7a0lt6+5VMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGXdhdmVsYW4tcHJvZC1zcDEuaXQuc3Uuc2UwHhcNMDkwNzI4MTA0MzA0WhcN
-MTkwNzI2MTA0MzA0WjAkMSIwIAYDVQQDExl3YXZlbGFuLXByb2Qtc3AxLml0LnN1
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7TYTIfV7kI7g+TIi
-x6tXtusozDHOK4sXm2StU3soSFb+WbQAyVsqDV1oqGmMUEULyPYwwo7MiXhZinii
-pMxuhiUbjc414efx5Il+etQekzkGFWnEPMCaDKt0oRKd+IgIJsS2InqvCmIKr2e9
-Hn0/z36E7enobEJFundduLIrHnAgLvbVZBekLI00293v96JHUjYshhy0i1uCtAuh
-oa+QzzbVSjZNOpIoeGMno/h4+QilRquoLuYWPjVT0Jujqrb+nN4CsebV4hAwwFun
-P1J+fVXI+JSs/H1QJqe+2fIGIZCDsUBR3xHVp7FQ9y+4b/5k9LQ8wJgamcbToC64
-8JJ3pwIDAQABo0cwRTAkBgNVHREEHTAbghl3YXZlbGFuLXByb2Qtc3AxLml0LnN1
-LnNlMB0GA1UdDgQWBBQOxqZr1tIfKe06aYoCDaMLu/t43zANBgkqhkiG9w0BAQUF
-AAOCAQEAaWCjso7/vVsDu4c6xbxKB0DoRwhGqTRC70SXC76n60CwmJNJdBP2QqZN
-B8XukYsJGr/Dkr/jO4qqVc1xi9Qfksyft6LpKdWm3mSPNL5m5i5snlukyFnYvz6m
-oaYb5vSBRyoHuz/nN979Qm6XFx+rl7sjOUhIklTLJkM0ghJRrOa137GEGdwYKmCH
-mVBY3XZTlatsogAojbHN8656Mps1cH+FzZhTYMTA+1ta4TT9Q4mTD5W/xM2k4Ldy
-xjQvMgNsCbY2jk0mgupDVYcZwa82ODKdbAMC6dFlGGHn7I8+IW05jVRrLtfR7lt7
-m/XvKye561mB0W1mWHdByCY8Q2jIWQ==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>wavelan-prod-sp1.it.su.se</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=wavelan-prod-sp1.it.su.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIDEjCCAfqgAwIBAgIJANU7a0lt6+5VMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGXdhdmVsYW4tcHJvZC1zcDEuaXQuc3Uuc2UwHhcNMDkwNzI4MTA0MzA0WhcN
-MTkwNzI2MTA0MzA0WjAkMSIwIAYDVQQDExl3YXZlbGFuLXByb2Qtc3AxLml0LnN1
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7TYTIfV7kI7g+TIi
-x6tXtusozDHOK4sXm2StU3soSFb+WbQAyVsqDV1oqGmMUEULyPYwwo7MiXhZinii
-pMxuhiUbjc414efx5Il+etQekzkGFWnEPMCaDKt0oRKd+IgIJsS2InqvCmIKr2e9
-Hn0/z36E7enobEJFundduLIrHnAgLvbVZBekLI00293v96JHUjYshhy0i1uCtAuh
-oa+QzzbVSjZNOpIoeGMno/h4+QilRquoLuYWPjVT0Jujqrb+nN4CsebV4hAwwFun
-P1J+fVXI+JSs/H1QJqe+2fIGIZCDsUBR3xHVp7FQ9y+4b/5k9LQ8wJgamcbToC64
-8JJ3pwIDAQABo0cwRTAkBgNVHREEHTAbghl3YXZlbGFuLXByb2Qtc3AxLml0LnN1
-LnNlMB0GA1UdDgQWBBQOxqZr1tIfKe06aYoCDaMLu/t43zANBgkqhkiG9w0BAQUF
-AAOCAQEAaWCjso7/vVsDu4c6xbxKB0DoRwhGqTRC70SXC76n60CwmJNJdBP2QqZN
-B8XukYsJGr/Dkr/jO4qqVc1xi9Qfksyft6LpKdWm3mSPNL5m5i5snlukyFnYvz6m
-oaYb5vSBRyoHuz/nN979Qm6XFx+rl7sjOUhIklTLJkM0ghJRrOa137GEGdwYKmCH
-mVBY3XZTlatsogAojbHN8656Mps1cH+FzZhTYMTA+1ta4TT9Q4mTD5W/xM2k4Ldy
-xjQvMgNsCbY2jk0mgupDVYcZwa82ODKdbAMC6dFlGGHn7I8+IW05jVRrLtfR7lt7
-m/XvKye561mB0W1mWHdByCY8Q2jIWQ==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.wavelan.su.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.wavelan.su.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.wavelan.su.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.wavelan.su.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.wavelan.su.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.wavelan.su.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.wavelan.su.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.wavelan.su.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/test.bils.se-auth-metadata.xml b/swamid-2.0/test.bils.se-auth-metadata.xml
index c26c492c..512c52a9 100644
--- a/swamid-2.0/test.bils.se-auth-metadata.xml
+++ b/swamid-2.0/test.bils.se-auth-metadata.xml
@@ -1,29 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.bils.se/auth/metadata/">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
<md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">BILS</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Bioinformatics Infrastructure for Life Sciences</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://test.bils.se/auth/info</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
<md:KeyDescriptor use="encryption">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDgDCCAmgCCQC/bFOq5e+52jANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMC
- U0UxEDAOBgNVBAgMB1VwcHNhbGExEDAOBgNVBAcMB1VwcHNhbGExDTALBgNVBAoM
- BEJJTFMxDDAKBgNVBAsMA2RldjEVMBMGA1UEAwwMdGVzdC5iaWxzLnNlMRowGAYJ
- KoZIhvcNAQkBFgtkYXpAYmlscy5zZTAeFw0xNTA2MjIxMjUxMDFaFw0xNjA2MjEx
- MjUxMDFaMIGBMQswCQYDVQQGEwJTRTEQMA4GA1UECAwHVXBwc2FsYTEQMA4GA1UE
- BwwHVXBwc2FsYTENMAsGA1UECgwEQklMUzEMMAoGA1UECwwDZGV2MRUwEwYDVQQD
- DAx0ZXN0LmJpbHMuc2UxGjAYBgkqhkiG9w0BCQEWC2RhekBiaWxzLnNlMIIBIjAN
- BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvIbs0kRuxpwPObDk1tkLQxu15k9c
- M7ds1cvtoNwG7cBPsK+7qGVPzWS6Di/7W7ObTZHJxYmJVADnSQj01p2wGbse0RP+
- 17XBloGxE6UUA5yJHNIauH2HmPoK3r48DZ6u3LxyQfmecNN30alF8n98jACPs2nD
- CmAHjzQWhtI0Z1FPn26wcBUiSU8gJS8AhGTmjMpc9kzJ/UkORw/vMoxqeWF1GTPy
- m6GNHk7jftI6m/H8uksnkc3HR4qkffrrIjtlWHFSTp6jADQkzSSI58+Yp+raucIp
- rZLh6o/4GSOL27zC/7JoJ4AugtGOVswzrD238pBTU3pFb0zLkSB3yDE8EwIDAQAB
- MA0GCSqGSIb3DQEBCwUAA4IBAQA9IxuGftj1HKmeR20qaEIuf/r0sdPy+TMSvq7x
- DFpE9pJpO7amzqDlBX+kZAPI0zR6FlGAuZPttdVUcV/rM9Er7wkvPgOD6tmelblk
- c02RHODAwz9H9zrUXTJ+JLd5fDcDtO2tIBtsrJW6GenOL/f/6/xhfnjraUyBsJrx
- dIXyTPFy3AvcXGRlmerQgAK76f7cA5yTYdZewqmL2GmMagfgOBr3r2IFGv96OniP
- RzJDSRB4WW8TL1u7LpPn2UjaQ0jFGM9/bxC6jS1TIqgbbmCNUAQ7YVh0/g3cOf7d
- g0diYVdCWk0ZP3QvFBBu7QZEC4GheezEur/bQq+zfc2FKvkq
+ MIIFGzCCBAOgAwIBAgIQCg6hqtuYkZ55b+FL/H496TANBgkqhkiG9w0BAQsFADBk
+ MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+ QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+ Q0EgMzAeFw0xNTA3MDcwMDAwMDBaFw0xODA3MTExMjAwMDBaMHAxCzAJBgNVBAYT
+ AlNFMRUwEwYDVQQIEwxPc3RlcmdvdGxhbmQxEjAQBgNVBAcTCUxpbmtvcGluZzEf
+ MB0GA1UEChMWTGlua29waW5ncyB1bml2ZXJzaXRldDEVMBMGA1UEAxMMdGVzdC5i
+ aWxzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvIbs0kRuxpwP
+ ObDk1tkLQxu15k9cM7ds1cvtoNwG7cBPsK+7qGVPzWS6Di/7W7ObTZHJxYmJVADn
+ SQj01p2wGbse0RP+17XBloGxE6UUA5yJHNIauH2HmPoK3r48DZ6u3LxyQfmecNN3
+ 0alF8n98jACPs2nDCmAHjzQWhtI0Z1FPn26wcBUiSU8gJS8AhGTmjMpc9kzJ/UkO
+ Rw/vMoxqeWF1GTPym6GNHk7jftI6m/H8uksnkc3HR4qkffrrIjtlWHFSTp6jADQk
+ zSSI58+Yp+raucIprZLh6o/4GSOL27zC/7JoJ4AugtGOVswzrD238pBTU3pFb0zL
+ kSB3yDE8EwIDAQABo4IBuzCCAbcwHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lR
+ EWN1UGIwHQYDVR0OBBYEFC/USBcPGwl3iEiryB40P5EDYi5PMBcGA1UdEQQQMA6C
+ DHRlc3QuYmlscy5zZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUH
+ AwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2lj
+ ZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdp
+ Y2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwB
+ ATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4G
+ CCsGAQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQu
+ Y29tMDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVS
+ RU5BU1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBz
+ 3a9V9W+zKmPWPkNr39TFgyyhKdaDQbnFUVi2obSY+vr5abAiY1UDRXfSpx0sk4I3
+ EDMBXK/Bja4ok2EMNKzGAAHA9Lj4LlvMl8kxz6fM8VO00yr5dycScKyvKHjI6VAj
+ 0CuEXlaoMYk3dJjAI6bZn44MB9C2aFxcjqhcKy7Ip7CWNT+LbhzAGg07hV7H7Y0e
+ Bd3gaTdt56dyFXxPCF1JSs1yUlTT4dhgRHzTmwDpznNxvKrrFHxdrF5Sfpb2R7Ng
+ gj6Lg0196OgB9H3vHKCHKfcYFQxl0rqGrAOg6UPn6kRFRXY42Qk+6Bvf0j94bcA/
+ uaWJuMqFL2/ea0WzYmcZ
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -32,44 +57,49 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDgDCCAmgCCQC/bFOq5e+52jANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMC
- U0UxEDAOBgNVBAgMB1VwcHNhbGExEDAOBgNVBAcMB1VwcHNhbGExDTALBgNVBAoM
- BEJJTFMxDDAKBgNVBAsMA2RldjEVMBMGA1UEAwwMdGVzdC5iaWxzLnNlMRowGAYJ
- KoZIhvcNAQkBFgtkYXpAYmlscy5zZTAeFw0xNTA2MjIxMjUxMDFaFw0xNjA2MjEx
- MjUxMDFaMIGBMQswCQYDVQQGEwJTRTEQMA4GA1UECAwHVXBwc2FsYTEQMA4GA1UE
- BwwHVXBwc2FsYTENMAsGA1UECgwEQklMUzEMMAoGA1UECwwDZGV2MRUwEwYDVQQD
- DAx0ZXN0LmJpbHMuc2UxGjAYBgkqhkiG9w0BCQEWC2RhekBiaWxzLnNlMIIBIjAN
- BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvIbs0kRuxpwPObDk1tkLQxu15k9c
- M7ds1cvtoNwG7cBPsK+7qGVPzWS6Di/7W7ObTZHJxYmJVADnSQj01p2wGbse0RP+
- 17XBloGxE6UUA5yJHNIauH2HmPoK3r48DZ6u3LxyQfmecNN30alF8n98jACPs2nD
- CmAHjzQWhtI0Z1FPn26wcBUiSU8gJS8AhGTmjMpc9kzJ/UkORw/vMoxqeWF1GTPy
- m6GNHk7jftI6m/H8uksnkc3HR4qkffrrIjtlWHFSTp6jADQkzSSI58+Yp+raucIp
- rZLh6o/4GSOL27zC/7JoJ4AugtGOVswzrD238pBTU3pFb0zLkSB3yDE8EwIDAQAB
- MA0GCSqGSIb3DQEBCwUAA4IBAQA9IxuGftj1HKmeR20qaEIuf/r0sdPy+TMSvq7x
- DFpE9pJpO7amzqDlBX+kZAPI0zR6FlGAuZPttdVUcV/rM9Er7wkvPgOD6tmelblk
- c02RHODAwz9H9zrUXTJ+JLd5fDcDtO2tIBtsrJW6GenOL/f/6/xhfnjraUyBsJrx
- dIXyTPFy3AvcXGRlmerQgAK76f7cA5yTYdZewqmL2GmMagfgOBr3r2IFGv96OniP
- RzJDSRB4WW8TL1u7LpPn2UjaQ0jFGM9/bxC6jS1TIqgbbmCNUAQ7YVh0/g3cOf7d
- g0diYVdCWk0ZP3QvFBBu7QZEC4GheezEur/bQq+zfc2FKvkq
+ MIIFGzCCBAOgAwIBAgIQCg6hqtuYkZ55b+FL/H496TANBgkqhkiG9w0BAQsFADBk
+ MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+ QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+ Q0EgMzAeFw0xNTA3MDcwMDAwMDBaFw0xODA3MTExMjAwMDBaMHAxCzAJBgNVBAYT
+ AlNFMRUwEwYDVQQIEwxPc3RlcmdvdGxhbmQxEjAQBgNVBAcTCUxpbmtvcGluZzEf
+ MB0GA1UEChMWTGlua29waW5ncyB1bml2ZXJzaXRldDEVMBMGA1UEAxMMdGVzdC5i
+ aWxzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvIbs0kRuxpwP
+ ObDk1tkLQxu15k9cM7ds1cvtoNwG7cBPsK+7qGVPzWS6Di/7W7ObTZHJxYmJVADn
+ SQj01p2wGbse0RP+17XBloGxE6UUA5yJHNIauH2HmPoK3r48DZ6u3LxyQfmecNN3
+ 0alF8n98jACPs2nDCmAHjzQWhtI0Z1FPn26wcBUiSU8gJS8AhGTmjMpc9kzJ/UkO
+ Rw/vMoxqeWF1GTPym6GNHk7jftI6m/H8uksnkc3HR4qkffrrIjtlWHFSTp6jADQk
+ zSSI58+Yp+raucIprZLh6o/4GSOL27zC/7JoJ4AugtGOVswzrD238pBTU3pFb0zL
+ kSB3yDE8EwIDAQABo4IBuzCCAbcwHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lR
+ EWN1UGIwHQYDVR0OBBYEFC/USBcPGwl3iEiryB40P5EDYi5PMBcGA1UdEQQQMA6C
+ DHRlc3QuYmlscy5zZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUH
+ AwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2lj
+ ZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdp
+ Y2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwB
+ ATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4G
+ CCsGAQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQu
+ Y29tMDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVS
+ RU5BU1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBz
+ 3a9V9W+zKmPWPkNr39TFgyyhKdaDQbnFUVi2obSY+vr5abAiY1UDRXfSpx0sk4I3
+ EDMBXK/Bja4ok2EMNKzGAAHA9Lj4LlvMl8kxz6fM8VO00yr5dycScKyvKHjI6VAj
+ 0CuEXlaoMYk3dJjAI6bZn44MB9C2aFxcjqhcKy7Ip7CWNT+LbhzAGg07hV7H7Y0e
+ Bd3gaTdt56dyFXxPCF1JSs1yUlTT4dhgRHzTmwDpznNxvKrrFHxdrF5Sfpb2R7Ng
+ gj6Lg0196OgB9H3vHKCHKfcYFQxl0rqGrAOg6UPn6kRFRXY42Qk+6Bvf0j94bcA/
+ uaWJuMqFL2/ea0WzYmcZ
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.bils.se/auth/logout"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.bils.se/auth/response" index="1"/>
- <md:AttributeConsumingService index="1">
- <md:ServiceName xml:lang="en">BILS Registration</md:ServiceName>
- <md:ServiceName xml:lang="sv">BILS Inloggning</md:ServiceName>
- <md:RequestedAttribute Name="first_name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute Name="last_name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
- <md:RequestedAttribute FriendlyName="email" Name="urn:oid:1.2.840.113549.1.9.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
- </md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
<md:OrganizationName xml:lang="en">Bioinformatics Infrastructure for Life Sciences</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Bioinformatics Infrastructure for Life Sciences</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.bils.se/</md:OrganizationURL>
</md:Organization>
- <md:ContactPerson contactType="technical"/>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Frédéric</md:GivenName>
+ <md:SurName>Haziza</md:SurName>
+ <md:EmailAddress>daz@bils.se</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/testgih.pingpong.net-shibboleth.sso-metadata.xml b/swamid-2.0/testgih.pingpong.net-shibboleth.sso-metadata.xml
new file mode 100644
index 00000000..f1077ee4
--- /dev/null
+++ b/swamid-2.0/testgih.pingpong.net-shibboleth.sso-metadata.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testgih.pingpong.net/Shibboleth.sso/Metadata">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">TEST-PING PONG vid GIH</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">TEST-PING PONG at GIH</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">test: Lärplattformen PING PONG vid Gymnastik- och idrottshögskolan.</mdui:Description>
+ <mdui:Description xml:lang="en">test: The learning platform PING PONG at The Swedish School of Sport and Health Sciences.</mdui:Description>
+ <mdui:Logo height="168" width="50">https://testgih.pingpong.net/login/pingpong-logo-168x50.png</mdui:Logo>
+ <mdui:Logo height="16" width="16">https://testgih.pingpong.net/login/pingpong-logo-16x16.png</mdui:Logo>
+ </mdui:UIInfo>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://testgih.pingpong.net/Shibboleth.sso/Login"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>krusbar.pingpong.net</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=krusbar.pingpong.net</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAMVvfL7J0nz+MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFGtydXNiYXIucGluZ3BvbmcubmV0MB4XDTEyMDYyODE1MDYzMFoXDTIyMDYy
+NjE1MDYzMFowHzEdMBsGA1UEAxMUa3J1c2Jhci5waW5ncG9uZy5uZXQwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvh+Jg4oen/vUUGtx9eAaYY5rXtTFl
+1nMfq5x3XghdSV8uPg4bQ6VXw/9fZVTnAO3iFrF1LrfjuZWhZN2iL40nXfM1isSR
+mDZDF7CgqwsnoaVodgS/OyL9Q9iGOaXrM2lrN4ucuFAZcd3MUIrZjyBp3jtWkuTp
+T1VHnicxVWbT8VsjrWAdj1MUFv2IeWPP1it+4dwUDZrLqKhRWnFAo8zGHXiyO+aw
+U1Qb/52EShNykDHWBbtzgadLhPQzWQy5E457wvNVFbad0cc29vASufbIhzBGE/U3
+DdVI6jphpn5QMZfHhl9BLoqr9MJh1F1BRlL+HOcLXbQqg0JD/d1d7XAjAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFGtydXNiYXIucGluZ3BvbmcubmV0MB0GA1UdDgQWBBQd
+qBIVHafXKIz/Jr3tdLtcKbzR8zANBgkqhkiG9w0BAQUFAAOCAQEAKYOuyj800ABK
+R99elNxsDEddcjmIJQbO5tAosETGVlyqqdWL2D1rtSw0CTQiaba5Ae/TcgR/fnOv
+1g3uBZA26iQPbzsKGKYsB21aUEPJO0ZVhTdcid1tS672fOIZf1Y8+hmNh1psAurp
+DNOpoBNLoM8S8P95Q7hM6xLM76D1R61q4kO3np/YLYwNQSsHnHddu8/9oJu5j7oV
+KGPGrSczPfxG4plIUxm5tzNkHqNyYQttKrXGqdtCdkwjtYxS48G/ba1XkR/+baMf
+D8OuFV1n1oNCM9fqRzlCOyA7ISZyMlfiMCP3HXs53AcrRAnUKYwkP6Q4dIPS3C4Y
+LaCAPwuThQ==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testgih.pingpong.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testgih.pingpong.net/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testgih.pingpong.net/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testgih.pingpong.net/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testgih.pingpong.net/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testgih.pingpong.net/Shibboleth.sso/SAML2/POST" index="1"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/urn-urkund-shibboleth-sp.xml b/swamid-2.0/urn-urkund-shibboleth-sp.xml
index 9db7884b..9407e844 100644
--- a/swamid-2.0/urn-urkund-shibboleth-sp.xml
+++ b/swamid-2.0/urn-urkund-shibboleth-sp.xml
@@ -12,6 +12,14 @@
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://secure.urkund.com/Shibboleth.sso/DS" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">URKUND</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">URKUND</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Detect and check for plagiarism with URKUND</mdui:Description>
+ <mdui:Description xml:lang="en">Detect and check for plagiarism with URKUND</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">http://www.urkund.com</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.urkund.com</mdui:InformationURL>
+ </mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">