Resolves SWAMIDOPS-207

3 files changed, 188 insertions, 0 deletions

diff --git a/swamid-2.0/redcap.ki.se-shibboleth.xml b/swamid-2.0/redcap.ki.se-shibboleth.xml
new file mode 100644
index 00000000..8a4278f1
--- /dev/null
+++ b/swamid-2.0/redcap.ki.se-shibboleth.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://redcap.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#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/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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://redcap.ki.se/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">REDCap - Karolinska Institutet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">REDCap - Karolinska Institutet</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">REDCap datainsamlingsverktyg för forskare på Karolinska Institutet</mdui:Description>
+        <mdui:Description xml:lang="en">REDCap data collection tool for researchers at Karolinska Institutet</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>kircweb02.ki.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=kircweb02.ki.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIID9DCCAlygAwIBAgIJANTts0REhI9OMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV
+BAMTD2tpcmN3ZWIwMi5raS5zZTAeFw0xNzA2MTMxNDU2MTBaFw0yNzA2MTExNDU2
+MTBaMBoxGDAWBgNVBAMTD2tpcmN3ZWIwMi5raS5zZTCCAaIwDQYJKoZIhvcNAQEB
+BQADggGPADCCAYoCggGBANilbH5Eghlskz++f1MKSiFmRs4Ufril17ERj/wHRjyW
+LF0P/7ZwZTOFS7YefYxrdLXfLjynnjAnXwNxk6Z9JuqTNpsiDrLqpGj+UJ1O4Vxj
+FveZqEemK3z7WPWoLg3IVDK2BMa5RgCBEJ+xvDAgaZblELHv4m5zdcRwXUgyBkKi
+dMeJ3k7yVW6+7NBQSRwgaGZQYJ8uKR6M3CHJdEDhZeq5JiEbGT0ZbEQO6KIJ5PP1
+gJno8CeheMwifRvb4CKUIzEjvrpv0WASwpde/j0pbwWJ3uMDOKp8tswMayZHYnGr
+a2BCXbfzIkpj3cgZQ2BOeNg92MWVRBPEF+mFaWqrfIQAmMHO2rB65aPhb+XaEktR
+Zkj0aNVBMwF7exAG9UC5+06czkJ1RhQeb8FN2+TX1QWwMKfd6sFtVQSWltfgXIbD
+DMBeVuC3SW6Fo6M1bPlX7lpVR6ZkyBrfB8AUSaMbrL51fF9ZuWfdZAqLHg0s6fIE
+i4k/J1C1c/eCF7/DEtPu6wIDAQABoz0wOzAaBgNVHREEEzARgg9raXJjd2ViMDIu
+a2kuc2UwHQYDVR0OBBYEFOgLHOprx64wQ+8aB1c/e2zErq+PMA0GCSqGSIb3DQEB
+CwUAA4IBgQCFv+Qvf4jh7+NDllAaOcriC+Q//o0CbXYZ7i+7wPI2XMXhkMchkhWD
+melhaum7lZuj27h1K6Q/1EPJ+h/zjRnoTSld3lu/Iud5Hvop/rbWsVrOiGwUx21F
+Ifv+B/Jhx85zWWyxKz6Q3Q20fABMNB0F3+JoXJ7AbGKHtQGwEGEYJrbZuUKdFRjP
+vEUsYjQJjoqI8IYGj/jSbO729E9B+LV19Du5m9+8ZoxwYg1MKPY50r5fPgrOmjKp
+UHyb4mX6dssg9GxtK7F1MPFGOt8BACx3HB6ELdlYtq69+9TvkFEzWAY/QodBlHAc
+nf2UYuiwaOTric4Xmwsc9H7mdCmvacNuop+XjUu7XIBOIomgtukJ502CtJpBTSTV
+hWjzcjusX4Q04zS8/IfOv1uMCogu29UnnuS2EB3hfw2sdT/0uLnLhTynO3sFplSb
+nL71cJpvF0I3mQ3CrfoTkEW21VuwKoEs62tS8wFCNXcImaOUQMhm7LBe9kp05jC5
+DOBgIJcDatI=
+</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://redcap.ki.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://redcap.ki.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://redcap.ki.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://redcap.ki.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://redcap.ki.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://redcap.ki.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://redcap.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://redcap.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://redcap.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://redcap.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://redcap.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://redcap.ki.se/Shibboleth.sso/SAML2/POST" index="7"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Michal</md:GivenName>
+    <md:SurName>Kment</md:SurName>
+    <md:EmailAddress>mailto:michal.kment@ki.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/redcap.tst.ki.se-shibboleth.xml b/swamid-2.0/redcap.tst.ki.se-shibboleth.xml
new file mode 100644
index 00000000..05cfa1f7
--- /dev/null
+++ b/swamid-2.0/redcap.tst.ki.se-shibboleth.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://redcap.tst.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#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/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </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://redcap.tst.ki.se/Shibboleth.sso/DS/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://redcap.tst.ki.se/Shibboleth.sso/DS/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">REDCap - Karolinska Institutet (test)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">REDCap - Karolinska Institutet (test)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">REDCap datainsamlingsverktyg för forskare på Karolinska Institutet</mdui:Description>
+        <mdui:Description xml:lang="en">REDCap data collection tool for researchers at Karolinska Institutet</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>kitstrcweb01.tst.ki.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=kitstrcweb01.tst.ki.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIECTCCAnGgAwIBAgIJAP3vO5Tgfa3oMA0GCSqGSIb3DQEBCwUAMCExHzAdBgNV
+BAMTFmtpdHN0cmN3ZWIwMS50c3Qua2kuc2UwHhcNMTcwNjEzMDc1NzExWhcNMjcw
+NjExMDc1NzExWjAhMR8wHQYDVQQDExZraXRzdHJjd2ViMDEudHN0LmtpLnNlMIIB
+ojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAuLIFz5Hq1AguBFIu+sdGx9tv
+0kZulE1yzftYlEv+faAWMQIp1fOL8WwF8XM2LamU+OdQ4pxq3WcCQxd04kZ5h7Nl
+kRgtGVaOhrXTBS5hiBXD0Y5FUk7KM3gJabzfdBFERTkK3iFyyxFbyOMoXdvh0QvX
+yWA5XwdRoDoAJvv49oSlYkcyhhhUWPJVxJsOg5DScIwfNCXcR62QXUr1OBgv95mL
+W1qGybhxhGkTSTYS//BfOF+6u4wUERIhWCqTJ8GXw5W6GuOvIaZXx3UDr53k4KLB
+VPowZhVF23MgqCTdN8khOdJA0Fy08xuKyoOZVEePrTGjDvwKZS6fpoiI0Ycoq5d4
+1dc5dPFB84OdEXCACZnkCCt+S5MIzlb17Pl+h0DP0j7jEtLtS+tVX0kgJxBexhgW
+h91g+UU11AUDJ1xZgpJg5I4OEzjdF9W6K/+EV156oc6iGsOqIM7eZWPtxZg08zJm
+VWrkJ1cdhFhnscrCCYBOIgP/Obvx8+5Pll6te9ADAgMBAAGjRDBCMCEGA1UdEQQa
+MBiCFmtpdHN0cmN3ZWIwMS50c3Qua2kuc2UwHQYDVR0OBBYEFA1Iz6/3hgIQFbRY
+o8xpWXyxBdJ+MA0GCSqGSIb3DQEBCwUAA4IBgQAbjB/IwQR+XVVweB0RNNSJ+S8k
+0khGp+Bpab8NBGSsEY4W1hGn4lS1G/EHgmy+woSuVTYELF3hLEk8nEiiqjHHDFO5
+g69h++EVSHtio9TsrbnD8Oj8mJktNWMRyPbqr6iRcZ0QumJuPH/8y9xYaTg5Ysi5
+xT1+lUL9yZFwq2mIT3XpBQ2wvIpn4tN4eAAuVbAGk8hJ9MkTrQaP3RdWVu9eJWwu
+LyjudMQkmcaN/1yhjkHG4zSqFp1F96RGAB2JaRlp53xZWhhUZY6JDINffYQxnc0t
+uDu+x0M0CGz38WNOE/SxBKUCPOcu1UGYoGue9hgHuiAjUbhTneuBCcsvYKzSSgL0
+4HZqaoFpD/IZzS2I8oil9KTiWH4FL3uW1yDDlcK88Ela4FQXam7oR50HecHEaTvZ
+7P+5W09xwWZfY6XhCziV4uUDu2Dya5qspePpSBj++xlZP65bs9td2TNK0y2gDdOo
+Gve8ozn6yxplJyB0jvZae8kfE4LtXr4adWlYG2E=
+</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://redcap.tst.ki.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://redcap.tst.ki.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://redcap.tst.ki.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://redcap.tst.ki.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://redcap.tst.ki.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://redcap.tst.ki.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://redcap.tst.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Michal</md:GivenName>
+    <md:SurName>Kment</md:SurName>
+    <md:EmailAddress>mailto:michal.kment@ki.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index e96402e6..9185ea6f 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -674,4 +674,6 @@
   <xi:include href="swamid-2.0/dev.cloudmore.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/local.cloudmore.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/connect2.sunet.se-shibboleth.sso-metadata.xml"/>
+  <xi:include href="swamid-2.0/redcap.ki.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/redcap.tst.ki.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>