From 703130a58780f45dff1e879e6d32e7cf423b27e8 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Thu, 22 Dec 2022 14:24:46 +0100
Subject: SWAMID-2444 SWAMID-2445 Updated expert.demo.antagning.se and
 backweb.demo.antagning.se

---
 swamid-2.0/backweb.demo.antagning.se-hubble-sp.xml | 38 ++++++++++++++--------
 swamid-2.0/expert.demo.antagning.se-ecs-sp.xml     | 38 ++++++++++++++--------
 2 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/swamid-2.0/backweb.demo.antagning.se-hubble-sp.xml b/swamid-2.0/backweb.demo.antagning.se-hubble-sp.xml
index 07a54e5a..a8b3f385 100644
--- a/swamid-2.0/backweb.demo.antagning.se-hubble-sp.xml
+++ b/swamid-2.0/backweb.demo.antagning.se-hubble-sp.xml
@@ -21,8 +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://refeds.org/category/research-and-scholarship</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 +37,10 @@
         <mdui:Description xml:lang="en">Hubble-demomiljö NyA</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>
@@ -62,8 +66,7 @@ R7WmsBhv6NTOf8hEQYDh5LyukBeDf6fczXkETIxAXfFBoTgf03cG4jL7Z4IbnpDE
 h9twWJtv4f4YF8sq3lHpgINmXR/5Cf/yYuqXajrRldGi4C3XyKhEIu0RKSZ7KeyM
 tuK96nc/EGcE7537ZUmb9B95gzZ+PrTFUMpifHRx8t94wq6Pt2qwdciOSRp0GzYM
 r4+XgT0UL7OozzUEVXEMuIxRaSwo+CtUnWoZjlVi813gHPGYl2F29OeEkGIYJU+N
-8EdGBFe+O77xhWTF9GsoyRkY9w==
-</ds:X509Certificate>
+8EdGBFe+O77xhWTF9GsoyRkY9w==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -90,29 +93,36 @@ r4+XgT0UL7OozzUEVXEMuIxRaSwo+CtUnWoZjlVi813gHPGYl2F29OeEkGIYJU+N
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://backweb.demo.antagning.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://backweb.demo.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://backweb.demo.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Hubble-demo</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Hubble-demomiljö</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">Swedish Council for Higher Education</md:OrganizationName>
+    <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">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: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>NyAdrift</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>NyAdrift</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>NyAdrift</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.demo.antagning.se-ecs-sp.xml b/swamid-2.0/expert.demo.antagning.se-ecs-sp.xml
index 76e1fae3..971fb630 100644
--- a/swamid-2.0/expert.demo.antagning.se-ecs-sp.xml
+++ b/swamid-2.0/expert.demo.antagning.se-ecs-sp.xml
@@ -21,8 +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://refeds.org/category/research-and-scholarship</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 +37,10 @@
         <mdui:Description xml:lang="en">Expert-demo Demomiljö NyA</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>
@@ -62,8 +66,7 @@ iieByhOGhq3uqSqerQlh1PMPSHX2t3+JyWTqkgGnT8afxiBzMagxDYjUpZkxjjne
 D4hsip+XGn90TLT+9IxoJW01tp8g7GPU+0MELqsHwhl3xqmnvcNVK6aOLv5z0NYW
 pEKcHl/p+8Hi2USh1yiQveSFNONYAOJSzr7IOggsV3PBEI/+1MW0FkjNnsu5KrTJ
 arzGMGrsugbRuCj1v2st5mezCqTVdljTLs7HekHn+L+VkQiXrC3oH0Kteo1FDiEy
-kGv/tac9fcTDGjZ7
-</ds:X509Certificate>
+kGv/tac9fcTDGjZ7</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -90,29 +93,36 @@ kGv/tac9fcTDGjZ7
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://expert.demo.antagning.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.demo.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.demo.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Expert-demo</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Expert-demomiljö</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: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">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: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>NyAdrift</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>NyAdrift</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>NyAdrift</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>
-- 
cgit v1.2.3