Resolved SWAMID-3624

1 files changed, 26 insertions, 12 deletions

diff --git a/swamid-2.0/crowd.sunet.se-shibboleth.xml b/swamid-2.0/crowd.sunet.se-shibboleth.xml
index 066f7318..4dce1eb9 100644
--- a/swamid-2.0/crowd.sunet.se-shibboleth.xml
+++ b/swamid-2.0/crowd.sunet.se-shibboleth.xml
@@ -22,8 +22,7 @@
     <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: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,11 @@
         <mdui:DisplayName xml:lang="en">Sunet Crowd Identity Management</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 </mdui:Description>
         <mdui:Description xml:lang="en">Sunet's Atlassian Crowd-service providing identity management for Sunet's Jira and Confluence</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/</mdui:InformationURL>
+        <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:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -87,23 +91,33 @@ og+StCZFRCgVG6Yoq6EYaJYK1DsUP+4hBlptoRNdLd4aYwdG52H3By9WhnAE8wQ=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crowd.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crowd.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://crowd.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Sunet Crowd Identity
+Management</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"/>
+      <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="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: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: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="support">
-    <md:GivenName>SUNET</md:GivenName>
-    <md:SurName>NOC</md:SurName>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sunet NOC</md:GivenName>
     <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SUNET</md:GivenName>
-    <md:SurName>NOC</md:SurName>
+  <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>