From 7ab8b14f2d8e6cbe883483cdd55525b2f80dee39 Mon Sep 17 00:00:00 2001
From: Johan Wassberg <jocar@sunet.se>
Date: Fri, 28 Oct 2022 08:18:44 +0200
Subject: SWAMID-1674: Updated meta2.eduroam.se

---
 swamid-2.0/meta2.eduroam.se.xml | 41 +++++++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/meta2.eduroam.se.xml b/swamid-2.0/meta2.eduroam.se.xml
index b42eb9aa..a4846512 100644
--- a/swamid-2.0/meta2.eduroam.se.xml
+++ b/swamid-2.0/meta2.eduroam.se.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/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -38,6 +38,10 @@
         <mdui:Description xml:lang="en">This is v2.0 of the new eduroam metadata management system for Sweden</mdui:Description>
         <mdui:Logo xml:lang="sv" height="115" width="50">https://meta2.eduroam.se/static/img/eduroam_logo.png</mdui:Logo>
         <mdui:Logo xml:lang="en" height="115" width="50">https://meta2.eduroam.se/static/img/eduroam_logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://meta2.eduroam.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://meta2.eduroam.se</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/info/eduroam+Meta+Privacy+Policy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/info/eduroam+Meta+Privacy+Policy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -88,15 +92,36 @@ GrCXc5ZoCHOTZu74wHNT5vyrZ6BxlA==
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta2.eduroam.se/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meta2.eduroam.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta2.eduroam.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">eduroam v2.0 meta</md:ServiceName>
+      <md:ServiceName xml:lang="sv">eduroam v2.0 meta</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">Vetenskapsrådet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Paul</md:GivenName>
-    <md:SurName>Scott</md:SurName>
-    <md:EmailAddress>mailto:paul.scott@kau.se</md:EmailAddress>
+    <md:GivenName>Kristofer</md:GivenName>
+    <md:SurName>H</md:SurName>
+    <md:EmailAddress>mailto:kristofer@sunet.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
-    <md:GivenName>Anders</md:GivenName>
-    <md:SurName>Nilsson</md:SurName>
-    <md:EmailAddress>mailto:anders.nilsson@umu.se</md:EmailAddress>
+    <md:GivenName>Kristofer</md:GivenName>
+    <md:SurName>H</md:SurName>
+    <md:EmailAddress>mailto:kristofer@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.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>Sunet Security Contact</md:GivenName>
+    <md:EmailAddress>mailto:abuse@sunet.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3