From 8169f2728578897d3a0cebed59d191d219d99694 Mon Sep 17 00:00:00 2001
From: Johan Wassberg <jocar@sunet.se>
Date: Thu, 24 Nov 2022 14:49:20 +0100
Subject: SWAMID-2013: Updated dev.nais.uhr.se

---
 swamid-2.0/dev.nais.uhr.se-shibboleth.xml | 53 +++++++++++++++++++++++++------
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/swamid-2.0/dev.nais.uhr.se-shibboleth.xml b/swamid-2.0/dev.nais.uhr.se-shibboleth.xml
index 7762566f..a42d7427 100644
--- a/swamid-2.0/dev.nais.uhr.se-shibboleth.xml
+++ b/swamid-2.0/dev.nais.uhr.se-shibboleth.xml
@@ -21,10 +21,9 @@
     <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>
-      <samla:Attribute 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: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>
@@ -37,6 +36,12 @@
         <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:InformationURL xml:lang="en">https://www.uhr.se/systemtjanster-for-larosaten/stodsystem-for-larosaten/nationellt-administrations--och-informationssystem-for-samordnare-nais/</mdui:InformationURL>
+        <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:Logo xml:lang="en" height="83" width="83">https://nyaanvandarstod.uhr.se/globalassets/uhr_symbol_lila.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="83" width="83">https://nyaanvandarstod.uhr.se/globalassets/uhr_symbol_lila.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://nais.uhr.se/About/PrivacyPolicy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://nais.uhr.se/About/PrivacyPolicy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -59,8 +64,7 @@ im084wgTvsAdycV9EbYuuLrQhALQuTuGhBf8qZY16gx23ICpn12nwcXdu02Xcg5U
 xK8cv3PFIgOcXB00dfmOkwwzgtZkYuRZz4bzf4TgrQv9vMhrVJEwHPog4HuU6N8l
 JPCgGoM1ape2Nyf198u6F4qXp5MZsS+vBOXxAyvHzWOr5uMzxg0oAJQwpkVp/b2z
 3N5QAVVFxkbyHn+8RkZQZ9FiWh7Yl56wU3gvGnZrPT2AaJtVaW4cQkw0gL+dAYfm
-3osR1KprOY0+GpXcvgi9X9YlLMzfcsBIiCEoV4wjwziY99phU80XLkFKmYLsmA==
-</ds:X509Certificate>
+3osR1KprOY0+GpXcvgi9X9YlLMzfcsBIiCEoV4wjwziY99phU80XLkFKmYLsmA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -87,10 +91,41 @@ JPCgGoM1ape2Nyf198u6F4qXp5MZsS+vBOXxAyvHzWOr5uMzxg0oAJQwpkVp/b2z
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.nais.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.nais.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.nais.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Nais</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Nais</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="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: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="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="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="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="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="en">Swedish Council for Higher Education</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Council for Higher Education</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
+  </md:Organization>
   <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="administrative">
+    <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:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Universitets- och högskolerådet</md:GivenName>
+    <md:EmailAddress>mailto:nais.support@uhr.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3