Merge branch 'master' of git.swamid.se:swamid-metadata

1 files changed, 31 insertions, 0 deletions

diff --git a/swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml b/swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml
index 9561fa00..99769feb 100644
--- a/swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml
+++ b/swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml
@@ -25,6 +25,12 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <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 protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="false" WantAssertionsSigned="true">
     <md:Extensions>
@@ -33,6 +39,10 @@
         <mdui:DisplayName xml:lang="sv">SUNET Relationship Inventory</mdui:DisplayName>
         <mdui:Description xml:lang="en">Service used for documenting the SUNET relationship</mdui:Description>
         <mdui:Description xml:lang="sv">Tjänst för att dokumentera SUNET relationship</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/pages/viewpage.action?pageId=123470072</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/pages/viewpage.action?pageId=123470072</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/SunetInternt/Sunet+Relationship+Inventory</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/SunetInternt/Sunet+Relationship+Inventory</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -107,14 +117,35 @@ u2DILJFDHG6NsygDB5HF7t4kMRyVy/xI+dAe80+WmjLKM33ybwW/suk=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sri.sunet.se/api/saml2/acs/" index="1"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">SUNET Relationship Inventory</md:ServiceName>
+      <md:ServiceName xml:lang="sv">SUNET Relationship Inventory</md:ServiceName>
       <md:RequestedAttribute 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" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
       <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" 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="sv">SUNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">SUNET</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://sunet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se/</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>SUNET</md:Company>
     <md:GivenName>Maria</md:GivenName>
     <md:SurName>Haider</md:SurName>
     <md:EmailAddress>mailto:mariah@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: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 CERT</md:GivenName>
+    <md:EmailAddress>mailto:cert@cert.sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>