From 5f11505ef9480bcd85372a5dea93a8d4701e6124 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Thu, 24 Feb 2022 11:08:53 +0100
Subject: SWAMID-727: Updated solid-proxy.sunet.se

---
 sp-with-coco-errors                                 | 1 +
 swamid-2.0/solid-proxy.sunet.se-sp-metadata.xml.xml | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sp-with-coco-errors b/sp-with-coco-errors
index 4f5dfa52..2307ea8c 100644
--- a/sp-with-coco-errors
+++ b/sp-with-coco-errors
@@ -16,3 +16,4 @@ swamid-2.0/staging.cloudmore.com-shibboleth.xml
 swamid-2.0/urn-mace-feide.no-services-no.inspera.assessment.test.xml
 swamid-2.0/us.cloudmore.com-shibboleth.xml
 swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-2.xml
+swamid-2.0/solid-proxy.sunet.se-sp-metadata.xml.xml
diff --git a/swamid-2.0/solid-proxy.sunet.se-sp-metadata.xml.xml b/swamid-2.0/solid-proxy.sunet.se-sp-metadata.xml.xml
index 0e8d623e..ef4cf514 100644
--- a/swamid-2.0/solid-proxy.sunet.se-sp-metadata.xml.xml
+++ b/swamid-2.0/solid-proxy.sunet.se-sp-metadata.xml.xml
@@ -1,6 +1,11 @@
 <?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://solid-proxy.sunet.se/sp/metadata.xml">
   <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
@@ -126,9 +131,7 @@ X9Si322m4vRUWYrPfkaXn9epfllq5Y7cP6itbTb8kgx0rTSz1XAIZnH4nAsTpbI=
       <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" isRequired="true"/>
       <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
       <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrcid" isRequired="true"/>
       <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonUniqueId" isRequired="true"/>
       <md:RequestedAttribute Name="urn:oasis:names:tc:SAML:attribute:subject-id" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="subject-id" isRequired="true"/>
       <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAssurance" isRequired="true"/>
     </md:AttributeConsumingService>
-- 
cgit v1.2.3