From 3045e2d4db03e128f66569d41cecf9d23ef7b9ab Mon Sep 17 00:00:00 2001
From: Fredrik Domeij <fredrik.domeij@umu.se>
Date: Wed, 16 Dec 2020 11:03:02 +0100
Subject: SWAMID-3639: CoCo added to www.start.ladok.se/www.student.ladok.se

---
 swamid-2.0/www.start.ladok.se-gui-sp.xml       | 44 +++++++++++++++++++-------
 swamid-2.0/www.student.ladok.se-student-sp.xml | 43 ++++++++++++++++++-------
 2 files changed, 65 insertions(+), 22 deletions(-)

diff --git a/swamid-2.0/www.start.ladok.se-gui-sp.xml b/swamid-2.0/www.start.ladok.se-gui-sp.xml
index c5b1888b..edf87595 100644
--- a/swamid-2.0/www.start.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.start.ladok.se-gui-sp.xml
@@ -24,6 +24,7 @@
       <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.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -32,14 +33,16 @@
       <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://www.start.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.start.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok www.start.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.start.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Ladok för personal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok for employees</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
+        <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
         <mdui:Logo xml:lang="sv" width="96" height="98">https://www.start.ladok.se/logo/ladok_sv.png</mdui:Logo>
         <mdui:Logo xml:lang="en" width="96" height="98">https://www.start.ladok.se/logo/ladok_en.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -75,23 +78,42 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.start.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.start.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.start.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Ladok for employees</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="sn" Name="urn:oid:2.5.4.4" 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:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:SurName>Ladok-supporten</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:SurName>Ladok-supporten</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.student.ladok.se-student-sp.xml b/swamid-2.0/www.student.ladok.se-student-sp.xml
index 72dce986..d43dbd39 100644
--- a/swamid-2.0/www.student.ladok.se-student-sp.xml
+++ b/swamid-2.0/www.student.ladok.se-student-sp.xml
@@ -25,6 +25,7 @@
         <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>
@@ -33,14 +34,16 @@
       <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://www.student.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.student.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt www.student.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student web www.student.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Ladok för studenter</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok for students</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
+        <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
         <mdui:Logo xml:lang="sv" width="96" height="98">https://www.student.ladok.se/logo/ladok_sv.png</mdui:Logo>
         <mdui:Logo xml:lang="en" width="96" height="98">https://www.student.ladok.se/logo/ladok_en.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -76,23 +79,41 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.student.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.student.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.student.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Ladok for students</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:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" 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:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:SurName>Ladok-supporten</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:SurName>Ladok-supporten</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3