http://mds.edugain.org into swamid-interfederations-2.0

1 files changed, 97 insertions, 49 deletions

diff --git a/swamid-interfederations-2.0/idp-test.llgc.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-test.llgc.org.uk-idp-shibboleth.xml
index 690582dd..be97bd85 100644
--- a/swamid-interfederations-2.0/idp-test.llgc.org.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-test.llgc.org.uk-idp-shibboleth.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-test.llgc.org.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the National Library of Wales.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-test.llgc.org.uk/idp/shibboleth">
+  <md:Extensions>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
@@ -12,12 +9,37 @@
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-11T09:38:34Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">llgc.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDJzCCAg+gAwIBAgIUf+ROdABvulYM0eBNBrr08C6TvOswDQYJKoZIhvcNAQEF
+						BQAwGjEYMBYGA1UEAxMPaWRwLmxsZ2Mub3JnLnVrMB4XDTE1MDUwNTEwNDI1NFoX
+						DTM1MDUwNTEwNDI1NFowGjEYMBYGA1UEAxMPaWRwLmxsZ2Mub3JnLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnIPzF237qyE3Px+37CeRobRfkDWI
+						PvHdJlD5nJkW8U+PTWnJ8At4PXC3gqV80EjSQHIFcyXkO261EHlA8SNWEcHRgpCj
+						viziINYRCPAzdtGmx75iqiFVwEskj1PODD4NjHRdCs4F3QQxmLZxlT2e2qufzuLm
+						0xcW7sopBpni3DOSLhy4EmaVXOe2WJFSWpLeAJYqBykWp53M2yfa7YM9i0DYiGee
+						sKFdTmP6N650488Aolw9PbECYZfVeqEhT5GbOZMZyE0Uhorjf3zvEGG8nPwEmF5x
+						hdx8dwUpnEByoLYZ1dz+S6TfKsckFxLpCk+AbFSTFTcqazUK3WO3aBzXUwIDAQAB
+						o2UwYzBCBgNVHREEOzA5gg9pZHAubGxnYy5vcmcudWuGJmh0dHBzOi8vaWRwLmxs
+						Z2Mub3JnLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQxx9cjObvnnBMR+VUm
+						LHVQdWfcUzANBgkqhkiG9w0BAQUFAAOCAQEAisO2C392/EeLBOD69GQ/4Xu7W9IQ
+						OdTV18rWXJVEPYDP7YmrcSk818fRVqK/jmxPtD6ue11ahS4ANoWYfL961uerYBy3
+						dH9DaLES8Z1q0Ph/9FaCToX54Qf3QZjeC+Z2cJxdU3GKW+jcAC2MA6xn8EZrav6o
+						wOtPF5sGumbFgmTsexNsy1yuavRO5Ss4L0PW6QaqZOnf6/qE84KxVz17F6liGtO5
+						jTr3pKI/A3iBWZt2V88lvRAxEQET8C6M9GnrRkSuLQUs6GWDbXKZHZPIs/qCvPG9
+						ZKiIFQhzp7jfUxRJaFznq0Ysg4Ftq0JIV+j8n7+JE4dO9Dp4c/rj6uzjDQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -42,24 +64,49 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.llgc.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.llgc.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.llgc.org.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.llgc.org.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.llgc.org.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.llgc.org.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.llgc.org.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.llgc.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.llgc.org.uk/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.llgc.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.llgc.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.llgc.org.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.llgc.org.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.llgc.org.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.llgc.org.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.llgc.org.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.llgc.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.llgc.org.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">llgc.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDJzCCAg+gAwIBAgIUf+ROdABvulYM0eBNBrr08C6TvOswDQYJKoZIhvcNAQEF
+						BQAwGjEYMBYGA1UEAxMPaWRwLmxsZ2Mub3JnLnVrMB4XDTE1MDUwNTEwNDI1NFoX
+						DTM1MDUwNTEwNDI1NFowGjEYMBYGA1UEAxMPaWRwLmxsZ2Mub3JnLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnIPzF237qyE3Px+37CeRobRfkDWI
+						PvHdJlD5nJkW8U+PTWnJ8At4PXC3gqV80EjSQHIFcyXkO261EHlA8SNWEcHRgpCj
+						viziINYRCPAzdtGmx75iqiFVwEskj1PODD4NjHRdCs4F3QQxmLZxlT2e2qufzuLm
+						0xcW7sopBpni3DOSLhy4EmaVXOe2WJFSWpLeAJYqBykWp53M2yfa7YM9i0DYiGee
+						sKFdTmP6N650488Aolw9PbECYZfVeqEhT5GbOZMZyE0Uhorjf3zvEGG8nPwEmF5x
+						hdx8dwUpnEByoLYZ1dz+S6TfKsckFxLpCk+AbFSTFTcqazUK3WO3aBzXUwIDAQAB
+						o2UwYzBCBgNVHREEOzA5gg9pZHAubGxnYy5vcmcudWuGJmh0dHBzOi8vaWRwLmxs
+						Z2Mub3JnLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQxx9cjObvnnBMR+VUm
+						LHVQdWfcUzANBgkqhkiG9w0BAQUFAAOCAQEAisO2C392/EeLBOD69GQ/4Xu7W9IQ
+						OdTV18rWXJVEPYDP7YmrcSk818fRVqK/jmxPtD6ue11ahS4ANoWYfL961uerYBy3
+						dH9DaLES8Z1q0Ph/9FaCToX54Qf3QZjeC+Z2cJxdU3GKW+jcAC2MA6xn8EZrav6o
+						wOtPF5sGumbFgmTsexNsy1yuavRO5Ss4L0PW6QaqZOnf6/qE84KxVz17F6liGtO5
+						jTr3pKI/A3iBWZt2V88lvRAxEQET8C6M9GnrRkSuLQUs6GWDbXKZHZPIs/qCvPG9
+						ZKiIFQhzp7jfUxRJaFznq0Ysg4Ftq0JIV+j8n7+JE4dO9Dp4c/rj6uzjDQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -84,25 +131,26 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.llgc.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.llgc.org.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">National Library of Wales</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">National Library of Wales / Llyfrgell Genedlaethol Cymru</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.llgc.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Illtud</GivenName>
-    <SurName>Daniel</SurName>
-    <EmailAddress>mailto:shibboleth-support@llgc.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Illtud</GivenName>
-    <SurName>Daniel</SurName>
-    <EmailAddress>mailto:shibboleth-technical@llgc.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.llgc.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.llgc.org.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">National Library of Wales</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National Library of Wales test IdP - DO NOT USE</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cy">IdP prawf Llyfrgell Genedlaethol Cymru - PEIDIWCH DEFNYDDIO</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.llgc.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Illtud</md:GivenName>
+    <md:SurName>Daniel</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-support@llgc.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Illtud</md:GivenName>
+    <md:SurName>Daniel</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-technical@llgc.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>