From edae0f9f7247f0a1bb9eade354b7467e64f2fea4 Mon Sep 17 00:00:00 2001
From: Johan Wassberg <jocar@sunet.se>
Date: Tue, 20 Dec 2022 16:37:39 +0100
Subject: SWAMID-2411: Updated graylog.nordu.net

---
 swamid-edugain/graylog.nordu.net-shibboleth.xml | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'swamid-edugain')

diff --git a/swamid-edugain/graylog.nordu.net-shibboleth.xml b/swamid-edugain/graylog.nordu.net-shibboleth.xml
index 30cf076a..2e6b1682 100644
--- a/swamid-edugain/graylog.nordu.net-shibboleth.xml
+++ b/swamid-edugain/graylog.nordu.net-shibboleth.xml
@@ -22,8 +22,7 @@
     <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/nren-service</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:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -36,6 +35,10 @@
         <mdui:DisplayName xml:lang="en">NORDUnet Graylog</mdui:DisplayName>
         <mdui:Description xml:lang="sv">En graylogserver hos NORDUnet</mdui:Description>
         <mdui:Description xml:lang="en">A graylog server run by NORDUnet</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://graylog.nordu.net/privacy-policy/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://graylog.nordu.net/privacy-policy/</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="en">https://www.graylog.org/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.graylog.org/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -59,8 +62,7 @@ ETYnToNIV9Jzq9GdQZ80MRw9dhnbLdxlx4dfiWdEDMjsNRFUoiYuuxNlfsPqlSV9
 GQIg/0d+cwEKLZnh82Z/8EqNlzuWqQ7XusYeLD9HM/fhU/rTT1wGnEnbWkQ0gZQ9
 FjlxPxeQButpr1QOUlF4WeyvRV93dH6O8khrQZTw4eNYCpgeEK5iAWmv1gFckZ61
 pc0/wSWsXlCKKdvcilYf9uc4RGpsdIHYHlCIBveUNMaqK3Ce2niYAgSGVH3vejoq
-44OGEs0L2FPx7UE2rXEb
-</ds:X509Certificate>
+44OGEs0L2FPx7UE2rXEb</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -83,11 +85,21 @@ pc0/wSWsXlCKKdvcilYf9uc4RGpsdIHYHlCIBveUNMaqK3Ce2niYAgSGVH3vejoq
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://graylog.nordu.net/Shibboleth.sso/SAML2/ECP" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://graylog.nordu.net/Shibboleth.sso/SAML/POST" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://graylog.nordu.net/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">NORDUnet Graylog</md:ServiceName>
+      <md:ServiceName xml:lang="sv">NORDUnet Graylog</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:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">NORDUnet A/S</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">NORDUnet A/S</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NORDUnet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">NORDUnet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.nordu.net</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>Sunet</md:GivenName>
-- 
cgit v1.2.3