resolves SWAMIDOPS-6776

3 files changed, 134 insertions, 0 deletions

diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index 50463c24..1e1fa467 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -218,4 +218,6 @@
   <xi:include href="swamid-1.0/iidp3.hv.se.xml"/>
   <xi:include href="swamid-1.0/account.mdh.se.xml"/>
   <xi:include href="swamid-1.0/adfs01.fhs.se.xml"/>
+  <xi:include href="swamid-1.0/testakt.it.ki.se.xml"/>
+  <xi:include href="swamid-1.0/testgag.it.ki.se.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-1.0/testakt.it.ki.se.xml b/swamid-1.0/testakt.it.ki.se.xml
new file mode 100644
index 00000000..90585e4f
--- /dev/null
+++ b/swamid-1.0/testakt.it.ki.se.xml
@@ -0,0 +1,66 @@
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testakt.it.ki.se/shibboleth">
+
+  <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 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://testakt.it.ki.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://testakt.it.ki.se/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>testakt.it.ki.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=testakt.it.ki.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAM3DTvphmyUaMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEHRlc3Rha3QuaXQua2kuc2UwHhcNMTMwMTE0MTMxMzAyWhcNMjMwMTEyMTMx
+MzAyWjAbMRkwFwYDVQQDExB0ZXN0YWt0Lml0LmtpLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAy4YOjmQB9kSZvz0c1Z6XH4AgfrKrTrx/Wnd8Nid3
+h1Mqpa07HvZtL7dZKsyhspvbx/AJpbLCzr3yCXVWgohUe+MJWn2/hCfymggN+yrV
+US9fuMGTErSCQ9VZ7BmmvEPclhWMBvA8r2Po5Nzcz+exVI09Ww9rKO0oNyaxxwPv
+ig2thOgQgd7/GNZweyevb1YDIxLmpTxI2OwK3E4ikx8InVSqEqTNu9q6se6bjHeo
+BmTQORnTeyz542hRu0cjOV5AcuvMreMXG4N+qW/cToFdjc3JutqKfi3irBJGF0pc
+fBpTbb2/MhAtDviCAwCJzqazHnqYRgjhStDMFAe9Ip97zQIDAQABoz4wPDAbBgNV
+HREEFDASghB0ZXN0YWt0Lml0LmtpLnNlMB0GA1UdDgQWBBQNLiq+j2EVv4KpAbSO
+Yb8ANJv3pTANBgkqhkiG9w0BAQUFAAOCAQEAaW8+I6eqKO0mpQ1OHvLjOngaFdzy
+QYi/vkE5eenu10aG7pz0QprIv+9QarNgNEkG9fWS7FzjqzMksTqg+C0ZxXwk8QP5
+XOTTrfOIYw9yfn/AxodLSImxibvC8vt2mFF4xLe9FC42Ur8Fb5TiIBTviE81nCLP
+hYX1kyL7fAUVecAwkn33Bwb0QCO6i0rq3XLSB+hS0qJb5qePPJLc+jfmSdjLlPtx
+agf3dT6iLUDOMQhLG3qA2QZqhjEbpzvcGXUjF4Z2nf+OtplAI2nTcDz8x45nIwnY
+MUoo/uwKQn4shjggip2k4jZ7JH/EBCXLYrptWqr7YPmos4JHpYwZwAwhFg==
+</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://testakt.it.ki.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testakt.it.ki.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testakt.it.ki.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testakt.it.ki.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testakt.it.ki.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testakt.it.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testakt.it.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testakt.it.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testakt.it.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testakt.it.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testakt.it.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/testgag.it.ki.se.xml b/swamid-1.0/testgag.it.ki.se.xml
new file mode 100644
index 00000000..6e7f596d
--- /dev/null
+++ b/swamid-1.0/testgag.it.ki.se.xml
@@ -0,0 +1,66 @@
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testgag.it.ki.se/shibboleth">
+
+  <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 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://testgag.it.ki.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://testgag.it.ki.se/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>testgag</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=testgag</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIJAI3dJm1l0MPyMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+BAMTB3Rlc3RnYWcwHhcNMTMwMTExMTI1MDE5WhcNMjMwMTA5MTI1MDE5WjASMRAw
+DgYDVQQDEwd0ZXN0Z2FnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+saStaMXWwBLjgdSvc9snMbM9KfhmNoWPVNRAYO1gUmBrX5p1XK6JFxkqIRpwEZ/t
+hqowU//tIOXKjipMa7hkX9k+n/jP5Cy/4EVHkczW9iYf/qaCC4L/0DZOYXxXmJTH
+718wgG2QQwbXNBgEPldCVqs3Vr74F0uryI222Qk8Iyei4psi9P5Eng68N3+kB5T2
+F+MnwjyCU9MXOD0s76genwJ+Kat8uZWLb/uX/Xw3UMr/QHdRlBrD8kuXR037mfIf
+e3aE0oBYKgWYUbUFsPjWdWOPs4GhtgN7Xz/UBXVOKDm7ovQpmSYB4BSFj2da3Wqw
+chIq046RECnOJr94HaU9+QIDAQABozUwMzASBgNVHREECzAJggd0ZXN0Z2FnMB0G
+A1UdDgQWBBQ1FMmD2kBlT1fLG1WiGNTqKXN+tTANBgkqhkiG9w0BAQUFAAOCAQEA
+mj0wtGNPs+RQnVB8wX40A9eHeE5VhjjTME787giTg6jeQNN5LYySlY35sNBPzRaw
+W53kUdaH2ZSRyr74W9ZZci9o1bNIzvxZUEn4hLsa6HQoGLxRopGXJvNC5+hEli/9
+aYN28/iDO1t+nO7krxcPH61sBAEnKq9OJM9oQrWol3lGEkeWhq6Evcdd0Fx5l2E7
+zo0PZj6BRUxSCIa8c1pJLtQhimhPb5CuamnOir5Ae6FrxSmqdbA9CBT9MXioBcUC
+QXyxky4ZRxRwrSEEgAnSMnEVxO6Q0kbyQImZXy7fTe3PninA9t0jy/p7b6qNqsMH
+JDXzgzqNBDH+pyHcbSmlcA==
+</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://testgag.it.ki.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testgag.it.ki.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testgag.it.ki.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testgag.it.ki.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testgag.it.ki.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testgag.it.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testgag.it.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testgag.it.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testgag.it.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testgag.it.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testgag.it.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>