resolves SWAMIDOPS-6208

3 files changed, 162 insertions, 0 deletions

diff --git a/swamid-ki-sll-1.0.mxml b/swamid-ki-sll-1.0.mxml
index 02bc08bf..b9edd318 100644
--- a/swamid-ki-sll-1.0.mxml
+++ b/swamid-ki-sll-1.0.mxml
@@ -7,4 +7,6 @@
   <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"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-ki-sll-1.0/beta.kib.ki.se.xml b/swamid-ki-sll-1.0/beta.kib.ki.se.xml
new file mode 100644
index 00000000..cd7c28fb
--- /dev/null
+++ b/swamid-ki-sll-1.0/beta.kib.ki.se.xml
@@ -0,0 +1,71 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.kib.ki.se/shibboleth">
+
+  <md:SPSSODescriptor AuthnRequestsSigned="1" 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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>samadhi</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=samadhi</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIJAM1x+5LlJQVQMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+BAMTB3NhbWFkaGkwHhcNMDkwODE0MTEzMzM4WhcNMTkwODEyMTEzMzM4WjASMRAw
+DgYDVQQDEwdzYW1hZGhpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+wBagrMP26PtYqxBexJdsMdyDYCT74qvR5wLeW1znJTS9I1eK8ghXZ0Wy+uGunUU7
+ePkQPDySt3dNOW6hOx9o8Z+/JqwSARj07glBpkN2psiza+7BQP/+l/4iBixGlDea
+wb59dC25cUA5k+YAV1fx6uwufQ/65iRKYilRVxzzSmorrrUuzbKA/Dh6MNCWDkU2
+ppxJ/FS0IiR88rj2ZHZbz2wb1ATLnkevD4mUuRY39P9yxb63bTeCG7GboHrVBmNt
+rrlskaeeIYNHIkiWqbPrW/IMCgMFim7r7fiYebTvhw037UtTFDnwI8DDmcfpvbff
+2hztelbzoERAkXardDqx5QIDAQABozUwMzASBgNVHREECzAJggdzYW1hZGhpMB0G
+A1UdDgQWBBTIRU/xxcULxzxNef3jHDp1W2Br7jANBgkqhkiG9w0BAQUFAAOCAQEA
+DsNpDbtB/fhZIlNN11erKFH1VKgZIsLBu86uEYwi3sqK9+DNk40sdG1U0INY21g5
+sTG/vlt6qyuLcB9C5BA+8Ms3T01vcWg+//4KM4OZuLM/0ylSDxhVCHwJU5erI9Bt
+JSqVQ12JHctvIqdIQm0JRR6CCXVdm6Wjy5vVQZEoIanxcyjd0AUF458M7arGk1RB
+pvLrKdwx16cOS9mkuq5Jg0Oj2yiUjx1WRzNzqAVQXpBb0ZZz0oKGiOqa0AgyfVKs
+aNy8twh152lw5iqjY7qxb9QDhtJpzlPnQk2CmHJbQUXrCK8cLSWSDsiCcaQVicb+
+15HeV+PRFYV9dngg8gm2vg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>samadhi</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=samadhi</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIJAM1x+5LlJQVQMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+BAMTB3NhbWFkaGkwHhcNMDkwODE0MTEzMzM4WhcNMTkwODEyMTEzMzM4WjASMRAw
+DgYDVQQDEwdzYW1hZGhpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+wBagrMP26PtYqxBexJdsMdyDYCT74qvR5wLeW1znJTS9I1eK8ghXZ0Wy+uGunUU7
+ePkQPDySt3dNOW6hOx9o8Z+/JqwSARj07glBpkN2psiza+7BQP/+l/4iBixGlDea
+wb59dC25cUA5k+YAV1fx6uwufQ/65iRKYilRVxzzSmorrrUuzbKA/Dh6MNCWDkU2
+ppxJ/FS0IiR88rj2ZHZbz2wb1ATLnkevD4mUuRY39P9yxb63bTeCG7GboHrVBmNt
+rrlskaeeIYNHIkiWqbPrW/IMCgMFim7r7fiYebTvhw037UtTFDnwI8DDmcfpvbff
+2hztelbzoERAkXardDqx5QIDAQABozUwMzASBgNVHREECzAJggdzYW1hZGhpMB0G
+A1UdDgQWBBTIRU/xxcULxzxNef3jHDp1W2Br7jANBgkqhkiG9w0BAQUFAAOCAQEA
+DsNpDbtB/fhZIlNN11erKFH1VKgZIsLBu86uEYwi3sqK9+DNk40sdG1U0INY21g5
+sTG/vlt6qyuLcB9C5BA+8Ms3T01vcWg+//4KM4OZuLM/0ylSDxhVCHwJU5erI9Bt
+JSqVQ12JHctvIqdIQm0JRR6CCXVdm6Wjy5vVQZEoIanxcyjd0AUF458M7arGk1RB
+pvLrKdwx16cOS9mkuq5Jg0Oj2yiUjx1WRzNzqAVQXpBb0ZZz0oKGiOqa0AgyfVKs
+aNy8twh152lw5iqjY7qxb9QDhtJpzlPnQk2CmHJbQUXrCK8cLSWSDsiCcaQVicb+
+15HeV+PRFYV9dngg8gm2vg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta.kib.ki.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://beta.kib.ki.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.kib.ki.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta.kib.ki.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta.kib.ki.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://beta.kib.ki.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.kib.ki.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta.kib.ki.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.kib.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://beta.kib.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta.kib.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://beta.kib.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.kib.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
\ No newline at end of file
diff --git a/swamid-ki-sll-1.0/pubtest.kib.ki.se.xml b/swamid-ki-sll-1.0/pubtest.kib.ki.se.xml
new file mode 100644
index 00000000..33d80321
--- /dev/null
+++ b/swamid-ki-sll-1.0/pubtest.kib.ki.se.xml
@@ -0,0 +1,89 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pubtest.kib.ki.se/shibboleth">
+
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>pubtest.kib.ki.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=pubtest.kib.ki.se,OU=UNIVERSITY LIBRARY,O=Karolinska Institutet,L=Stockholm,ST=Stockholm,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIJAKV4aTyWfGNaMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
+VQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0x
+HjAcBgNVBAoTFUthcm9saW5za2EgSW5zdGl0dXRldDEbMBkGA1UECxMSVU5JVkVS
+U0lUWSBMSUJSQVJZMRowGAYDVQQDExFwdWJ0ZXN0LmtpYi5raS5zZTAeFw0xMTAz
+MTAxMDI2MTVaFw0yMTAzMDcxMDI2MTVaMIGOMQswCQYDVQQGEwJTRTESMBAGA1UE
+CBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHjAcBgNVBAoTFUthcm9s
+aW5za2EgSW5zdGl0dXRldDEbMBkGA1UECxMSVU5JVkVSU0lUWSBMSUJSQVJZMRow
+GAYDVQQDExFwdWJ0ZXN0LmtpYi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL5ct6zdPPKT2XVVN+k1NLxaQ8nlcCriXgoD4IBCUiFzcV+6M6G9
+HIznpvxkU6Zgrf5lvfjd7XZwTtRzseBIen+vIr09gceRrtAnuOEvrEiplSMCSObu
+syUiu2iZ1fPrQngNJifnUD2MNQT+tdsuiqkLlCPSCpp/QlpXmtjbqbQSr3vauN/c
+gTupXnC42t7jEwAF4+iX8jF9uqlSutzroftEuTNpqQhAIQy7nicZFGa8z/RZR5Uw
+ggtktt67/F6fiZce9h2b6Y4rh/IB8rEiyP2PEn6yaUVlYbNUqhIFDNBCB575EzdU
+pqZ1LYl3gbeZJKPHT310qli4uh4Y8jffwbMCAwEAAaOB9jCB8zAdBgNVHQ4EFgQU
+y1KnEVpEtiJqU6WaFw+tALF0xpkwgcMGA1UdIwSBuzCBuIAUy1KnEVpEtiJqU6Wa
+Fw+tALF0xpmhgZSkgZEwgY4xCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hv
+bG0xEjAQBgNVBAcTCVN0b2NraG9sbTEeMBwGA1UEChMVS2Fyb2xpbnNrYSBJbnN0
+aXR1dGV0MRswGQYDVQQLExJVTklWRVJTSVRZIExJQlJBUlkxGjAYBgNVBAMTEXB1
+YnRlc3Qua2liLmtpLnNlggkApXhpPJZ8Y1owDAYDVR0TBAUwAwEB/zANBgkqhkiG
+9w0BAQUFAAOCAQEAdFgQ7X5JGGATE/wkL/ToOCQ9vfxhKeap8Vkq6jGPmjtvMakB
+tZ25E4goMZZEhlXbS+c9LpcTNk/ly+E+O6+BwvVfqVIM1ZTlQdyvTlFfa0HeT6Qc
+ukOzkF6JP3XzzbbrZgTZz1Jqg1p15usxKjtQ39qFblWeMCVT2E/uCBKXTDGAaT/3
+INX+EzKTDBbgE7n2uqZy40PZ/CDn6L+3wYsCJdRhVbS+fjJn+bV3+MGPN0gIL6GO
+32aBC2+zv1e0dAsMk8qIysoOy79BlrAOupek7m/pYhQp461FV1dOtGqyuNWEueiN
+c7fJJOmf36l5tyqvSMhnNVbprhB8dsF9RiAgFw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>pubtest.kib.ki.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=pubtest.kib.ki.se,OU=UNIVERSITY LIBRARY,O=Karolinska Institutet,L=Stockholm,ST=Stockholm,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIJAKV4aTyWfGNaMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
+VQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0x
+HjAcBgNVBAoTFUthcm9saW5za2EgSW5zdGl0dXRldDEbMBkGA1UECxMSVU5JVkVS
+U0lUWSBMSUJSQVJZMRowGAYDVQQDExFwdWJ0ZXN0LmtpYi5raS5zZTAeFw0xMTAz
+MTAxMDI2MTVaFw0yMTAzMDcxMDI2MTVaMIGOMQswCQYDVQQGEwJTRTESMBAGA1UE
+CBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHjAcBgNVBAoTFUthcm9s
+aW5za2EgSW5zdGl0dXRldDEbMBkGA1UECxMSVU5JVkVSU0lUWSBMSUJSQVJZMRow
+GAYDVQQDExFwdWJ0ZXN0LmtpYi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL5ct6zdPPKT2XVVN+k1NLxaQ8nlcCriXgoD4IBCUiFzcV+6M6G9
+HIznpvxkU6Zgrf5lvfjd7XZwTtRzseBIen+vIr09gceRrtAnuOEvrEiplSMCSObu
+syUiu2iZ1fPrQngNJifnUD2MNQT+tdsuiqkLlCPSCpp/QlpXmtjbqbQSr3vauN/c
+gTupXnC42t7jEwAF4+iX8jF9uqlSutzroftEuTNpqQhAIQy7nicZFGa8z/RZR5Uw
+ggtktt67/F6fiZce9h2b6Y4rh/IB8rEiyP2PEn6yaUVlYbNUqhIFDNBCB575EzdU
+pqZ1LYl3gbeZJKPHT310qli4uh4Y8jffwbMCAwEAAaOB9jCB8zAdBgNVHQ4EFgQU
+y1KnEVpEtiJqU6WaFw+tALF0xpkwgcMGA1UdIwSBuzCBuIAUy1KnEVpEtiJqU6Wa
+Fw+tALF0xpmhgZSkgZEwgY4xCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hv
+bG0xEjAQBgNVBAcTCVN0b2NraG9sbTEeMBwGA1UEChMVS2Fyb2xpbnNrYSBJbnN0
+aXR1dGV0MRswGQYDVQQLExJVTklWRVJTSVRZIExJQlJBUlkxGjAYBgNVBAMTEXB1
+YnRlc3Qua2liLmtpLnNlggkApXhpPJZ8Y1owDAYDVR0TBAUwAwEB/zANBgkqhkiG
+9w0BAQUFAAOCAQEAdFgQ7X5JGGATE/wkL/ToOCQ9vfxhKeap8Vkq6jGPmjtvMakB
+tZ25E4goMZZEhlXbS+c9LpcTNk/ly+E+O6+BwvVfqVIM1ZTlQdyvTlFfa0HeT6Qc
+ukOzkF6JP3XzzbbrZgTZz1Jqg1p15usxKjtQ39qFblWeMCVT2E/uCBKXTDGAaT/3
+INX+EzKTDBbgE7n2uqZy40PZ/CDn6L+3wYsCJdRhVbS+fjJn+bV3+MGPN0gIL6GO
+32aBC2+zv1e0dAsMk8qIysoOy79BlrAOupek7m/pYhQp461FV1dOtGqyuNWEueiN
+c7fJJOmf36l5tyqvSMhnNVbprhB8dsF9RiAgFw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pubtest.kib.ki.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pubtest.kib.ki.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pubtest.kib.ki.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pubtest.kib.ki.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pubtest.kib.ki.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pubtest.kib.ki.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pubtest.kib.ki.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pubtest.kib.ki.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pubtest.kib.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pubtest.kib.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pubtest.kib.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pubtest.kib.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pubtest.kib.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pubtest.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
\ No newline at end of file