SWAMID-77 resolved yet again, maybe

2 files changed, 58 insertions, 6 deletions

diff --git a/swamid-2.0/vfu.su.se-shibboleth.sso.xml b/swamid-2.0/vfu.su.se-shibboleth.sso.xml
index 1b239820..fc511d67 100644
--- a/swamid-2.0/vfu.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfu.su.se-shibboleth.sso.xml
@@ -6,9 +6,7 @@
     </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.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>
@@ -28,6 +26,7 @@
         <mdui:DisplayName xml:lang="en">Workplace Situated Education at Stockholm University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">VFU är verksamhetsfölagd utbildning där utbildningen sker på en arbetsplats</mdui:Description>
         <mdui:Description xml:lang="en">VFU is workplace situated education where the education takes place at a work place</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://serviceportalen.su.se/sv-se/article/1366077</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -70,9 +69,36 @@ ZbIlfQJbU+IsF+PBKYkQ9oGeHIBu0E6lRYjrmIFz1n176w==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vfu.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">VFU</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="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="givenName" Name="urn:oid:2.5.4.42" 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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" 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="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" 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:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">SU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>IT-avdelningen</md:SurName>
     <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/vfusyd.su.se-shibboleth.sso.xml b/swamid-2.0/vfusyd.su.se-shibboleth.sso.xml
index 336afafe..fa56dafd 100644
--- a/swamid-2.0/vfusyd.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfusyd.su.se-shibboleth.sso.xml
@@ -22,9 +22,7 @@
     <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>
@@ -43,6 +41,7 @@
         <mdui:DisplayName xml:lang="en">Workplace Situated Education at Stockholm University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">VFU är verksamhetsförlagd utbildning där utbildningen sker på en arbetsplats</mdui:Description>
         <mdui:Description xml:lang="en">VFU is workplace situated education where the education takes place at a work place</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://serviceportalen.su.se/sv-se/article/1366077</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -97,9 +96,36 @@ XR6xsoeRckHfPU+Ipt5ovuN1xQnJmgvGww1VWgdSwEL0UqFf6Gj6eM4=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfusyd.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfusyd.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfusyd.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">VFU-syd</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="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="givenName" Name="urn:oid:2.5.4.42" 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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" 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="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" 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:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">SU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>IT-avdelningen</md:SurName>
     <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>