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

author: Björn Mattsson <bjorn@sunet.se> 2022-10-17 15:34:47 +0200
committer: Björn Mattsson <bjorn@sunet.se> 2022-10-17 15:34:47 +0200
commit: 2f77bb65571ddb8ecef5a94481a60984fe2b759b (patch)
tree: 62d9eb983f14459ad468a08f45b82be693c2cc6b
parent: cd04d34e99d5da088167fd29d518c07083c5f8a6 (diff)
parent: 2a763b9b5d0dc33eff3ccbe76416a319deff4a31 (diff)
15 files changed, 259 insertions, 289 deletions
diff --git a/swamid-2.0/drive.sunet.se-index.php-apps-user_saml-saml-metadata.xml b/swamid-2.0/drive.sunet.se-index.php-apps-user_saml-saml-metadata.xml
deleted file mode 100644
index 1219931a..00000000
--- a/swamid-2.0/drive.sunet.se-index.php-apps-user_saml-saml-metadata.xml
+++ /dev/null
@@ -1,63 +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://drive.sunet.se/index.php/apps/user_saml/saml/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-09-10T08:36:14Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">SUNET Drive</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">SUNET Drive</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Sunet Drive är en molntjänst baserad på Sunets Lagring Tjänst (Storage As A Service) samt produkten NextCloud</mdui:Description>
-        <mdui:Description xml:lang="en">Sunet Drive is a cloud service running on Sunets Storage As A Service and NextCloud</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/Drive</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/Drive</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID4zCCAsugAwIBAgIUKRsi6VCKlaRX+Uq7fZBbntqWLXQwDQYJKoZIhvcNAQELBQAwgYAxCzAJBgNVBAYTAlNFMRowGAYDVQQIDBFTdG9ja2hvbG1zIGzDg8KkbjESMBAGA1UEBwwJU3RvY2tob2xtMQ4wDAYDVQQKDAVTdW5ldDEUMBIGA1UEAwwLU3VuZXQgRHJpdmUxGzAZBgkqhkiG9w0BCQEWDG5vY0BzdW5ldC5zZTAeFw0yMTEwMDgxMzE4MjlaFw0yMTExMDcxMzE4MjlaMIGAMQswCQYDVQQGEwJTRTEaMBgGA1UECAwRU3RvY2tob2xtcyBsw4PCpG4xEjAQBgNVBAcMCVN0b2NraG9sbTEOMAwGA1UECgwFU3VuZXQxFDASBgNVBAMMC1N1bmV0IERyaXZlMRswGQYJKoZIhvcNAQkBFgxub2NAc3VuZXQuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCeoEUOLkn+uBiH8JQ2wvQX7Ma0VKP2AFJ3au4olZl1qiLnJx1AMMtm8SEBrXTMulAnCPjfo5VOtO9iKSG5WhXeDPD1whMoteCZ15FeMnr+qiwvU43imINeUey2VHDKGMoXrKf2HkrpGB+CtPejH/iW5MFXGoPa0z+6PAdGu6YiZA3kVDyUK3HE1WiMVX/KPqbyFB8YW7jU+2onpEd7DiwlxbVxHY48vkVXugcS0RYcTpXtuVl/kixWQqiViTyE+YWUT+RQTfN59mbSH/lsRr2YmvfPEQwHM99uIWJapZPsgrgu7TqMYwvhNteMV6aCCoHDRMR/PgpcxeylxNh6rf9LAgMBAAGjUzBRMB0GA1UdDgQWBBTnr0QT/cC4DW/lvBfO/XL6FvpzVDAfBgNVHSMEGDAWgBTnr0QT/cC4DW/lvBfO/XL6FvpzVDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBxam58Qo5p4TPQjSPMxYjaCs5GDwzk3dNEZYbTqxJWI0fS2fbtG9iv67wTXr2fnKCtWhG1qd4VbOG7b1avKBM8vV3VxcJ8j2RJoJk+/CWkTN2LNcy9uzYs1w6o4CRmS7S6Rn1VjAQ15SHfiLd47y7ggh/tU+hONpqtBXSAeeYCSyL5c0wC/Yk13mUAI7MwSG68Lva7jvNKx5WsLh/xSsIOsIsTOcp0WKWP706iak1NfQaOhDWoywptfGNUXugcWToKqk/7S+E8O8vZPN82+HGwdMGqXd9FaoHUYAjUc4juhXzfkAnNyzRa5YHjTxDtby/iur4duwBmVwYrtlRfTWHY</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID4zCCAsugAwIBAgIUKRsi6VCKlaRX+Uq7fZBbntqWLXQwDQYJKoZIhvcNAQELBQAwgYAxCzAJBgNVBAYTAlNFMRowGAYDVQQIDBFTdG9ja2hvbG1zIGzDg8KkbjESMBAGA1UEBwwJU3RvY2tob2xtMQ4wDAYDVQQKDAVTdW5ldDEUMBIGA1UEAwwLU3VuZXQgRHJpdmUxGzAZBgkqhkiG9w0BCQEWDG5vY0BzdW5ldC5zZTAeFw0yMTEwMDgxMzE4MjlaFw0yMTExMDcxMzE4MjlaMIGAMQswCQYDVQQGEwJTRTEaMBgGA1UECAwRU3RvY2tob2xtcyBsw4PCpG4xEjAQBgNVBAcMCVN0b2NraG9sbTEOMAwGA1UECgwFU3VuZXQxFDASBgNVBAMMC1N1bmV0IERyaXZlMRswGQYJKoZIhvcNAQkBFgxub2NAc3VuZXQuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCeoEUOLkn+uBiH8JQ2wvQX7Ma0VKP2AFJ3au4olZl1qiLnJx1AMMtm8SEBrXTMulAnCPjfo5VOtO9iKSG5WhXeDPD1whMoteCZ15FeMnr+qiwvU43imINeUey2VHDKGMoXrKf2HkrpGB+CtPejH/iW5MFXGoPa0z+6PAdGu6YiZA3kVDyUK3HE1WiMVX/KPqbyFB8YW7jU+2onpEd7DiwlxbVxHY48vkVXugcS0RYcTpXtuVl/kixWQqiViTyE+YWUT+RQTfN59mbSH/lsRr2YmvfPEQwHM99uIWJapZPsgrgu7TqMYwvhNteMV6aCCoHDRMR/PgpcxeylxNh6rf9LAgMBAAGjUzBRMB0GA1UdDgQWBBTnr0QT/cC4DW/lvBfO/XL6FvpzVDAfBgNVHSMEGDAWgBTnr0QT/cC4DW/lvBfO/XL6FvpzVDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBxam58Qo5p4TPQjSPMxYjaCs5GDwzk3dNEZYbTqxJWI0fS2fbtG9iv67wTXr2fnKCtWhG1qd4VbOG7b1avKBM8vV3VxcJ8j2RJoJk+/CWkTN2LNcy9uzYs1w6o4CRmS7S6Rn1VjAQ15SHfiLd47y7ggh/tU+hONpqtBXSAeeYCSyL5c0wC/Yk13mUAI7MwSG68Lva7jvNKx5WsLh/xSsIOsIsTOcp0WKWP706iak1NfQaOhDWoywptfGNUXugcWToKqk/7S+E8O8vZPN82+HGwdMGqXd9FaoHUYAjUc4juhXzfkAnNyzRa5YHjTxDtby/iur4duwBmVwYrtlRfTWHY</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://drive.sunet.se/index.php/apps/user_saml/saml/acs" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Richard Freitag</md:SurName>
-    <md:EmailAddress>mailto:freitag@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SUNET</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SUNET</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.hb.se-idp-shibboleth.xml b/swamid-2.0/idp.hb.se-idp-shibboleth.xml
index c458552d..f85c8641 100644
--- a/swamid-2.0/idp.hb.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hb.se-idp-shibboleth.xml
@@ -15,6 +15,7 @@
         <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
         <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
         <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/idp.ltu.se-idp-shibboleth.xml b/swamid-2.0/idp.ltu.se-idp-shibboleth.xml
