Merge branch 'master' of git.swamid.se:swamid-metadatamd-2023-06-19-v03

2 files changed, 77 insertions, 37 deletions

diff --git a/metadata/swamid-2.0/hhs-se.zoom.us.xml b/metadata/swamid-2.0/hhs-se.zoom.us.xml
index c3ae2b20..085d0ec9 100644
--- a/metadata/swamid-2.0/hhs-se.zoom.us.xml
+++ b/metadata/swamid-2.0/hhs-se.zoom.us.xml
@@ -60,43 +60,6 @@ xFEIAakZ2fyywt4v69l48K9/2kWs8PBshSPhTExTT1Da3oEr/EkAoiPWnOrUZlqWd2otiND6r7+q
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIGtjCCBZ6gAwIBAgIQCf48SVwTzO89aW3TTSBUPTANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMSkwJwYDVQQDEyBEaWdpQ2VydCBUTFMgUlNBIFNI
-QTI1NiAyMDIwIENBMTAeFw0yMjAxMDUwMDAwMDBaFw0yMzAxMDQyMzU5NTlaMHExCzAJBgNVBAYT
-AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQHEwhTYW4gSm9zZTEoMCYGA1UEChMfWm9v
-bSBWaWRlbyBDb21tdW5pY2F0aW9ucywgSW5jLjEQMA4GA1UEAxMHem9vbS51czCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMojahRTgictiNEB+fQXIFnxZEqgygvhCJn0Hov4IVM6e7a+
-dMJo1VQsgExMB1PSanNvbs5CSmnH4rOSdA3QZrLqV388aXXDYTnMaWj+sgFPlVWUTRGU7cg/v3gX
-NONYAjnspYkKPSevw9hogchfNKIb22oFhKqcEW6Om8l6uWoBuA5iOV6xD0pK5kz6tCQZT+/XgAkc
-RYflPyHSJcne50ETOltttnrronSf9mRDV3GuO6jinR3vrjoPBxJRHvCIzbwtrFFtxbJtZxvDDwoj
-W+1N0zxIKuqDDbNz2xV5ljc+O50MrrpNNAhrK43MhJFCnDnpVa7mD/hnhvjXDxakUJMCAwEAAaOC
-A2owggNmMB8GA1UdIwQYMBaAFLdrouqoqoSMeeq02g+YssWVdrn0MB0GA1UdDgQWBBTOCRYgvopA
-dEFLhLr0FUufc47Z7zASBgNVHREECzAJggd6b29tLnVzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUE
-FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NybDMu
-ZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VExTUlNBU0hBMjU2MjAyMENBMS00LmNybDBAoD6gPIY6aHR0
-cDovL2NybDQuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VExTUlNBU0hBMjU2MjAyMENBMS00LmNybDA+
-BgNVHSAENzA1MDMGBmeBDAECAjApMCcGCCsGAQUFBwIBFhtodHRwOi8vd3d3LmRpZ2ljZXJ0LmNv
-bS9DUFMwfwYIKwYBBQUHAQEEczBxMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5j
-b20wSQYIKwYBBQUHMAKGPWh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFRMU1JT
-QVNIQTI1NjIwMjBDQTEtMS5jcnQwDAYDVR0TAQH/BAIwADCCAX4GCisGAQQB1nkCBAIEggFuBIIB
-agFoAHYA6D7Q2j71BjUy51covIlryQPTy9ERa+zraeF3fW0GvW4AAAF+KAVBygAABAMARzBFAiEA
-rtfeQ99OhmoaWWW6C+cEOoOwXwrZMDaJXhsoGdOy1jgCICAfL+l2WkJ9B1lKb6D93rWANj2voiga
-BEy6CCj+fI7/AHUANc8ZG7+xbFe/D61MbULLu7YnICZR6j/hKu+oA8M71kwAAAF+KAVCFQAABAMA
-RjBEAiBOxbNBm8bHEcz+AJiSLW6RP2pZUzxJRmUjwaJlXN44sQIgJDKdCUMn4GFo80idD135JaqJ
-LorDPfSBDvL73t+Yu6cAdwCzc3cH4YRQ+GOG1gWp3BEJSnktsWcMC4fc8AMOeTalmgAAAX4oBUI0
-AAAEAwBIMEYCIQDbkQO7Uq7yq+s2zHu++WzuhtKVEDkeVzfStZVWDBHgBgIhAMcTpkfrd/b9RI8/
-k48BrNXLnVJX1o4Qw5tTuPvAvmk2MA0GCSqGSIb3DQEBCwUAA4IBAQAog8XzmWnid9A/wtsn6abK
-yPNFFss7YhPgWY0PnBpbnvxQVeP5oCDU/3YecyaXbm0CiY4dEH22EV5nNVgSVLPcZud75W3VVYlV
-DhZtmTIEGF6FnYv1Q1tek0Okgf03XdKWwODqYSY+3FwaBa6cON6Vw7bhVRVl3KuMtuH5vSJP2rAE
-lYhdyaErrG3nwskUpqIZ9wwmjXRQW6705G5yk3Y6vRqoRefSbO7QqTxABvwGh23GDhyiW+rkibU2
-VKj5OfOwlyK5N91EbZUfLsO2U9hg//ZdOJMmxvpO6UgZBmd7TjOdYM8Nkr9CBB1Jm1+CgfqrQgeL
-mYIp+qov+EzUDeCQ</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hhs-se.zoom.us/saml/SingleLogout" ResponseLocation="https://hhs-se.zoom.us/saml/SingleLogout"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hhs-se.zoom.us/saml/SingleLogout" ResponseLocation="https://hhs-se.zoom.us/saml/SingleLogout"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
diff --git a/metadata/swamid-2.0/idportal-test.slu.se-sp.xml b/metadata/swamid-2.0/idportal-test.slu.se-sp.xml
new file mode 100644
index 00000000..11a7eb39
--- /dev/null
+++ b/metadata/swamid-2.0/idportal-test.slu.se-sp.xml
@@ -0,0 +1,77 @@
+<?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://idportal-test.slu.se/sp">
+  <md:Extensions>
+    <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/code-of-conduct/v2</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2023-04-20T05:48:59Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:Description xml:lang="en">Service allowing slu users to activate their account and confirm identity</mdui:Description>
+        <mdui:Description xml:lang="sv">Tjänst för att låta slus användare hämta ut konto och bekräfta sin identitet</mdui:Description>
+        <mdui:DisplayName xml:lang="en">SLU Idportal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SLU Idportal</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://idportal.slu.se/policy/infosv</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://idportal.slu.se/policy/infoen</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idportal.slu.se/policy/eduidpolicyEn</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://idportal.slu.se/policy/eduidpolicysv</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFxTCCA62gAwIBAgIUM7TPcG0XmLJQJcTFlCSc3dV9dj4wDQYJKoZIhvcNAQELBQAwcjELMAkGA1UEBhMCU2UxDzANBgNVBAgMBlN3ZWRlbjEQMA4GA1UEBwwHVXBwc2FsYTEfMB0GA1UECgwWU2lnbmluZ0lkcG9ydGFsZW4tdGVzdDEfMB0GA1UEAwwWU2lnbmluZ0lkcG9ydGFsZW4tdGVzdDAeFw0yMzA0MDMwOTAyMTlaFw0zMzAzMzEwOTAyMTlaMHIxCzAJBgNVBAYTAlNlMQ8wDQYDVQQIDAZTd2VkZW4xEDAOBgNVBAcMB1VwcHNhbGExHzAdBgNVBAoMFlNpZ25pbmdJZHBvcnRhbGVuLXRlc3QxHzAdBgNVBAMMFlNpZ25pbmdJZHBvcnRhbGVuLXRlc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDTO8QDQwnmHy9mt0FjSQxOQMBTOei3NJpNVuQ2Rlbbkg3UwpjkUUXlK1YmTeX0XmnZnXz1Ap8OUdwdv/UJ9uN6Y7MEhxRLT1GcYir3HCVt2T36TtpQbB34mX9u52lBhvOiGgsGXc5BbcvuzYYxuoujgx1/wvsOhvJxnbbVSRp56kNHT92aE+t27llIk9FiBI4r3dUler/II2teDNPMmiwgzh0MusUjey6CcOzuHY12JC+3ZbAyJBuIb04xSoyDFVe5Nfy56/tj420qFSyHEx/tADfueQITr7JaOC4+l2Ib6vhzxPwTfMCx0CF/74SOsjIicpWuk+ZTvfgQ1Iv1wfooUP5HsY3i+6iCisNYjs9wKbVeM7ijBwRlOHz6C+lub3CFMP7qAw2AfIkYsrs//ABc/9d7CV4cmCfTWRLDOtEIkdoA0Az8DJkVTesGu0Zw0GHRc7i+e5JCdMIdahq3srwAQ0f/WlipsotGynKPz2YI0IMhMtChQzFwiuW0jYBsXfKCXZEmBo+uN9Rd6/8rDdQG1MBAuvNq0neQw95WNfH2nD4D3mYdlME6OZ2Qq3/XzkdHb0AifddR5TEFwM7FOM1/1cogNq+MXEZG4IGBgh1iicHJTNmOR9A4mrnFK3FnR2qO22ILGXJ0QgVqe1nCJmt0qtWOi1YI17aRl/LgF+NjdQIDAQABo1MwUTAdBgNVHQ4EFgQUeObKoObiZxgv3S1twBiVc9EYRD8wHwYDVR0jBBgwFoAUeObKoObiZxgv3S1twBiVc9EYRD8wDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAm8/XghljuHp5aJcP56nW+mjGRq+VPKYqev4jfZTC1HDmHP/ypRGOG7u51676yYUxpXPthjX//5PGLGERccx5IFIG2I2SqDvmMZwXLUU6Ex3WJ8126dFfWntFZjOy/TP+Cpzux/ovM6HkInqWftL2SnTric4ZUvxnoZOVqx/QLvcTSvEGqe9RGjRKB6ZpkjvgRtSrcyHpzEJot/MxM9AKoon+BMwkwRHaW1w4bziy1H3p3FR0BR9vxQS5ftN89weSlD0PqSVPccKT+/vz3sE0rWFy7uY4z8tHanJtUPrNsecfE6XQX2eZgmxo+81qbqYOfIrZMGTy5FOcVjL8351y8gcXzVk8UE5kA5vUSJ4Ghytr61D9e3EfAjfjMscd/8uR1LWnhmaGPG1Wtb4d8qPnjTUDEGnl0JjG3LyKkuKiRHB0PehJ5ZdZ9l0JmUD7EErvc+Fgz+7wHfj+EYHfEwcxAama/uWQtcdb2XoCnpk2I8dOY4675VnTrwsgqVft9+KjtCrqBrLuy9fMh6lztLt8zv6s2KysmOOU9h7O0DqzdYsGJek2ll00Im2wMR8vonCySnJli5Xk36Wdey3rx5c34W68M3Gd2st4qdOXcpLx4zO/oROef+V5mEpKvhlCa2Lb71Hsg7D4XA6yR2wvU6oPm/XDM8GHM9reAgAehWIUZpU=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIF0TCCA7mgAwIBAgIUe2DMt2AHEOtvVU3LwmIAH+yfS8EwDQYJKoZIhvcNAQELBQAweDELMAkGA1UEBhMCU2UxDzANBgNVBAgMBlN3ZWRlbjEQMA4GA1UEBwwHVXBwc2FsYTEiMCAGA1UECgwZRW5jcnlwdGlvbklkcG9ydGFsZW4tdGVzdDEiMCAGA1UEAwwZRW5jcnlwdGlvbklkcG9ydGFsZW4tdGVzdDAeFw0yMzA0MDMwOTAzMzlaFw0zMzAzMzEwOTAzMzlaMHgxCzAJBgNVBAYTAlNlMQ8wDQYDVQQIDAZTd2VkZW4xEDAOBgNVBAcMB1VwcHNhbGExIjAgBgNVBAoMGUVuY3J5cHRpb25JZHBvcnRhbGVuLXRlc3QxIjAgBgNVBAMMGUVuY3J5cHRpb25JZHBvcnRhbGVuLXRlc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC8TaW8E5GpTKNw4++rl9+4XBdUy7xEERoxcv+D8xh1UvG44cTv1ERTCzPSVYBpTZz5chRCTRI5Dq7eIGlXdkN3ME/ufu5AmE4UVmAliNWOrjB7U1qRWj8/yy4YXMeamGXQH3BACVFl6Gx96YGt9mtinQsPoxql0uMq3kkVm7Fhlacm7dO8IZbM0hbpqQmbqyvCP6oCt/78LKs+xBAegG1kEFf9Xe2cUQdWGFbR+dEGh48Ud1J6qizrhjbgzJ7yK5Nhu9PSvha3zaKugVmJ+L3P9Xz1CatPqXklIyKTvvm3rG6meymkZGVJtFfWHZ9c6w/e8Xfi6LpvyQPxZqozbCv3e5tjXKMzx6VWwT9WdbrICKBcoxCdZ5kwIcCCv3k0tHF8Ig8QeThSXVvCGBrYJVlLPs8g3xWu/DExF8K3k5OrE7m4HQoXVwNsYH91PqQqYAqAYVn/BCwQBLoQYlKSJzKddZ/zF9PJIh/Qx6aWqlvoUuUVNYBPaxxVciIkt016kJDuuOVF27SJ95DQh3rWfCnM4G2x30Dv0+E+UyHAp9gfrAwGuKbaTDry2Zigt0/wVDxYby/rEPoB3SNd9Fkp4HMVe8dSxfc76EhRBJsg+wr/eA3IKPobJWM55DZwkr8gmFeUbv06GKML/j6XamIEfggLaWUcp3udWrThSu7B16U2xwIDAQABo1MwUTAdBgNVHQ4EFgQUaXDvp+f6v52P4eRVkvvziRnaL34wHwYDVR0jBBgwFoAUaXDvp+f6v52P4eRVkvvziRnaL34wDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAtswNQG5xXO0KAb35S66weGmKx7TYb0rf/YnXHILF3KLxn/7u8UniadrQN8khXnvmVuuwrRQk6D0m1GUSZfLF/r2GWynBDZs2/IXbuHw6LtCK12Ho1ZZSQSH6I1+dTLUXadLxV4nrUwU5EIfCdnG/2/fnYVX1yfHeNhAjpg3QZ45250BjljKcYBmd7dZ2Gn3gJEzt6YLBxO7FsClytA8Iv48KuYXHzvV3UoNQZnI9mvtBh7VHXZP3H/HwgLR1W2sCfbkPP35h+m+3hZ4dZO+FOQQcKbhqfz8x1RFa+n6e1Qp5BRowQtIpDU+wwGnoPT65vmNLSwz9cyIu5Dtz36VRIBnr3QR3frywVd0oMaAIIsAWgX5A2X/QFBUgeMaUQ5rx1PTWjHhpMmvAPL8ytFaa6k12CcVYRCP7D9mGUJvB/mWKEEvdJXusdFVuU9NPJaVVBzDEoms9Qnpf0Zt3/yBWcZpUBdEUYGhGotD0SR64wAu9/SIT2v51NCiMZPd750BHLnZwOs3YO37XmKgp8JQinpf2tnEdkI9PVMk/BW177mBma6uHf334jIjZbERJG+C39A68NpC6FM0ejBhQra0X4mk+jKOi5rjWbSb/ZRr1epzn1rUbF6qaplyUmNZlmtwZi/cbr8KgTGkJw0LXsYTPvnxLwuLeoUOtbKuzLq/gkok=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://localhost:7271/sp/Logout"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://localhost:7271/sp/Acs" isDefault="true" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://localhost:7271/sp/Acs" isDefault="false" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">idportal-test</md:ServiceName>
+      <md:ServiceName xml:lang="sv">idportal-test</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="givenName" Name="urn:oid:2.5.4.42" 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="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacDateOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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="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="mailLocalAddress" Name="urn:oid:2.16.840.1.113730.3.1.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">SLU</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">SLU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Sveriges lantbruksuniversitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.slu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.slu.se/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:support@slu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:EmailAddress>mailto:support@slu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:support@slu.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>SLU säkerhet</md:GivenName>
+    <md:EmailAddress>mailto:sakerhet@slu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>