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

7 files changed, 114 insertions, 191 deletions

diff --git a/swamid-2.0/coursegit.cs.lth.se-gitlab-saml.xml b/swamid-2.0/coursegit.cs.lth.se-gitlab-saml.xml
index bc46d963..3b2bedc8 100644
--- a/swamid-2.0/coursegit.cs.lth.se-gitlab-saml.xml
+++ b/swamid-2.0/coursegit.cs.lth.se-gitlab-saml.xml
@@ -35,6 +35,7 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coursegit.cs.lth.se/users/auth/saml/callback" index="0" isDefault="true"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">coursegit</md:ServiceName>
+      <md:ServiceName xml:lang="sv">coursegit</md:ServiceName>
       <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="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"/>
@@ -44,9 +45,11 @@
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.lu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.lu.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Peter</md:GivenName>
diff --git a/swamid-2.0/lmdl756.cs.lth.se-shibboleth.xml b/swamid-2.0/lmdl756.cs.lth.se-shibboleth.xml
index f8d64eab..a87f62cb 100644
--- a/swamid-2.0/lmdl756.cs.lth.se-shibboleth.xml
+++ b/swamid-2.0/lmdl756.cs.lth.se-shibboleth.xml
@@ -68,8 +68,7 @@ d8ZylrPnGNsgvJFvQw7h/b+SF2+3oUlSQnuk9hxrJ48jKFl8wOYm5zSAPLvTJM+q
 a5isRe6E7sAhFkj+QtDwb0CY8v0pMw7fgsHZWOEHfxzFYkJAXbLjSUNLvOnSFEHz
 6DVMj0J6/M1odDkjuajGIohRg8uSNcXPMIKCxUxYj+CpvCwkVaef7H6pKG5xPNEs
 WaJcv1xIjOlLxRU++XQh2u3BAN3k36TOaQyBAkRzs8IvnlXLBL8Ms7epph5oq6sf
-5wz8f3ojQi4dvPVojgZ5+QCXJ3iZCaVUQanPXi7YyvE8Trx+psF9aoYuHi8=
-</ds:X509Certificate>
+5wz8f3ojQi4dvPVojgZ5+QCXJ3iZCaVUQanPXi7YyvE8Trx+psF9aoYuHi8=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -100,8 +99,7 @@ jT3Z/IjyG3ABG+ZOS7fcNiNUjOdjiG5wqTcLjal85fJi7pG3Myl3IiNwx4AguThH
 yyANwsjF1IkLADe4+mq35p/qqdlf1ic7/akoRFCSH6Y3i8hV+4SDnZi7lgNOeQzu
 wXbXnA4pd/yprB69Tozj1ZzOEPlDsBIrnVE1qP/FairIKVMPkZVv6jvdSnzYaa2x
 T89jyJCV1U7T1Avwld8lvm8luLrhoqdhZNVRqnwePXYZfTUpWJmIae8ctzIrr9oh
