From b994cd4e74ccd6e83a168078e9d75ecd526ee1f0 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Thu, 22 Dec 2022 13:02:27 +0100
Subject: SWAMID-2434 SWAMID-2436 Updated expert.test.antagning.se and
 backweb.test.antagning.se

---
 swamid-2.0/backweb.test.antagning.se-hubble-sp.xml | 44 ++++++++++++++--------
 swamid-2.0/expert.test.antagning.se-ecs-sp.xml     | 40 ++++++++++++++++++--
 2 files changed, 65 insertions(+), 19 deletions(-)

diff --git a/swamid-2.0/backweb.test.antagning.se-hubble-sp.xml b/swamid-2.0/backweb.test.antagning.se-hubble-sp.xml
index 6797ed32..8099dee6 100644
--- a/swamid-2.0/backweb.test.antagning.se-hubble-sp.xml
+++ b/swamid-2.0/backweb.test.antagning.se-hubble-sp.xml
@@ -21,9 +21,8 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -36,6 +35,12 @@
         <mdui:DisplayName xml:lang="en">Hubble</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Hubble är tjänsten för överföring av utbildningsinformation till NyA</mdui:Description>
         <mdui:Description xml:lang="en">Hubble transfers education information to NyA</mdui:Description>
+        <mdui:Logo xml:lang="en" height="52" width="205">https://www.universityadmissions.se/images/logo/university-admisssions.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="52" width="195">https://www.antagning.se/images/logo/antagning_se.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">https://www.antagning.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.universityadmissions.se</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://nyaanvandarstod.uhr.se/sok/beskrivning-av-antagningssystemet/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://nyaanvandarstod.uhr.se/sok/description-of-the-admissions-system/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -90,29 +95,36 @@ ihDEIZcSIfuOauweBRXYMbkL
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://backweb.test.antagning.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://backweb.test.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://backweb.test.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Hubble</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Hubble</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">www.uhr.se</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">www.uhr.se/en</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uhr.se/en</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
-    <md:Company>Swedish Council for Higher Education</md:Company>
-    <md:SurName>UHR Systemdrift</md:SurName>
+    <md:Company>Antagning.se</md:Company>
     <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:Company>Swedish Council for Higher Education</md:Company>
-    <md:SurName>Håkan Pettersson</md:SurName>
+    <md:Company>Antagning.se</md:Company>
     <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:Company>Swedish Council for Higher Education</md:Company>
-    <md:SurName>UHR Systemdrift</md:SurName>
+    <md:Company>Antagning.se</md:Company>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>NyAdrift</md:Company>
+    <md:GivenName>NyAdrift</md:GivenName>
     <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/expert.test.antagning.se-ecs-sp.xml b/swamid-2.0/expert.test.antagning.se-ecs-sp.xml
index 4376b15c..655e0bba 100644
--- a/swamid-2.0/expert.test.antagning.se-ecs-sp.xml
+++ b/swamid-2.0/expert.test.antagning.se-ecs-sp.xml
@@ -21,9 +21,8 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -37,6 +36,10 @@
         <mdui:Description xml:lang="en">Apply online to Swedish universities and university colleges.</mdui:Description>
         <mdui:Logo height="52" width="195" xml:lang="sv">https://www.antagning.se/images/logo/antagning_se.png</mdui:Logo>
         <mdui:Logo height="52" width="205" xml:lang="en">https://www.universityadmissions.se/images/logo/university-admisssions.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://www.universityadmissions.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.antagning.se</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://nyaanvandarstod.uhr.se/sok/beskrivning-av-antagningssystemet/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://nyaanvandarstod.uhr.se/sok/description-of-the-admissions-system/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -90,5 +93,36 @@ GTcF7jYb6VGkInV0
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://expert.test.antagning.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.test.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.test.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">NyA-webben (test)</md:ServiceName>
+      <md:ServiceName xml:lang="sv">NyA-webben (test)</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Antagning.se</md:Company>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Antagning.se</md:Company>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Antagning.se</md:Company>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>NyAdrift</md:Company>
+    <md:GivenName>NyAdrift</md:GivenName>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3