https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml into swamid-interfederations-2.0

1 files changed, 81 insertions, 89 deletions

diff --git a/swamid-interfederations-2.0/shib.manchester.ac.uk.xml b/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
index e132a1a8..74fdf3f3 100644
--- a/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
+++ b/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
@@ -1,51 +1,45 @@
-<?xml version="1.0"?>
+<?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>
-		<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-
-
-
-
-
-	</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>
-			<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">The University of Manchester</mdui:DisplayName>
-				<mdui:Logo height="16" width="16">https://login.manchester.ac.uk/disco/logo-16x16-m.png</mdui:Logo>
-				<mdui:Logo height="34" width="80">https://login.manchester.ac.uk/disco/logo-80x34-ltd.png</mdui:Logo>
-			</mdui:UIInfo>
-			<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-				<mdui:IPHint>130.88.0.0/16</mdui:IPHint>
-				<mdui:DomainHint>manchester.ac.uk</mdui:DomainHint>
-				<mdui:DomainHint>man.ac.uk</mdui:DomainHint>
-				<mdui:DomainHint>mbs.ac.uk</mdui:DomainHint>
-				<mdui:DomainHint>mimas.ac.uk</mdui:DomainHint>
-				<mdui:DomainHint>mib.ac.uk</mdui:DomainHint>
-				<mdui:DomainHint>mbs-worldwide.ac.uk</mdui:DomainHint>
-				<mdui:GeolocationHint>geo:53.465624,-2.233193</mdui:GeolocationHint>
-				<mdui:GeolocationHint>geo:53.474881,-2.233593</mdui:GeolocationHint>
-				<mdui:GeolocationHint>geo:53.236237,-2.306421</mdui:GeolocationHint>
-				<mdui:GeolocationHint>geo:53.480372,-2.24893</mdui:GeolocationHint>
-				<mdui:GeolocationHint>geo:51.572576,-1.315923</mdui:GeolocationHint>
-				<mdui:GeolocationHint>geo:53.462436,-2.227711</mdui:GeolocationHint>
-				<mdui:GeolocationHint>geo:53.429749,-2.230049</mdui:GeolocationHint>
-				<mdui:GeolocationHint>geo:53.445089,-2.278115</mdui:GeolocationHint>
-				<mdui:GeolocationHint>geo:53.490592,-2.28839</mdui:GeolocationHint>
-				<mdui:GeolocationHint>geo:53.487545,-2.323424</mdui:GeolocationHint>
-				<mdui:GeolocationHint>geo:53.427332,-2.247825</mdui:GeolocationHint>
-				<mdui:GeolocationHint>geo:46.23145,6.050119</mdui:GeolocationHint>
-			</mdui:DiscoHints>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-
-				<ds:X509Data>
-					<ds:X509Certificate>
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </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>
+      <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">The University of Manchester</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">https://login.manchester.ac.uk/disco/logo-16x16-m.png</mdui:Logo>
+        <mdui:Logo height="34" width="80">https://login.manchester.ac.uk/disco/logo-80x34-ltd.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>130.88.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>manchester.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>man.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>mbs.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>mimas.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>mib.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>mbs-worldwide.ac.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:53.465624,-2.233193</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.474881,-2.233593</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.236237,-2.306421</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.480372,-2.24893</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.572576,-1.315923</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.462436,-2.227711</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.429749,-2.230049</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.445089,-2.278115</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.490592,-2.28839</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.487545,-2.323424</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.427332,-2.247825</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.23145,6.050119</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEvzCCA6egAwIBAgIQLnN/xcI/Xs3CPSU+WOVMZTANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTEwMDkxMDAwMDAwMFoXDTEzMDkwOTIzNTk1OVowgZQxCzAJBgNV
@@ -73,27 +67,26 @@
 						OqOnjEJ/2UdVSaMlZCk6DeqMOxpeSg1hAq1m1OiyUepzJZ4zo6W5a90/Q56hPaYE
 						hCCkj8L8NyX2H2RPH9QLJpIbVg==
 					</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>
-			<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">manchester.ac.uk</shibmd:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-
-				<ds:X509Data>
-					<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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">manchester.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEvzCCA6egAwIBAgIQLnN/xcI/Xs3CPSU+WOVMZTANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTEwMDkxMDAwMDAwMFoXDTEzMDkwOTIzNTk1OVowgZQxCzAJBgNV
@@ -121,27 +114,26 @@
 						OqOnjEJ/2UdVSaMlZCk6DeqMOxpeSg1hAq1m1OiyUepzJZ4zo6W5a90/Q56hPaYE
 						hCCkj8L8NyX2H2RPH9QLJpIbVg==
 					</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>IT Service Desk</GivenName>
-		<EmailAddress>mailto:IT-Servicedesk@manchester.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="technical">
-		<GivenName>Sam</GivenName>
-		<SurName>Jones</SurName>
-		<EmailAddress>mailto:sam.jones@manchester.ac.uk</EmailAddress>
-	</ContactPerson>
-
+        </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>IT Service Desk</GivenName>
+    <EmailAddress>mailto:IT-Servicedesk@manchester.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Sam</GivenName>
+    <SurName>Jones</SurName>
+    <EmailAddress>mailto:sam.jones@manchester.ac.uk</EmailAddress>
+  </ContactPerson>
 </EntityDescriptor>