SWAMID-1025 Updated idp.vr.se

2 files changed, 61 insertions, 41 deletions

diff --git a/swamid-2.0/aktivera-test.su.se-Shibboleth.sso.xml b/swamid-2.0/aktivera-test.su.se-Shibboleth.sso.xml
index f23a674c..aefdfa7d 100644
--- a/swamid-2.0/aktivera-test.su.se-Shibboleth.sso.xml
+++ b/swamid-2.0/aktivera-test.su.se-Shibboleth.sso.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
 <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://aktivera-test.su.se/Shibboleth.sso">
   <md:Extensions>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
diff --git a/swamid-2.0/idp.vr.se-adfs-services-trust.xml b/swamid-2.0/idp.vr.se-adfs-services-trust.xml
index 627cf9c3..cf380ca6 100644
--- a/swamid-2.0/idp.vr.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp.vr.se-adfs-services-trust.xml
@@ -5,17 +5,17 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+      </samla: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-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://idp.vr.se/adfs/services/trust">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://idp.vr.se/adfs/services/trust">
+    <md:Extensions>
       <shibmd:Scope regexp="false">vr.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Vetenskapsrådet</mdui:DisplayName>
@@ -28,44 +28,60 @@
         <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:PrivacyStatementURL xml:lang="sv">https://www.vr.se/behandling-av-personuppgifter.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.vr.se/english/information-on-processing-of-personal-data.html</mdui:PrivacyStatementURL>
       </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">VR</OrganizationName>
-    <OrganizationName xml:lang="en">VR</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Swedish Research Council</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">https://www.vr.se/</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://www.vr.se/english.html</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:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds: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=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICzjCCAbagAwIBAgIQW2vRHAgJ67hIVKJOty1vyzANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDExhBREZTIFNpZ25pbmcgLSBpZHAudnIuc2UwHhcNMjAxMDI4MTUzNDAyWhcNMzAxMDI2MTUzNDAyWjAjMSEwHwYDVQQDExhBREZTIFNpZ25pbmcgLSBpZHAudnIuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+EAAdKo+ObbHZj1MC9QFyFFQiM10fL4sykVgmLmyhqiC0bbCn+bNG62SBqk+ETtrP+KPKDyGCRzax1X7N85v9H+WLQTazrnjvjF84QwklOzjcl0Eslap8MBs0xJH4RtkJ8v5UHktstoxASBIUr72J4elGk5WJ1ivb9YlQtqtjknYM+cLgHHeWICjqFqBT8PAOoEbzO3AAJEZ4OyN/vv0LVrpsUcZtIbaWgc97h28/8/Ntxbe6hj0eDsZPCIRBLUt91FinBXH3ZD0wq27OGjBb07rdaR2qmouVHwK4TsMANhrDmDBUBvGn2XxkF+fOtUsfrMi2nFyrQDiSTZdfS0NdAgMBAAEwDQYJKoZIhvcNAQELBQADggEBADPVulta6eB8lOSXL0Tzuy/XFz3tor+E6EpjSwG5/HhtcSWQVUdSECToyI6lZPPskKYvGPXGjfOCJagvG+e6Y1+kKQ33KY7104wY4Jhq1QJTzMIvswxWBikdJ4AWv9x0R9y5sVXZoLWjFtKP58psXHc3aM2x2+igO45uO1YSqwWlWNkO2Q1i7IxcRlHcVh1vcUm771UNXOEL4xY4E2R9sUKPx5/V9kiDbGIQczFAZikZXnY09IyPNq4FjIQ2MYzz7NxxL2fmHdIQ2EUbohLXgd8ULfHZ2fD2zbeMUbPVdwWtSS6xPam1Dgh4df49XVGJwQZ+t2061i3aIu5g+SLTtCQ=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vr.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vr.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vr.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vr.se/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">VR</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">VR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Research Council</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.vr.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.vr.se/english.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Vetenskapsrådet</md:Company>
+    <md:EmailAddress>mailto:swamidkontakt@vr.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Iver AB</md:Company>
+    <md:EmailAddress>mailto:support@iver.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Iver AB</md:Company>
+    <md:GivenName>Henrik</md:GivenName>
+    <md:SurName>Valstedt</md:SurName>
+    <md:EmailAddress>mailto:henrik.valstedt@iver.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>Vetenskapsrådet</md:Company>
+    <md:GivenName>Säk ansvarig</md:GivenName>
+    <md:EmailAddress>mailto:swamidkontakt@vr.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>