Resolves SWAMIDOPS-8227

2 files changed, 204 insertions, 0 deletions

diff --git a/swamid-2.0/swamid.vr.se-idp-shibboleth.xml b/swamid-2.0/swamid.vr.se-idp-shibboleth.xml
new file mode 100644
index 00000000..ab7b32c3
--- /dev/null
+++ b/swamid-2.0/swamid.vr.se-idp-shibboleth.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://swamid.vr.se/idp/shibboleth">
+  <Extensions>
+    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </attr:EntityAttributes>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmd:Scope regexp="false">vr.se</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Vetenskapsrådet PRODTEST</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">IDP på Vetenskapsrådet</mdui:Description>
+        <mdui:DisplayName xml:lang="en">The Swedish Research Council PRODTEST</mdui:DisplayName>
+        <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="111" width="225">https://www.vr.se/images/18.12fff4451215cbd83e4800013838/vetenskapsradet-logotyp.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="111" width="225">https://www.vr.se/images/18.12fff4451215cbd83e4800013838/vetenskapsradet-logotyp.png</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="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHDCCAgSgAwIBAgIVAKdD1Rjdxk5H7ZVxQK4E87QLjAUaMA0GCSqGSIb3DQEB
+CwUAMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTAeFw0xNjA1MzExMjQ0MTFaFw0z
+NjA1MzExMjQ0MTFaMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAInY7L5a+yKOLzFrpMDV2298fF8a2F+y4825
+IKw5+hT4PwggJhDrVNm38VAKwxcxMha7+quAr6Q8ByQNBCOqNzLsTtgsmWFhQ9xH
+MU1P9oUHojq7Aey2FinuZZnaBE8JD0R5mo1P3CEBup0NnEqwn/lgdKNulTj4ban9
+bEuOe2uJfIF2T1tOMoLPSVGUfmyXD4dBbhFkmAmdCakQqW98+MUUu2lirCmeD14e
+jpBalmyTQ+sGkHuQqe1BUYAi6bq34FwbJTy2vB8fEpA+VGKPsfSpPEnAes0L5EI6
+Bew7KF02fPvlEAlkxG6nomO6nyp4BLNGAkGItc04DqpaYEZl7DsCAwEAAaNfMF0w
+HQYDVR0OBBYEFENgbwatWUlCeh0R6kmOICOMgacUMDwGA1UdEQQ1MDOCDHN3YW1p
+ZC52ci5zZYYjaHR0cHM6Ly9zd2FtaWQudnIuc2UvaWRwL3NoaWJib2xldGgwDQYJ
+KoZIhvcNAQELBQADggEBAG+jt0/1LgFkA1RkiaL6IkngsZaVAo7Cv9dY/BlpmWca
+CKFZUH/BC5aG30yOtJOruFsrYQ9TyhA4ey6yF2ah9pU5VkBqi2at3CwrQeY3PGVZ
+vE9QvWWqj1XZY1kv65s4fNTi7GK9vxVn0Xln1A90aWpGsyUN89wBPo7fZLO0M7Lu
+r6BYicgEVxuiwC0Ti5PIhIuE/qepoRAtF9C2BbW0ns6mhXh07nQpPnUOTtcBQpm0
+UjdiwlVx2MI6pNqAhs6CyGLbl24pX2ZSIeQANV6EyC/2gwYVoCEiKy4y2rLEj/gn
+spRe2TjMjBpOrQ3a0jWGQNY2xJ9Wh8deLv4jBXxvolk=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIUW8VbDedRqzlrcKGuwXrMfP/ZhtkwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMc3dhbWlkLnZyLnNlMB4XDTE2MDUzMTEyNDQxMFoXDTM2
+MDUzMTEyNDQxMFowFzEVMBMGA1UEAwwMc3dhbWlkLnZyLnNlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjcG5ieiKa7dnFkPwgvSYBwx4ZjYGymzbT8wR
+tPvGUMGFHteFQllaj6l8fDIFzjLPLEDx1AF2Y42gn+vU0pOWu2XIuuX2Ah0MeCVZ
+bczYFvmetfguY2uSeoVkYeiBJaFlCkfY55e/FbRR9XTH5JFRtM2hu7m7mmti6d1o
+kOngUzujyDNplun6Yhx1N/SxpJJlCT5KKzMAlH4A/No2vreqJxwxcVlsUDf/3ENq
+/SELElcuSb+yZ7bNnYfrjfu4zBNuO4ljo4I65GrNlBqMfqb4yu+Xe8uiNunWZJOf
+6+CsHhdxLm3d8uphaT1mxhTDX5Ejn8QYKSV6MYY2sv1LDNaiWQIDAQABo18wXTAd
+BgNVHQ4EFgQUpEiIxHvDKchdVtCsToexB9EPQVIwPAYDVR0RBDUwM4IMc3dhbWlk
+LnZyLnNlhiNodHRwczovL3N3YW1pZC52ci5zZS9pZHAvc2hpYmJvbGV0aDANBgkq
+hkiG9w0BAQsFAAOCAQEAMboAmcD8EC4uWjsxeVNXxeY3HsMsrxSGvthEf1Gc3I9h
+9GAnlxpt4MPNhvN5w+jLg4cNmSZip2lTncF2muOFDFg+o/D4LFlm03Jpyn2ofK5D
+pZqZGoZ97M+0mltEjrqegSwTs4aOoeMZsndzD0F3ars7pgCBPu+lxW7sSzGMuppg
+ZJlqm3ZacbC47MoJJbdLBq3IDGBcZOCsjTHZCZiHDIKUaZwgmIJUD4tAHBlYxpu2
+SW6ArEDHwaWpsBcWi0kF+nPjmMHVuAEIyiOz5g8kMUDtFQC0ohxS4yDftv72iEut
+KBGBXPCezbVPs7lue7sIDzcUbtrWlrtkJoPc1K6fYA==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHDCCAgSgAwIBAgIVAImv4R6xSBeJSVpZiQBiD6Fd37SsMA0GCSqGSIb3DQEB
+CwUAMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTAeFw0xNjA1MzExMjQ0MTBaFw0z
+NjA1MzExMjQ0MTBaMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAK7lDfcuX9cNY6dp5yLAz9ijP8X6wRCDjKNU
+65oRPXWweNYGsgDEZ+BvIYaou2/zunP1yoSZkQPJA51NJJ67GU0v8z/l0npgCGl4
+oOXofoVdl/7+nhUxgXADVBscsQVfaANl646YjSQhv4z/J0dbu0kGAPfy1WLOhmyL
+52ghwMRYb2T23q6bjGgF9KGVQ5m9u6PrZnyI7sPJQaJZGVA/2r/LkCIMI5tl/HyN
+zSI4jRjk/GA0LHagBopChjX9tAk+QYFWzAy7XpK5tuRYVHpPzN20FRfURzmSxlax
+3nOuFfh6uNzKjGopPR/rJWxR06Dn/nLRBBxXxfJbCGy1YNcv5x8CAwEAAaNfMF0w
+HQYDVR0OBBYEFJ2p67r4xaqD+V/RCoxrlRrPoObaMDwGA1UdEQQ1MDOCDHN3YW1p
+ZC52ci5zZYYjaHR0cHM6Ly9zd2FtaWQudnIuc2UvaWRwL3NoaWJib2xldGgwDQYJ
+KoZIhvcNAQELBQADggEBAC6AZRu2jtSoQLI+kUZTM9Tp8LoLULuKHlVcxyg35MoW
+qX2YFx0iDzKliK3/Kvg6GIVoEBCHCBQKfM7vuhKOWB8I5DWsDdNeWtTQpoNNzg67
+zg16ulEpuBcRdMhEzCTDNiu7tLwqfaH2JlmPx3rvqJf6MTiq1BJSZiwtXciqruUi
+/1ZVztspUK+Rcth6YKxxndDjk7SLNv0Em2X1NDAssRChdfs2+NNxaJgyaPcsusU5
+mSKBUbKat2Zu8OPeCvOLRTStArYkB4IC0d/1x1EaTIsS0szzAnQZeQ0fdHKVoTKX
+ZyJActptXxuKpK7kDw3emzp+cUmalkrHkBxi4WzUB44=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.vr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.vr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid.vr.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.vr.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.vr.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">vr.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHDCCAgSgAwIBAgIVAKdD1Rjdxk5H7ZVxQK4E87QLjAUaMA0GCSqGSIb3DQEB
+CwUAMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTAeFw0xNjA1MzExMjQ0MTFaFw0z
+NjA1MzExMjQ0MTFaMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAInY7L5a+yKOLzFrpMDV2298fF8a2F+y4825
+IKw5+hT4PwggJhDrVNm38VAKwxcxMha7+quAr6Q8ByQNBCOqNzLsTtgsmWFhQ9xH
+MU1P9oUHojq7Aey2FinuZZnaBE8JD0R5mo1P3CEBup0NnEqwn/lgdKNulTj4ban9
+bEuOe2uJfIF2T1tOMoLPSVGUfmyXD4dBbhFkmAmdCakQqW98+MUUu2lirCmeD14e
+jpBalmyTQ+sGkHuQqe1BUYAi6bq34FwbJTy2vB8fEpA+VGKPsfSpPEnAes0L5EI6
+Bew7KF02fPvlEAlkxG6nomO6nyp4BLNGAkGItc04DqpaYEZl7DsCAwEAAaNfMF0w
+HQYDVR0OBBYEFENgbwatWUlCeh0R6kmOICOMgacUMDwGA1UdEQQ1MDOCDHN3YW1p
+ZC52ci5zZYYjaHR0cHM6Ly9zd2FtaWQudnIuc2UvaWRwL3NoaWJib2xldGgwDQYJ
+KoZIhvcNAQELBQADggEBAG+jt0/1LgFkA1RkiaL6IkngsZaVAo7Cv9dY/BlpmWca
+CKFZUH/BC5aG30yOtJOruFsrYQ9TyhA4ey6yF2ah9pU5VkBqi2at3CwrQeY3PGVZ
+vE9QvWWqj1XZY1kv65s4fNTi7GK9vxVn0Xln1A90aWpGsyUN89wBPo7fZLO0M7Lu
+r6BYicgEVxuiwC0Ti5PIhIuE/qepoRAtF9C2BbW0ns6mhXh07nQpPnUOTtcBQpm0
+UjdiwlVx2MI6pNqAhs6CyGLbl24pX2ZSIeQANV6EyC/2gwYVoCEiKy4y2rLEj/gn
+spRe2TjMjBpOrQ3a0jWGQNY2xJ9Wh8deLv4jBXxvolk=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIUW8VbDedRqzlrcKGuwXrMfP/ZhtkwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMc3dhbWlkLnZyLnNlMB4XDTE2MDUzMTEyNDQxMFoXDTM2
+MDUzMTEyNDQxMFowFzEVMBMGA1UEAwwMc3dhbWlkLnZyLnNlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjcG5ieiKa7dnFkPwgvSYBwx4ZjYGymzbT8wR
+tPvGUMGFHteFQllaj6l8fDIFzjLPLEDx1AF2Y42gn+vU0pOWu2XIuuX2Ah0MeCVZ
+bczYFvmetfguY2uSeoVkYeiBJaFlCkfY55e/FbRR9XTH5JFRtM2hu7m7mmti6d1o
+kOngUzujyDNplun6Yhx1N/SxpJJlCT5KKzMAlH4A/No2vreqJxwxcVlsUDf/3ENq
+/SELElcuSb+yZ7bNnYfrjfu4zBNuO4ljo4I65GrNlBqMfqb4yu+Xe8uiNunWZJOf
+6+CsHhdxLm3d8uphaT1mxhTDX5Ejn8QYKSV6MYY2sv1LDNaiWQIDAQABo18wXTAd
+BgNVHQ4EFgQUpEiIxHvDKchdVtCsToexB9EPQVIwPAYDVR0RBDUwM4IMc3dhbWlk
+LnZyLnNlhiNodHRwczovL3N3YW1pZC52ci5zZS9pZHAvc2hpYmJvbGV0aDANBgkq
+hkiG9w0BAQsFAAOCAQEAMboAmcD8EC4uWjsxeVNXxeY3HsMsrxSGvthEf1Gc3I9h
+9GAnlxpt4MPNhvN5w+jLg4cNmSZip2lTncF2muOFDFg+o/D4LFlm03Jpyn2ofK5D
+pZqZGoZ97M+0mltEjrqegSwTs4aOoeMZsndzD0F3ars7pgCBPu+lxW7sSzGMuppg
+ZJlqm3ZacbC47MoJJbdLBq3IDGBcZOCsjTHZCZiHDIKUaZwgmIJUD4tAHBlYxpu2
+SW6ArEDHwaWpsBcWi0kF+nPjmMHVuAEIyiOz5g8kMUDtFQC0ohxS4yDftv72iEut
+KBGBXPCezbVPs7lue7sIDzcUbtrWlrtkJoPc1K6fYA==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHDCCAgSgAwIBAgIVAImv4R6xSBeJSVpZiQBiD6Fd37SsMA0GCSqGSIb3DQEB
+CwUAMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTAeFw0xNjA1MzExMjQ0MTBaFw0z
+NjA1MzExMjQ0MTBaMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAK7lDfcuX9cNY6dp5yLAz9ijP8X6wRCDjKNU
+65oRPXWweNYGsgDEZ+BvIYaou2/zunP1yoSZkQPJA51NJJ67GU0v8z/l0npgCGl4
+oOXofoVdl/7+nhUxgXADVBscsQVfaANl646YjSQhv4z/J0dbu0kGAPfy1WLOhmyL
+52ghwMRYb2T23q6bjGgF9KGVQ5m9u6PrZnyI7sPJQaJZGVA/2r/LkCIMI5tl/HyN
+zSI4jRjk/GA0LHagBopChjX9tAk+QYFWzAy7XpK5tuRYVHpPzN20FRfURzmSxlax
+3nOuFfh6uNzKjGopPR/rJWxR06Dn/nLRBBxXxfJbCGy1YNcv5x8CAwEAAaNfMF0w
+HQYDVR0OBBYEFJ2p67r4xaqD+V/RCoxrlRrPoObaMDwGA1UdEQQ1MDOCDHN3YW1p
+ZC52ci5zZYYjaHR0cHM6Ly9zd2FtaWQudnIuc2UvaWRwL3NoaWJib2xldGgwDQYJ
+KoZIhvcNAQELBQADggEBAC6AZRu2jtSoQLI+kUZTM9Tp8LoLULuKHlVcxyg35MoW
+qX2YFx0iDzKliK3/Kvg6GIVoEBCHCBQKfM7vuhKOWB8I5DWsDdNeWtTQpoNNzg67
+zg16ulEpuBcRdMhEzCTDNiu7tLwqfaH2JlmPx3rvqJf6MTiq1BJSZiwtXciqruUi
+/1ZVztspUK+Rcth6YKxxndDjk7SLNv0Em2X1NDAssRChdfs2+NNxaJgyaPcsusU5
+mSKBUbKat2Zu8OPeCvOLRTStArYkB4IC0d/1x1EaTIsS0szzAnQZeQ0fdHKVoTKX
+ZyJActptXxuKpK7kDw3emzp+cUmalkrHkBxi4WzUB44=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.vr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">VR</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Vetenskapsrådet PRODTEST</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">The Swedish Research Council PRODTEST</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.vr.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Robert Chrudina</SurName>
+    <EmailAddress>mailto:robert.chrudina@tieto.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index d34a551d..c0f600a0 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -51,4 +51,5 @@
   <xi:include href="swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.ths.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/swamid.vr.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>