From c8eb1976c45ada7e28a49759de45357e99fe848e Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Wed, 15 Dec 2021 11:38:03 +0100
Subject: SWAMID-565 and SWAMID-566, Updated 2 SP:s for umu.se

---
 ...ministrationsverktyg.test.umu.se-shibboleth.xml | 39 ++++++++++++++++++----
 .../administrationsverktyg.umu.se-shibboleth.xml   | 31 +++++++++++++----
 2 files changed, 58 insertions(+), 12 deletions(-)

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/administrationsverktyg.test.umu.se-shibboleth.xml b/swamid-2.0/administrationsverktyg.test.umu.se-shibboleth.xml
index 156cad20..e72928b7 100644
--- a/swamid-2.0/administrationsverktyg.test.umu.se-shibboleth.xml
+++ b/swamid-2.0/administrationsverktyg.test.umu.se-shibboleth.xml
@@ -22,9 +22,7 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -38,6 +36,8 @@
         <mdui:DisplayName xml:lang="en">Staging environment for user accounts at Umea University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Administration av användarkonton</mdui:Description>
         <mdui:Description xml:lang="en">Administration of user accounts</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://administrationsverktyg.umu.se/kontoaktivering/privacy/privacysystem?lang=en&amp;system=https://administrationsverktyg.test.umu.se</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://administrationsverktyg.umu.se/kontoaktivering/privacy/privacysystem?lang=sv&amp;system=https://administrationsverktyg.test.umu.se</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -90,10 +90,37 @@ yAjfX0OGn0jUCSm6ChocbhoPktw5blWKP8EaFl6sIfj40Ft7fto1JSV0vfDbJQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://administrationsverktyg.test.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://administrationsverktyg.test.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://administrationsverktyg.test.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Staging environment for user accounts at Umea University</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Stagingmiljö för administration av användarkonton vid Umeå universitet</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: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="sv">Umeå universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Umea University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.umu.se/en/</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="administrative">
-    <md:GivenName>Tommy</md:GivenName>
-    <md:SurName>Larsson</md:SurName>
-    <md:EmailAddress>mailto:tommy.larsson@umu.se</md:EmailAddress>
+    <md:Company>Umeå University</md:Company>
+    <md:SurName>ITS datordrift</md:SurName>
+    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Umeå University</md:Company>
+    <md:SurName>ITS datordrift</md:SurName>
+    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Umeå University</md:Company>
+    <md:SurName>ITS datordrift</md:SurName>
+    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml b/swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml
index d79f5c6a..f6017a43 100644
--- a/swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml
+++ b/swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml
@@ -22,9 +22,7 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -38,6 +36,8 @@
         <mdui:DisplayName xml:lang="en">Production environment for user accounts at Umea University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Administration av användarkonton</mdui:Description>
         <mdui:Description xml:lang="en">Administration of user accounts</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://administrationsverktyg.umu.se/kontoaktivering/privacy/privacysystem?lang=en&amp;system=https://administrationsverktyg.umu.se</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://administrationsverktyg.umu.se/kontoaktivering/privacy/privacysystem?lang=sv&amp;system=https://administrationsverktyg.umu.se</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://administrationsverktyg.umu.se/Shibboleth.sso/adfs"/>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://administrationsverktyg.umu.se/Shibboleth.sso/eduid"/>
@@ -92,10 +92,29 @@ rnr4gDQ+JdRcPUyn4+9DPcsnABhy+LtA3mmXyFBJ2jetFqPJ
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://administrationsverktyg.umu.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://administrationsverktyg.umu.se/Shibboleth.sso/SAML2/ECP" index="9"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://administrationsverktyg.umu.se/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Administration of user accounts at Umea University</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Administration av användarkonton vid Umeå universitet</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: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:ContactPerson contactType="administrative">
-    <md:GivenName>Tommy</md:GivenName>
-    <md:SurName>Larsson</md:SurName>
-    <md:EmailAddress>mailto:tommy.larsson@umu.se</md:EmailAddress>
+    <md:Company>Umeå University</md:Company>
+    <md:SurName>ITS datordrift</md:SurName>
+    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Umeå University</md:Company>
+    <md:SurName>ITS datordrift</md:SurName>
+    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Umeå University</md:Company>
+    <md:SurName>ITS datordrift</md:SurName>
+    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3