Resolves SWAMIDOPS-8104, SWAMIDOPS-8105, SWAMIDOPS-8106

4 files changed, 277 insertions, 0 deletions

diff --git a/swamid-2.0/student.cvt.ladok.se-student-sp.xml b/swamid-2.0/student.cvt.ladok.se-student-sp.xml
new file mode 100644
index 00000000..7ea75729
--- /dev/null
+++ b/swamid-2.0/student.cvt.ladok.se-student-sp.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.cvt.ladok.se/student-sp">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.cvt.ladok.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.cvt.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok student.cvt.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student.cvt.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://student.cvt.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://student.cvt.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>student.cvt.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=student.cvt.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIJAMQUFu9hRBbAMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
+BAMTFHN0dWRlbnQuY3Z0LmxhZG9rLnNlMB4XDTE2MDMxNDEyNTA1NloXDTI2MDMx
+MjEyNTA1NlowHzEdMBsGA1UEAxMUc3R1ZGVudC5jdnQubGFkb2suc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCww6s8AXukNEe9sqmdKPAhqGagAiil
+9X0OLI11+zM/ZNDqgPVp/PkazpsyhTjZ75KZd7PycPDg0QSvA0c5mfJ3LzjXSo6H
+1wgK8s4Co9qw9+iuYe0+IIo0AzyywROmyocwe4Ogcmgyhfkk0GlH4sUrubsEYGF5
+zjXoIPqQeSGX0iRu6OLatytrYW5G+2sfDiLvjIx6WyCRofqxGpw0UFnqzshgCqf+
+MF5yhUYb9bL3Z+n0g438pAJWB8SHMo7SF5E8Io3jBEt+TFZcKX8Btue3MSFKWE3V
+OggyHqC/YJDrKwMbplpf33149Xya7qsVHGfGn1vHGEV9qHcDAfzb2iHJAgMBAAGj
+ZzBlMEQGA1UdEQQ9MDuCFHN0dWRlbnQuY3Z0LmxhZG9rLnNlhiNodHRwczovL3N0
+dWRlbnQuY3Z0LmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUzNibcuI91UxXPtL7
+if8DRHxDVVowDQYJKoZIhvcNAQELBQADggEBAJbKjPVaGpzIPzy3qSPibIFE9kQK
+8+6gdhfvOT7uDKMXFJl5wHYhdlJdQwGDVLZ0ypKDDhKy604de4CaxcguBx1SyAMm
+tCmca7YcLOZsWzzXs56hkl1wGsbCaBWQ+B5I+ekF7rQo8jr2ET5p8hlTjjdLf01S
+GYTN1IiSlcwmRQfd6DXrO+2BOrsBf7jytPeoyy4A3YEfsP/jwtdbyAEjm2Nn6gkZ
+XKD0jhIk+fkRgCXvqtT4sIusZaziRdmhXKI/WAL/r5XL3SsE7knFtBTU0U+02grq
+sT5JHJ3U9r/brdGPiSt7y0rUeDe3+ChZjBUlfQ4z/NlOdMwX93/2zTk+qYc=
+</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://student.cvt.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.cvt.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.cvt.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.cvt.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.cvt.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.cvt.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.cvt.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.cvt.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.cvt.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.cvt.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.cvt.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.cvt.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.cvt.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.cvt.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/student.ete.grayzone.ladok.se-student-sp.xml b/swamid-2.0/student.ete.grayzone.ladok.se-student-sp.xml
new file mode 100644
index 00000000..0e93751c
--- /dev/null
+++ b/swamid-2.0/student.ete.grayzone.ladok.se-student-sp.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.ete.grayzone.ladok.se/student-sp">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok student.ete.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student.ete.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://student.ete.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://student.ete.grayzone.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>student.ete.grayzone.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=student.ete.grayzone.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJAM9TZ3bJgRSnMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
+BAMTHXN0dWRlbnQuZXRlLmdyYXl6b25lLmxhZG9rLnNlMB4XDTE2MDMxNDEyMTky
+MloXDTI2MDMxMjEyMTkyMlowKDEmMCQGA1UEAxMdc3R1ZGVudC5ldGUuZ3JheXpv
+bmUubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrGglc
+qjEsQ/2l3R85R++FVQCh14u1PViCWv/0JnTzwY/St1ZlLlLGE7m6OmEBUus4CL2N
+/HYJ0CUzUQCIHZyOlr9aPFd7QESvCqN2jY1VLzJZib4snNU4E4mMwD4G3gPJFLZN
+9VUQ/tLe1/rarpWJT8+YJsriMooH9s1MnmCwq+qTZ1UWNcqy5HGl9SfgfLXGNlLx
+fMrU0qT1cbw6QqMvb8piqa5Nh+UbkYnTkVkkvw0qt0gg11zmW8h4m9UJ+16FzdBh
+VMxDEf3GYiOYF+/vNqcBYUM6bbUQZC8vDawHzi8QLWUyNSoC697M1CXUZxN2napX
+7eWDHFRO5S2Mdwz1AgMBAAGjeTB3MFYGA1UdEQRPME2CHXN0dWRlbnQuZXRlLmdy
+YXl6b25lLmxhZG9rLnNlhixodHRwczovL3N0dWRlbnQuZXRlLmdyYXl6b25lLmxh
+ZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUGTot6nFf4oASiKcWzhx14GAXxGcwDQYJ
+KoZIhvcNAQELBQADggEBAElk+35EkGf0cnnmvvWX4fSURP951DAhBMIZUvjRUbr6
+yFB87ks7qRZtWVnU21DY8TPexjW+z1FXxbjaK291IHf1Q3PsTtJxM7TYxuhQfTZC
+yS5mTLvbctumSGkBdoCcoYjt32hc0Z55uid7Q3fTuYAyM5aWXwaKLc6xtnhj/SVs
+XynDfWLB38dE1w3y+l1M1jA54oThxbY6jQ1xtsH//uaVs/N/KH56Tl9a7GbPkqOu
+BIAoHEP3VaBC4B2DHmv9NTi8Rig3yWn6fI455tJeOE1k9gJoipjnuIIfqnTyjS7S
+jiq6Ou5FTOEqQgLPeRmGW7g6EvnhUSXTSawYV46aXc8=
+</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://student.ete.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.cvt.ladok.se-gui-sp.xml b/swamid-2.0/www.cvt.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..f6a38a9d
--- /dev/null
+++ b/swamid-2.0/www.cvt.ladok.se-gui-sp.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.cvt.ladok.se/gui-sp">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cvt.ladok.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.cvt.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok www.cvt.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.cvt.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://www.cvt.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.cvt.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.cvt.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.cvt.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAKIBaYTXA/UKMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNV
+BAMTEHd3dy5jdnQubGFkb2suc2UwHhcNMTYwMzE0MTI1MDE3WhcNMjYwMzEyMTI1
+MDE3WjAbMRkwFwYDVQQDExB3d3cuY3Z0LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA1BtDJ0yOznNEjxYdreMZIj5PAp4XVHbVJ7SVUfXK
+qaaLntdnhfUu4j1HMTmJynODaTMmGU7WuToHFDSvS7hF8W+uNtHgTqZ6KCXJP43x
+xlUHhwJ6NgDyav4DHELDxx1gbvYsS8XSJFSdz5ndzQdE4JVjIEMzz1EH3VgUh5N3
+f0l1oW+t9+Y2hug/DR/xgiof6aC/WTfcRE5X3syL1eFDdi5HcLtuqwsIr2ye4Z53
+sNasbH+CqRk3rEuz0Xn2g1xUlVVmHUl1U8DH1bVDwNoGhooiL6UjrfBjPpjnIq1t
+KStatxJLwnEdvx1GEJBJ1OQBsKro2wVrXwAU3mC5cbegJQIDAQABo18wXTA8BgNV
+HREENTAzghB3d3cuY3Z0LmxhZG9rLnNlhh9odHRwczovL3d3dy5jdnQubGFkb2su
+c2UvZ3VpLXNwMB0GA1UdDgQWBBQrZwcdAGn4uy7Y0JnGewF0MM1TxjANBgkqhkiG
+9w0BAQsFAAOCAQEAVJevYxixFe9Tv2RuJ9tEoUnp2bUyN/48rL5oDGb7JSeCNbg1
+kROhWl0wEU/Yf1gY4RUGFy+IWXMDMDY9hJ7MZE0mNE2tyXtUHA7sCJXeuyjo2cCA
+eY2fmu0U60jbzZgahmxGdekdiDLeLAIJymhkGmMYT3v56KNr7DgqJ5HBdKKjFoRQ
+s1sd9atFeunYVqeqKSg3RpuOQfFtTNUReoCpsNyIvYIJD/Fii/eivqDDggaoSPRJ
+WnimKipRjtjA/SYLRR/nyoXAsQni3B9LlCSTmM5P6ydj8OgynYTf49JII2/kVohu
+y9GY07YaqJzsN7hRR+MqdDquFOn1kbK8mY+1EQ==
+</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://www.cvt.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cvt.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cvt.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cvt.ladok.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 777277eb..f61f7bf0 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -509,4 +509,7 @@
   <xi:include href="swamid-2.0/www.ate.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/student.test.ladok.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/student.ate.ladok.se-student-sp.xml"/>
+  <xi:include href="swamid-2.0/www.cvt.ladok.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/student.ete.grayzone.ladok.se-student-sp.xml"/>
+  <xi:include href="swamid-2.0/student.cvt.ladok.se-student-sp.xml"/>
 </md:EntitiesDescriptor>