From 0fb645d18f01cca67d3075dcacfc801efcfb488b Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Thu, 7 Mar 2013 17:51:03 +0100
Subject: resolves SWAMIDOPS-6817

---
 nya-1.0/shibboleth.antagning.se.xml | 69 ++++++++++++++++++++++++++++++-------
 1 file changed, 57 insertions(+), 12 deletions(-)

(limited to 'nya-1.0')

diff --git a/nya-1.0/shibboleth.antagning.se.xml b/nya-1.0/shibboleth.antagning.se.xml
index d1b9c806..8921fc7b 100644
--- a/nya-1.0/shibboleth.antagning.se.xml
+++ b/nya-1.0/shibboleth.antagning.se.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0"?>
-<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">
+<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">
 
@@ -17,26 +20,48 @@ MIIBwjCCAWygAwIBAgIJALANRraT06m8MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF3NoaWJib2xl
             </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: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"/>
+        <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: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" 
+                             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-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"/>
+        <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>
@@ -49,13 +74,33 @@ MIIBwjCCAWygAwIBAgIJALANRraT06m8MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF3NoaWJib2xl
             </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: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"/>
+        <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>
-    
-</EntityDescriptor>
+        <Organization>
+		<OrganizationName xml:lang="en">
+			UHR
+		</OrganizationName>
+		<OrganizationDisplayName xml:lang="en">
+			Swedish Council for Higher Education
+		</OrganizationDisplayName>
+		<OrganizationURL xml:lang="en">
+			http://www.uhr.se
+		</OrganizationURL>
+	</Organization>
+	<ContactPerson contactType="technical">
+		<Company>
+			Swedish Council for Higher Education
+		</Company>
+		<EmailAddress>
+			appldrift_saml@uhr.se
+		</EmailAddress>
+	</ContactPerson>
+</EntityDescriptor>    
-- 
cgit v1.2.3