index 404b5e11..b269c656 100644
--- a/swamid-2.0/idp.ltu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.ltu.se-idp-shibboleth.xml
@@ -25,6 +25,10 @@
         <mdui:Description xml:lang="en">Identity Provider for Lulea University of Technology</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.ltu.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.ltu.se/?l=en</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="130" width="250">https://www.ltu.se/image/LTU_logo-sve-smal.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="130" width="250">https://www.ltu.se/image/LTU_logo-eng-smal.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.ltu.se/ltu/it-support/IT-support-personal/Anvandarnamn-och-losenord/Din-anvandare/Policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren-Identity-Provider-IdP-1.218207</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.ltu.se/ltu/it-support/IT-support-personal/Anvandarnamn-och-losenord/Din-anvandare/Policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren-Identity-Provider-IdP-1.218207?l=en</mdui:PrivacyStatementURL>
         <mdui:Keywords xml:lang="sv">LTU lulea+tekniska+universitet lulea+university+of+technology</mdui:Keywords>
         <mdui:Keywords xml:lang="en">LTU lulea+tekniska+universitet lulea+university+of+technology</mdui:Keywords>
       </mdui:UIInfo>
@@ -198,10 +202,12 @@ ZdLXjuEF1cFQB3AAK9PIEmkLc69IXjPQ
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ltu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">LTU</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Lulea University of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Luleå tekniska universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Luleå tekniska universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Lulea University of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ltu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.ltu.se/?l=en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.ltu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Lulea University of Technology</md:Company>
diff --git a/swamid-2.0/idp02.gih.se-idp-shibboleth.xml b/swamid-2.0/idp02.gih.se-idp-shibboleth.xml
index e02cc207..ffc8927c 100644
--- a/swamid-2.0/idp02.gih.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp02.gih.se-idp-shibboleth.xml
@@ -12,6 +12,10 @@
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -41,31 +45,6 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUfL5eIxaCCsXXEHWoMbWDcuznRdkwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMaWRwMDIuZ2loLnNlMB4XDTIwMTExOTExMzA1OFoXDTMw
-MTExOTExMzA1OFowFzEVMBMGA1UEAwwMaWRwMDIuZ2loLnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAj+HoBNvAQtsXd+fWDPJaB3oZhN4sLRxKxvr2
-6GnH67VmUtzb8LpByJ6P9aW+xbHP/KYZ2waDDM0OwmhFsgT6WMfIwu3JWa+JL0ey
-5ttKaP6Z7Dv20UD6ntntVLq9hGf/RDQSlbAtqoYAUMURAbiGQ8W0MK1K1cLCzJNn
-51xgvIJ0EFCThoBm29Qz9L85MwLFM/qQm3HLf3VuR7Sm9r1Uehr1XeZbylv1n5Ln
-PKThGVqNF3EUWPxY1rJb07MYKyis+IG8jf+8GyXi9hmdBX96znacB3MAZ+VSSxYX
-/glQYdukMZZr0UoL5AowT9GkEZ82lBOPngXm9SnDA4tGabe8jQIDAQABo18wXTAd
-BgNVHQ4EFgQUmf0NpPd2MGKF4HJmHxXsmDBhVyowPAYDVR0RBDUwM4IMaWRwMDIu
-Z2loLnNlhiNodHRwczovL2lkcDAyLmdpaC5zZS9pZHAvc2hpYmJvbGV0aDANBgkq
-hkiG9w0BAQsFAAOCAQEARcQYXeG/c5NT1dqlOQEbS5RmuuHo8YeVJqn42J4p7YWK
-ePa/fGNyiIa6r5L96S4zf1pBGXQ4waEofvdDr3WC/bUr2y4zpSoGL04z7Kz4JhIn
-2vv9sUFxjU+N61NxuSu/nSdoHNNi0+vTLqO0dCn2tsCzCYDOM+8fIzanWT7CCMd1
-+7kzroyXpbQfrsg1gHwkdz6FRhpyy8wYlkQBqNiYw8uI2Enz5DtCIgTdzeY5K6T2
-sq6tAAvkig6Q9YAKsZp2pxchkm8VE3Asn9pkKmmylelMXYrX1JZzfPyaQcY2UPD8
-U+hy+KSevibyVy5OBDk6lia+Yp9JAMYJ9eXkcaI1mg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAKtN6+g8qyINNSUdMUj+ETmlrH8pMA0GCSqGSIb3DQEB
 CwUAMBcxFTATBgNVBAMMDGlkcDAyLmdpaC5zZTAeFw0yMDExMTkxMTMyMTBaFw0z
 MDExMTkxMTMyMTBaMBcxFTATBgNVBAMMDGlkcDAyLmdpaC5zZTCCASIwDQYJKoZI
