Resolves SWAMIDOPS-8245

3 files changed, 187 insertions, 0 deletions

diff --git a/swamid-2.0/hsk.integrationstest.ladok.se-gui-sp.xml b/swamid-2.0/hsk.integrationstest.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..bc8eb645
--- /dev/null
+++ b/swamid-2.0/hsk.integrationstest.ladok.se-gui-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://hsk.integrationstest.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/nren-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://hsk.integrationstest.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://hsk.integrationstest.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok hsk.integrationstest.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok hsk.integrationstest.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://hsk.integrationstest.ladok.se/branded/HSK/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>hsk.integrationstest.ladok.se</ds:KeyName>
+        <ds:KeyName>https://hsk.integrationstest.ladok.se/gui-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=hsk.integrationstest.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJAIhhW9K62mFJMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+BAMTHWhzay5pbnRlZ3JhdGlvbnN0ZXN0LmxhZG9rLnNlMB4XDTE2MDYxNDEwNTMy
+NVoXDTI2MDYxMjEwNTMyNVowKDEmMCQGA1UEAxMdaHNrLmludGVncmF0aW9uc3Rl
+c3QubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNwEW1
+tlrO9Aa5vTMnljSk5ZWOlG0VYCpHUkvw1STjucL13nU+eKD8C7rYzbXsVji0iw3d
+Fkary1cLPK8tFli9u5cfnnsdqEB27Y+2loWla9qo8L/uPBuyK9Ht1fcNT0xtv3FY
+TDiXdHcF8xu32XfpPSMvrMq/sHmdBzzbVTVf+dHBOAC5RxuhMOjqU4GPs3VVwY22
+WAGjFrZHsSlsF/t+BaeGggb5f4kSWyP+6MuIE8il6FX7KsEbeJaMUXYK/sl3TvFN
+5Qq64Z7/HT/c3/83IqGEhQj5iK6FHuo2TabAzJS6vbUEe7OH6PPDTtPNvPtYCMzN
+lFarPnYRCOLl7KNtAgMBAAGjeTB3MFYGA1UdEQRPME2CHWhzay5pbnRlZ3JhdGlv
+bnN0ZXN0LmxhZG9rLnNlhixodHRwczovL2hzay5pbnRlZ3JhdGlvbnN0ZXN0Lmxh
+ZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUQXaWTVNhFyzkXRSEdRWUUbp8xEYwDQYJ
+KoZIhvcNAQEFBQADggEBACsBvuStf68CRjjqyXZeMNHICS1QCXAW7y5qpGwhEBDQ
+MVMv7r/hdZZKIilo+hrQ5/s9tcXUrm7ayJ8moXOkqstBFGZSi5IATiEQTuQgUPIH
+rM2HD1HvXxa9hHeXZaxEil//+gB9LYFbiCKDRc/OzndfMDgDLsEbOgchIFD605ti
+Phu403euhtD/KZzK6kjiWe1DrHUf6mhGlkvNXC/vaSSPgDrKDOSLYps6+lIbcQlx
+nKdl5XIjJemFgGpcOc2ZW0f4+PSmUAL6q651X9cNHvM+767/QMHfh4SDjZL9xdiJ
+jRXjwYKNYZz43SF1icrUFkZrhQII6+H2ivPEWUw4hTU=
+</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://hsk.integrationstest.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/hsk.student.integrationstest.ladok.se-student-sp.xml b/swamid-2.0/hsk.student.integrationstest.ladok.se-student-sp.xml
new file mode 100644
index 00000000..32226923
--- /dev/null
+++ b/swamid-2.0/hsk.student.integrationstest.ladok.se-student-sp.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hsk.student.integrationstest.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/nren-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://hsk.student.integrationstest.ladok.se:446/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://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok hsk.student.integrationstest.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok hsk.student.integrationstest.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://hsk.student.integrationstest.ladok.se:446/branded/HSK/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>hsk.student.integrationstest.ladok.se</ds:KeyName>
+        <ds:KeyName>https://hsk.integrationstest.ladok.se/gui-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=hsk.student.integrationstest.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDZTCCAk2gAwIBAgIJAI2z0K0VXT3DMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
+BAMTJWhzay5zdHVkZW50LmludGVncmF0aW9uc3Rlc3QubGFkb2suc2UwHhcNMTYw
+NjE0MDgwOTU4WhcNMjYwNjEyMDgwOTU4WjAwMS4wLAYDVQQDEyVoc2suc3R1ZGVu
+dC5pbnRlZ3JhdGlvbnN0ZXN0LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAsmeY6Dhg+r0LBJXtJ1Q2zvRQQvKDjxCcq0lrKuwCRoX6lRmB
+Acb7tLhAh4R3ABxAK1A++EW5Fro9+BPwHYoqSmQPHzs62XTpSKWhtsdOvTvt02qp
+N3ezHMTWi7ieKPSO8Rwvx1IU6RcpI1xOIydpkyRNrWcuvcYu9XEBzMI/VviVc/Cc
+kHHFEsz/3BCcSgEVK6+72hnyzTQmgxXZYuUPyaHID36AmHmaj8ToUxQngvIHISlz
+L+N5u2hVWZelCk64a1Jj50MdDRZ+sMg57UJhDEIarZxK6fFmLFIrq51J40EdeiiD
+RIazf4QqQKq6snno3nBeIAOdAUIJgL2QqtRiJQIDAQABo4GBMH8wXgYDVR0RBFcw
+VYIlaHNrLnN0dWRlbnQuaW50ZWdyYXRpb25zdGVzdC5sYWRvay5zZYYsaHR0cHM6
+Ly9oc2suaW50ZWdyYXRpb25zdGVzdC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYE
+FGItX/ug1OlgMS6TqqpzsVCsAr2WMA0GCSqGSIb3DQEBBQUAA4IBAQB5Uw5g3/1a
+BXXto0UjkJpBF4gIBwAPfbeWTEcgmy0YJcFZFzMyRFuooyxCsR0w5vd0nkE+p2hp
+xYwskuSZ3Proh+4V09b+Co4vhD2KdoRGYuXFEIvwi1FMMrgXlB6IsAAtL5zZCZOv
+Ew4hvfj7+tIS0L/SCyLrLDvx17zEsT6TW/6vSR2jEUZdE23Gyj9ppO65bpqP1+XI
+xq7s52AC2fSEfMPcC2i2CxM+pBg7PIoyG30T61xTYjdfba+Pv1H2yCcO2foRh7o7
+MCuAPiSOKSeoQ7QZFxvT2xoIlMs2UooH06gdsRK6+oKWCaOVUpPcry7XNXl0pJvg
+RKmJ1UnF1rDO
+</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://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hsk.student.integrationstest.ladok.se:446/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 7c9aa20e..bab21479 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -587,4 +587,6 @@
   <xi:include href="swamid-2.0/luvittest2.ced.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/vfu-dev.it.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/zeus.slu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/hsk.integrationstest.ladok.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/hsk.student.integrationstest.ladok.se-student-sp.xml"/>
 </md:EntitiesDescriptor>