Resolves SWAMID-3512

4 files changed, 20 insertions, 11 deletions

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 671f9fe7..73a4a6a9 100644
--- a/swamid-2.0/idp.vr.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp.vr.se-adfs-services-trust.xml
@@ -4,13 +4,19 @@
     <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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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">
     <Extensions>
       <shibmd:Scope regexp="false">vr.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Vetenskapsrådet ADFS</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">The Swedish Research Council ADFS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Vetenskapsrådet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">The Swedish Research Council</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>
diff --git a/swamid-2.0/swamid.vr.se-idp-shibboleth.xml b/swamid-2.0/swamid.vr.se-idp-shibboleth.xml
index af638690..49d40efc 100644
--- a/swamid-2.0/swamid.vr.se-idp-shibboleth.xml
+++ b/swamid-2.0/swamid.vr.se-idp-shibboleth.xml
@@ -4,20 +4,23 @@
     <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>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
+      <saml:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 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</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Vetenskapsrådet (gammal)</mdui:DisplayName>
         <mdui:Description xml:lang="sv">IDP på Vetenskapsrådet</mdui:Description>
-        <mdui:DisplayName xml:lang="en">The Swedish Research Council</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">The Swedish Research Council (old)</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>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index 81985a93..ed343331 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -31,7 +31,6 @@
   <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"/>
   <xi:include href="swamid-2.0/weblogin.kau.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login1.fhs.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml"/>
@@ -54,4 +53,5 @@
   <xi:include href="swamid-2.0/idp.oru.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/federation.uniarts.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp-shib.slu.se-idp.xml"/>
+  <xi:include href="swamid-2.0/idp.vr.se-adfs-services-trust.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index f261c7f4..755eca93 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -14,5 +14,5 @@
   <xi:include href="swamid-2.0/sts.vinnova.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/adfs.kb.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp.vr.se-adfs-services-trust.xml"/>
+  <xi:include href="swamid-2.0/swamid.vr.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>