From 5c226e9d61d55c598e18557684607a66a27a5f3b Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Sat, 3 Dec 2022 08:34:39 +0100
Subject: SWAMID-2136 Updated www.tentaadmindev.uhr.se

---
 swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml | 46 ++++++++++++++++------
 1 file changed, 35 insertions(+), 11 deletions(-)

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml b/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml
index 0b21530f..77fa935d 100644
--- a/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml
+++ b/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml
@@ -22,8 +22,9 @@
     <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:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -31,10 +32,14 @@
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.tentaadmindev.uhr.se/Shibboleth.sso/Login"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">TentaAdmin</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">TentaAdmin</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Administration av tentamen och tentamensvakter.</mdui:Description>
-        <mdui:Description xml:lang="en">Administration av tentamen och tentamensvakter.</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">TEST TentaAdmin</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">TEST TentaAdmin</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">TEST Administration av tentamen och tentamensvakter.</mdui:Description>
+        <mdui:Description xml:lang="en">TEST Administration av tentamen och tentamensvakter.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://tentaadmin.uhr.se/about/privacypolicy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://tentaadmin.uhr.se/about/privacypolicy</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://tentaadmin.uhr.se/about/privacypolicy</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://tentaadmin.uhr.se/about/privacypolicy</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -58,8 +63,7 @@ EC7BlH7OMRM5j0/vVlRoRadjkJmRaEf/VfaNxwktgNQPVkXQatycSZ7oderQngbG
 CVlWHY4+3c6XmbuQZDjPYFQcbamkQf61/0xyPAXr6z7vF1RiSzt4ej9q3gI+7/if
 nQjC6dzNCzYmZcO1m5jx5BgECpee+1YzPgWSnZmXexQiPsv7AeTosT0CxdFkwKz9
 OCAgWY6O9B3McR43joEl1kbkE4ckdvrpmDrGdjZn78smL6SGV2Frl5d0ALjQSVkB
-9qq7wBTjnxf2rBXhnRNuEzB+Jw==
-</ds:X509Certificate>
+9qq7wBTjnxf2rBXhnRNuEzB+Jw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -86,10 +90,30 @@ OCAgWY6O9B3McR43joEl1kbkE4ckdvrpmDrGdjZn78smL6SGV2Frl5d0ALjQSVkB
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.tentaadmindev.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.tentaadmindev.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.tentaadmindev.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">TEST Tentaadmin</md:ServiceName>
+      <md:ServiceName xml:lang="en">TEST Tentaadmin</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">TEST Universitets- och högskolerådet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">TEST Universitets- och högskolerådet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">TEST Universitets- och högskolerådet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">TEST Swedish Council for Higher Education</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.uhr.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Anders</md:GivenName>
-    <md:SurName>Möllström</md:SurName>
-    <md:EmailAddress>mailto:Anders.mollstrom@uhr.se</md:EmailAddress>
+    <md:Company>TEST Universitets- och högskolerådet</md:Company>
+    <md:GivenName>Christine</md:GivenName>
+    <md:SurName>Claesson</md:SurName>
+    <md:EmailAddress>mailto:christine.claesson@uhr.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>TEST Universitets- och högskolerådet</md:Company>
+    <md:GivenName>Christine</md:GivenName>
+    <md:SurName>Claesson</md:SurName>
+    <md:EmailAddress>mailto:christine.claesson@uhr.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3