-j5gr7XQCCeL9oLyVB3uwplxSZP5Ge9SGrYs62gV66LAgPH8yd7l+KtqEfOk=
-</ds:X509Certificate>
+j5gr7XQCCeL9oLyVB3uwplxSZP5Ge9SGrYs62gV66LAgPH8yd7l+KtqEfOk=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -125,9 +123,11 @@ j5gr7XQCCeL9oLyVB3uwplxSZP5Ge9SGrYs62gV66LAgPH8yd7l+KtqEfOk=
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.lu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.lu.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Peter</md:GivenName>
diff --git a/swamid-2.0/passporttest.lu.se-activateaccount-shibboleth.xml b/swamid-2.0/passporttest.lu.se-activateaccount-shibboleth.xml
deleted file mode 100644
index 7f49f159..00000000
--- a/swamid-2.0/passporttest.lu.se-activateaccount-shibboleth.xml
+++ /dev/null
@@ -1,97 +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://passporttest.lu.se/activateaccount/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-11-04T17:17:43Z">
-      <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#ecdsa-sha512"/>
-    <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-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <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/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <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.swamid.se/category/sfs-1993-1153</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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://passporttest.lu.se/Shibboleth.sso/Login-antagning"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://passporttest.lu.se/Shibboleth.sso/Login-eduid"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://passporttest.lu.se/Shibboleth.sso/Login-lu"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Lund University user account activation and password reset</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Lund universitets kontoaktivering och lösenordsåterställning</mdui:DisplayName>
-        <mdui:Description xml:lang="en">As a new user you use this service to activate your university user account.</mdui:Description>
-        <mdui:Description xml:lang="sv">Denna tjänst används för att du som ny vid universitetet ska kunna aktivera ditt användarkonto vid universitetet.</mdui:Description>
-        <mdui:Logo xml:lang="en" height="50" width="50">http://www.lunduniversity.lu.se/sites/www.lunduniversity.lu.se/files/lund_university_logotype.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="50" width="50">http://www.lu.se/sites/www.lu.se/files/logo.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://passporttest.lu.se/activateaccount</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://passporttest.lu.se/activateaccount</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>uwtestws01.uwtest.lu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=uwtestws01.uwtest.lu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAIXu3O5M/nIOMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF3V3dGVzdHdzMDEudXd0ZXN0Lmx1LnNlMB4XDTE0MTAyMTE1MDAyNFoXDTI0
-MTAxODE1MDAyNFowIjEgMB4GA1UEAxMXdXd0ZXN0d3MwMS51d3Rlc3QubHUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5CSxXWUV+CxQKCIvis/Li
-ounrcRbo5wb+6EUvyTNo5v8kiY+g6FTkVYypzYu2zMQMbMZMbLC6gIYHmoCTY4a4
-5SfP0UBrKFMr1fhnXNrRMhx3e2yRCMDQ6MW5TeTHyKqWt5LnQza5gdXF8rddXapU
-G3o7/6J9siYqJFS4qJ4flOtI98WA49jmiHJFutir6tS0FVqdLVNfmUIfo8+ua4dm
-WU7CXyKJkFIYfuCUyAWk7WWdrmjLMg+ujmbWG+lFRy0rU7JpMnOZ/4xnm4DdYYdT
-oBka1qpxzdu4i7zKRwBvMpdeik6pbwMXcj9/qAq5wDm7OWulYwOceKbHLR/zUm1F
-AgMBAAGjRTBDMCIGA1UdEQQbMBmCF3V3dGVzdHdzMDEudXd0ZXN0Lmx1LnNlMB0G
-A1UdDgQWBBTHsEqrpHmU4lcM2mhVlQGMNN/agDANBgkqhkiG9w0BAQUFAAOCAQEA
-Rbk93Mxqs96mm8RgxuogewDXQIwRsxEpdikP6VjhcHkCkM/oRpeXsGjgqY44BNuW
-8PwPRMjYlbqen8bzbOP9YknrC5QczVVgKIUFMRqE2TgU9pLl6MpLaH+weT8hKX/H
-EBmKKnmi55mNxx5bq3pu8vUL03VnqtjpssKXGLdY0waAdssxf0df72gNpKdQ+TMH
-hLW84PHAzXW4q3d3FK8RTe41YPbyFaosVULPyBrKm91A5qbfIdCvyz9rCYYeNiTC
-tnp8qHXMMEECQXRq8CM7UGqBJY9BUPRwGsyk0YpsRyqQzk2CR7IqQwj85V5HdQxi
-FLZnYYc2YEZAVn2+7pTtmA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passporttest.lu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passporttest.lu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://passporttest.lu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passporttest.lu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://passporttest.lu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passporttest.lu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://passporttest.lu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passporttest.lu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://passporttest.lu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passporttest.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://passporttest.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://passporttest.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://passporttest.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://passporttest.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/sp-utv.ldc.lu.se-shibboleth.xml b/swamid-2.0/sp-utv.ldc.lu.se-shibboleth.xml
deleted file mode 100644
index 54d4fdea..00000000
--- a/swamid-2.0/sp-utv.ldc.lu.se-shibboleth.xml
+++ /dev/null
@@ -1,86 +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://sp-utv.ldc.lu.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-12-12T08:48:17Z">
-      <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"/>
-    <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/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp-utv.ldc.lu.se/Shibboleth.sso/Login-lu"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-utv.ldc.lu.se/Shibboleth.sso/Login-swamid" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Utvecklings-SP LDC</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Development SP LDC</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">SP använd under utveckling av verktygsstöd riktade mot utbildning och forskning vid Lunds universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">SP used for development of applications for education and reasearch at Lund university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://sp-utv.ldc.lu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://sp-utv.ldc.lu.se</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://sp-utv.ldc.lu.se/shibboleth</ds:KeyName>
-        <ds:KeyName>sp-utv.ldc.lu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp-utv.ldc.lu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAN65YVXdSJ7XMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEHNwLXV0di5sZGMubHUuc2UwHhcNMTQxMDA3MTAxNjMzWhcNMTcxMDA2MTAx
-NjMzWjAbMRkwFwYDVQQDExBzcC11dHYubGRjLmx1LnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAsOutKnHh2PBCsGI2cUYfbpi6/fZB3MqHM7E3PmEY
-bqr4yKvORvhTDELByzk8UWekuVFOAvAMRRxFXt8D8CcZfTdtZJ76fOrnWA/1fyLS
-Cp0qOqXS6t8knKKVxaeU68XCGmyYtii8kSWg/a6wcjb5oZnOM3hlSPbW2UqFS3Gz
-IxM+elaAsJmFBmbmZAFLCMv16luWMSb+PeopYxKgzAzcPlPJUpKa1O5Fj5lpXBFn
-dERSIYpglDDroP19KyjX4Yx6Qt1W0Lk/SHLRSL9yhTBj/2FmP8Oh0Cb6nuvEhX8/
-+EqAl5+1mDZqub2+zK4yhvXoSLbxj5SqWb2rKhOT4aIwBwIDAQABo2MwYTBABgNV
-HREEOTA3ghBzcC11dHYubGRjLmx1LnNlhiNodHRwczovL3NwLXV0di5sZGMubHUu
-c2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUMDubZakw5ve46w+NRnXk/wtb9f8wDQYJ
-KoZIhvcNAQEFBQADggEBADNXPStinQ6fhQmLYBCJLqSAiu9LiQ/72KCTtQ/gGWhl
-cpVD6wxib2U3uVXi27WVH7RCnFAOBilUCV0sZ3PlNfzlseeS2v4nIul05Y7onV18
-E1tCPpfcgLYNkDXPpisiLsfRZoemSLo8asgYPZazWOT1RQcBaDUmoKRu3JaJm+ok
-vbvRVfuv5ILsWaTB3aM+bkPCqNFU+9jwnf8xHqz7OozAvAaktqojTn6z1sdcNwVU
-RalEs/MrU/fHzsNJ9rWhWGMDHgwJUD0vluORdGrw4+D+m9WerEBC/1LsEiluhkKE
-N+oxvR5W/Ta3bfsVAYaIRqIam+/ysez57D1OXJDaLV0=
-</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:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-utv.ldc.lu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-utv.ldc.lu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-utv.ldc.lu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-utv.ldc.lu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-utv.ldc.lu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-utv.ldc.lu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-utv.ldc.lu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-utv.ldc.lu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-utv.ldc.lu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-utv.ldc.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-utv.ldc.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-utv.ldc.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-utv.ldc.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-utv.ldc.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index ac344182..70b1ee7d 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -285,7 +285,6 @@
   <xi:include href="swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml"/>
   <xi:include href="swamid-2.0/outscan.outpost24.com-opi-XMLAPI-ACTION-SHOWSPMETADATA.xml"/>
   <xi:include href="swamid-2.0/passportprod.lu.se-activateaccount-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/passporttest.lu.se-activateaccount-shibboleth.xml"/>
   <xi:include href="swamid-2.0/permit-eu.caleaccess.com.xml"/>
   <xi:include href="swamid-2.0/personalized.release-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/pingpong.hb.se-shibboleth.sso-metadata.xml"/>
