named Antagning.se (UHR)

SWAMIDOPS-6988

1 files changed, 54 insertions, 92 deletions

diff --git a/nya-1.0/shibboleth.antagning.se-shibboleth-idp.xml b/nya-1.0/shibboleth.antagning.se-shibboleth-idp.xml
index 8921fc7b..630dd903 100644
--- a/nya-1.0/shibboleth.antagning.se-shibboleth-idp.xml
+++ b/nya-1.0/shibboleth.antagning.se-shibboleth-idp.xml
@@ -1,106 +1,68 @@
-<EntityDescriptor entityID="https://shibboleth.antagning.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <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 regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth.antagning.se/shibboleth-idp">
+  <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 regexp="false">studera.nu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Antagning.se (UHR)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universityadmissions.se (UHR)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för sökande med konto i NyA-systemet.</mdui:Description>
+        <mdui:Description xml:lang="en">The Identity Provider for students with account in the NyA-system.</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIBwjCCAWygAwIBAgIJALANRraT06m8MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguYW50YWduaW5nLnNlMB4XDTEwMDkxNzEyNDQxN1oXDTIwMDkxNDEyNDQxN1owIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5hbnRhZ25pbmcuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAvO4xzF2oRbNcBA1MKuxm6wPaIJQv3HJFA1LuMSSfPao9PUIv86h5LwlG7ptNB5ffUjyrEyNA5GbGCiQ+PzpeeQIDAQABo4GEMIGBMB0GA1UdDgQWBBRxz4/fk7N81wJl0hzH9/t/zCkd9DBSBgNVHSMESzBJgBRxz4/fk7N81wJl0hzH9/t/zCkd9KEmpCQwIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5hbnRhZ25pbmcuc2WCCQCwDUa2k9OpvDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAtZiOTVSQiLgyDrJAx97tuP3rc2LIj6fpo/Vrh7i/o+8tSfP/Nm0ld1+EphqklGSnDFpU+IkesmgGcgHxAOCB1w==
                     </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://shibboleth.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
-
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://shibboleth.antagning.se: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://shibboleth.antagning.se/idp/profile/Shibboleth/SSO" />
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://shibboleth.antagning.se/idp/profile/SAML2/POST/SSO" />
-
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://shibboleth.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://shibboleth.antagning.se/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 regexp="false">studera.nu</shibmd:Scope>
-			<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-				<mdui:DisplayName xml:lang="sv">
-					Universitets- och högskolerådet
-				</mdui:DisplayName>
-				<mdui:DisplayName xml:lang="en">
-					Swedish Council for Higher Education
-				</mdui:DisplayName>
-				<mdui:Description xml:lang="sv">
-					Identity Provider för sökande med konto i NyA-systemet.
-				</mdui:Description>
-				<mdui:Description xml:lang="en">
-					The Identity Provider for students with account in the NyA-system.
-				</mdui:Description>
-			</mdui:UIInfo>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.antagning.se: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://shibboleth.antagning.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.antagning.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.antagning.se/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 regexp="false">studera.nu</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIBwjCCAWygAwIBAgIJALANRraT06m8MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguYW50YWduaW5nLnNlMB4XDTEwMDkxNzEyNDQxN1oXDTIwMDkxNDEyNDQxN1owIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5hbnRhZ25pbmcuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAvO4xzF2oRbNcBA1MKuxm6wPaIJQv3HJFA1LuMSSfPao9PUIv86h5LwlG7ptNB5ffUjyrEyNA5GbGCiQ+PzpeeQIDAQABo4GEMIGBMB0GA1UdDgQWBBRxz4/fk7N81wJl0hzH9/t/zCkd9DBSBgNVHSMESzBJgBRxz4/fk7N81wJl0hzH9/t/zCkd9KEmpCQwIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5hbnRhZ25pbmcuc2WCCQCwDUa2k9OpvDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAtZiOTVSQiLgyDrJAx97tuP3rc2LIj6fpo/Vrh7i/o+8tSfP/Nm0ld1+EphqklGSnDFpU+IkesmgGcgHxAOCB1w==
                     </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://shibboleth.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-        
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://shibboleth.antagning.se: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">
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.antagning.se: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">
 			UHR
 		</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">
+    <OrganizationDisplayName xml:lang="en">
 			Swedish Council for Higher Education
 		</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">
+    <OrganizationURL xml:lang="en">
 			http://www.uhr.se
 		</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<Company>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>
 			Swedish Council for Higher Education
 		</Company>
-		<EmailAddress>
+    <EmailAddress>
 			appldrift_saml@uhr.se
 		</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>    
+  </ContactPerson>
+</EntityDescriptor>