From eb1d71aa5a9bbdd764010a50fc31ba4f4b6090a0 Mon Sep 17 00:00:00 2001
From: Mikael Frykholm <mifr@sunet.se>
Date: Thu, 17 Aug 2023 16:05:49 +0200
Subject: SWAMID-3109 Updated https://tentaadmin.test.umu.se/shibboleth

---
 .../tentaadmin.test.umu.se-shibboleth.xml          | 36 +++++++++++++++++-----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/metadata/swamid-2.0/tentaadmin.test.umu.se-shibboleth.xml b/metadata/swamid-2.0/tentaadmin.test.umu.se-shibboleth.xml
index 87de7004..b94b256e 100644
--- a/metadata/swamid-2.0/tentaadmin.test.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/tentaadmin.test.umu.se-shibboleth.xml
@@ -21,8 +21,9 @@
     <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:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -35,10 +36,10 @@
         <mdui:DisplayName xml:lang="en">TentaAdmin Test</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Testsystem för administration av tentamen och tentamensvakter.</mdui:Description>
         <mdui:Description xml:lang="en">Testsystem för administration av tentamen och tentamensvakter.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://administrationsverktyg.umu.se/privacy/information?system=https://tentaadmin.test.umu.se/shibboleth&amp;lang=en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://administrationsverktyg.umu.se/privacy/information?system=https://tentaadmin.test.umu.se/shibboleth&amp;lang=sv</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://administrationsverktyg.umu.se/privacy?system=https://tentaadmin.test.umu.se/shibboleth&amp;lang=en</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://administrationsverktyg.umu.se/privacy?system=https://tentaadmin.test.umu.se/shibboleth&amp;lang=sv</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="en">https://tentaadmin.uhr.se/about/privacypolicy</mdui:InformationURL>
+        <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:PrivacyStatementURL xml:lang="sv">https://tentaadmin.uhr.se/about/privacypolicy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -90,10 +91,20 @@ suSHYdJ8LMJw7rSLdWpPGSkzLeCe5/rTHeOP7r2Mh0G9PLaAFE26Gn3YOA==</ds:X509Certificate
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tentaadmin.test.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tentaadmin.test.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tentaadmin.test.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">TentaAdmin Test</md:ServiceName>
+      <md:ServiceName xml:lang="sv">TentaAdmin 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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Umeå uni</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Umea University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.umu.se/en/</md:OrganizationURL>
@@ -110,4 +121,15 @@ suSHYdJ8LMJw7rSLdWpPGSkzLeCe5/rTHeOP7r2Mh0G9PLaAFE26Gn3YOA==</ds:X509Certificate
     <md:SurName>ITS datordrift</md:SurName>
     <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Umea University</md:Company>
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Duchek</md:SurName>
+    <md:EmailAddress>mailto:peter.duchek@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>UmU Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:abuse@umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3