diff options
| -rw-r--r-- | swamid-externals-2.0.mxml | 1 | ||||
| -rw-r--r-- | swamid-externals-2.0/kantarainitiative.org-shibboleth-sp.xml | 81 | ||||
| -rw-r--r-- | swamid-externals-2.0/terena.org-sp.xml | 17 |
3 files changed, 8 insertions, 91 deletions
diff --git a/swamid-externals-2.0.mxml b/swamid-externals-2.0.mxml index 16d43fc7..eae77d91 100644 --- a/swamid-externals-2.0.mxml +++ b/swamid-externals-2.0.mxml @@ -1,5 +1,4 @@ <?xml version="1.0"?> <EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-externals-2.0.xml"> -<xi:include href="swamid-externals-2.0/kantarainitiative.org-shibboleth-sp.xml"/> <xi:include href="swamid-externals-2.0/terena.org-sp.xml"/> </EntitiesDescriptor> diff --git a/swamid-externals-2.0/kantarainitiative.org-shibboleth-sp.xml b/swamid-externals-2.0/kantarainitiative.org-shibboleth-sp.xml deleted file mode 100644 index 80b786f7..00000000 --- a/swamid-externals-2.0/kantarainitiative.org-shibboleth-sp.xml +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kantarainitiative.org/shibboleth-sp"> - <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:KeyDescriptor use="signing"> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:KeyName>kantarainitiative.org</ds:KeyName> - <ds:X509Data> - <ds:X509SubjectName> - emailAddress=support@kantarainitiative.org,CN=kantarainitiative.org,OU=Kantara Initiative,O=Kantara Initiative,L=Piscataway,ST=New Jersey,C=US - </ds:X509SubjectName> - <ds:X509Certificate> -MIIC3DCCAcSgAwIBAgIJAL/MUbTAo+SkMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV -BAMTB2thcmFqYW4wHhcNMTMwODEyMjA1NjQyWhcNMjMwODEwMjA1NjQyWjASMRAw -DgYDVQQDEwdrYXJhamFuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA -wwDDR3EpTSj+88WTW7KheApOZ9Qf6heGZAJxaSzFKN7YO5UI30mZcJSDNABEeOaA -anlrOd/UfC0i2D6dgr3gWCYq9qSyxIwTHn8x3Th9gJOAbMD/ySgXu8LKwu50GlP5 -ll3U7DxY0hh6VF8eRNj9bLjf7BAx08u18j0QwQkqm+h6wehm5vFNzBGU5hLOqf2J -y7eMBoKlDe0Cv9rHLyc64NciodO3pSqjsH6tBEqDQDvk6+LRhpRR0yBTSNL1YC9R -ROB5lXj92hM1DSwP1c8AdRdl+kFKITw2pP7cn+3VbgBtaqy/H4vgZDYQyMPzAwwo -GsuWgSOYy6vTP07mkyE6CQIDAQABozUwMzASBgNVHREECzAJggdrYXJhamFuMB0G -A1UdDgQWBBQ5n1pMLRKfp4YN5becz2ZwIeMMSDANBgkqhkiG9w0BAQUFAAOCAQEA -FeSlsbQV+/+MwL+C41s2v7/1WXQU+quAvzuNOPVbOmncW88Bs9pEQMoI1a8kjH5g -ip6ORw8s815b5LG3FqT4KimFbt2TY75a4t3VFpmHp0HE9McIaoN5bX4Z5hlXXH9/ -P1+8pnt4B/0s+7nhjV9ZXGJu8Wq0yA7PzH8Pzgkk+q7jGrQ1Nm/xn4dTA7OqixmI -FBOHIcbN/g+7Y74Kut/ixQeXsuDioGpKWjR/6NykQEeiQhpy6bq/d0N4sDWZTQCn -GjJWwb6FELUoeNsd0ItGrolRUV8987vCoT/4K7LVAMOvc9oboZGBmxYfftor8TXx -bTWG+YWyPbuGCUX1wouDRQ== -</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>kantarainitiative.org</ds:KeyName> - <ds:X509Data> - <ds:X509SubjectName> - emailAddress=support@kantarainitiative.org,CN=kantarainitiative.org,OU=Kantara Initiative,O=Kantara Initiative,L=Piscataway,ST=New Jersey,C=US - </ds:X509SubjectName> - <ds:X509Certificate> -MIIC3DCCAcSgAwIBAgIJAL/MUbTAo+SkMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV -BAMTB2thcmFqYW4wHhcNMTMwODEyMjA1NjQyWhcNMjMwODEwMjA1NjQyWjASMRAw -DgYDVQQDEwdrYXJhamFuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA -wwDDR3EpTSj+88WTW7KheApOZ9Qf6heGZAJxaSzFKN7YO5UI30mZcJSDNABEeOaA -anlrOd/UfC0i2D6dgr3gWCYq9qSyxIwTHn8x3Th9gJOAbMD/ySgXu8LKwu50GlP5 -ll3U7DxY0hh6VF8eRNj9bLjf7BAx08u18j0QwQkqm+h6wehm5vFNzBGU5hLOqf2J -y7eMBoKlDe0Cv9rHLyc64NciodO3pSqjsH6tBEqDQDvk6+LRhpRR0yBTSNL1YC9R -ROB5lXj92hM1DSwP1c8AdRdl+kFKITw2pP7cn+3VbgBtaqy/H4vgZDYQyMPzAwwo -GsuWgSOYy6vTP07mkyE6CQIDAQABozUwMzASBgNVHREECzAJggdrYXJhamFuMB0G -A1UdDgQWBBQ5n1pMLRKfp4YN5becz2ZwIeMMSDANBgkqhkiG9w0BAQUFAAOCAQEA -FeSlsbQV+/+MwL+C41s2v7/1WXQU+quAvzuNOPVbOmncW88Bs9pEQMoI1a8kjH5g -ip6ORw8s815b5LG3FqT4KimFbt2TY75a4t3VFpmHp0HE9McIaoN5bX4Z5hlXXH9/ -P1+8pnt4B/0s+7nhjV9ZXGJu8Wq0yA7PzH8Pzgkk+q7jGrQ1Nm/xn4dTA7OqixmI -FBOHIcbN/g+7Y74Kut/ixQeXsuDioGpKWjR/6NykQEeiQhpy6bq/d0N4sDWZTQCn -GjJWwb6FELUoeNsd0ItGrolRUV8987vCoT/4K7LVAMOvc9oboZGBmxYfftor8TXx -bTWG+YWyPbuGCUX1wouDRQ== -</ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </md:KeyDescriptor> - <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kantarainitiative.org/Shibboleth.sso/SAML2/POST" index="1"/> - <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kantarainitiative.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/> - <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kantarainitiative.org/Shibboleth.sso/SAML2/Artifact" index="3"/> - <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kantarainitiative.org/Shibboleth.sso/SAML2/ECP" index="4"/> - <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kantarainitiative.org/Shibboleth.sso/SAML/POST" index="5"/> - <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kantarainitiative.org/Shibboleth.sso/SAML/Artifact" index="6"/> - </md:SPSSODescriptor> - <md:Organization> - <md:OrganizationName xml:lang="en">Kantara Initiative</md:OrganizationName> - <md:OrganizationDisplayName xml:lang="en">Kantara Initiative</md:OrganizationDisplayName> - <md:OrganizationURL xml:lang="en">http://kantarainitiative.org/</md:OrganizationURL> - </md:Organization> - <md:ContactPerson contactType="support"> - <md:GivenName>Authentication Support</md:GivenName> - <md:EmailAddress>support@kantarainitiative.org</md:EmailAddress> - </md:ContactPerson> - <md:ContactPerson contactType="administrative"> - <md:GivenName>Joni</md:GivenName> - <md:SurName>Brennan</md:SurName> - <md:EmailAddress>staff@kantarainitiative.org</md:EmailAddress> - </md:ContactPerson> -</md:EntityDescriptor> diff --git a/swamid-externals-2.0/terena.org-sp.xml b/swamid-externals-2.0/terena.org-sp.xml index afc6b3b2..ff904e03 100644 --- a/swamid-externals-2.0/terena.org-sp.xml +++ b/swamid-externals-2.0/terena.org-sp.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp"> - <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> + <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true"> <md:Extensions> <mdui:UIInfo> <mdui:DisplayName xml:lang="en">GÉANT Service Provider Proxy</mdui:DisplayName> @@ -30,8 +30,8 @@ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/> <md:AttributeConsumingService index="0"> - <md:ServiceName xml:lang="en">TERENA Service Provider Proxy</md:ServiceName> - <md:ServiceDescription xml:lang="en">A Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription> + <md:ServiceName xml:lang="en">GÉANT Service Provider Proxy</md:ServiceName> + <md:ServiceDescription xml:lang="en">A service provider proxy for all GÉANT federated services</md:ServiceDescription> <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/> <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/> <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/> @@ -42,13 +42,12 @@ </md:AttributeConsumingService> </md:SPSSODescriptor> <md:Organization> - <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName> - <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName> - <md:OrganizationURL xml:lang="en">http://www.terena.org/</md:OrganizationURL> + <md:OrganizationName xml:lang="en">GÉANT</md:OrganizationName> + <md:OrganizationDisplayName xml:lang="en">GÉANT</md:OrganizationDisplayName> + <md:OrganizationURL xml:lang="en">http://www.geant.org/</md:OrganizationURL> </md:Organization> <md:ContactPerson contactType="technical"> - <md:GivenName>TERENA</md:GivenName> - <md:SurName>AAI team</md:SurName> - <md:EmailAddress>aai@terena.org</md:EmailAddress> + <md:GivenName>GÉANT AAI team</md:GivenName> + <md:EmailAddress>aai@geant.org</md:EmailAddress> </md:ContactPerson> </md:EntityDescriptor> |