SWAMID-1256 update ni.sunet.se-saml2-metadata-

2 files changed, 34 insertions, 3 deletions

diff --git a/swamid-2.0/ni.sunet.se-saml2-metadata.xml b/swamid-2.0/ni.sunet.se-saml2-metadata-.xml
index 686c473a..87fd5b3d 100644
--- a/swamid-2.0/ni.sunet.se-saml2-metadata.xml
+++ b/swamid-2.0/ni.sunet.se-saml2-metadata-.xml
@@ -4,6 +4,12 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-02-15T14:29:57Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes>
+      <samla:Attribute 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:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
@@ -12,6 +18,10 @@
         <mdui:DisplayName xml:lang="en">SUNET Network Inventory</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Tjänst för att dokumentera SUNET nätverket</mdui:Description>
         <mdui:Description xml:lang="en">Service used for documenting the SUNET network</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/pages/viewpage.action?pageId=123470072</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/pages/viewpage.action?pageId=123470072</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/sunetops/SUNET+Network+Inventory</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/sunetops/SUNET+Network+Inventory</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="encryption">
@@ -68,14 +78,35 @@ aRl22guR2G2MeQtvNn+JuYRmrJbW8xi5mXCQkps2TvQfiVLHAzCIpXUZANpnS582
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ni.sunet.se/saml2/acs/" index="1"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">SUNET Network Inventory</md:ServiceName>
-      <md:RequestedAttribute Name="eduPersonPrincipalName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute Name="displayName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:ServiceName xml:lang="sv">SUNET Network Inventory</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="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: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="sv">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>NORDUnet A/S</md:Company>
     <md:GivenName>Markus</md:GivenName>
     <md:SurName>Krogh</md:SurName>
     <md:EmailAddress>mailto:markus@nordu.net</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:ContactPerson contactType="support">
+    <md:Company>SUNET NOC</md:Company>
+    <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 CERT</md:GivenName>
+    <md:EmailAddress>mailto:cert@cert.sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 7f36037a..c9ff6c6a 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -186,7 +186,6 @@
   <xi:include href="swamid-2.0/vartuppdrag.se.xml"/>
   <xi:include href="swamid-2.0/account.hh.se-Shibboleth.xml"/>
   <xi:include href="swamid-2.0/keystone.lab.cloud.ipnett.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/ni.sunet.se-saml2-metadata.xml"/>
   <xi:include href="swamid-2.0/luvit.education.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/bibliometri.swepub.kb.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.test.ladok.se-gui-sp.xml"/>
@@ -623,4 +622,5 @@
   <xi:include href="swamid-2.0/rps.kau.se.xml"/>
   <xi:include href="swamid-2.0/metadata.qa.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sri-test.sunet.se-api-saml2-metadata-.xml"/>
+  <xi:include href="swamid-2.0/ni.sunet.se-saml2-metadata-.xml"/>
 </md:EntitiesDescriptor>