Resolves SWAMIDOPS-8401

4 files changed, 136 insertions, 7 deletions

diff --git a/swamid-2.0/ladokportalen.hb.se-shibboleth.sso.xml b/swamid-2.0/ladokportalen.hb.se-shibboleth.sso.xml
new file mode 100644
index 00000000..d59e8477
--- /dev/null
+++ b/swamid-2.0/ladokportalen.hb.se-shibboleth.sso.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladokportalen.hb.se/Shibboleth.sso">
+  <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#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">
+    <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://ladokportalen.hb.se/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">ladokportalen.hb.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">ladokportalen.hb.se</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Du försöker logga in på ladokportalen.hb.se</mdui:Description>
+        <mdui:Description xml:lang="en">You have asked to log in to ladokportalen.hb.se</mdui:Description>
+        <mdui:Logo height="99" width="350" xml:lang="sv">https://hbidp.hb.se/idp/images/hblogo.png</mdui:Logo>
+        <mdui:Logo height="99" width="350" xml:lang="en">https://hbidp.hb.se/idp/images/hblogo_en.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>uportalhh.ldc.lu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=uportalhh.ldc.lu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAJQE9r/79RHVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV 
+BAMTE3Vwb3J0YWxoaC5sZGMubHUuc2UwHhcNMTMwNDA0MDgyMjM4WhcNMjMwNDAy 
+MDgyMjM4WjAeMRwwGgYDVQQDExN1cG9ydGFsaGgubGRjLmx1LnNlMIIBIjANBgkq 
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsOyRWECTEayEUPA38gZp/n7yAmxbQaRx 
+5UdNg0aL6/ubnreSzzgSC2dZ/RsKf6OqRtUmy8KgsxAPVaNmWJirWO/2S0sXSEUf 
+uZRAgtetTHJVcOjfN0XPoT0WB/z7BfL5nDQa/xT8EccUtNQBTyFvmBdy2o3qGtEh 
+pzSscFnHy1l0f/jwfzz6kEDlKl9YZD0qqGknA8Q+qavFSVrkcxfJ6amP6ZorUfjb 
+5B9/AGshVo9gMoRNK+xMlZpn80/rogXml+9Sa0FWoTU5f2jP1nFPduysfNMmmox3 
+KlS8xAL2La4RDY9M3LmiylWNMzLAC9+ZMaUYd3i1xZpuoF01Vr1i7wIDAQABo0Ew 
+PzAeBgNVHREEFzAVghN1cG9ydGFsaGgubGRjLmx1LnNlMB0GA1UdDgQWBBRkuwCN 
+p94hyVSpnqt+eFDwyK3sCTANBgkqhkiG9w0BAQUFAAOCAQEAN4Hren7Em14CBvZM 
+JRQk0A83VHtAB8Q/xZV+WM/Y6gBW7Oi6o0bR83tNMjljJu7jwBUCpsjoIv9xrJ8b 
+HAsokXqQMq16nEzixcKTx+hF6SSLipssg+H5bA9ed73hBvd+TTXnqNM1N5lSRCRa 
+D0OVyKSxNiIzCrhGH47NZxWPx27GdcrrvMrh+L5il78WYEs1A3aVsH47lzKKQFTW 
+BFIaHLDydw+aa3tG0LQxBc5Buw6dkfy9HRyWYNbsgXfRXX35Vc27DgeXmX1lqUUr 
+p42UyLfzJ7+RpY4aRQN3hwbYkm3ngivIg30ukw1ImqwMKTdCM6/yb4ttLg8FzYQF 
+6e57eQ== 
+</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://ladokportalen.hb.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladokportalen.hb.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladokportalen.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladokportalen.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/rikards-idp.omv.lu.se-idp-shibboleth.xml b/swamid-2.0/rikards-idp.omv.lu.se-idp-shibboleth.xml
index 91bd8d9a..450681d9 100644
--- a/swamid-2.0/rikards-idp.omv.lu.se-idp-shibboleth.xml
+++ b/swamid-2.0/rikards-idp.omv.lu.se-idp-shibboleth.xml
@@ -89,17 +89,10 @@ V6T+niX3S1uuhRveG+6u/rz8moLBy+wYVE31+qsoE3ZkDWULEJg2pZxlaFKhA/FW
     </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rikards-idp.omv.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rikards-idp.omv.lu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <!--
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rikards-idp.omv.lu.se/idp/profile/SAML2/Redirect/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rikards-idp.omv.lu.se/idp/profile/SAML2/POST/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rikards-idp.omv.lu.se/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rikards-idp.omv.lu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-        -->
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rikards-idp.omv.lu.se/idp/profile/Shibboleth/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rikards-idp.omv.lu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rikards-idp.omv.lu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rikards-idp.omv.lu.se/idp/profile/SAML2/Redirect/SSO"/>
   </IDPSSODescriptor>
   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
