From ac7d5533746627b23cc1ee3ef3c6d7927bdcbb86 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Tue, 28 Dec 2021 13:28:05 +0100
Subject: SWAMID-584, Updated www.nais.uhr.se with CoCo

---
 swamid-2.0/www.nais.uhr.se-shibboleth.xml | 63 +++++++++++++++++++++----------
 1 file changed, 43 insertions(+), 20 deletions(-)

(limited to 'swamid-2.0/www.nais.uhr.se-shibboleth.xml')

diff --git a/swamid-2.0/www.nais.uhr.se-shibboleth.xml b/swamid-2.0/www.nais.uhr.se-shibboleth.xml
index b540fb46..93c5eed1 100644
--- a/swamid-2.0/www.nais.uhr.se-shibboleth.xml
+++ b/swamid-2.0/www.nais.uhr.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://www.nais.uhr.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-09-09T14:55:49Z">
@@ -26,22 +22,26 @@ and do *NOT* provide it in real time to your partners.
     <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/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+        <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>
-      <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://www.nais.uhr.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <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://www.nais.uhr.se/Shibboleth.sso/StudentLogin"/>
       <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://www.nais.uhr.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <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://www.nais.uhr.se/Shibboleth.sso/Login"/>
+      <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://www.nais.uhr.se/Shibboleth.sso/StaffLogin"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">NaisSP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">NaisSP</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">NAIS står för Nationellt Administrations- och Informationssystem för samordnare av särskilt pedagogiskt stöd</mdui:Description>
-        <mdui:Description xml:lang="en">NAIS stands for National Administration- and Information system for coordination of pedagogical aid</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">NaisAcc</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">NaisAcc</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">NaisAcc</mdui:Description>
+        <mdui:Description xml:lang="en">NaisAcc</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.uhr.se/systemtjanster-for-larosaten/stodsystem-for-larosaten/nationellt-administrations--och-informationssystem-for-samordnare-nais/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.uhr.se/systemtjanster-for-larosaten/stodsystem-for-larosaten/nationellt-administrations--och-informationssystem-for-samordnare-nais/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://nais.uhr.se/About/PrivacyPolicy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://nais.uhr.se/About/PrivacyPolicy</mdui:PrivacyStatementURL>
+        <mdui:Logo xml:lang="sv" height="83" width="83">https://nyaanvandarstod.uhr.se/globalassets/uhr_symbol_lila.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="83" width="83">https://nyaanvandarstod.uhr.se/globalassets/uhr_symbol_lila.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -89,14 +89,37 @@ MViWUqDxKicGyuokDNf3hpcc9w==
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nais.uhr.se/Shibboleth.sso/NIM/POST"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nais.uhr.se/Shibboleth.sso/NIM/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nais.uhr.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nais.uhr.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nais.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nais.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nais.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">NaisAcc</md:ServiceName>
+      <md:ServiceName xml:lang="sv">NaisAcc</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" 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:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" 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: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="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" 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="sv">Universitets- och högskolerådet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Council for Higher Education</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Universitets- och högskolerådet</md:Company>
+    <md:EmailAddress>mailto:nais.support@uhr.se</md:EmailAddress>
+  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Carina</md:GivenName>
-    <md:SurName>Lindström</md:SurName>
-    <md:EmailAddress>mailto:support@reqtest-services.com</md:EmailAddress>
+    <md:Company>Universitets- och högskolerådet</md:Company>
+    <md:EmailAddress>mailto:nais.support@uhr.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Universitets- och högskolerådet</md:Company>
+    <md:EmailAddress>mailto:nais.support@uhr.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3