From 46a9a4b081233c299448b800f9f121ee779dfdf1 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Thu, 5 Jan 2023 10:30:00 +0100
Subject: SWAMID-2485 Updated uraccess.net

---
 swamid-2.0/uraccess.net-shibboleth.xml | 41 ++++++++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/swamid-2.0/uraccess.net-shibboleth.xml b/swamid-2.0/uraccess.net-shibboleth.xml
index 830d0b79..6f9210bc 100644
--- a/swamid-2.0/uraccess.net-shibboleth.xml
+++ b/swamid-2.0/uraccess.net-shibboleth.xml
@@ -22,8 +22,8 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -34,6 +34,12 @@
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">UR access - Mediebiblioteket för högskolor och universitet.</mdui:DisplayName>
         <mdui:Description xml:lang="sv">UR access innehåller ca 18000 TV- och radioprogram från Utbildningsradion.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.ur.se/om-ur/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.ur.se/integritetspolicy/</mdui:PrivacyStatementURL>
+        <mdui:DisplayName xml:lang="en">UR access - Medialibrary for Swedish Universitys</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UR access contains roundabout 18000 TV and Radio programs from UR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.ur.se/about-ur/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.ur.se/integritetspolicy/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -58,8 +64,7 @@ BTM2wp9H6vC35z+R3O3c7GMP37LcJMHSwcCgQPWboIp/nxEGEGFwHPB0dUN5qvLR
 OQyxsrnkpOih7FXNtpHItLDGS8JDac4TRWE4x1b1r/B0t50TsXe3Pa6t/H/sGugT
 WA1u0ZsP4QtQfCFyJlIisLruEDEydRdT1UNUcbo6TsRW33G5rzAH9X6+D19LnFRg
 W/UOQjERpXGqmGI72CVn9Q8PXeKyVvIl7zaSzz9GLjJpQLdjkSWHW+qMH+7kbn4S
-RXmDTYIhHnjv+Sc7dzCbIA==
-</ds:X509Certificate>
+RXmDTYIhHnjv+Sc7dzCbIA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -86,7 +91,25 @@ RXmDTYIhHnjv+Sc7dzCbIA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uraccess.net/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uraccess.net/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uraccess.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">UR access - Mediebiblioteket för högskolor och universitet.</md:ServiceName>
+      <md:ServiceName xml:lang="en">Medialibrary for Swedish Universitys</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+    <md:AttributeConsumingService index="2">
+      <md:ServiceName xml:lang="en">UR access - Medialibrary for Swedish Universitys</md:ServiceName>
+      <md:ServiceName xml:lang="sv">UR access - Mediebiblioteket för högskolor och universitet.</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" 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" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Sveriges Utbildningsradio AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Swedish Educational Broadcasting Company</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">UR</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">UR</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.ur.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.ur.se/about-ur/</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="support">
     <md:EmailAddress>mailto:onsite@ur.se</md:EmailAddress>
   </md:ContactPerson>
@@ -95,4 +118,14 @@ RXmDTYIhHnjv+Sc7dzCbIA==
     <md:SurName>Nilsson</md:SurName>
     <md:EmailAddress>mailto:Michael.Nilsson@ur.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Daniel</md:GivenName>
+    <md:SurName>Elliott</md:SurName>
+    <md:EmailAddress>mailto:daniel.elliott@ur.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Daniel</md:GivenName>
+    <md:SurName>Elliott</md:SurName>
+    <md:EmailAddress>mailto:daniel.elliott@ur.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3