Resolves SWAMID-3472

3 files changed, 61 insertions, 0 deletions

diff --git a/sp-with-coco-errors b/sp-with-coco-errors
index 393922d6..c4e82571 100644
--- a/sp-with-coco-errors
+++ b/sp-with-coco-errors
@@ -15,3 +15,4 @@ swamid-2.0/us.cloudmore.com-shibboleth.xml
 swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
 swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-2.xml
 swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
+swamid-2.0/moodle.media.nordu.net.xml
diff --git a/swamid-2.0/idp.vr.se-adfs-services-trust.xml b/swamid-2.0/idp.vr.se-adfs-services-trust.xml
new file mode 100644
index 00000000..30d2cfc2
--- /dev/null
+++ b/swamid-2.0/idp.vr.se-adfs-services-trust.xml
@@ -0,0 +1,59 @@
+<?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="http://idp.vr.se/adfs/services/trust">
+  <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>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">vr.se</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Vetenskapsrådet ADFS test</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">The Swedish Research Council ADFS test</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">IDP på Vetenskapsrådet</mdui:Description>
+        <mdui:Description xml:lang="en">IDP at Swedish Research Council</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.vr.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.vr.se/english/</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="146" width="122">https://www.vr.se/logo_small</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="146" width="122">https://www.vr.se/logo_small</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">vr vetenskapsrådet vrpunktse</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">vr the+swedish+research+council vrpunktse</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:DomainHint>vr.se</mdui:DomainHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC1DCCAbygAwIBAgIQH9lfNQcH76JMIFpZZaXFlzANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDExtBREZTIEVuY3J5cHRpb24gLSBpZHAudnIuc2UwHhcNMjAxMDI4MTUzMzU2WhcNMzAxMDI2MTUzMzU2WjAmMSQwIgYDVQQDExtBREZTIEVuY3J5cHRpb24gLSBpZHAudnIuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjy1xkzbzwM18lhuAqZrvKdB9wpryVw0O4h+MxrXU1WJfZd6i7/8kLthv9DAWOibecIW13TH5d4Bya+YxO1J4b0FssX8yeC34CtNtmGAMP8BtsfjX3myn0XIMaTc1UgcxlZn7YJwLEFiKFVQ54bPOH9rEa5sK/YjZRnamnm+Ouhy92/r1k88zs3XOZR3Z3kfL9uVayjiL6fB7j7zxpNKBbpsMQYFYptWaxXpDqT8a6CFjcMWdsL7U8RqYHoe2HY/m5KOSs3VIDEP5m42ciclgj90USOa6b2JTbkg1fvntV/vwlxbNv5zgdE8PMJyyWA/r5+E3+L4UmlD2r0f54i9GZAgMBAAEwDQYJKoZIhvcNAQELBQADggEBABTd8zgxGqPdSQU9/RxnIwjFMwB5NPyK69otl/Gq3zqRx+i/Uvd797Bo+OflKpuxuEbkI2+DVea6YIsdUuFGCrwgDo3Jy+xlEtcXdc1kCgbNmYYynPqvnRxZnByEhfoS40+oBHPHN84nc1zfatcQ2edxIfMxu4/m6Z3jlU0tK7Di8/C/SAduvQCPlI2sv4dwwuMBYG4M1iiesqCTjCIHKlN6VXUpygMHXHkRfbUyx7E5+Ywax8k0x1Dfjqf6rc7pF0b9NF0FGt+TdU3S9HHb3V36hRY8iA+imwXEukPMAWrLwNphdcEgBAyhHW8CW7gUeyOZp6tZXc0gWTXcYSxe7Tc=</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIICzjCCAbagAwIBAgIQW2vRHAgJ67hIVKJOty1vyzANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDExhBREZTIFNpZ25pbmcgLSBpZHAudnIuc2UwHhcNMjAxMDI4MTUzNDAyWhcNMzAxMDI2MTUzNDAyWjAjMSEwHwYDVQQDExhBREZTIFNpZ25pbmcgLSBpZHAudnIuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+EAAdKo+ObbHZj1MC9QFyFFQiM10fL4sykVgmLmyhqiC0bbCn+bNG62SBqk+ETtrP+KPKDyGCRzax1X7N85v9H+WLQTazrnjvjF84QwklOzjcl0Eslap8MBs0xJH4RtkJ8v5UHktstoxASBIUr72J4elGk5WJ1ivb9YlQtqtjknYM+cLgHHeWICjqFqBT8PAOoEbzO3AAJEZ4OyN/vv0LVrpsUcZtIbaWgc97h28/8/Ntxbe6hj0eDsZPCIRBLUt91FinBXH3ZD0wq27OGjBb07rdaR2qmouVHwK4TsMANhrDmDBUBvGn2XxkF+fOtUsfrMi2nFyrQDiSTZdfS0NdAgMBAAEwDQYJKoZIhvcNAQELBQADggEBADPVulta6eB8lOSXL0Tzuy/XFz3tor+E6EpjSwG5/HhtcSWQVUdSECToyI6lZPPskKYvGPXGjfOCJagvG+e6Y1+kKQ33KY7104wY4Jhq1QJTzMIvswxWBikdJ4AWv9x0R9y5sVXZoLWjFtKP58psXHc3aM2x2+igO45uO1YSqwWlWNkO2Q1i7IxcRlHcVh1vcUm771UNXOEL4xY4E2R9sUKPx5/V9kiDbGIQczFAZikZXnY09IyPNq4FjIQ2MYzz7NxxL2fmHdIQ2EUbohLXgd8ULfHZ2fD2zbeMUbPVdwWtSS6xPam1Dgh4df49XVGJwQZ+t2061i3aIu5g+SLTtCQ=</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vr.se/adfs/ls/"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vr.se/adfs/ls/"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vr.se/adfs/ls/"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vr.se/adfs/ls/"/>
+  </IDPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="sv">Vetenskapsrådet</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</OrganizationDisplayName>
+    <OrganizationURL xml:lang="sv">https://www.vr.se/</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <GivenName>Anders</GivenName>
+    <SurName>Flodell</SurName>
+    <EmailAddress>mailto:Anders.Flodell@vr.se</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index b1b05a48..356611df 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -59,4 +59,5 @@
   <xi:include href="swamid-2.0/weblogin-test-v4.kau.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nya-00.its.umu.se-aws-idp.xml"/>
   <xi:include href="swamid-2.0/idp-shibtest.slu.se-idp.xml"/>
+  <xi:include href="swamid-2.0/idp.vr.se-adfs-services-trust.xml"/>
 </EntitiesDescriptor>