@@ -228,4 +207,8 @@ hfPauxBtehyqdj0u5Kh1alBnJrNgsNU1ldLSDXt8fxU=
     <md:EmailAddress>mailto:itsupport@gih.se</md:EmailAddress>
     <md:TelephoneNumber>+46812053700</md:TelephoneNumber>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Security Response Team</md:GivenName>
+    <md:EmailAddress>mailto:abuse@gih.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/jira-next.its.umu.se-shibboleth.xml b/swamid-2.0/jira-next.its.umu.se-shibboleth.xml
index 2dee63ff..4736993e 100644
--- a/swamid-2.0/jira-next.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/jira-next.its.umu.se-shibboleth.xml
@@ -22,8 +22,8 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <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.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -38,6 +38,10 @@
         <mdui:DisplayName xml:lang="en">Jira Next, ITS, Umeå University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Jira Next, ITS, IT-stöd och systemutveckling, Umeå universitet</mdui:Description>
         <mdui:Description xml:lang="en">Jira Next, ITS, ICT Services and System Development, Umeå University</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://administrationsverktyg.umu.se/privacy/information/?system=https%3A%2F%2Fjira-next.its.umu.se%2Fshibboleth&amp;lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://administrationsverktyg.umu.se/privacy/information/?system=https%3A%2F%2Fjira-next.its.umu.se/shibboleth&amp;lang=se</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://administrationsverktyg.umu.se/privacy/?system=https%3A%2F%2Fjira-next.its.umu.se%2Fshibboleth&amp;lang=en</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://administrationsverktyg.umu.se/privacy?system=https%3A%2F%2Fjira-next.its.umu.se%2Fshibboleth&amp;lang=se</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -96,5 +100,43 @@ kkF74aGqDdNQj8WhvVWDtw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jira-next.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jira-next.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jira-next.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Jira Dev, ITS, Umeå University</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Jira Dev, ITS, Umeå universitet</md:ServiceName>
+      <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="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="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="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="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:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Umeå Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Umea University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Umeå Universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.umu.se/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.umu.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå Universitet</md:Company>
+    <md:GivenName>ITS Datordrift</md:GivenName>
+    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå Universitet</md:Company>
+    <md:GivenName>ITS Datordrift</md:GivenName>
+    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Umeå Universitet</md:Company>
+    <md:GivenName>ITS Datordrift</md:GivenName>
+    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>ITS, Umeå Universitet</md:Company>
+    <md:GivenName>UmU Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:abuse@umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml b/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml
index 6e9f53ab..93c14f75 100644
--- a/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml
@@ -22,8 +22,8 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <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.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -38,6 +38,10 @@
         <mdui:DisplayName xml:lang="en">Jira Test, ITS, Umeå University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Jira Test, ITS, IT-stöd och systemutveckling, Umeå universitet</mdui:Description>
         <mdui:Description xml:lang="en">Jira Test, ITS, ICT Services and System Development, Umeå University</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://administrationsverktyg.umu.se/privacy/information/?system=https%3A%2F%2Fjira-stage.its.umu.se%2Fshibboleth&amp;lang=en</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://administrationsverktyg.umu.se/privacy/?system=https%3A%2F%2Fjira-stage.its.umu.se%2Fshibboleth&amp;lang=en</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://administrationsverktyg.umu.se/privacy?system=https%3A%2F%2Fjira-stage.its.umu.se%2Fshibboleth&amp;lang=se</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://administrationsverktyg.umu.se/privacy/information/?system=https%3A%2F%2Fjira-stage.its.umu.se/shibboleth&amp;lang=se</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -96,9 +100,44 @@ LUM1EdYsX8qUyvMYoftcOdiik08=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Jira Dev, ITS, Umeå University</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Jira Dev, ITS, Umeå universitet</md:ServiceName>
+      <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="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="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="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="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:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Umeå Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Umea University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Umeå Universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.umu.se/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.umu.se/</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå Universitet</md:Company>
+    <md:GivenName>ITS Datordrift</md:GivenName>
     <md:SurName>Risto Järvi</md:SurName>
     <md:EmailAddress>mailto:risto.jarvi@umu.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå Universitet</md:Company>
+    <md:GivenName>ITS Datordrift</md:GivenName>
+    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Umeå Universitet</md:Company>
+    <md:GivenName>ITS Datordrift</md:GivenName>
+    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>ITS, Umeå Universitet</md:Company>
+    <md:GivenName>UmU Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:abuse@umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/jira.its.umu.se-shibboleth.xml b/swamid-2.0/jira.its.umu.se-shibboleth.xml
index 1b984922..64343de0 100644
--- a/swamid-2.0/jira.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/jira.its.umu.se-shibboleth.xml
@@ -17,8 +17,8 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <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.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -32,6 +32,10 @@
         <mdui:DisplayName xml:lang="en">Jira, ITS, Umeå University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Jira, ITS, IT-stöd och systemutveckling, Umeå universitet</mdui:Description>
         <mdui:Description xml:lang="en">Jira, ITS, ICT Services and System Development, Umeå University</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://administrationsverktyg.umu.se/privacy/information/?system=https%3A%2F%2Fjira.its.umu.se%2Fshibboleth&amp;lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://administrationsverktyg.umu.se/privacy/information/?system=https%3A%2F%2Fjira.its.umu.se/shibboleth&amp;lang=se</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://administrationsverktyg.umu.se/privacy/?system=https%3A%2F%2Fjira.its.umu.se%2Fshibboleth&amp;lang=en</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://administrationsverktyg.umu.se/privacy?system=https%3A%2F%2Fjira.its.umu.se%2Fshibboleth&amp;lang=se</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -80,5 +84,43 @@ kcpkPw96Zj9HfRw2XGwo0pM+nRwYuw9WpA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jira.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jira.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jira.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Jira Dev, ITS, Umeå University</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Jira Dev, ITS, Umeå universitet</md:ServiceName>
