From 5015a4d6ec921cfea9dc126d14f06ab4c652b503 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Thu, 2 Jun 2022 08:42:39 +0200
Subject: SWAMID-996 SWAMID-997 SWAMID-998 Updated
 https://kth-graylog.cnaas.sunet.se https://kth-nav.cnaas.sunet.se
 https://kth-ni.cnaas.sunet.se

---
 swamid-2.0/kth-graylog.cnaas.sunet.se.xml | 34 ++++++++++++++++++++++---------
 swamid-2.0/kth-nav.cnaas.sunet.se.xml     | 30 +++++++++++++++++++--------
 swamid-2.0/kth-ni.cnaas.sunet.se.xml      | 30 ++++++++++++++++++---------
 3 files changed, 66 insertions(+), 28 deletions(-)

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/kth-graylog.cnaas.sunet.se.xml b/swamid-2.0/kth-graylog.cnaas.sunet.se.xml
index 78dfd6ce..403b4ef0 100644
--- a/swamid-2.0/kth-graylog.cnaas.sunet.se.xml
+++ b/swamid-2.0/kth-graylog.cnaas.sunet.se.xml
@@ -1,9 +1,6 @@
 <?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://kth-graylog.cnaas.sunet.se">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-09-22T10:22:24Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
@@ -21,10 +18,13 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="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">
+      <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>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-09-22T10:22:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
@@ -35,6 +35,9 @@
         <mdui:DisplayName xml:lang="en">CnaaS KTH Graylog</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Loggsystem för CnaaS på KTH.</mdui:Description>
         <mdui:Description xml:lang="en">Logging system for CnaaS at KTH.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.graylog.org</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.graylog.org</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+Graylog+when+using+federated+login</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+Graylog+when+using+federated+login</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
@@ -86,23 +89,34 @@ ra3Y3sqZtwkRQH0c2QW0WGXwsVLRACK9OCX87shM+4QxvxMrgjaJYjh/hmC86iHw
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kth-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kth-graylog.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">Cnaas KTH Graylog</md:ServiceName>
-      <md:ServiceName xml:lang="en">Cnaas KTH Graylog</md:ServiceName>
+      <md:ServiceName xml:lang="sv">CnaaS KTH Graylog</md:ServiceName>
+      <md:ServiceName xml:lang="en">CnaaS KTH Graylog</md:ServiceName>
       <md:RequestedAttribute FriendlyName="eduPersonAssurance" 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" isRequired="true"/>
       <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">Sunet</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Sunet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+    <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/en</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:SurName>Sunet NOC</md:SurName>
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sunet 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 NOC</md:GivenName>
     <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
-    <md:SurName>Ernst Widerberg</md:SurName>
-    <md:EmailAddress>mailto:ernst@sunet.se</md:EmailAddress>
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/kth-nav.cnaas.sunet.se.xml b/swamid-2.0/kth-nav.cnaas.sunet.se.xml
index 0942a146..6eae223d 100644
--- a/swamid-2.0/kth-nav.cnaas.sunet.se.xml
+++ b/swamid-2.0/kth-nav.cnaas.sunet.se.xml
@@ -1,9 +1,6 @@
 <?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://kth-nav.cnaas.sunet.se">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-26T17:17:26Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
@@ -21,10 +18,13 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="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">
+      <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>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-26T17:17:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
@@ -35,6 +35,9 @@
         <mdui:DisplayName xml:lang="en">CnaaS KTH NAV</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Nätverksövervakningssystem för CnaaS på KTH.</mdui:Description>
         <mdui:Description xml:lang="en">Network monitoring system for CnaaS at KTH.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://nav.uninett.no</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://nav.uninett.no</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+NAV+when+using+federated+login</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+NAV+when+using+federated+login</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
@@ -93,16 +96,27 @@ AISFtyqcxrhuLJJ5YElANw==
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
+    <md:OrganizationName xml:lang="sv">Sunet</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Sunet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+    <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/en</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:SurName>Sunet NOC</md:SurName>
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sunet 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 NOC</md:GivenName>
     <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
-    <md:SurName>Ernst Widerberg</md:SurName>
-    <md:EmailAddress>mailto:ernst@sunet.se</md:EmailAddress>
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/kth-ni.cnaas.sunet.se.xml b/swamid-2.0/kth-ni.cnaas.sunet.se.xml
index 6c63aea6..d3dac3c6 100644
--- a/swamid-2.0/kth-ni.cnaas.sunet.se.xml
+++ b/swamid-2.0/kth-ni.cnaas.sunet.se.xml
@@ -1,9 +1,6 @@
 <?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://kth-ni.cnaas.sunet.se">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-12-15T11:27:53Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
@@ -25,6 +22,9 @@
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-12-15T11:27:53Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
@@ -35,8 +35,10 @@
         <mdui:DisplayName xml:lang="en">CnaaS KTH NI</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Inventariesystem för CnaaS på KTH.</mdui:Description>
         <mdui:Description xml:lang="en">Inventory system for CnaaS at KTH.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/x/jYmvBg</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/x/jYmvBg</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://portal.nordu.net/display/NI/NORDUnet+Network+Inventory</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://portal.nordu.net/display/NI/NORDUnet+Network+Inventory</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+NI+when+using+federated+login</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+NI+when+using+federated+login</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -96,17 +98,25 @@ ZIJ9xVO4IWOhdNxsmZHVeUKoE/C0bRngvFO+SkwOv8FJB6R1WzFMp/GcmashYS5S
   <md:Organization>
     <md:OrganizationName xml:lang="sv">Sunet</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Sunet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
     <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:OrganizationURL xml:lang="en">https://www.sunet.se/en</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:SurName>Sunet NOC</md:SurName>
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sunet 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 NOC</md:GivenName>
     <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
-    <md:SurName>Ernst Widerberg</md:SurName>
-    <md:EmailAddress>mailto:ernst@sunet.se</md:EmailAddress>
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3