Resolved SWAMID-3639

1 files changed, 40 insertions, 30 deletions

diff --git a/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
index 9dc85670..e89900a5 100644
--- a/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-01.ladok.umu.se/student-sp">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
@@ -29,6 +25,7 @@ and do *NOT* provide it in real time to your partners.
         <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>
@@ -37,14 +34,16 @@ and do *NOT* provide it in real time to your partners.
       <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://ladok3-01.ladok.umu.se:442/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://ladok3-01.ladok.umu.se:442/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt ladok3-01</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student web ladok3-01</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 ladok3-01.ladok.umu.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok for students ladok3-01.ladok.umu.se</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://ladok3-01.ladok.umu.se:442/logo/ladok_sv.png</mdui:Logo>
         <mdui:Logo xml:lang="en" width="96" height="98">https://ladok3-01.ladok.umu.se:442/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>
@@ -53,26 +52,7 @@ and do *NOT* provide it in real time to your partners.
         <ds:KeyName>ladok3-01.ladok.umu.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=ladok3-01.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>
-MIIDPTCCAiWgAwIBAgIJAPEBgpwK1hxNMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0wMS5sYWRvay51bXUuc2UwHhcNMTQxMDA2MDc1MTMxWhcNMjQx
-MDAzMDc1MTMxWjAhMR8wHQYDVQQDExZsYWRvazMtMDEubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0FInxZg2fEgXhvHMGxn0wAah
-TMCX0XTYmg5rs/fhJ2T0RAxuRCUmvf2ETW/F7makbonO75IDHghExLEUGkxcGK4v
-0uqaPM7/9C799QICJ5cmyrE7tCXOJPO9GAe28Qv88WJm/6DSwngnUryB2r7HlE0f
-UVrMQopRYLqD33eXBFQ732X9nqt9i/R5OK6O/kOE9nmyaBoQdmjZNLYxnobbDNrH
-PrcCje8NFVIxXjOzX8vssEpo8f0DtpOj34F15BSvrr8t5F28UdaTx0Hb7c9B3hW8
-KxAJxs0QHPCI/mgMpBxZBq+9uBLzTxiXvjUjw31EuQI6SJAkyyLBlqHgIUo6EQID
-AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMDEubGFkb2sudW11LnNlhjJodHRw
-czovL2xhZG9rMy0wMS5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
-BgNVHQ4EFgQUahPApJv5/xIpL/gbnN8MUfFhhUowDQYJKoZIhvcNAQEFBQADggEB
-AETmm90R56msmOBioztlxMk6TOQbPYVi4NOnqTOokD/X960brBKntkGpXSnNGd7K
-tmK5F2ThcZJZ7FuOev53zJv2lzroBv9t0D8S49I3g4JlEM9TgoS8/hi/bFuC3PCC
-ONwj91gF9J6rzYTum9XhUOChqEg5JJskYHNHs9vmVfhmkHLh3RbGweXm3Da7zrph
-b+mNrM4Y+K+m3IlSj4NBvEIGlu8rf3rl1Iad2HcIevkCgiiCD8V+rumLzXSUTpKe
-ZEqci1h+aWvVDHxYNmDsZbFWOYg+t+Wfcu9uZxHADXvamSFdFAQJqplrSgXsWKNG
-Fgjs4zg7hkT8XjhWJeHVZjI=
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAPEBgpwK1hxNMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFmxhZG9rMy0wMS5sYWRvay51bXUuc2UwHhcNMTQxMDA2MDc1MTMxWhcNMjQxMDAzMDc1MTMxWjAhMR8wHQYDVQQDExZsYWRvazMtMDEubGFkb2sudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0FInxZg2fEgXhvHMGxn0wAahTMCX0XTYmg5rs/fhJ2T0RAxuRCUmvf2ETW/F7makbonO75IDHghExLEUGkxcGK4v0uqaPM7/9C799QICJ5cmyrE7tCXOJPO9GAe28Qv88WJm/6DSwngnUryB2r7HlE0fUVrMQopRYLqD33eXBFQ732X9nqt9i/R5OK6O/kOE9nmyaBoQdmjZNLYxnobbDNrHPrcCje8NFVIxXjOzX8vssEpo8f0DtpOj34F15BSvrr8t5F28UdaTx0Hb7c9B3hW8KxAJxs0QHPCI/mgMpBxZBq+9uBLzTxiXvjUjw31EuQI6SJAkyyLBlqHgIUo6EQIDAQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMDEubGFkb2sudW11LnNlhjJodHRwczovL2xhZG9rMy0wMS5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAdBgNVHQ4EFgQUahPApJv5/xIpL/gbnN8MUfFhhUowDQYJKoZIhvcNAQEFBQADggEBAETmm90R56msmOBioztlxMk6TOQbPYVi4NOnqTOokD/X960brBKntkGpXSnNGd7KtmK5F2ThcZJZ7FuOev53zJv2lzroBv9t0D8S49I3g4JlEM9TgoS8/hi/bFuC3PCCONwj91gF9J6rzYTum9XhUOChqEg5JJskYHNHs9vmVfhmkHLh3RbGweXm3Da7zrphb+mNrM4Y+K+m3IlSj4NBvEIGlu8rf3rl1Iad2HcIevkCgiiCD8V+rumLzXSUTpKeZEqci1h+aWvVDHxYNmDsZbFWOYg+t+Wfcu9uZxHADXvamSFdFAQJqplrSgXsWKNGFgjs4zg7hkT8XjhWJeHVZjI=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -99,5 +79,35 @@ Fgjs4zg7hkT8XjhWJeHVZjI=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-01.ladok.umu.se:442/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>Ladok-supporten</md:SurName>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <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: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:ContactPerson>
 </md:EntityDescriptor>