@@ -386,7 +385,6 @@
   <xi:include href="swamid-2.0/solid-proxy.sunet.se-sp-metadata.xml.xml"/>
   <xi:include href="swamid-2.0/sp-01.oru.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp-test.it.su.se-Shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/sp-utv.ldc.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp.haikom.com-saml.xml"/>
   <xi:include href="swamid-2.0/sp.it.gu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp.saml.staging.ebbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml"/>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 8fce9319..e5cfc21e 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -13,6 +13,7 @@
   <xi:include href="swamid-testing/miunidutv.test.miun.se-saml-miun-metadata.xml"/>
   <xi:include href="swamid-testing/permitwinstaging1.caleaccess.com.xml"/>
   <xi:include href="swamid-testing/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml"/>
+  <xi:include href="swamid-testing/samlvettingspdev.test.it.gu.se.xml"/>
   <xi:include href="swamid-testing/selfservice-test.test.hb.se-Shibboleth.xml"/>
   <xi:include href="swamid-testing/sesamutvf.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-testing/sp-t1.oru.se-shibboleth.xml"/>
diff --git a/swamid-testing/samlvettingspdev.test.it.gu.se.xml b/swamid-testing/samlvettingspdev.test.it.gu.se.xml
new file mode 100644
index 00000000..4f92ae6e
--- /dev/null
+++ b/swamid-testing/samlvettingspdev.test.it.gu.se.xml
@@ -0,0 +1,104 @@
+<?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://samlvettingspdev.test.it.gu.se">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-12-09T08:44:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <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:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:Description xml:lang="en">Account activation for the University of Gotehenburg</mdui:Description>
+        <mdui:Description xml:lang="sv">Kontoaktivering för Göteborgs universitet</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Account activation for the University of Gotehenburg</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Kontoaktivering för Göteborgs universitet</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://sptest.it.gu.se/info</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://sptest.it.gu.se/info</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://sp.it.gu.se/privacy-policy/?lang=en</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://sp.it.gu.se/privacy-policy/?lang=sv</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIQE5HAhCRBOphLNLu1Ts3eKDANBgkqhkiG9w0BAQsFADAU
+MRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMjIxMDE1MTUxMDAxWhcNMjMxMDE1MTUz
+MDAxWjAUMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDgkq/hli/LClq7piIB8eX+PR0ZQgcT9eunJMiYAVFlYddB2CSR
+hmcH0jpIMhgz0pfg/SgE38iVNejcL/uu1+86NEzbCFMTrSKBfp3EAFRGGLHZgHun
+usKT5/JtqKJOEIH97dAJot38QZAlkfktNrR731UkyazQO89rmGH0BMdV6p2ylNDn
+NYIRUrM9qNIBUhAw75xM4oFlK1r3KuotPZ5cWQgwsPHW2ML7l6XSokbmXNyi7uSH
+V2aOdmjOCOqf6I0uQ6nFWpz7lZP1uV9F4gUVPo/JAVkt4nKkERwWBDDyzh36YIw2
+PvTCbVXAPskT++hRUmWxfS230Egq7G2UMQHtAgMBAAGjZjBkMA4GA1UdDwEB/wQE
+AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwFAYDVR0RBA0wC4IJ
+bG9jYWxob3N0MB0GA1UdDgQWBBTSkbIURwvVclPsKkZI0THUJOyRnTANBgkqhkiG
+9w0BAQsFAAOCAQEAt+AbdGn9gch+U/J+0Z2OJPnXMgY3pLNzX/5PIvlaT0bcnxmD
+FQA2TyuE7RfBHvh9n8hxo4MX48xk9Mwa6zGCT9/VakHFiikj0BaCS+w76+WODhKx
+B0ZCjdgOUfOJWVEStfEnKbJHnPyfdanX03XS11fpCvqCNKtBS6MdNzHx+I+2KBFk
+kKwyaanH09rba/ZKgrg4SZqTUYylG6OpE8UI2FeYSIKSFrnPUnpNhUXd0E3VUKoh
+zdEYs1kQRylSueKLleTejTZa8MyR6abMgM7DnsebsweMqavvmFdXTiehh5IAPygH
+KdDCYYX3nxmihSFMU9MLBACFzLYjVf3/BNPNIQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIQE5HAhCRBOphLNLu1Ts3eKDANBgkqhkiG9w0BAQsFADAU
+MRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMjIxMDE1MTUxMDAxWhcNMjMxMDE1MTUz
+MDAxWjAUMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDgkq/hli/LClq7piIB8eX+PR0ZQgcT9eunJMiYAVFlYddB2CSR
+hmcH0jpIMhgz0pfg/SgE38iVNejcL/uu1+86NEzbCFMTrSKBfp3EAFRGGLHZgHun
+usKT5/JtqKJOEIH97dAJot38QZAlkfktNrR731UkyazQO89rmGH0BMdV6p2ylNDn
+NYIRUrM9qNIBUhAw75xM4oFlK1r3KuotPZ5cWQgwsPHW2ML7l6XSokbmXNyi7uSH
+V2aOdmjOCOqf6I0uQ6nFWpz7lZP1uV9F4gUVPo/JAVkt4nKkERwWBDDyzh36YIw2
+PvTCbVXAPskT++hRUmWxfS230Egq7G2UMQHtAgMBAAGjZjBkMA4GA1UdDwEB/wQE
+AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwFAYDVR0RBA0wC4IJ
+bG9jYWxob3N0MB0GA1UdDgQWBBTSkbIURwvVclPsKkZI0THUJOyRnTANBgkqhkiG
+9w0BAQsFAAOCAQEAt+AbdGn9gch+U/J+0Z2OJPnXMgY3pLNzX/5PIvlaT0bcnxmD
+FQA2TyuE7RfBHvh9n8hxo4MX48xk9Mwa6zGCT9/VakHFiikj0BaCS+w76+WODhKx
+B0ZCjdgOUfOJWVEStfEnKbJHnPyfdanX03XS11fpCvqCNKtBS6MdNzHx+I+2KBFk
+kKwyaanH09rba/ZKgrg4SZqTUYylG6OpE8UI2FeYSIKSFrnPUnpNhUXd0E3VUKoh
+zdEYs1kQRylSueKLleTejTZa8MyR6abMgM7DnsebsweMqavvmFdXTiehh5IAPygH
+KdDCYYX3nxmihSFMU9MLBACFzLYjVf3/BNPNIQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Location="https://localhost:7232/Swamid/Logout" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:AssertionConsumerService Location="https://localhost:7232/Swamid/AssertionConsumerService" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" isDefault="true"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Account activation for the University of Gotehenburg</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Kontoaktivering för Göteborgs universitet</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="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">GU</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">GU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Gothenburg</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.gu.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>mailto:xnilsr@gu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:EmailAddress>mailto:gukonto@gu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:support@gu.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>Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:irt@gu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>