+      <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="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="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="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="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:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Umeå Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Umea University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Umeå Universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.umu.se/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.umu.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå Universitet</md:Company>
+    <md:GivenName>ITS Datordrift</md:GivenName>
+    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå Universitet</md:Company>
+    <md:GivenName>ITS Datordrift</md:GivenName>
+    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Umeå Universitet</md:Company>
+    <md:GivenName>ITS Datordrift</md:GivenName>
+    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>ITS, Umeå Universitet</md:Company>
+    <md:GivenName>UmU Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:abuse@umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/mah.hr.evry.se-shibboleth.xml b/swamid-2.0/mah.hr.evry.se-shibboleth.xml
deleted file mode 100644
index 896ccb1f..00000000
--- a/swamid-2.0/mah.hr.evry.se-shibboleth.xml
+++ /dev/null
@@ -1,82 +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://mah.hr.evry.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-03-20T14:38:33Z">
-      <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"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <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-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </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>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Primula</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Primula</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Webgränssnittet till HR-systemet Primula från EVRY HR Solutions AB för anställda vid Malmö högskola</mdui:Description>
-        <mdui:Description xml:lang="en">The web interface to the HR software system Primula from EVRY HR Solutions AB for employees at Malmö University</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDuDCCAqACBQCo2ygOMA0GCSqGSIb3DQEBBAUAMIGfMQswCQYDVQQGEwJTRTEQ
-MA4GA1UECBMHVXBwc2FsYTEdMBsGA1UEChMURXZyeSBIUiBTb2x1dGlvbnMgQUIx
-EDAOBgNVBAcTB1VwcHNhbGExEzARBgNVBAMTCmhyLmV2cnkuc2UxEDAOBgNVBAsT
-B1ByaW11bGExJjAkBgkqhkiG9w0BCQEWF3ByaW11bGFzdXBwb3J0QGV2cnkuY29t
-MB4XDTE1MDEyNzEzMTQ0M1oXDTI1MDEyNDEzMTQ0M1owgZ8xCzAJBgNVBAYTAlNF
-MRAwDgYDVQQIEwdVcHBzYWxhMR0wGwYDVQQKExRFdnJ5IEhSIFNvbHV0aW9ucyBB
-QjEQMA4GA1UEBxMHVXBwc2FsYTETMBEGA1UEAxMKaHIuZXZyeS5zZTEQMA4GA1UE
-CxMHUHJpbXVsYTEmMCQGCSqGSIb3DQEJARYXcHJpbXVsYXN1cHBvcnRAZXZyeS5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJstEPNIMU6Q+1Fie
-ekZiInII7woqYNQ9cg30gvwYluNA9aKs9Rx1OXufcvxZEhcQ1R5zCe2gWa7I9bCi
-gyluonu51qmk++c7aMLIXU1pXhM/6sIXIHy36WZbabg7HYp4Ju+diUmV+LxWAe3c
-zjvoFWC3pr4mwJBeUkQtKk+UBLd4L6rOAM2htN6lyXduMcSJMSckS4aZqYMj02Dd
-hz3lMiSVErkA351af+oVC+6HghlnfNyiJbjGh+hslPcvnrBaOCX84/QI36X0NZjo
-7/o5vfmbfEM3K4YZklqhjkXOm+0KuRWj3DLyxqDyMURu4WNpMlap+kPhm1J64agx
-uo6rAgMBAAEwDQYJKoZIhvcNAQEEBQADggEBAEl9NSzAegcuz+J2ktf63LNRge/e
-GxWW8KIM2t5HyWYudHBTsVqlSNQEe1V/vmW/lwntct7gGHXwnPp8Ulb3JrGjJq6I
-NukeIMKSMJVHsCYTwbAqeCT6POaX6C8Uzs4CFV8VUv3x61Rbr7BKrYgxf2Q+CyG7
-2fWaucSmjZ56flYFTUmJ1sFzYuFKn9Ty5xPMV/eGmlT8kJ8HBH5E3cVQ+vVSoRYf
-fP/0el9T10aI13RD/03wXWCku1Ewx8Qqw+ANcN9HhZwdH23kpP+jYiBfOmhtCDh1
-DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mah.hr.evry.se/Shibboleth.sso/SAML2/Artifact" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mah.hr.evry.se/Shibboleth.sso/SAML2/POST" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mah.hr.evry.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:artifact-01" Location="https://mah.hr.evry.se/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:browser-post" Location="https://mah.hr.evry.se/Shibboleth.sso/SAML2/POST" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Primula Web</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eppn" 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"/>
-      <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"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Primula</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:primulasupport@tietoevry.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/play.konstfack.se.xml b/swamid-2.0/play.konstfack.se.xml
index 13dae0c9..7e3bafed 100644
--- a/swamid-2.0/play.konstfack.se.xml
+++ b/swamid-2.0/play.konstfack.se.xml
@@ -16,10 +16,10 @@
         <mdui:DisplayName xml:lang="sv">Konstfack Play (Kaltura)</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Konstfack Play (Kaltura)</mdui:DisplayName>
         <mdui:Description xml:lang="en">This is Konstfack's streamingservice.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.konstfack.se/sv/Om-Konstfack</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.konstfack.se/en/About-Konstfack</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.konstfack.se/sv/Om-Konstfack/Om-webbplatsen</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.konstfack.se/en/About-Konstfack/About-the-website</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://www.konstfack.se/sv/Bibliotek/Hogskolepedagogik-och-digitala-larmiljoer/Konstfack-Play/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.konstfack.se/en/Library/Learning-support/Konstfack-Play/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.konstfack.se/Om-Konstfack/GDPR/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.konstfack.se/en/About-Konstfack/Personal-data-processing-at-Konstfack---GDPR/</mdui:PrivacyStatementURL>
         <mdui:Logo xml:lang="sv" height="75" width="335">https://idp-v2.konstfack.se/adfs/portal/logo/logo.png</mdui:Logo>
         <mdui:Logo xml:lang="en" height="75" width="335">https://idp-v2.konstfack.se/adfs/portal/logo/logo.png</mdui:Logo>
         <mdui:Description xml:lang="sv">Detta är Konstfacks streamingtjänst.</mdui:Description>
@@ -63,4 +63,8 @@
     <md:GivenName>IT Helpdesk</md:GivenName>
     <md:EmailAddress>mailto:IT-helpdesk@konstfack.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>IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:IT-helpdesk@konstfack.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/play.sunet.se.xml b/swamid-2.0/play.sunet.se.xml
