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

1 files changed, 126 insertions, 45 deletions

diff --git a/swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml
index ba674b33..d4ff03fa 100644
--- a/swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.manchester.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The University of Manchester.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.manchester.ac.uk/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-04T15:35:56.421696Z">
       <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">manchester.ac.uk</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">University of Manchester</mdui:DisplayName>
@@ -37,8 +34,50 @@
         <mdui:GeolocationHint>geo:53.427332,-2.247825</mdui:GeolocationHint>
         <mdui:GeolocationHint>geo:46.23145,6.050119</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIGTDCCBTSgAwIBAgIRAKqovYJemilLsOjpGizaFjgwDQYJKoZIhvcNAQELBQAw
+						gZYxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+						BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTwwOgYD
+						VQQDEzNDT01PRE8gUlNBIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlY3VyZSBT
+						ZXJ2ZXIgQ0EwHhcNMTYwNDI3MDAwMDAwWhcNMTkwNTI5MjM1OTU5WjCCASwxCzAJ
+						BgNVBAYTAkdCMRAwDgYDVQQREwdNMTMgOVBMMRMwEQYDVQQIEwpNYW5jaGVzdGVy
+						MRMwEQYDVQQHEwpNYW5jaGVzdGVyMRQwEgYDVQQJEwtPeGZvcmQgUm9hZDElMCMG
+						A1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEnMCUGA1UECxMeSW5m
+						b3JtYXRpb24gU3lzdGVtcyBEZXBhcnRtZW50MUIwQAYDVQQLEzlJc3N1ZWQgdGhy
+						b3VnaCBUaGUgVW5pdmVyc2l0eSBvZiBNYW5jaGVzdGVyIEUtUEtJIE1hbmFnZXIx
+						FzAVBgNVBAsTDkluc3RhbnRTU0wgUHJvMR4wHAYDVQQDExVzaGliLm1hbmNoZXN0
+						ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxAfWVVRZY
+						2d/qV3JMTU2auGYctKlpMIAKZ1MlTd/PgYhZ2LFSBOom+KaUimAgPBFneGuMQjGl
+						MU0XfI6YScnYvwr3whJxfeUx6KfRUXbgBthhzODfVUIW1GM6kNiXg2g1ui2gP4vA
+						+1zloX25G2NC0DobNENOHnFhUWoULGEcZQ/lgLPKEtSaIh2wLRTW7ifNf3lCAuqN
+						m03g6A0ZIyIZcNrt3g/LJBT0ZzfgMiIEL0+meHGwvTs28Ulg8Tr3wpVHO7KpcOqi
+						130pkmoS2McTiTvgVR4vk3SkkGD50ebS4mLqqlJad8e9GthAAsskbYPV5LIcNCvp
+						pnctTPQmKt2tAgMBAAGjggH6MIIB9jAfBgNVHSMEGDAWgBSa8yvaz61Pti+7KkhI
+						KhK3G0LBJDAdBgNVHQ4EFgQUHYQgMzJMNj8vaCAgtD4QkGnYM4YwDgYDVR0PAQH/
+						BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+						BwMCMFAGA1UdIARJMEcwOwYMKwYBBAGyMQECAQMEMCswKQYIKwYBBQUHAgEWHWh0
+						dHBzOi8vc2VjdXJlLmNvbW9kby5jb20vQ1BTMAgGBmeBDAECAjBaBgNVHR8EUzBR
+						ME+gTaBLhklodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9SU0FPcmdhbml6
+						YXRpb25WYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3JsMIGLBggrBgEFBQcBAQR/
+						MH0wVQYIKwYBBQUHMAKGSWh0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET1JT
+						QU9yZ2FuaXphdGlvblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcnQwJAYIKwYB
+						BQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTA7BgNVHREENDAyghVzaGli
+						Lm1hbmNoZXN0ZXIuYWMudWuCGXd3dy5zaGliLm1hbmNoZXN0ZXIuYWMudWswDQYJ
+						KoZIhvcNAQELBQADggEBALF55z7tMSN4isveFVoWHPnPE8plXoD+ob/7Rog0d/Kj
+						bh796RUJxlu/HF5I/G7PN6PgkHSXpKFZhMH0GI+5bgveyQrpy/ya6aydRstCp74G
+						MKLKE1Sz0Q8NpeaSmfaAf0p8JacLWqa+o9mp23S85T+JKllUF/psNPKxdmNoKyaY
+						ey0v5yXqYPDGSPvTJ53gRbUe2H1hpVSm0bH7AWU2IrJP+ASoaF73ZdA3G+yGxL/W
+						RmuVUzTOZswHLYbuTcs9oGhhYPfmyzsSZ7KSpK7JRwVQmNM+McKSVmPRUlVFr8hS
+						HhJYh990GQT5rBgj66iBBXAFUAERRh6xQ1qdzSUhXmo=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -69,21 +108,63 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.manchester.ac.uk:8443/shibboleth-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://shib.manchester.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.manchester.ac.uk/shibboleth-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://shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.manchester.ac.uk:8443/shibboleth-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://shib.manchester.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.manchester.ac.uk/shibboleth-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">manchester.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>
+						MIIGTDCCBTSgAwIBAgIRAKqovYJemilLsOjpGizaFjgwDQYJKoZIhvcNAQELBQAw
+						gZYxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+						BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTwwOgYD
+						VQQDEzNDT01PRE8gUlNBIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlY3VyZSBT
+						ZXJ2ZXIgQ0EwHhcNMTYwNDI3MDAwMDAwWhcNMTkwNTI5MjM1OTU5WjCCASwxCzAJ
+						BgNVBAYTAkdCMRAwDgYDVQQREwdNMTMgOVBMMRMwEQYDVQQIEwpNYW5jaGVzdGVy
+						MRMwEQYDVQQHEwpNYW5jaGVzdGVyMRQwEgYDVQQJEwtPeGZvcmQgUm9hZDElMCMG
+						A1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEnMCUGA1UECxMeSW5m
+						b3JtYXRpb24gU3lzdGVtcyBEZXBhcnRtZW50MUIwQAYDVQQLEzlJc3N1ZWQgdGhy
+						b3VnaCBUaGUgVW5pdmVyc2l0eSBvZiBNYW5jaGVzdGVyIEUtUEtJIE1hbmFnZXIx
+						FzAVBgNVBAsTDkluc3RhbnRTU0wgUHJvMR4wHAYDVQQDExVzaGliLm1hbmNoZXN0
+						ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxAfWVVRZY
+						2d/qV3JMTU2auGYctKlpMIAKZ1MlTd/PgYhZ2LFSBOom+KaUimAgPBFneGuMQjGl
+						MU0XfI6YScnYvwr3whJxfeUx6KfRUXbgBthhzODfVUIW1GM6kNiXg2g1ui2gP4vA
+						+1zloX25G2NC0DobNENOHnFhUWoULGEcZQ/lgLPKEtSaIh2wLRTW7ifNf3lCAuqN
+						m03g6A0ZIyIZcNrt3g/LJBT0ZzfgMiIEL0+meHGwvTs28Ulg8Tr3wpVHO7KpcOqi
+						130pkmoS2McTiTvgVR4vk3SkkGD50ebS4mLqqlJad8e9GthAAsskbYPV5LIcNCvp
+						pnctTPQmKt2tAgMBAAGjggH6MIIB9jAfBgNVHSMEGDAWgBSa8yvaz61Pti+7KkhI
+						KhK3G0LBJDAdBgNVHQ4EFgQUHYQgMzJMNj8vaCAgtD4QkGnYM4YwDgYDVR0PAQH/
+						BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+						BwMCMFAGA1UdIARJMEcwOwYMKwYBBAGyMQECAQMEMCswKQYIKwYBBQUHAgEWHWh0
+						dHBzOi8vc2VjdXJlLmNvbW9kby5jb20vQ1BTMAgGBmeBDAECAjBaBgNVHR8EUzBR
+						ME+gTaBLhklodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9SU0FPcmdhbml6
+						YXRpb25WYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3JsMIGLBggrBgEFBQcBAQR/
+						MH0wVQYIKwYBBQUHMAKGSWh0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET1JT
+						QU9yZ2FuaXphdGlvblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcnQwJAYIKwYB
+						BQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTA7BgNVHREENDAyghVzaGli
+						Lm1hbmNoZXN0ZXIuYWMudWuCGXd3dy5zaGliLm1hbmNoZXN0ZXIuYWMudWswDQYJ
+						KoZIhvcNAQELBQADggEBALF55z7tMSN4isveFVoWHPnPE8plXoD+ob/7Rog0d/Kj
+						bh796RUJxlu/HF5I/G7PN6PgkHSXpKFZhMH0GI+5bgveyQrpy/ya6aydRstCp74G
+						MKLKE1Sz0Q8NpeaSmfaAf0p8JacLWqa+o9mp23S85T+JKllUF/psNPKxdmNoKyaY
+						ey0v5yXqYPDGSPvTJ53gRbUe2H1hpVSm0bH7AWU2IrJP+ASoaF73ZdA3G+yGxL/W
+						RmuVUzTOZswHLYbuTcs9oGhhYPfmyzsSZ7KSpK7JRwVQmNM+McKSVmPRUlVFr8hS
+						HhJYh990GQT5rBgj66iBBXAFUAERRh6xQ1qdzSUhXmo=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -114,24 +195,24 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.manchester.ac.uk:8443/shibboleth-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">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Manchester</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.manchester.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth support</GivenName>
-    <EmailAddress>mailto:shibboleth-support@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rachid</GivenName>
-    <SurName>Chalabi</SurName>
-    <EmailAddress>mailto:r.chalabi@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.manchester.ac.uk:8443/shibboleth-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">The University of Manchester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Manchester</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.manchester.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth support</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-support@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rachid</md:GivenName>
+    <md:SurName>Chalabi</md:SurName>
+    <md:EmailAddress>mailto:r.chalabi@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>