Merge branch 'master' of git.swamid.se:swamid-metadata

1 files changed, 64 insertions, 30 deletions

diff --git a/swamid-2.0/acc.valda.uhr.se-shibboleth.xml b/swamid-2.0/acc.valda.uhr.se-shibboleth.xml
index 6b69dee1..5a6b9d7e 100644
--- a/swamid-2.0/acc.valda.uhr.se-shibboleth.xml
+++ b/swamid-2.0/acc.valda.uhr.se-shibboleth.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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://acc.valda.uhr.se/shibboleth">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-12-12T09:42:34Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-12-21T08:29:32Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -22,46 +22,54 @@
     <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>
   <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:Extensions>
-      <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://acc.valda.uhr.se/Shibboleth.sso/DS/ds.swamid.se"/>
-      <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://acc.valda.uhr.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <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://acc.valda.uhr.se/Shibboleth.sso/Login"/>
+      <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://acc.valda.uhr.se/Shibboleth.sso/DS/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://acc.valda.uhr.se/Shibboleth.sso/DS/Login" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Valda</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Valda</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Ärendehanteringssystem för valideringar inom olika områden</mdui:Description>
-        <mdui:Description xml:lang="en">Case management service for various validation procedures</mdui:Description>
+        <mdui:Description xml:lang="sv">Valda</mdui:Description>
+        <mdui:Description xml:lang="en">Valda</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.uhr.se/systemtjanster-for-larosaten/stodsystem-for-larosaten/validering--digitalt-ansoknings--och-administrationssystem-valda/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.uhr.se/systemtjanster-for-larosaten/stodsystem-for-larosaten/validering--digitalt-ansoknings--och-administrationssystem-valda/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://valda.uhr.se/home/privacypolicy/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://valda.uhr.se/home/privacypolicy/</mdui:PrivacyStatementURL>
+        <mdui:Logo xml:lang="sv" height="83" width="83">https://nyaanvandarstod.uhr.se/globalassets/uhr_symbol_lila.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="83" width="83">https://nyaanvandarstod.uhr.se/globalassets/uhr_symbol_lila.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
-        <ds:KeyName>uhrval-test.i.uhr.se</ds:KeyName>
+        <ds:KeyName>acc.valda.uhr.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=uhrval-test.i.uhr.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAKrvj/quXo0oMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFHVocnZhbC10ZXN0LmkudWhyLnNlMB4XDTE0MTIwODA5MTExMVoXDTI0MTIw
-NTA5MTExMVowHzEdMBsGA1UEAxMUdWhydmFsLXRlc3QuaS51aHIuc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtIWX5i6gPePK7nbap8snxwcLqlCID
-LWZkxbQGCVIgixRk1w87yUD882SSZjUATS8JV+8TeHNIsRSkBeXB1MQQopeDtm5C
-LDhh/RxHL3IRBlhesOE5zWcc4xeBzRIBKb1OC773XbSLx1lQhZmH+fiQvEk5FfWG
-ri683HBCQq3gpc3hX2lY7C7oAxL7KST+37zLIBy7c83fzWr3eQ1myKZFfHBsmMOt
-pNjBNMG8V924gaHWKAuqDa6lds53PszYZh27bN7dWXRrN0vXEZu6zfEioJVvg5RL
-c0lUqg/yu8Dk9JYYm9rQDj007livs9QllR54wsIxosVQWhAz36ZFafaNAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFHVocnZhbC10ZXN0LmkudWhyLnNlMB0GA1UdDgQWBBSG
-EGTlhQfKssjt+WgDPIKFHzzZEDANBgkqhkiG9w0BAQUFAAOCAQEAOHImN37aqOBU
-wicsP5vJ7X8yX6he/dAnRKhZbjWSlpFSZGwZrV/B6YeROAyRbzQH1fQRTup+angF
-B5m+vmxG0XjhUm8gXpMNqjgxaay72m2rPTVAkbqkMNTKNf44bRK5OGqPlJ0lwrnC
-Wh1+2EdKahr4lzJaqiW2rXvX3moTYqrJlssglT+IRTzoNbL6eQLdqCVvZxXDjyUb
-D79D+ECq8yjkS4/8EQlvHdHozRMMplJTo+pXoZwV9KZgMMsxdT63VuJ/0HRCxCMC
-zcmOSN36LTlSIYY4q9pC8MCzt5YqZdnKJUIyjFy+Mmjeyw4t+ouUjjI6+AifCten
-BwquFopAQg==
+          <ds:X509SubjectName>CN=acc.valda.uhr.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEAjCCAmqgAwIBAgIUU62Om6XD5Qy+qFOCB/MRGF5oRfAwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAxMQYWNjLnZhbGRhLnVoci5zZTAeFw0yMTEyMTcxMjAwMDJa
+Fw0zMTEyMTUxMjAwMDJaMBsxGTAXBgNVBAMTEGFjYy52YWxkYS51aHIuc2UwggGi
+MA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDnQNp608o+y13KzmzfwL4LTbAl
++knmrHURY2sIGLduDuXbWUmsdpw7FqGuFAM9Z5BIOmWxcH8G2Q+3HDutiBXBJeKb
+qsg3XViArZnbvthee4b1ytLhhOZJ2PuGACnFWcrftxGLX50d7A4ZS1i7n27SrhfZ
+vsuTJ7Iq8SZXTPm17NQrR/PjBna9z0Vq9k2jszGzidIniZmgF4GhCQ08YhIEg7YV
+ES3uzqX7YPosmBN+q1GPcYw2RInt1d/+lHbrkPzoBsLXE2uJGcWKDiG+0J/o9xQI
+kJoWsi8/+vCwPW6qusf/bWoX4bExJgzdBi61gtYEXEOUuuTdBQpexC4bBWUG9BtD
+ZJVgK2apfgbGStHZ16J0Iq34rbfhYBg6teP5rCu5p2hy2IbEiWn3QUT1N3oIhLD7
++5P6p1tcXswWno5coP1v/WQijILzTZiYccDcrKYYoZlmu9spuvtKFRfEva87YVvj
+lbdw5c+VFexLyp6/p3wZ/f0yWLDArnMl27ysvnMCAwEAAaM+MDwwGwYDVR0RBBQw
+EoIQYWNjLnZhbGRhLnVoci5zZTAdBgNVHQ4EFgQUDyKUn9QSgcKC8flXV5M66/mB
+LWowDQYJKoZIhvcNAQELBQADggGBABKkVBo9TceEfmAQtRU4wWvwV8sBG3OXpesd
+KvFfV+7rKs4YcebUBzr5F/XxGGbAITKhmqleI2XjML8hr23cfxGFhGdckxf2PXuP
+GO3+lHWM4fKzvpbm1bCBUbx+YaTXnO1/MD3uVAUXnhEKtAnsxpV3EaUCpnh9O8lH
+tH+l3JxvU+GhmCoWlO9DlVZlnWgj3+E0ztHicWGMwp/W1XlLPeE9trN8xl0PzhXL
++lqoRHLQpD5iLA2N9B5chtPM/UvbLQ7URS0voANfuGatSlKeiALqRadVuBqsS4/Q
+0w7toajxrTHbwic/udn9VPsOo4PQU9/CM7r+eJcGxKFfd+c8UFnh38xN3LRRBONZ
+nEZe2u2BUKKyW3Bny3AK0enVlnmqkw02xt8x8B4AHJIFaSk3bAeG7XgrBl1jQHfK
+gFk0V3eoVBSPe/jvSS8nfsbKV6k2dXkUZa8Z2u2h457H1ikxlLqEUKFyK1tDDFhT
+rLT94sn8cj6s7zqKnIBXqdrL/fL8Aw==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -89,10 +97,36 @@ BwquFopAQg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://acc.valda.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://acc.valda.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://acc.valda.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <!-- Required för personnummer -->
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Valda</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Valda</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="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" 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="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">Universitets- och högskolerådet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Council for Higher Education</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Universitets- och högskolerådet</md:Company>
+    <md:EmailAddress>mailto:valdasupport@uhr.se</md:EmailAddress>
+  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Carina</md:GivenName>
-    <md:SurName>Lindström</md:SurName>
+    <md:Company>Universitets- och högskolerådet</md:Company>
+    <md:EmailAddress>mailto:valdasupport@uhr.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Universitets- och högskolerådet</md:Company>
     <md:EmailAddress>mailto:valdasupport@uhr.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>