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

1 files changed, 42 insertions, 123 deletions

diff --git a/swamid-interfederations-2.0/idp.goldsmiths.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.goldsmiths.ac.uk-idp-shibboleth.xml
index 1890dc56..30053159 100644
--- a/swamid-interfederations-2.0/idp.goldsmiths.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.goldsmiths.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.goldsmiths.ac.uk/idp/shibboleth">
-  <!--
-		This is a "Goldsmiths, University of London" Shibboleth IdP for Goldsmiths' College.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.goldsmiths.ac.uk/idp/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-07-21T11:02:00Z">
       <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">gold.ac.uk</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Goldsmiths, University of London</mdui:DisplayName>
         <mdui:Logo height="66" width="180">https://www.gold.ac.uk/static/images/gold/logo_goldsmiths.gif</mdui:Logo>
         <mdui:Logo height="16" width="16">https://www.gold.ac.uk/static/images/g-16x16.gif</mdui:Logo>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -57,60 +54,21 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFrzCCBJegAwIBAgIQfHx94mojHl/68SiEwa+kHTANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEyMDYyODAwMDAwMFoXDTE1MDYyODIzNTk1OVowgYUxCzAJBgNV
-						BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xEjAQBgNVBAcTCU5ldyBDcm9zczEcMBoG
-						A1UEChMTR29sZHNtaXRocycgQ29sbGVnZTEUMBIGA1UECxMLSVQgU2VydmljZXMx
-						HTAbBgNVBAMTFGlkcC5nb2xkc21pdGhzLmFjLnVrMIICIjANBgkqhkiG9w0BAQEF
-						AAOCAg8AMIICCgKCAgEAot8BZGs52fkqWL67J8MNbrqZwqYIMsJrzOUgsqjGtWI3
-						nERfnocoRKUzPpZqTgaeVbpzNNncex3bddCNwtYDWXppWnGooZ+e97SVEquOCv4c
-						OyT4n0yg8cchfW04dy4MmCKEAiTJSq3hK4HLPgKiRwKN7WvejCD92wc0+rWLISML
-						U3S8BNDOmOYHKw8k7Q8LNY5irvSreR7dGVuYg4fgZH0Ub1t/hU8JqKC9uKCfGVwV
-						JhpsToWuJzB1MAwzhkem6SzuwkKMxZk1pZ9pKocZF3EttdiSBxJKm+sGuNvrM5VX
-						2OFEsDrkiRxUIKWwKY4Oa669aRRkwnKWyzLfn3kO+5B6K4SF3hu9K11rBYSxqxpe
-						GexNe6f5nNKntQnQf7fFkLA0LT5du0yGP63I+RVPyKFVTqvmeFKFlpKZ49iqaLrt
-						GqmUG83ACF4/ntoup6UNfraXyYO3wxGMUG83dQhGZBhvJk+osnLSLwPxL/mqKFBI
-						23tQnXwebLi7tRKYSDZEz3bUYEqrxfv9rtcSsjRL1a/jhwkA4J3rvRcE66z+iQTM
-						y9AyH27pWx+igv3AEHXNLLgNyJNgPA5wsuH6faaPKEvbL2tm3yAqOrn3rJejnirP
-						wc0H9ybzdTJ8w0T0r3Ga/7ypxdxoICEU+8tvNBS23rz+BGeCjPe8xjNJcWRdKJkC
-						AwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0G
-						A1UdDgQWBBQudULPA4BUR/Wtj7MvpnX1q4RqEjAOBgNVHQ8BAf8EBAMCBaAwDAYD
-						VR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0g
-						BBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3Js
-						LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8w
-						NQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-						Q0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAf
-						BgNVHREEGDAWghRpZHAuZ29sZHNtaXRocy5hYy51azANBgkqhkiG9w0BAQUFAAOC
-						AQEAjoZstIwjOnKopO0Ab7L2cnlmeDUJDJgXIVR1bQyS6Bs4K0499aHpOiyvTAOY
-						ALgNoq1T6p59tKyypjGQMdqOC7v+u7m+rV+R/GNTjoz6s2t5g52OFvPb3l+5bKf6
-						yWrO3/jW5QsQ5vi2Ul3zhyRU7MPorRTMeh1V5wEbgyOBBHSLteYHKrvYvSU6wk+E
-						o1xrSRynxN2GYJ7DC/irbFIsRwwrdYD30tqAI7x5AjyAIVFYNsELVCUN7i1250V3
-						9D7YjT2NiIExUkQJkaqNvP+cd5tv52GbrSS6RlVqjvYJloDb2jTa9Zxd0nNpnYtl
-						NYwSTpJWaft6dHpT96Gj0W9t9Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.goldsmiths.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.goldsmiths.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <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.goldsmiths.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.goldsmiths.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.goldsmiths.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.goldsmiths.ac.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.goldsmiths.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.goldsmiths.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <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.goldsmiths.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.goldsmiths.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.goldsmiths.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.goldsmiths.ac.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">gold.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -150,63 +108,24 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFrzCCBJegAwIBAgIQfHx94mojHl/68SiEwa+kHTANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEyMDYyODAwMDAwMFoXDTE1MDYyODIzNTk1OVowgYUxCzAJBgNV
-						BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xEjAQBgNVBAcTCU5ldyBDcm9zczEcMBoG
-						A1UEChMTR29sZHNtaXRocycgQ29sbGVnZTEUMBIGA1UECxMLSVQgU2VydmljZXMx
-						HTAbBgNVBAMTFGlkcC5nb2xkc21pdGhzLmFjLnVrMIICIjANBgkqhkiG9w0BAQEF
-						AAOCAg8AMIICCgKCAgEAot8BZGs52fkqWL67J8MNbrqZwqYIMsJrzOUgsqjGtWI3
-						nERfnocoRKUzPpZqTgaeVbpzNNncex3bddCNwtYDWXppWnGooZ+e97SVEquOCv4c
-						OyT4n0yg8cchfW04dy4MmCKEAiTJSq3hK4HLPgKiRwKN7WvejCD92wc0+rWLISML
-						U3S8BNDOmOYHKw8k7Q8LNY5irvSreR7dGVuYg4fgZH0Ub1t/hU8JqKC9uKCfGVwV
-						JhpsToWuJzB1MAwzhkem6SzuwkKMxZk1pZ9pKocZF3EttdiSBxJKm+sGuNvrM5VX
-						2OFEsDrkiRxUIKWwKY4Oa669aRRkwnKWyzLfn3kO+5B6K4SF3hu9K11rBYSxqxpe
-						GexNe6f5nNKntQnQf7fFkLA0LT5du0yGP63I+RVPyKFVTqvmeFKFlpKZ49iqaLrt
-						GqmUG83ACF4/ntoup6UNfraXyYO3wxGMUG83dQhGZBhvJk+osnLSLwPxL/mqKFBI
-						23tQnXwebLi7tRKYSDZEz3bUYEqrxfv9rtcSsjRL1a/jhwkA4J3rvRcE66z+iQTM
-						y9AyH27pWx+igv3AEHXNLLgNyJNgPA5wsuH6faaPKEvbL2tm3yAqOrn3rJejnirP
-						wc0H9ybzdTJ8w0T0r3Ga/7ypxdxoICEU+8tvNBS23rz+BGeCjPe8xjNJcWRdKJkC
-						AwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0G
-						A1UdDgQWBBQudULPA4BUR/Wtj7MvpnX1q4RqEjAOBgNVHQ8BAf8EBAMCBaAwDAYD
-						VR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0g
-						BBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3Js
-						LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8w
-						NQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-						Q0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAf
-						BgNVHREEGDAWghRpZHAuZ29sZHNtaXRocy5hYy51azANBgkqhkiG9w0BAQUFAAOC
-						AQEAjoZstIwjOnKopO0Ab7L2cnlmeDUJDJgXIVR1bQyS6Bs4K0499aHpOiyvTAOY
-						ALgNoq1T6p59tKyypjGQMdqOC7v+u7m+rV+R/GNTjoz6s2t5g52OFvPb3l+5bKf6
-						yWrO3/jW5QsQ5vi2Ul3zhyRU7MPorRTMeh1V5wEbgyOBBHSLteYHKrvYvSU6wk+E
-						o1xrSRynxN2GYJ7DC/irbFIsRwwrdYD30tqAI7x5AjyAIVFYNsELVCUN7i1250V3
-						9D7YjT2NiIExUkQJkaqNvP+cd5tv52GbrSS6RlVqjvYJloDb2jTa9Zxd0nNpnYtl
-						NYwSTpJWaft6dHpT96Gj0W9t9Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.goldsmiths.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.goldsmiths.ac.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">Goldsmiths' College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Goldsmiths, University of London</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.goldsmiths.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@gold.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sally</GivenName>
-    <SurName>Houston</SurName>
-    <EmailAddress>mailto:s.houston@gold.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.goldsmiths.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.goldsmiths.ac.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">Goldsmiths' College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Goldsmiths, University of London</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.goldsmiths.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Services Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@gold.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>George</md:GivenName>
+    <md:SurName>Thompson</md:SurName>
+    <md:EmailAddress>mailto:g.thompson@gold.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>