Merge branch 'master' of git.swamid.se:swamid-metadatamd-2024-11-26-v08

2 files changed, 20 insertions, 6 deletions

diff --git a/metadata/swamid-2.0/acctest.minastipendier.se-shibboleth.xml b/metadata/swamid-2.0/acctest.minastipendier.se-shibboleth.xml
index a3be6e16..abfdd848 100644
--- a/metadata/swamid-2.0/acctest.minastipendier.se-shibboleth.xml
+++ b/metadata/swamid-2.0/acctest.minastipendier.se-shibboleth.xml
@@ -20,6 +20,8 @@
     <mdattr:EntityAttributes>
       <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
+        <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>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2024-11-08T09:53:02Z">
@@ -37,8 +39,8 @@
         <mdui:DisplayName xml:lang="en">Scholarships for students and postgraduates, My Pages</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://www.uhr.se/systemtjanster-for-larosaten/stodsystem-for-larosaten/stipendierauk/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">https://www.uhr.se/systemtjanster-for-larosaten/stodsystem-for-larosaten/stipendierauk/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://systest.stipendierauk.uhr.se/Home/PrivacyPolicy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://systest.stipendierauk.uhr.se/Home/PrivacyPolicy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://acctest.stipendierauk.uhr.se/Home/PrivacyPolicy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://acctest.stipendierauk.uhr.se/Home/PrivacyPolicy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -90,6 +92,11 @@ rLT94sn8cj6s7zqKnIBXqdrL/fL8Aw==</ds:X509Certificate>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://acctest.minastipendier.se/Shibboleth.sso/NIM/POST"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://acctest.minastipendier.se/Shibboleth.sso/NIM/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://acctest.minastipendier.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Scholarships for students and postgraduates, My Pages</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Stipendier för studenter och doktorander, Mina sidor</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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
diff --git a/metadata/swamid-2.0/minastipendier.se-shibboleth.xml b/metadata/swamid-2.0/minastipendier.se-shibboleth.xml
index dabda80c..d79d6df1 100644
--- a/metadata/swamid-2.0/minastipendier.se-shibboleth.xml
+++ b/metadata/swamid-2.0/minastipendier.se-shibboleth.xml
@@ -20,6 +20,8 @@
     <mdattr:EntityAttributes>
       <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
+        <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>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2024-11-08T11:50:11Z">
@@ -28,14 +30,14 @@
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://minastipendier.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://minastipendier.se/Shibboleth.sso/DS/Login" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://minastipendier.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://minastipendier.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Scholarships for students and postgraduates, My Pages</mdui:DisplayName>
         <mdui:Description xml:lang="en">StipendieRauk, My Pages</mdui:Description>
         <mdui:InformationURL xml:lang="en">https://www.uhr.se/systemtjanster-for-larosaten/stodsystem-for-larosaten/stipendierauk/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://systest.stipendierauk.uhr.se/Home/PrivacyPolicy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://systest.stipendierauk.uhr.se/Home/PrivacyPolicy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://stipendierauk.uhr.se/Home/PrivacyPolicy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://stipendierauk.uhr.se/Home/PrivacyPolicy</mdui:PrivacyStatementURL>
         <mdui:InformationURL xml:lang="sv">https://www.uhr.se/systemtjanster-for-larosaten/stodsystem-for-larosaten/stipendierauk/</mdui:InformationURL>
         <mdui:DisplayName xml:lang="sv">Stipendier för studenter och doktorander, Mina sidor</mdui:DisplayName>
         <mdui:Description xml:lang="sv">StipendieRauk, Mina sidor</mdui:Description>
@@ -128,6 +130,11 @@ NuQ=</ds:X509Certificate>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://minastipendier.se/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://minastipendier.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://minastipendier.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Scholarships for students and postgraduates, My Pages</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Stipendier för studenter och doktorander, Mina sidor</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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>