From 4d6c3e30d4b5e8c275a1a8bb5cf3a44ef1f8b8c1 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Thu, 5 Nov 2020 15:46:52 +0100
Subject: Resolves SWAMID-3466 part 1

---
 sp-with-coco-errors                              |  1 +
 swamid-2.0/portalservices.miun.se-shibboleth.xml | 36 +++++++++++++++---------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/sp-with-coco-errors b/sp-with-coco-errors
index c4e82571..a871c441 100644
--- a/sp-with-coco-errors
+++ b/sp-with-coco-errors
@@ -16,3 +16,4 @@ swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
 swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-2.xml
 swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
 swamid-2.0/moodle.media.nordu.net.xml
+swamid-2.0/portalservices.miun.se-shibboleth.xml
diff --git a/swamid-2.0/portalservices.miun.se-shibboleth.xml b/swamid-2.0/portalservices.miun.se-shibboleth.xml
index f1ab77f5..7ac96540 100644
--- a/swamid-2.0/portalservices.miun.se-shibboleth.xml
+++ b/swamid-2.0/portalservices.miun.se-shibboleth.xml
@@ -4,18 +4,21 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</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.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>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SelfRegister</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Egenregistrering</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">SelfRegister</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Egenregistering</mdui:Description>
-        <mdui:Description xml:lang="en">Self register</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.miun.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.miun.se/en/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.miun.se/kontakt/personuppgifter/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.miun.se/en/contact/personaldata/</mdui:PrivacyStatementURL>
+        <mdui:Description xml:lang="sv">Egenregistrering för studenter.</mdui:Description>
+        <mdui:Description xml:lang="en">Self Register Service for students.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.miun.se/globalassets/ovrigt/policy-samid/privacy_policy_egenregistrering_se.pdf</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.miun.se/globalassets/ovrigt/policy-samid/privacy_policy_selfregister_en.pdf</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -98,8 +101,15 @@ TeyoCQ24KR1X/NqeCJndNrh9MFFO1D14hF64NWpRKRybaB2lzrgIiIWvlw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portalservices2.miun.se/Shibboleth.sso/SAML/POST" index="10"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://portalservices.miun.se/Shibboleth.sso/SAML/Artifact" index="11"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://portalservices2.miun.se/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">Egenregistrering</md:ServiceName>
+      <md:ServiceName xml:lang="en">SelfRegister</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="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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
+    <md:OrganizationName xml:lang="sv">MIUN</md:OrganizationName>
     <md:OrganizationName xml:lang="en">MIUN</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Mittuniversitetet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Mid Sweden University</md:OrganizationDisplayName>
@@ -111,20 +121,18 @@ TeyoCQ24KR1X/NqeCJndNrh9MFFO1D14hF64NWpRKRybaB2lzrgIiIWvlw==
     <md:GivenName>SystemDrift</md:GivenName>
     <md:SurName>IT Helpdesk</md:SurName>
     <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 123 45 67 89</md:TelephoneNumber>
+    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>Mid Sweden University</md:Company>
-    <md:GivenName>SystemDrift</md:GivenName>
-    <md:SurName>IT Helpdesk </md:SurName>
-    <md:EmailAddress>mailto:swamidcontact@miun.se </md:EmailAddress>
-    <md:TelephoneNumber>+46 123 45 67 89</md:TelephoneNumber>
+    <md:SurName>SystemDrift, INFRA, Mittuniversitetet</md:SurName>
+    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>Mid Sweden University</md:Company>
-    <md:GivenName>SystemDrift</md:GivenName>
     <md:SurName>IT Helpdesk</md:SurName>
     <md:EmailAddress>mailto:helpdesk@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 123 45 67 89</md:TelephoneNumber>
+    <md:TelephoneNumber>+46 771 976130</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3