diff --git a/swamid-2.0/uportalhb-test.ldc.lu.se-shibboleth.sso.xml b/swamid-2.0/uportalhb-test.ldc.lu.se-shibboleth.sso.xml
new file mode 100644
index 00000000..23c418ed
--- /dev/null
+++ b/swamid-2.0/uportalhb-test.ldc.lu.se-shibboleth.sso.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uportalhb-test.ldc.lu.se/Shibboleth.sso">
+  <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#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">
+    <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://uportalhb-test.ldc.lu.se/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">uportalhb-test.ldc.lu.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">uportalhb-test.ldc.lu.se</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Du försöker logga in på uportalhb-test.ldc.lu.se</mdui:Description>
+        <mdui:Description xml:lang="en">You have asked to log in to uportalhb-test.ldc.lu.se</mdui:Description>
+        <mdui:Logo height="99" width="350" xml:lang="sv">https://hbidp.hb.se/idp/images/hblogo.png</mdui:Logo>
+        <mdui:Logo height="99" width="350" xml:lang="en">https://hbidp.hb.se/idp/images/hblogo_en.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>uportalhh.ldc.lu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=uportalhh.ldc.lu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAJQE9r/79RHVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV 
+BAMTE3Vwb3J0YWxoaC5sZGMubHUuc2UwHhcNMTMwNDA0MDgyMjM4WhcNMjMwNDAy 
+MDgyMjM4WjAeMRwwGgYDVQQDExN1cG9ydGFsaGgubGRjLmx1LnNlMIIBIjANBgkq 
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsOyRWECTEayEUPA38gZp/n7yAmxbQaRx 
+5UdNg0aL6/ubnreSzzgSC2dZ/RsKf6OqRtUmy8KgsxAPVaNmWJirWO/2S0sXSEUf 
+uZRAgtetTHJVcOjfN0XPoT0WB/z7BfL5nDQa/xT8EccUtNQBTyFvmBdy2o3qGtEh 
+pzSscFnHy1l0f/jwfzz6kEDlKl9YZD0qqGknA8Q+qavFSVrkcxfJ6amP6ZorUfjb 
+5B9/AGshVo9gMoRNK+xMlZpn80/rogXml+9Sa0FWoTU5f2jP1nFPduysfNMmmox3 
+KlS8xAL2La4RDY9M3LmiylWNMzLAC9+ZMaUYd3i1xZpuoF01Vr1i7wIDAQABo0Ew 
+PzAeBgNVHREEFzAVghN1cG9ydGFsaGgubGRjLmx1LnNlMB0GA1UdDgQWBBRkuwCN 
+p94hyVSpnqt+eFDwyK3sCTANBgkqhkiG9w0BAQUFAAOCAQEAN4Hren7Em14CBvZM 
+JRQk0A83VHtAB8Q/xZV+WM/Y6gBW7Oi6o0bR83tNMjljJu7jwBUCpsjoIv9xrJ8b 
+HAsokXqQMq16nEzixcKTx+hF6SSLipssg+H5bA9ed73hBvd+TTXnqNM1N5lSRCRa 
+D0OVyKSxNiIzCrhGH47NZxWPx27GdcrrvMrh+L5il78WYEs1A3aVsH47lzKKQFTW 
+BFIaHLDydw+aa3tG0LQxBc5Buw6dkfy9HRyWYNbsgXfRXX35Vc27DgeXmX1lqUUr 
+p42UyLfzJ7+RpY4aRQN3hwbYkm3ngivIg30ukw1ImqwMKTdCM6/yb4ttLg8FzYQF 
+6e57eQ== 
+</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://uportalhb-test.ldc.lu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uportalhb-test.ldc.lu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uportalhb-test.ldc.lu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uportalhb-test.ldc.lu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uportalhb-test.ldc.lu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uportalhb-test.ldc.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uportalhb-test.ldc.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uportalhb-test.ldc.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 866c023d..0dcaeecb 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -624,4 +624,6 @@
   <xi:include href="swamid-2.0/student.verifiering2.ladok.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/www.verifiering2.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/test.account.hj.se.xml"/>
+  <xi:include href="swamid-2.0/uportalhb-test.ldc.lu.se-shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/ladokportalen.hb.se-shibboleth.sso.xml"/>
 </md:EntitiesDescriptor>