Merge branch 'master' of git.swamid.se:swamid-metadatamd-2023-10-25-v01

3 files changed, 4 insertions, 90 deletions

diff --git a/metadata/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml b/metadata/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
index 479beac0..065a026c 100644
--- a/metadata/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
+++ b/metadata/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
@@ -20,7 +20,10 @@
     <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="2021-06-14T15:58:46Z">
@@ -105,6 +108,7 @@
       <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>
diff --git a/metadata/swamid-2.0/sso-proxy.mail.sunet.dev-sp.xml b/metadata/swamid-2.0/sso-proxy.mail.sunet.dev-sp.xml
deleted file mode 100644
index cfaf21f5..00000000
--- a/metadata/swamid-2.0/sso-proxy.mail.sunet.dev-sp.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://sso-proxy.mail.sunet.dev/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2023-09-11T13:52:43Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="false" WantAssertionsSigned="false">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sso-proxy.mail.sunet.dev/Saml2SP/disco" index="1"/>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">Sunet's mail platform</mdui:Description>
-        <mdui:Description xml:lang="sv">Sunets mail-plattform</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Sunet mail (test)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Sunet e-post</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/sunetops/Mail</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/sunetops/Mail</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.vr.se/english/information-on-processing-of-personal-data.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.vr.se/behandling-av-personuppgifter.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUG2XIsxzAHx0e2t5bBpSje4lmKyEwDQYJKoZIhvcNAQELBQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjMwOTExMDgzMzAyWhcNMzMwOTA4MDgzMzAyWjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAN3erN5ecLo3w6s7ZxMmLkLL5df7y57x+FwCVTenTGRLYfcPuOnfe6j4hfKupXgJ4ssxEuqaihqzMleZm9N5mBBjs08wgH99qDIfDMKHHuyXuWe5D6CX1hK/O1xLerYRN908sFX+QBF7xr3/U+vhd24lvOqmf12UenZePUzA6kNUF21l3mRNjizSALG6MDyKDS1+4cTQ/Qz59aJ7SYtOwqO78UzyTtFXWRLBemTxqbUO433Q7EyxJRPb2uyhSDCPuZSHv7Db3ROa73EeFP+raZuq+ZdXH/OBLJ8VzN78e8WEODo0XV0lZWmvRk/hLvXGKjG3QzPo7bc23RbYd8A+LMW6Q/JsbvWW1Si7AWza/lkiHrLoRCuNgS25MflINj99nKoRXP48FoXOedxlNzRpXDrVudXz0Zj7urnOwoPEqgQSy4sib2yC7GZ3t8LBM5P9GrUdlOBb5dqQEv0AhOhuW7jr2td6Ss7U0/rbxu5vFVI2i+wzJFsbsJj5+QpstGf8bmpYlH1RmAqbHDogFq4UxCQNSo4kDstv7gtiiDe8Ad8Q7WTW3lMRdWJXE008mr9cPB4sCHeXsNZZhxYKILscth5LowAJnxW3Rd/H6Nk/rACjJC+nJ1UhG2sgz1y2KCl9euMMuJvJsFOht550x3C+kFJ0kLRlG4slW5Gac9sQ0YVJAgMBAAGjUzBRMB0GA1UdDgQWBBSTPMlCihAA5CcU+MbtJ+/waYC0bzAfBgNVHSMEGDAWgBSTPMlCihAA5CcU+MbtJ+/waYC0bzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQBZEI3HykpfAHsQsoTRecxi0aqXiamO4EqZP+/M55Z/lfMQMuk4YRmj79/tBGCTU2bZjErt88H5JWdBwY9RojusJL8zfauEHSWInZMXtTcENz8UmBdudQt75/DbaSqQjI9PbZJpyBfWa5Ql8MQBRiMMaCqj0npilhHTJa/EFaSZ53n+b45VqWXWulRcOmvAuuqqyjvv8VkXIBwwfVQfZNzGNjHOWuzAxnWT6tcoSiFbbTnpuvKbndKfHaDc2iGaWg9tUUdV4VHAsQUom4cYxRi6CIG1Sqbqk7IyTQJH2pIHCtOAnUal/9D7zLK0/eue2aj0xfPNQMvtvh2i6uek8EwpPNdVpkQFYsgbpc1CFf7beC+oIBLxhi6ETma6OVpmOpoQo1ZULJLicIWfai8Mzwhnqq1ymre5WHLNuSfZv36tW6BhYY9xlfR3TPoCK1vLw8GSUvxM8N3nv02CkKmkFO8y9IdHQTG5ut68uUvJcu1neG2fs2raEgnmXff9RaPTpuU3QQO2dIAMXTuu/9WAPgLmziTP3BW3aGgZoEq+QSaxyhrPdtVNE3/0guOCLYKtcWFT9rCI5OyfUK2R5qFyY+jjpShd6HbrpOtNWi1X4XR2gL+6WNmWCTH0ktWrF6qfPmFIAqsokd6rejHUJ8lI7XM1qFJfdnJVC13ouzM6R+s8Mg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUG2XIsxzAHx0e2t5bBpSje4lmKyEwDQYJKoZIhvcNAQELBQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjMwOTExMDgzMzAyWhcNMzMwOTA4MDgzMzAyWjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAN3erN5ecLo3w6s7ZxMmLkLL5df7y57x+FwCVTenTGRLYfcPuOnfe6j4hfKupXgJ4ssxEuqaihqzMleZm9N5mBBjs08wgH99qDIfDMKHHuyXuWe5D6CX1hK/O1xLerYRN908sFX+QBF7xr3/U+vhd24lvOqmf12UenZePUzA6kNUF21l3mRNjizSALG6MDyKDS1+4cTQ/Qz59aJ7SYtOwqO78UzyTtFXWRLBemTxqbUO433Q7EyxJRPb2uyhSDCPuZSHv7Db3ROa73EeFP+raZuq+ZdXH/OBLJ8VzN78e8WEODo0XV0lZWmvRk/hLvXGKjG3QzPo7bc23RbYd8A+LMW6Q/JsbvWW1Si7AWza/lkiHrLoRCuNgS25MflINj99nKoRXP48FoXOedxlNzRpXDrVudXz0Zj7urnOwoPEqgQSy4sib2yC7GZ3t8LBM5P9GrUdlOBb5dqQEv0AhOhuW7jr2td6Ss7U0/rbxu5vFVI2i+wzJFsbsJj5+QpstGf8bmpYlH1RmAqbHDogFq4UxCQNSo4kDstv7gtiiDe8Ad8Q7WTW3lMRdWJXE008mr9cPB4sCHeXsNZZhxYKILscth5LowAJnxW3Rd/H6Nk/rACjJC+nJ1UhG2sgz1y2KCl9euMMuJvJsFOht550x3C+kFJ0kLRlG4slW5Gac9sQ0YVJAgMBAAGjUzBRMB0GA1UdDgQWBBSTPMlCihAA5CcU+MbtJ+/waYC0bzAfBgNVHSMEGDAWgBSTPMlCihAA5CcU+MbtJ+/waYC0bzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQBZEI3HykpfAHsQsoTRecxi0aqXiamO4EqZP+/M55Z/lfMQMuk4YRmj79/tBGCTU2bZjErt88H5JWdBwY9RojusJL8zfauEHSWInZMXtTcENz8UmBdudQt75/DbaSqQjI9PbZJpyBfWa5Ql8MQBRiMMaCqj0npilhHTJa/EFaSZ53n+b45VqWXWulRcOmvAuuqqyjvv8VkXIBwwfVQfZNzGNjHOWuzAxnWT6tcoSiFbbTnpuvKbndKfHaDc2iGaWg9tUUdV4VHAsQUom4cYxRi6CIG1Sqbqk7IyTQJH2pIHCtOAnUal/9D7zLK0/eue2aj0xfPNQMvtvh2i6uek8EwpPNdVpkQFYsgbpc1CFf7beC+oIBLxhi6ETma6OVpmOpoQo1ZULJLicIWfai8Mzwhnqq1ymre5WHLNuSfZv36tW6BhYY9xlfR3TPoCK1vLw8GSUvxM8N3nv02CkKmkFO8y9IdHQTG5ut68uUvJcu1neG2fs2raEgnmXff9RaPTpuU3QQO2dIAMXTuu/9WAPgLmziTP3BW3aGgZoEq+QSaxyhrPdtVNE3/0guOCLYKtcWFT9rCI5OyfUK2R5qFyY+jjpShd6HbrpOtNWi1X4XR2gL+6WNmWCTH0ktWrF6qfPmFIAqsokd6rejHUJ8lI7XM1qFJfdnJVC13ouzM6R+s8Mg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <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://sso-proxy.mail.sunet.dev/Saml2SP/acs/post" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Support</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SUNET Noc</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>SUNET CERT</md:GivenName>
-    <md:EmailAddress>mailto:cert@cert.sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-sp-2.0.mxml b/metadata/swamid-sp-2.0.mxml
index d76c9fdb..027a073b 100644
--- a/metadata/swamid-sp-2.0.mxml
+++ b/metadata/swamid-sp-2.0.mxml
@@ -383,7 +383,6 @@
   <xi:include href="swamid-2.0/sri-test.sunet.se-api-saml2-metadata-.xml"/>
   <xi:include href="swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml"/>
   <xi:include href="swamid-2.0/sse.instructure.com-saml2.xml"/>
-  <xi:include href="swamid-2.0/sso-proxy.mail.sunet.dev-sp.xml"/>
   <xi:include href="swamid-2.0/stage.math.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/staging.ilabsolutions.com.xml"/>
   <xi:include href="swamid-2.0/stark.kau.se-shibboleth.xml"/>