Resolves SWAMID-2925

2 files changed, 98 insertions, 0 deletions

diff --git a/swamid-2.0/test.gdb.vr.se.xml b/swamid-2.0/test.gdb.vr.se.xml
new file mode 100644
index 00000000..784c9780
--- /dev/null
+++ b/swamid-2.0/test.gdb.vr.se.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://test.gdb.vr.se">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <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"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Vetenskapsrådets granskardatabas</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Vetenskapsrådets reviewer database</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Granskardatabasen är till för Vetenskapsrådets personal</mdui:Description>
+        <mdui:Description xml:lang="en">This service is for Vetenskapsrådet personell</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.vr.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.vr.se/english/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.example.se/info/integritet.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.example.se/info/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="111" width="225">http://www.vr.se/images/18.12fff4451215cbd83e4800013838/vetenskapsradet-logotyp.png</mdui:Logo>
+      </mdui:UIInfo>
+      <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://test.gdb.vr.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://test.gdb.vr.se/Shibboleth.sso/DS/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>test.gdb.vr.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=test.gdb.vr.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIID/DCCAmSgAwIBAgIUCmwCvYcGMcjKfZ+4jMbn9cgXOdowDQYJKoZIhvcNAQEL
+BQAwGTEXMBUGA1UEAxMOdGVzdC5nZGIudnIuc2UwHhcNMjAwNDI3MDczMjQ3WhcN
+MzAwNDI1MDczMjQ3WjAZMRcwFQYDVQQDEw50ZXN0LmdkYi52ci5zZTCCAaIwDQYJ
+KoZIhvcNAQEBBQADggGPADCCAYoCggGBALaWN6AbtLII4ZYjCLhfkXsEjY5H7Zgr
+uuhynMA+HyfXgjb2S06kD62LwwtMueUmtEMgmUzqUChFB69+4F+ZSIfu2HPmHsqa
+ZznVjDncnD/9McpRUkP9Xdo9kkaY2f2L3skV9skmXxjAs6Wlg+qLU2/B9dPlAcCx
+6kpXYKJtey7WzMkWzycPx2hJXlmhjmhcdb4hnCFD5UvvOPg54SErzAsWWs3zQOh2
+snc2QGdRyQAv6ctIoXqYuqjLIX4MzbdV7/3wEHUVZnhiGchBeJOBDfnZry7PiDtT
+tClswCb+KijEYab99Vk2rCk5zzlLFsbIcS4K4tEZ/qc9zlwDfB4RMeg89Hhy2k7k
+eoZOj6KrsO4cnNRQqmys1BHmu63/I67uz2qWbgELeCJrZ+oOrMP8hpCkEDEig3+r
+QkonyHdo3/4+mqfdsD8yUrmlTSI74Sqgr6sVKdP8ZpA3kaHRNze7Ak/Khx5q7dtb
+/WF6FRey+uLcPh3Sf9vFPcoUliX+iqLD1QIDAQABozwwOjAZBgNVHREEEjAQgg50
+ZXN0LmdkYi52ci5zZTAdBgNVHQ4EFgQUEygxvrdVU77U1fH/sFtpHMId9JcwDQYJ
+KoZIhvcNAQELBQADggGBAJ+f0EeIWE5en/QBbd74h6ZC6Lgwl8gDMi/AvvoYtCgT
+WzFgCts8f4pwvtgezajaLL4jCySGLqh3EQafapTLwmTaqzVSOdR6WtDtlWQvUsS6
+5YlJXb0vC8d+E0hbJPOfEyJj1F8RYyek52fNuPvzDGU7Sm3diHoKtfGVvQlNQpeF
+t+Zb8vIAog7m3Ur/AsC7EA/W9Mgqga/Qmh9JV7czSpiR5XazB3RDy+t0FldFLhut
+yrNXj9MDKlPBgFL/FSnN3nUJw9/oXiO+YTsmOGME4xwM25OzsWbTdu2muBuE/Ixp
+ZrK6sm8SZmzjuJo4h7SZECpdOeiS6ErEMkVOIvjhe5nIaK3tJUPj5LYrOXG/Y9d6
+vnwDKi5vaFhk9VXaoe5D4ahWPvYCUPyCl6JvGrR++QJu6MaMTL3bsqSYCL1qm+6H
+QWzb3x/j/mfh531/SuRBRcvg6nVgtaRAXupRsiDoU7seHSQAAmKOiIPVMo5SQGnv
+Ipo2oUGm1iXxmDB7XIubtQ==
+</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://test.gdb.vr.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.gdb.vr.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.gdb.vr.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.gdb.vr.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.gdb.vr.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.gdb.vr.se/Shibboleth.sso/SAML2/POST" index="1"/>
+  </md:SPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">VR</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">The Swedish Research Council</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.vr.se</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <SurName>Morgan Nyman</SurName>
+    <EmailAddress>mailto:morgan.nyman@visma.com</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 77672d85..32563499 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -627,4 +627,5 @@
   <xi:include href="swamid-2.0/sig.idsec.se-sigservice-dev.xml"/>
   <xi:include href="swamid-2.0/play.gih.se.xml"/>
   <xi:include href="swamid-2.0/vrgdb.local.xml"/>
+  <xi:include href="swamid-2.0/test.gdb.vr.se.xml"/>
 </md:EntitiesDescriptor>