SWAMID-870 Updated halon-eu.sunet.se

1 files changed, 25 insertions, 7 deletions

diff --git a/swamid-2.0/halon-eu.sunet.se-shibboleth.xml b/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
index 001b8639..b48d9206 100644
--- a/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
+++ b/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
@@ -4,12 +4,6 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-10-01T08:29:10Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <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/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
     <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"/>
@@ -26,6 +20,11 @@
     <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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <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>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
@@ -34,6 +33,10 @@
         <mdui:DisplayName xml:lang="en">Halon EndUser</mdui:DisplayName>
         <mdui:Description xml:lang="sv">En ny antispam tjänst hos SUNET</mdui:Description>
         <mdui:Description xml:lang="en">A new antispam service at SUNET</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/Mailfilter/Data+Protection+Code+of+Conduct</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/Mailfilter/Data+Protection+Code+of+Conduct</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="en">https://www.sunet.se/services/sakerhet/mailfilter</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.sunet.se/services/sakerhet/mailfilter</mdui:InformationURL>
       </mdui:UIInfo>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://halon-eu.sunet.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://halon-eu.sunet.se/Shibboleth.sso/Login" index="1"/>
@@ -88,15 +91,30 @@ uQHAppDUMcAVcciXyqOjeW25eKnOv6Dnkg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://halon-eu.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://halon-eu.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://halon-eu.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Halon EndUser</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Halon Kontrollpanel</md:ServiceName>
+      <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: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="en">Swedish University Network</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Svenska Universitetsdatornätverk</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>Tomas</md:GivenName>
+    <md:SurName>Liljebergh</md:SurName>
+    <md:EmailAddress>mailto:tomas@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
     <md:GivenName>Fredrik</md:GivenName>
     <md:SurName>Pettai</md:SurName>
-    <md:EmailAddress>mailto:pettai@sunet.se</md:EmailAddress>
+    <md:EmailAddress>mailto:pettai+sp@sunet.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>