index 16cfea92..95acc066 100644
--- a/swamid-2.0/play.sunet.se.xml
+++ b/swamid-2.0/play.sunet.se.xml
@@ -51,7 +51,7 @@
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>mailto:media@sunet.se</md:EmailAddress>
+    <md:EmailAddress>mailto:smt@sunet.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:SurName>Administrator</md:SurName>
@@ -59,7 +59,7 @@
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>mailto:media@sunet.se</md:EmailAddress>
+    <md:EmailAddress>mailto:smt@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>Security Response Team</md:GivenName>
diff --git a/swamid-2.0/test-mah.hr.evry.se-shibboleth.xml b/swamid-2.0/test-mah.hr.evry.se-shibboleth.xml
deleted file mode 100644
index a94e377b..00000000
--- a/swamid-2.0/test-mah.hr.evry.se-shibboleth.xml
+++ /dev/null
@@ -1,72 +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://test-mah.hr.evry.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-01-30T10:48:28Z">
-      <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"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <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-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </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:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIJALQZLo4SG3IqMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3Rlc3Qtc3NjLmhyLmV2cnkuc2UwHhcNMTQxMTI1MTQ0ODU1WhcNMjQxMTIy
-MTQ0ODU1WjAeMRwwGgYDVQQDExN0ZXN0LXNzYy5oci5ldnJ5LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtmMXETFuyDLH3w07c8NvkgzVuwzIXrCE
-Uvs7wZyT6ZxJBZUpv40E3hMjWD6H1HES5EReGn1Pz/N0WNwJgKwPSoXAKdIsarle
-JXT8tLnWh1VwxYwqJAWicIBEHg+wieZOtpx4bZWbuoawrmG4y+Sv2bQ4ysCGTv+e
-ldtBQDDg7AoYgKKNd7XTCvmpCFSRgsvKNlfcM7IqqbQGZXAjAdN8fE925NCwJAXD
-Ls1TkHuhdUDqonkpjeIcOknfl1MYHmabjICyStZapz+3/dwbkUxpR92FwaCg+RcQ
-S0rnS/PL9NXZYliFZp0Xh4ScDIma9psz2sE7slSRYuw1YVUiOu5iawIDAQABo2kw
-ZzBGBgNVHREEPzA9ghN0ZXN0LXNzYy5oci5ldnJ5LnNlhiZodHRwczovL3Rlc3Qt
-c3NjLmhyLmV2cnkuc2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUyyz73UbcUW2un96s
-oed1EtDPMQAwDQYJKoZIhvcNAQEFBQADggEBADlt8uXtd2pneWkOTEsnz1pjb9bi
-pirtJavI5AUPV2rK70VRG/jpSbagsZFJWQrw+fPZVEF5emKUyR49EUJRn0KCBNya
-SZg2n3AISr0f3QfubUAzCCHukIRnhGt4xeAAWN05X7ANzxwnGlvVFrY4LQmwYiyD
-8IUFY03HFM86DjGWnC7TfPA4sg12abLkRuWHRytlWSO61a6xXvFflQlAuwMlL6Vm
-gEhPDsDiKCgP+rtRfKirnUj/35G+bl+esZ9Nv4FQ3uEMxezo5IofzVjy92Xg4bxP
-tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-mah.hr.evry.se/Shibboleth.sso/SAML2/Artifact" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-mah.hr.evry.se/Shibboleth.sso/SAML2/POST" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test-mah.hr.evry.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:artifact-01" Location="https://test-mah.hr.evry.se/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:browser-post" Location="https://test-mah.hr.evry.se/Shibboleth.sso/SAML2/POST" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Primula Web</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eppn" 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"/>
-      <md:RequestedAttribute FriendlyName="affiliation" 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"/>
-      <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"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Primula</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:primulasupport@tietoevry.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/weblogin2.test.uu.se-adfs-services-trust.xml b/swamid-2.0/weblogin2.test.uu.se-adfs-services-trust.xml
new file mode 100644
index 00000000..e37984c5
--- /dev/null
+++ b/swamid-2.0/weblogin2.test.uu.se-adfs-services-trust.xml
@@ -0,0 +1,71 @@
+<?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="http://weblogin2.test.uu.se/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-10-14T15:27:39Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Uppsala University Weblogin2 TEST</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Uppsala University Weblogin2 TEST ADFS</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=838050670</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=838050670#persondata</mdui:PrivacyStatementURL>
+        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="sv">Uppsala universitet Weblogin2 TEST</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Uppsala University Weblogin2 TEST ADFS</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=838050670</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=838050670#persondata</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE6jCCAtKgAwIBAgIQGAqTx5HrH7ZGgyOEQIFV8jANBgkqhkiG9w0BAQsFADAxMS8wLQYDVQQDEyZBREZTIEVuY3J5cHRpb24gLSB3ZWJsb2dpbjIudGVzdC51dS5zZTAeFw0yMjEwMTAxMTE0MjFaFw0zMjEwMDcxMTE0MjFaMDExLzAtBgNVBAMTJkFERlMgRW5jcnlwdGlvbiAtIHdlYmxvZ2luMi50ZXN0LnV1LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArxHSX/c6xZHhy3iRbk/ioYgOkofoVPpImLxi1CfBiCC6+R9N0nhWgklO0mT4LJ4YzwPzTaPv+/ZLvvk83Bsy/PQAhwIyG98iAle+evKP/PvENXWOSeWKPl56SjKbhGe9Pq113FSdjbHRed9Bgt3VhysaYcv/d6JT675N7K5AMTEKqDLVm5HbLKZG0AXUYU/vMvvheI8A/ALrnWZbx7DXbC4F+FlboYr3+RSCgu6SQkZIjr1vtSATYNULZ9aenuF2eKNiW45jTC92ctne5V2LRB1aS15bVSmbB7AVK6N5Df+0zLDRvAPGMnjM1RiEFLwpxLvLuRHgvdVPgzd8U2COeJcc6FGBapeBTgvE1+ROJXHn8wAmD3M5aFhpiaV2M5Ua1ukQFT+55h5kujnSlB31272BJzMuNxelqgdpzTNDhzc30fV7Z1i/cmvIH5wnTX+GFR+ktdBu/G1ZE65NMZ56UKlyTy+7imgK+EmCq9hw1bCHh0CVq59k4Zk5NNR1FreXf/U1D6aHK380e1nwDxqUBITJPcbgnBC6am3sCR3lF5ldiRnzohnCMisTPiwwbtqAnHMp6vdqu2WAQNTBYHEXouezKUfdswEgXpAvjlBI7Qso+GSDqDlpd/84pNdhJknTw/uNLMtMRpVB6FICG7T0U4LBEru3hRaq6fDH6gvyaCUCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAC/ACo1AQ5NQqLtv3Hqgx7eE6aQLTgumMgT9TJ//EJBl7RV9ylE1lbmDGSEMPYGQZLqnq84fgvxEtqe6BeGLc13V8zldMxZGAOYfQ27t09aNGzACVAAAQyVTzwngtXu6r8Whj7QGfyTX4KLU40Zqbm8DlUZHLOGCVvL/aCNzmiz0oq3IoKh6O2xPPNmuoXv/Ch8rccihV/uD6cOPfFZSvYVxMJX+J1uoS4V+Ja7Lkl5IRb5GMlxBnT6rNVXpV/TBZA7SU3c/YkMhd7vOTAhKqVzVxIax+t16Mhxl/+nQpmbLCN5Pq1vXZPbX/g9xX/cdceRyrWNDcFIRri+2qicnYQBbGGjeCE7Pwqz4jPuhBU6tWY6rKpRfbktBViL6lNlJYa7HJdQjSog9MhpOH7EMDGOqi/bTbEX7nrXmdgASWqlIUJ+GmWGdkdWXo4VeVeTotIv253kRt3wirxvvuGIw8fmeB7DxoSb8eG7q8r3dwyWgM++Yat9q49NjJZHkPHBTkFvNp+dwBhAzmDCuO7P50xa9J4YWvr+TiZ3H6udILPRi03pywA7Utbw/7bWSIP8cDFxxe1L9K2llq1cdFa+i1qkQs6swO73SxzWVtomifRXLezwZwQoMLYV+OaJsmR5a6/Ix+9D3up3xhAKNhrlxHCEgJ3f/tSn8LgceNbvQhPyE=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE5DCCAsygAwIBAgIQPate/Lcn/axFmLVIRJiPFjANBgkqhkiG9w0BAQsFADAuMSwwKgYDVQQDEyNBREZTIFNpZ25pbmcgLSB3ZWJsb2dpbjIudGVzdC51dS5zZTAeFw0yMjEwMTAxMTE0MjNaFw0zMjEwMDcxMTE0MjNaMC4xLDAqBgNVBAMTI0FERlMgU2lnbmluZyAtIHdlYmxvZ2luMi50ZXN0LnV1LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAw8EvZ1TSbiF84RH1rvcFt/lqMr/aAhMRTzYLiVrNuzyR1ecRi9QKoMGasNPbiVBBHwMMO102SjLPsRuGH1DG82VROjYTQ6F2OlaRqWXqfZzkzZm+06okh2pi4KTL8/P+NB9ai6MuaTzUqqmVBHKi662f9F+WFOiQnya7uoZcvfB8R0pC6m7Ta0P0AzGVSJbajfu5nU7P0urMW8tqRM10q8ni4Y64O3Oter3CH+26AIIPM4xznJhhwHwjT0qRD+nfdQz7eefjUZy15tNbxG1th/liz6DEk6Eycm47P4QVtVsTocco9htteV6V6I556VA4YmWrAOKD89/X1aK5CLzGwjfZGLaHta8TQIOukHSqXP91kxGNai82c8t9eCu4uLmfVI6u3cHNL01bojFZJY3Kq1QmE/tMUw88M5uzhwQ+D55UwT0JJutEzTWKJ8T0dW3EXmnUiS/j9F/YQaW5I6AUJLxNNSpgPrFNQ7dTU4Y+Qp9v7nYiXuonjSuxy/NHnPSd7VmYbDaXaRzMb2Wsyjg/MGAHP46YjYCOdGO7vv1zmzzzYTuA0qljf9qE82QEMTh4UTNEA/1YC62IAhCVqiirbZSJJsFcTY4yF2rLzkBmtGhjWadu11Oo8Zl1OLAejpznhpwW3sIsev6Jub9ZGLK8lzbhkbmt4+YJHxuQfblcyvECAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAKZsT5ZUmx9j3AkBu727RZ6Q1xCbElCp1elYy5MTHvNWh5S0/oPGp63enVinTQktx+BRw24DoVhVXiBrZZxm/dMbxeb9pv+MYOru2n81KFky+YL7rDttCF0qUWxL54L0Aq8hfAF8yn3scXVBqkR83lStnb1S/W0FTe74HSQWDXTVUgKSo6OOgxotg5KCNf5EFzxGHxfqcwAAcvlxXI3Sl4r19TGYoCEMyQJs5/4B9cv7mnZZNtEhMurDY3uozz+wdqVA0oG2GB7gJb5be/+UnfFv5Zimuo+e/UHIZMg4W3zeAkZCTA26psNHsZznNfeYDYqdYNMAQib4q2t6vNREPrsFK8AlMpGSRDWonx9fwrHXCUNP50NFyCcILbuNn2Yk1LjxLPK+PsZRSx8gFs1hZ3eeA9ku3ccpaGupEWws4zqM7NDrQBN1ay/r/gQJ7qyrPQ/+p6pkd4gPQC6nYL1s5qtoONpVskgKEr8XlxqLV04eEuKSVuKGYx5YeIP+uQTaxSROBw+soy58BCvPeWFi38v3rcE/ONhktSfA3INg5A3th9aVKurR8MXFdh8YQx74q2Ro5du67NdveBh5y+jXy/6UbwYXcoOfs+mqJE8XDZv0KgmtHlsDE+9z+ynKCsCiTfeCw+vt0VOhB1JbNjuTUH9gF0iP2mnmy5j0I86B4c+U=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin2.test.uu.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin2.test.uu.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <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://weblogin2.test.uu.se/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weblogin2.test.uu.se/adfs/ls/" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.uu.se/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.uu.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:SurName>Servicedesk</md:SurName>
+    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>018-4714400</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:SurName>Servicedesk</md:SurName>
+    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>018-4714400</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>018-4714400</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www2.uu.se.xml b/swamid-2.0/www2.uu.se.xml
index cbb5495a..193a018a 100644
--- a/swamid-2.0/www2.uu.se.xml
+++ b/swamid-2.0/www2.uu.se.xml
@@ -7,6 +7,7 @@
     <mdattr:EntityAttributes>
       <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -28,42 +29,42 @@
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDSjCCAjKgAwIBAgIGAXmKPwsiMA0GCSqGSIb3DQEBCwUAMEQxKjAoBgNVBAMMIWh0dHBzOi8v
-dXNlLXV1LXByb2Quc2l0ZXZpc2lvbi5zZTEWMBQGA1UECwwNc2l0ZXZpc2lvbi1zcDAeFw0yMTA1
-MjAxNDQ3MzhaFw0zMTA1MTgxNDQ3MzhaMEQxKjAoBgNVBAMMIWh0dHBzOi8vdXNlLXV1LXByb2Qu
-c2l0ZXZpc2lvbi5zZTEWMBQGA1UECwwNc2l0ZXZpc2lvbi1zcDCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAJ4gH+56VIwfh+wSp5y4tEebQ8L+BzCjtwB9+bU+r5QHTwe53xjAtje5ewCQ
-5Ebf9/wyuvgaIKhLDrscfVxBsxaNX9Qg71khwI2EkR6KI/PSn7tnRKzykTz8Pgjy7IXhKoxVSlyM
-wgWA3zj12AjI+h8SaVpHvJynGKArnZUoLmU5NIjEVNbYFOg8IRvqMSi2FJ5Bg1tt8NOpU3Dedwt8
-X0g1UsUz3abbKFT57tgVYzdNujrq+gko/+yuxbZtA0gje0gXtCUdSJXd1Fp+Y/+si3gNNDKi6D0h
-1CuYxqTTrbsPuwC7RUGPMHdHyBMtaIsmeoa2pd+ykSPQCsYXLDtID8cCAwEAAaNCMEAwHQYDVR0O
-BBYEFCe8P1poVW60+5qDKB8v/PQau2TsMB8GA1UdIwQYMBaAFCe8P1poVW60+5qDKB8v/PQau2Ts
-MA0GCSqGSIb3DQEBCwUAA4IBAQBmzHAJA0puzn3e3CcZjMIfihbaQgVER8xx71QsercURaDpbryl
-mKonzsYkwVIyprs1dqdTB3OggfUBdwmYN/BtJrZsXUz92VtscelBUElTHUKlleKXkaKip3HyqToU
-rdGFb72hMYuYhq0H5hKd4nogbqEN3vKng9ao+oD+4H0le8vkaJN25jqGsnmbfi7+DhDIVbqcVjt6
-6u7g6a1UlwE1rQLeebgW8Yr0y7L3to/drYxY5WYseNjxWZ8+y5X4DY2etZai4yZuTMBNIgxGI6qS
-ynJbufe5TdXucnNIfhwtDlpi912EMKjVUQpudD3bF2fhOPz5cDAG5n7SXJVQcuDz</ds:X509Certificate>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIGAYPMbonpMA0GCSqGSIb3DQEBCwUAMDUxGzAZBgNVBAMMEmh0dHBzOi8v
+d3d3Mi51dS5zZTEWMBQGA1UECwwNc2l0ZXZpc2lvbi1zcDAeFw0yMjEwMTIxMzQyMTlaFw0zMjEw
+MDkxMzQyMTlaMDUxGzAZBgNVBAMMEmh0dHBzOi8vd3d3Mi51dS5zZTEWMBQGA1UECwwNc2l0ZXZp
+c2lvbi1zcDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKQJsazttiWS3MfdvbPC8/uc
+Huf0eTUWa5x5Ox+OvZXkwKBUh1GU+YUw0ywSXo4C/3q4ciaQ7T0Y9n27VzFfR6SewsaGIS6/Ri8s
+pv0vKA/V5CTzod9FYwHgTTC/LLxMKjfGBEIsg/aaIyaOvlMvXOcwLUvkg0+nwfSm/fl4zjO5XL0l
+XcU1OTbHbQbqSoPtR6bNROkhPMJICuIIqoNdXhmWZjLL2OQ0XeOT8WBnBsXR13S4uGbyt2OtvEuu
+56Yl3qWbKfa9MjhZ8fqScVp/028aeU5hTX46TAPOi4akWbH5mUZBngerVi8SkSBHwpU5NrPa3UIK
+Gd288T8XYeE8z8sCAwEAAaNCMEAwHQYDVR0OBBYEFG0qF8V5JIlnAeLp9w0s8VAcB5AMMB8GA1Ud
+IwQYMBaAFG0qF8V5JIlnAeLp9w0s8VAcB5AMMA0GCSqGSIb3DQEBCwUAA4IBAQB+JrzxvQoCE6oK
+F4OLZ6Fp/qc7+Mrs8Xa4wH5QUG2C/e4Bdj1bLzzIxcSATUh7NWZPs+AkE03GcTL36oBgm+wadBvv
+h5tlRRvR/krj6SPSH/SMF+NQuTUX6rtP30boXWU0J80FzX3x0BQKyxZQxRMzKoKdv9ZRNiGFwL4C
+QRSb7mv34CMk+WRMsHZfYmTKgfsyonxSviBYtbhoIcjQDBLaq3gHLek+xj5XGS7z9A0nsY/yMqNw
+su6hB+LbcMWKy0cUQSWn9cGdapDLgzvoUxVuX78U0JFTD4CLTmUZwgHoP8y+vHqBDDpCjr6zw/oP
+1famsC1XeYyKEi8r95mTK/om</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDSjCCAjKgAwIBAgIGAXmKPwsiMA0GCSqGSIb3DQEBCwUAMEQxKjAoBgNVBAMMIWh0dHBzOi8v
-dXNlLXV1LXByb2Quc2l0ZXZpc2lvbi5zZTEWMBQGA1UECwwNc2l0ZXZpc2lvbi1zcDAeFw0yMTA1
-MjAxNDQ3MzhaFw0zMTA1MTgxNDQ3MzhaMEQxKjAoBgNVBAMMIWh0dHBzOi8vdXNlLXV1LXByb2Qu
-c2l0ZXZpc2lvbi5zZTEWMBQGA1UECwwNc2l0ZXZpc2lvbi1zcDCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAJ4gH+56VIwfh+wSp5y4tEebQ8L+BzCjtwB9+bU+r5QHTwe53xjAtje5ewCQ
-5Ebf9/wyuvgaIKhLDrscfVxBsxaNX9Qg71khwI2EkR6KI/PSn7tnRKzykTz8Pgjy7IXhKoxVSlyM
-wgWA3zj12AjI+h8SaVpHvJynGKArnZUoLmU5NIjEVNbYFOg8IRvqMSi2FJ5Bg1tt8NOpU3Dedwt8
-X0g1UsUz3abbKFT57tgVYzdNujrq+gko/+yuxbZtA0gje0gXtCUdSJXd1Fp+Y/+si3gNNDKi6D0h
-1CuYxqTTrbsPuwC7RUGPMHdHyBMtaIsmeoa2pd+ykSPQCsYXLDtID8cCAwEAAaNCMEAwHQYDVR0O
-BBYEFCe8P1poVW60+5qDKB8v/PQau2TsMB8GA1UdIwQYMBaAFCe8P1poVW60+5qDKB8v/PQau2Ts
-MA0GCSqGSIb3DQEBCwUAA4IBAQBmzHAJA0puzn3e3CcZjMIfihbaQgVER8xx71QsercURaDpbryl
-mKonzsYkwVIyprs1dqdTB3OggfUBdwmYN/BtJrZsXUz92VtscelBUElTHUKlleKXkaKip3HyqToU
-rdGFb72hMYuYhq0H5hKd4nogbqEN3vKng9ao+oD+4H0le8vkaJN25jqGsnmbfi7+DhDIVbqcVjt6
-6u7g6a1UlwE1rQLeebgW8Yr0y7L3to/drYxY5WYseNjxWZ8+y5X4DY2etZai4yZuTMBNIgxGI6qS
-ynJbufe5TdXucnNIfhwtDlpi912EMKjVUQpudD3bF2fhOPz5cDAG5n7SXJVQcuDz</ds:X509Certificate>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIGAYPMbonpMA0GCSqGSIb3DQEBCwUAMDUxGzAZBgNVBAMMEmh0dHBzOi8v
+d3d3Mi51dS5zZTEWMBQGA1UECwwNc2l0ZXZpc2lvbi1zcDAeFw0yMjEwMTIxMzQyMTlaFw0zMjEw
+MDkxMzQyMTlaMDUxGzAZBgNVBAMMEmh0dHBzOi8vd3d3Mi51dS5zZTEWMBQGA1UECwwNc2l0ZXZp
+c2lvbi1zcDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKQJsazttiWS3MfdvbPC8/uc
+Huf0eTUWa5x5Ox+OvZXkwKBUh1GU+YUw0ywSXo4C/3q4ciaQ7T0Y9n27VzFfR6SewsaGIS6/Ri8s
+pv0vKA/V5CTzod9FYwHgTTC/LLxMKjfGBEIsg/aaIyaOvlMvXOcwLUvkg0+nwfSm/fl4zjO5XL0l
+XcU1OTbHbQbqSoPtR6bNROkhPMJICuIIqoNdXhmWZjLL2OQ0XeOT8WBnBsXR13S4uGbyt2OtvEuu
+56Yl3qWbKfa9MjhZ8fqScVp/028aeU5hTX46TAPOi4akWbH5mUZBngerVi8SkSBHwpU5NrPa3UIK
+Gd288T8XYeE8z8sCAwEAAaNCMEAwHQYDVR0OBBYEFG0qF8V5JIlnAeLp9w0s8VAcB5AMMB8GA1Ud
+IwQYMBaAFG0qF8V5JIlnAeLp9w0s8VAcB5AMMA0GCSqGSIb3DQEBCwUAA4IBAQB+JrzxvQoCE6oK
+F4OLZ6Fp/qc7+Mrs8Xa4wH5QUG2C/e4Bdj1bLzzIxcSATUh7NWZPs+AkE03GcTL36oBgm+wadBvv
+h5tlRRvR/krj6SPSH/SMF+NQuTUX6rtP30boXWU0J80FzX3x0BQKyxZQxRMzKoKdv9ZRNiGFwL4C
+QRSb7mv34CMk+WRMsHZfYmTKgfsyonxSviBYtbhoIcjQDBLaq3gHLek+xj5XGS7z9A0nsY/yMqNw
+su6hB+LbcMWKy0cUQSWn9cGdapDLgzvoUxVuX78U0JFTD4CLTmUZwgHoP8y+vHqBDDpCjr6zw/oP
+1famsC1XeYyKEi8r95mTK/om</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index fc4b476a..9072835a 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -120,7 +120,6 @@
   <xi:include href="swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml"/>
   <xi:include href="swamid-2.0/his.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ltu.hr.evry.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/mah.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.miun.se.xml"/>
   <xi:include href="swamid-2.0/www.egencia.com-auth-v1.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-chalmers-sp.xml"/>
