From da3b0eaf9ba04ef429aaabd1266d8437cd32d878 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Thu, 10 Jun 2021 13:51:13 +0200
Subject: SWAMID-281, Moved adfs.hv.se from testing to eduGAIN. Aslo added R&S
 and CoCo support"

---
 swamid-2.0/adfs.hv.se-adfs-services-trust.xml | 9 +++++++++
 swamid-edugain-idp-1.0.mxml                   | 1 +
 swamid-testing-idp-1.0.mxml                   | 1 -
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/swamid-2.0/adfs.hv.se-adfs-services-trust.xml b/swamid-2.0/adfs.hv.se-adfs-services-trust.xml
index 4d39d633..8b5a97c4 100644
--- a/swamid-2.0/adfs.hv.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.hv.se-adfs-services-trust.xml
@@ -4,6 +4,15 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-09-27T13:28:21Z">
       <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>
+      <saml:Attribute xmlns:saml="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">
+        <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" 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://adfs.hv.se/adfs/services/trust">
     <Extensions>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index 48a1c97b..f9627c79 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -52,4 +52,5 @@
   <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"/>
+  <xi:include href="swamid-2.0/adfs.hv.se-adfs-services-trust.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 6b609522..413395e7 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -55,5 +55,4 @@
   <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/testidpv4.lu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/adfs.hv.se-adfs-services-trust.xml"/>
 </EntitiesDescriptor>
-- 
cgit v1.2.3