SWAMID-1226: Update some Sunet SPs

crowd-test.sunet.se
crowd.sunet.se
rt-test.sunet.se
rt.sunet.se

4 files changed, 102 insertions, 14 deletions

diff --git a/swamid-2.0/crowd-test.sunet.se-shibboleth.xml b/swamid-2.0/crowd-test.sunet.se-shibboleth.xml
index e156453f..65f32ec7 100644
--- a/swamid-2.0/crowd-test.sunet.se-shibboleth.xml
+++ b/swamid-2.0/crowd-test.sunet.se-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>
@@ -60,6 +59,12 @@
         <mdui:DisplayName xml:lang="en">Sunet Crowd Identity Management (test)</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Sunets Atlassian Crowd-tjänst som hjälper till med användarhantering för Sunets Jira och Confluence (test)</mdui:Description>
         <mdui:Description xml:lang="en">Sunet's Atlassian Crowd-service providing identity management for Sunet's Jira and Confluence (test)</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="128" width="128">https://wiki.sunet.se/favicon-128-128.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/info/Crowd+Privacy+Policy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/info/Crowd+Privacy+Policy</mdui:PrivacyStatementURL>
+        <mdui:Logo xml:lang="sv" height="128" width="128">https://wiki.sunet.se/favicon-128-128.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -103,5 +108,38 @@ ZrXY5oHBd8OApNTk1ef9iGdfMQ==
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd-test.sunet.se/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd-test.sunet.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd-test.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Sunet Crowd Identity
+Management</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Sunets Crowd-inloggningstjänst (test)</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="givenName" Name="urn:oid:2.5.4.42" 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:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <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 Security Contact</md:GivenName>
+    <md:EmailAddress>mailto:abuse@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/crowd.sunet.se-shibboleth.xml b/swamid-2.0/crowd.sunet.se-shibboleth.xml
index 84544fea..de713878 100644
--- a/swamid-2.0/crowd.sunet.se-shibboleth.xml
+++ b/swamid-2.0/crowd.sunet.se-shibboleth.xml
@@ -40,6 +40,7 @@
         <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/info/Crowd+Privacy+Policy</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/info/Crowd+Privacy+Policy</mdui:PrivacyStatementURL>
         <mdui:Logo xml:lang="en" height="128" width="128">https://wiki.sunet.se/favicon-128-128.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="128" width="128">https://wiki.sunet.se/favicon-128-128.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -94,6 +95,7 @@ og+StCZFRCgVG6Yoq6EYaJYK1DsUP+4hBlptoRNdLd4aYwdG52H3By9WhnAE8wQ=
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Sunet Crowd Identity
 Management</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Sunets Crowd-inloggningstjänst</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="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:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -120,4 +122,8 @@ Management</md:ServiceName>
     <md:GivenName>Sunet Security Contact</md:GivenName>
     <md:EmailAddress>mailto:abuse@sunet.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/rt-test.sunet.se-shibboleth.xml b/swamid-2.0/rt-test.sunet.se-shibboleth.xml
index deab2766..bebcbd4e 100644
--- a/swamid-2.0/rt-test.sunet.se-shibboleth.xml
+++ b/swamid-2.0/rt-test.sunet.se-shibboleth.xml
@@ -20,12 +20,6 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <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>
-      <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:Attribute>
-    </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
@@ -62,6 +56,10 @@
         <mdui:DisplayName xml:lang="en">SWAMID's issue tracker (test)</mdui:DisplayName>
         <mdui:Description xml:lang="sv">SWAMIDs ärendehanteringssystem hos Sunet (test)</mdui:Description>
         <mdui:Description xml:lang="en">SWAMID's issue tracker at Sunet (test)</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/info/RT+Privacy+Policy</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/info/RT+Privacy+Policy</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/info/RT+Privacy+Policy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/info/RT+Privacy+Policy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -106,4 +104,28 @@ qFDyEiYnvPNe95CFpLV4ccxmu+AyDyGOg8KnzgzOHIJZQRgUOMKI7qxeHQ==
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rt-test.sunet.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rt-test.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <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 Security Contact</md:GivenName>
+    <md:EmailAddress>mailto:abuse@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/rt.sunet.se-shibboleth.xml b/swamid-2.0/rt.sunet.se-shibboleth.xml
index 6e203a3a..1c7176fe 100644
--- a/swamid-2.0/rt.sunet.se-shibboleth.xml
+++ b/swamid-2.0/rt.sunet.se-shibboleth.xml
@@ -20,12 +20,6 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <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>
-      <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:Attribute>
-    </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
@@ -62,6 +56,10 @@
         <mdui:DisplayName xml:lang="en">SWAMID's issue tracker</mdui:DisplayName>
         <mdui:Description xml:lang="sv">SWAMIDs ärendehanteringssystem hos Sunet</mdui:Description>
         <mdui:Description xml:lang="en">SWAMID's issue tracker at Sunet</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/info/RT+Privacy+Policy</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/info/RT+Privacy+Policy</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/info/RT+Privacy+Policy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/info/RT+Privacy+Policy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -105,4 +103,28 @@ UJa1o8SLCiWTcxQc3uz1rXh/K6gjHos0nQMdyg==
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rt.sunet.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rt.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <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 Security Contact</md:GivenName>
+    <md:EmailAddress>mailto:abuse@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>