SWAMID-3253: Ladok integrationstestmd-2023-10-30-v01

1 files changed, 23 insertions, 6 deletions

diff --git a/metadata/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml b/metadata/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
index 6357f43c..321e72fa 100644
--- a/metadata/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
+++ b/metadata/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
@@ -20,13 +20,17 @@
     <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.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/ec/1.0/eidas-naturalperson</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/ec/1.0/loa3-pnr</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/st/1.0/public-sector-sp</samla:AttributeValue>
+        <samla:AttributeValue>http://id.swedenconnect.se/contract/sc/eid-choice-2017</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-04-28T11:23:28Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/Login" index="1"/>
@@ -35,15 +39,25 @@
         <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: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">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>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>https://ladok3-01.ladok.umu.se/student-sp</ds:KeyName>
+        <ds:KeyName>ladok3-01.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ladok3-01.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFTCCAv2gAwIBAgIJAMECDl0w1cg/MA0GCSqGSIb3DQEBCwUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMS5sYWRvay51bXUuc2UwHhcNMjIwODE5MTMxNjUwWhcNMzIwODE2MTMxNjUwWjAhMR8wHQYDVQQDDBZsYWRvazMtMDEubGFkb2sudW11LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwcl+Ekm2rS/oCjnkQXuTcgM0kjj2UFnzutUB2Gnz7vu4MG89XpXhbr7GPVaIi+VK7OcR5WQ73I+exqO9jFJb23qoIfGQBzdShxJdWCICeFuhr7jwsqjwwcX+UP9bR0yvCPoHebgphzi+oUXBNTNF7HoS862q6FhXAvYBvJapSLj8P/qXEMjps7BRZs8eCvTKsVWRd0BnWM1qFjSHfCvBqJvQzgQlgcJpf/Pn6pkqv3xJPokPGiFuQM0gPTrjJHA0GDMBLdTZLfHo8hx9ycNr6r/HQ1oMay+3yX9Chw6dQuxLlXirZTN19mwbmCymRZ84OCVFuAOa5y3CMimZdUEUv8AfS9Gfxs3t/VP7xcdufHGnjIpCd/cadn1wSGCOqmJ66UFtzQtRadMcpgVNHsz9Wy33CCqXBV1ApyQAyav++BUcjkfm+706ZL5tWpprYZGm1M4/0bcQpfXRySMZTRLXyAUHNgN1hefNUTgaZnaUrQJOkForUK+iiOO/R10gYK0r3cEHgLreDEJpN9jPiWRwox6NkEFVbvU6uHcM+qsbRKioZJ3pEcqpEUX2C7QGS6++uvLUT03PUafMoLf0t19rZj5T4cwjCMZ0ZMXgzquSPbXBhCbnnSAcygnVZBusHAJJ5uawUF3BWoDElfIYapPpzCSOf3nwfpcoXJUrbqqLq68CAwEAAaNQME4wHQYDVR0OBBYEFGDQrp6MVLYjkHCvRdKOGQB0NhIjMB8GA1UdIwQYMBaAFGDQrp6MVLYjkHCvRdKOGQB0NhIjMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAIPp/zbfikl/SMlWMb0NCJjSRGpL6GAzlTCDp0Blum8IqMdp4K5qGjdLwXUEiP0IUhlsEhsaB/WpHajzHpKLv/UWcf/orFAIo4jnpDPe7amZPSxyUmiiYREDNJs4Ia2vv4MwW13CmezHnlP5+5iHDCQ65CFtsti9TL6Q56T71/mzpu9Y7z6vZ3WvHNaO2MoSR3m8L4Evje3z70MsDkrcyQf/C3kjYzsNMScZbsbmNwWqAjRBnUSTQ5t0a7/PAoAJrNBm4myQdPs4G7inOqmnpSuXlc8p5TVi7cszoBhj100nd1W9FQvK3n74XnSnqRGU/nfDQO1HToFMBN2gQdPgjRC2WidM7YXQ4jckH7nbB3pLFvV7wuwo40w2S9mB2Hrh1fzlxUMtrqAYwKW6hoR+aKagSMVFF4rIV9gEB5a3sAmXa9m009sRuUoYVR4ljYS+oJfZAzfy31K2484baubDh/d/94DxkfSuX6fpkfGDCMKkzRQMrlq5lTaSknctFyx2jR166OUO7SQjGwEFwYpIDoP5VtQhQN73RsM8lFNsw8S0vy7xuM+n6AJxAFXKW2FMoA9UkOrH3gpCyvMuRcvQ61er9DIW3jc1lE4WjTyUnmipTdHFNzx30PJqKXOKT/Ot+fxbzKVkzAfKFRkX6JXL3eVD72dvK1jknPrPK1G53mE8</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:KeyName>https://ladok3-01.ladok.umu.se/student-sp</ds:KeyName>
         <ds:KeyName>ladok3-01.ladok.umu.se</ds:KeyName>
@@ -71,6 +85,8 @@
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/NIM/Redirect"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/NIM/POST"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/NIM/Artifact"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <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"/>
@@ -83,11 +99,12 @@
       <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: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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>