@@ -490,7 +489,6 @@
   <xi:include href="swamid-2.0/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/kth-graylog.cnaas.sunet.se.xml"/>
   <xi:include href="swamid-2.0/jss.kau.se-8443-saml-metadata.xml"/>
-  <xi:include href="swamid-2.0/drive.sunet.se-index.php-apps-user_saml-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/su-graylog.cnaas.sunet.se.xml"/>
   <xi:include href="swamid-2.0/noec.release-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/rands.release-check.swamid.se-shibboleth.xml"/>
@@ -584,4 +582,5 @@
   <xi:include href="swamid-2.0/monitor.drive.sunet.se.xml"/>
   <xi:include href="swamid-2.0/monitor.drive.test.sunet.se.xml"/>
   <xi:include href="swamid-2.0/du-graylog.cnaas.sunet.se.xml"/>
+  <xi:include href="swamid-2.0/weblogin2.test.uu.se-adfs-services-trust.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 54dc9d14..942e9f1c 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -8,7 +8,6 @@
   <xi:include href="swamid-2.0/aqtest.port.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test-his.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test-hkr.hr.evry.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/test-mah.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/t0253.srv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/emmautv.ldc.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/devrb.lbic.lu.se.xml"/>
author	Björn Mattsson <bjorn@sunet.se>	2022-10-17 15:34:47 +0200
committer	Björn Mattsson <bjorn@sunet.se>	2022-10-17 15:34:47 +0200
commit	2f77bb65571ddb8ecef5a94481a60984fe2b759b (patch)
tree	62d9eb983f14459ad468a08f45b82be693c2cc6b
parent	cd04d34e99d5da088167fd29d518c07083c5f8a6 (diff)
parent	2a763b9b5d0dc33eff3ccbe76416a319deff4a31 (diff)