resolves SWAMIDOPS-6412

3 files changed, 60 insertions, 33 deletions

diff --git a/swamid-ki-sll-1.0.mxml b/swamid-ki-sll-1.0.mxml
index b9edd318..3b70df0d 100644
--- a/swamid-ki-sll-1.0.mxml
+++ b/swamid-ki-sll-1.0.mxml
@@ -4,9 +4,9 @@
   <xi:include href="swamid-1.0/kiidp.ki.se.xml"/>
   <xi:include href="swamid-1.0/samadhi.kib.ki.se.xml"/>
   <xi:include href="swamid-ki-sll-1.0/necs.sll.se.xml"/>
-  <xi:include href="swamid-ki-sll-1.0/idptest.sll.se.xml"/>
   <xi:include href="swamid-ki-sll-1.0/idp.sll.se.xml"/>
   <xi:include href="swamid-1.0/bibliometrics.ki.se.xml"/>
   <xi:include href="swamid-ki-sll-1.0/beta.kib.ki.se.xml"/>
   <xi:include href="swamid-ki-sll-1.0/pubtest.kib.ki.se.xml"/>
+  <xi:include href="swamid-ki-sll-1.0/idpext.test.ek.sll.se.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-ki-sll-1.0/idpext.test.ek.sll.se.xml b/swamid-ki-sll-1.0/idpext.test.ek.sll.se.xml
new file mode 100644
index 00000000..edd1b2a8
--- /dev/null
+++ b/swamid-ki-sll-1.0/idpext.test.ek.sll.se.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?><md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_f2f77d8c05f5f99c6fa3e0fdfd0ac80b" entityID="http://idpext.test.ek.sll.se/neas"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<ds:SignedInfo>
+<ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+<ds:Reference URI="#_f2f77d8c05f5f99c6fa3e0fdfd0ac80b">
+<ds:Transforms>
+<ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
+<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"><ec:InclusiveNamespaces xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#" PrefixList="ds md"/></ds:Transform>
+</ds:Transforms>
+<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+<ds:DigestValue>TC9tvBg3xmXPLYTKtMvMgqI3oNY=</ds:DigestValue>
+</ds:Reference>
+</ds:SignedInfo>
+<ds:SignatureValue>
+tV5qwF6JJbBYLJ5F0SNgWGp0c1qHkbD4Z5I5ybgc3ZpJgcefoQ724GC2P5t3bGZOnbVsch6owZlz
+BNP2lrBx5hZVucK6mB1kJz/vn03B7nERooQyywsdf2jYaTQ6Bw7YPfo4yvEo9bSi2H6wCR1lcOGT
+UA0WIJ5ZOgiUphpWm5T68/w/8bJ9p8PLeyjdvnHApBgnlmeLMs1UEMnovhSNqFVMaXfK7dVzWlI5
+2Sr4agkbPFBaHDGq+ab8kV7Daa7mDFspXKhkCEWwk1jOejUdA/m/SqeDIlWtM3BquuQrSC/AieOo
+TEmXZZ4tDJJmB8M/Fcs0mgwUryJAMUFGe0eqvA==
+</ds:SignatureValue>
+<ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIEZTCCA02gAwIBAgIJAJp4wLfm2XW/MA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlNFMRIw
+EAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEVMBMGA1UEChMMMTYyMzIxMDAw
+MDE2MRAwDgYDVQQLEwdTTEx0ZXN0MR4wHAYDVQQDExVpZHBleHQudGVzdC5lay5zbGwuc2UwHhcN
+MTAxMjA2MDgyMzAxWhcNMTExMjA2MDgyMzAxWjB+MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3Rv
+Y2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xFTATBgNVBAoTDDE2MjMyMTAwMDAxNjEQMA4GA1UE
+CxMHU0xMdGVzdDEeMBwGA1UEAxMVaWRwZXh0LnRlc3QuZWsuc2xsLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA4ibxWfMWcVv/5cdFNS5FZxTrZBJu61myC+SiW0Nkrws3J/2uve4b
+eRig27f7hhr2+tGQeWW2uifmco2ajkqcutXtSfxqtVWRvUuq7GIog1aeNH17Qtq4+QEIxVXfmRJm
+/jVT0ihz6JsN/S6St8Pt937oeDetryvpGvV4tJ54/vUYos0i1shcoDr6jUujQ/aHoN48MkymvDD6
+m4v5FJgAUCaeRVFzKwaXsd172ZoA2NFSLPxkCOrm2Nm1SvZfPtFdfLCmgsElwXWnbtfVD8LdUsTs
+DWGcOkEWA14qbeVcK81xUW/xsvT36p0Wdy8zd1CqIabSc5F3S4ney1+yDQPNiwIDAQABo4HlMIHi
+MB0GA1UdDgQWBBTBxmnEBJq8D6hVP9U6fhESjbtsPzCBsgYDVR0jBIGqMIGngBTBxmnEBJq8D6hV
+P9U6fhESjbtsP6GBg6SBgDB+MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYD
+VQQHEwlTdG9ja2hvbG0xFTATBgNVBAoTDDE2MjMyMTAwMDAxNjEQMA4GA1UECxMHU0xMdGVzdDEe
+MBwGA1UEAxMVaWRwZXh0LnRlc3QuZWsuc2xsLnNlggkAmnjAt+bZdb8wDAYDVR0TBAUwAwEB/zAN
+BgkqhkiG9w0BAQUFAAOCAQEAyPco1XdKpag55ll+JPUytF9LQiVh5u/T49fpw97z/XXYzk1MqMua
+7vAAnJmZMSgI1oGZOR3KKyxj23jrhwlTKiwRwHNSY+/8eMtD/qM/Rld+iMBRmtyRnGQH4efDMTBt
+cB+aYskYmZzPSJEt+IWaPDrbyKbGVCJuSby3PZMpBIa7iIeqLWVP++ztcFtt3MWx0pPoOgjGUAe2
+mQiCxdw9svIOM0q+G1wvlCCYXzXGHEwyO/gBqU+sXiamozORlIo5JCsZk450Mxw8FWbExZBCqGpX
+bAy/e4vxQuTw2gZY1+Bfp0Bfhuy9RK07YTfWPpHBjulSG2/QXJsgjU+ozV9MeA==</ds:X509Certificate></ds:X509Data></ds:KeyInfo></ds:Signature><md:IDPSSODescriptor WantAuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><md:KeyDescriptor use="signing"><ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:X509Data><ds:X509Certificate>MIIEZTCCA02gAwIBAgIJAJp4wLfm2XW/MA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlNFMRIw
+EAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEVMBMGA1UEChMMMTYyMzIxMDAw
+MDE2MRAwDgYDVQQLEwdTTEx0ZXN0MR4wHAYDVQQDExVpZHBleHQudGVzdC5lay5zbGwuc2UwHhcN
+MTAxMjA2MDgyMzAxWhcNMTExMjA2MDgyMzAxWjB+MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3Rv
+Y2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xFTATBgNVBAoTDDE2MjMyMTAwMDAxNjEQMA4GA1UE
+CxMHU0xMdGVzdDEeMBwGA1UEAxMVaWRwZXh0LnRlc3QuZWsuc2xsLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA4ibxWfMWcVv/5cdFNS5FZxTrZBJu61myC+SiW0Nkrws3J/2uve4b
+eRig27f7hhr2+tGQeWW2uifmco2ajkqcutXtSfxqtVWRvUuq7GIog1aeNH17Qtq4+QEIxVXfmRJm
+/jVT0ihz6JsN/S6St8Pt937oeDetryvpGvV4tJ54/vUYos0i1shcoDr6jUujQ/aHoN48MkymvDD6
+m4v5FJgAUCaeRVFzKwaXsd172ZoA2NFSLPxkCOrm2Nm1SvZfPtFdfLCmgsElwXWnbtfVD8LdUsTs
+DWGcOkEWA14qbeVcK81xUW/xsvT36p0Wdy8zd1CqIabSc5F3S4ney1+yDQPNiwIDAQABo4HlMIHi
+MB0GA1UdDgQWBBTBxmnEBJq8D6hVP9U6fhESjbtsPzCBsgYDVR0jBIGqMIGngBTBxmnEBJq8D6hV
+P9U6fhESjbtsP6GBg6SBgDB+MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYD
+VQQHEwlTdG9ja2hvbG0xFTATBgNVBAoTDDE2MjMyMTAwMDAxNjEQMA4GA1UECxMHU0xMdGVzdDEe
+MBwGA1UEAxMVaWRwZXh0LnRlc3QuZWsuc2xsLnNlggkAmnjAt+bZdb8wDAYDVR0TBAUwAwEB/zAN
+BgkqhkiG9w0BAQUFAAOCAQEAyPco1XdKpag55ll+JPUytF9LQiVh5u/T49fpw97z/XXYzk1MqMua
+7vAAnJmZMSgI1oGZOR3KKyxj23jrhwlTKiwRwHNSY+/8eMtD/qM/Rld+iMBRmtyRnGQH4efDMTBt
+cB+aYskYmZzPSJEt+IWaPDrbyKbGVCJuSby3PZMpBIa7iIeqLWVP++ztcFtt3MWx0pPoOgjGUAe2
+mQiCxdw9svIOM0q+G1wvlCCYXzXGHEwyO/gBqU+sXiamozORlIo5JCsZk450Mxw8FWbExZBCqGpX
+bAy/e4vxQuTw2gZY1+Bfp0Bfhuy9RK07YTfWPpHBjulSG2/QXJsgjU+ozV9MeA==</ds:X509Certificate></ds:X509Data><ds:KeyName>2709baf0896baf6854289c9778be58ea1eb1f93f</ds:KeyName></ds:KeyInfo></md:KeyDescriptor><md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpext.test.ek.sll.se/neas/SAMLConsumer" index="2"/><md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat><md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpext.test.ek.sll.se/neas/SSOService"/><md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpext.test.ek.sll.se/neas/SSOService"/></md:IDPSSODescriptor><md:Organization><md:OrganizationName xmlns:xml="http://www.w3.org/XML/1998/namespace" xml:lang="en">SLL</md:OrganizationName><md:OrganizationDisplayName xmlns:xml="http://www.w3.org/XML/1998/namespace" xml:lang="en">SLL</md:OrganizationDisplayName><md:OrganizationURL xmlns:xml="http://www.w3.org/XML/1998/namespace" xml:lang="en">http://www.sll.se/</md:OrganizationURL></md:Organization></md:EntityDescriptor>
\ No newline at end of file
diff --git a/swamid-ki-sll-1.0/idptest.sll.se.xml b/swamid-ki-sll-1.0/idptest.sll.se.xml
deleted file mode 100644
index 6c14b3b1..00000000
--- a/swamid-ki-sll-1.0/idptest.sll.se.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://idptest.sll.se/necs">
-  <IDPSSODescriptor WantAuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDGTCCAoKgAwIBAgIJAMTNv5D3FjBaMA0GCSqGSIb3DQEBBQUAMGcxCzAJBgNVBAYTAlNFMRIw
-EAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEMMAoGA1UEChMDU0xMMQwwCgYD
-VQQLEwNJZFAxFDASBgNVBAMTC25lY3Muc2xsLnNlMB4XDTA5MDkwMTA2NDQxNVoXDTEwMDkwMTA2
-NDQxNVowZzELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0b2NraG9sbTESMBAGA1UEBxMJU3RvY2to
-b2xtMQwwCgYDVQQKEwNTTEwxDDAKBgNVBAsTA0lkUDEUMBIGA1UEAxMLbmVjcy5zbGwuc2UwgZ8w
-DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANnKwL7FuS+QwZMOQ/73w7hH4DxZZ3JBwsvtrKrucKBv
-5HlrjpM5Zz7SIq/3To3HQ48vKev1Hdwsd+DA24EkzA2z44/Yo0wyuCTqWti4H792vVTVzUfJ+x19
-DgP0ni/xxM5Ea68kTUGabBbi0SdqBcytb5/oUMoB1YvMxJ3pHGDPAgMBAAGjgcwwgckwHQYDVR0O
-BBYEFP8DYOaAGC03f/WQWDdXizrnTZN9MIGZBgNVHSMEgZEwgY6AFP8DYOaAGC03f/WQWDdXizrn
-TZN9oWukaTBnMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9j
-a2hvbG0xDDAKBgNVBAoTA1NMTDEMMAoGA1UECxMDSWRQMRQwEgYDVQQDEwtuZWNzLnNsbC5zZYIJ
-AMTNv5D3FjBaMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAQoKH1AsRsA3RUd/J19ZE
-9s36XgtO+ZK9RTsfTjAY7t+CXu1RKGkRS2gtNYVj6+GBx135zwnOCPSHJ0MKFtkwuHbZdjtgstPz
-Mwhwwu0V4AYs/3D5tTs3ekAKDOtnVTzOc2zRT6vbxxYioQdZPp9Exe0PrMymntimPNQEssgwL1M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.sll.se/necs/SAMLResponder"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SLL</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stockholms Lans Landsting</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sll.se/</OrganizationURL>
-  </Organization>
-</EntityDescriptor>