From 5b1ea92ca2bd59fdc4eb9190f98dd7641797c22e Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Mon, 21 Dec 2020 09:45:28 +0100
Subject: Resolved SWAMID-3669

---
 swamid-2.0/gdb.vr.se.xml   | 96 ++++++++++++++++++++++++++++++++++++++++++++++
 swamid-edugain-sp-1.0.mxml |  1 +
 swamid-sp-2.0.mxml         |  1 +
 3 files changed, 98 insertions(+)
 create mode 100644 swamid-2.0/gdb.vr.se.xml

diff --git a/swamid-2.0/gdb.vr.se.xml b/swamid-2.0/gdb.vr.se.xml
new file mode 100644
index 00000000..7379a5e5
--- /dev/null
+++ b/swamid-2.0/gdb.vr.se.xml
@@ -0,0 +1,96 @@
+<?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://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>
+      <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://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://gdb.vr.se/Shibboleth.sso/DS/Login" index="1"/>
+      <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.vr.se/behandling-av-personuppgifter.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="111" width="225">http://www.vr.se/images/18.12fff4451215cbd83e4800013838/vetenskapsradet-logotyp.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>gdb.vr.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=gdb.vr.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIID7TCCAlWgAwIBAgIUHTuNGOWWZD8HZrKF1b6fI8fa+YowDQYJKoZIhvcNAQEL
+BQAwFDESMBAGA1UEAxMJZ2RiLnZyLnNlMB4XDTIwMTIxODA5NTgxM1oXDTMwMTIx
+NjA5NTgxM1owFDESMBAGA1UEAxMJZ2RiLnZyLnNlMIIBojANBgkqhkiG9w0BAQEF
+AAOCAY8AMIIBigKCAYEAubwCe/SSJ12YCgTSO7UqQ0rnc3XGQH6OvArD7cKNXBPq
+TeUAgInD/HHZpx6CvpdDlc6ksEx1jzFjZ5CsK21BYOgRzKwKGBpcaL0SXH4Qsbiy
+BnbBn4LMtiD7zl8YArg6BSIyx9e68RBffHnaUxyH6TUCQl3tjsCpmMULvOWjRBiM
+0JzPT69Fhyo0APp8itEC3ZUGRDlOmPsCJ++/zf1JICznXwGhRaZdAqdJ5HvurOoe
+1xNwBPfRFCVNlnefGDUlozWrgkqQ9eBW93BIZYQXcaVIBIbV3uzNnF8Q+4noUfVv
+JxVCOWfC9DLiihvqoLWMYZZU2NiFuMXcX6vd+/MP6Cf8HAnRFA+YXsKccx6Qh2QI
+uw7jCDzc8RfqcUzwQG7Lxpn+LL2VL7Qjh0444S9j2rQsqy5F+eiTdq0+WNrY/I9+
+mgHO8UhYpsXSGAF9fL5c5HcyZJb+NFkex8VJpmw/rxgj5GPsuXX6hCq/dvBHcaTj
+urU8X0xZavZaiNQqudUxAgMBAAGjNzA1MBQGA1UdEQQNMAuCCWdkYi52ci5zZTAd
+BgNVHQ4EFgQUpu78z/RHZQzh45m1LVWOsE2mdX8wDQYJKoZIhvcNAQELBQADggGB
+ACyC4TUIZAS3252HQM2fRpSZd+loB8vhYuS+6Dq+wzjcXOfkn3j22xI5wxPcD5cW
+xyYKklBIwAfPbMVgmx+3i+ICn3Nk8x7tJXijnTJFKkXgsIew3WN5nnSWxt16+uXg
+bOHN7e+YxOm4hLC00QK4tpdNS6Ry7dl1WpyDYl7zqBWNVBDr5qANUbVOW9vsU4AE
+cTJt56cnxekn5OVWIG8vOh3Md6k0bBDj01zRjo9DLJ0dwYfqfycQC01DrUQty1Cw
+youq1E/ViMng/MKYOeBwnrDjhTYZq9iDoRYTptq+1SDMTq2j5jUdcupLHzEfhnp7
+G67BoNvlPGjU4htb32Ri8a88CJ179Lf+VjnrqffSg10gheeJ6GRpU6a06GMAFteZ
+mRKH2iKX98lOo36CWBvYX8mRvxNNW08IbgS5XdiQ5fBB9fjq4oI3pT2hj2NKMWOJ
+ZmCvWMy0Tq4xRtVivWY7tePnTEKs9LMKoFMKWZliUVZiR0TO5BE0yTUAKluZBHrz
+1g==
+</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://gdb.vr.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gdb.vr.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gdb.vr.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gdb.vr.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gdb.vr.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://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>Karwan Sorani</SurName>
+    <EmailAddress>mailto:karwan.sorani@vr.se</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index e5d95acc..d42a94d6 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -49,4 +49,5 @@
   <xi:include href="swamid-2.0/crowd.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml"/>
   <xi:include href="swamid-2.0/indico.fysik.su.se-shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/gdb.vr.se.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index d902b72e..43fa0c9f 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -671,4 +671,5 @@
   <xi:include href="swamid-2.0/wiki.pdc.kth.se.xml"/>
   <xi:include href="swamid-2.0/speech.humlab.umu.se.xml"/>
   <xi:include href="swamid-2.0/gitlab.speech.humlab.umu.se.xml"/>
+  <xi:include href="swamid-2.0/gdb.vr.se.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3