Merge branch 'master' of git.swamid.se:swamid-metadata

3 files changed, 58 insertions, 62 deletions

diff --git a/swamid-2.0/expert.antagning.se-ecs-sp.xml b/swamid-2.0/expert.antagning.se-ecs-sp.xml
index 6ef55431..5a9b8813 100644
--- a/swamid-2.0/expert.antagning.se-ecs-sp.xml
+++ b/swamid-2.0/expert.antagning.se-ecs-sp.xml
@@ -22,62 +22,6 @@
         <mdui:Logo height="52" width="205" xml:lang="en">https://www.universityadmissions.se/images/logo/university-admisssions.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
-    <!-- OLD CERTIFICATES -->
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>expert.antagning.se</ds:KeyName>
-        <ds:KeyName>https://expert.antagning.se/ecs-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=expert.antagning.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANSBcY8AW9T/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2V4cGVydC5hbnRhZ25pbmcuc2UwHhcNMTEwNTA5MTc0MTQ3WhcNMjEwNTA2
-MTc0MTQ3WjAeMRwwGgYDVQQDExNleHBlcnQuYW50YWduaW5nLnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtylQ0TngqqfQUnyBdtd1+WfFCBaFa1MY
-Twc7L/toQr6WJ1QfQyFZgWTEM48PySKVxt+NByyY9VXmcIhADPiP+QiPccME4ink
-x+/xmU532IW6IW1lg3QOLh2tG5fplJZvbmW5ni/tv5Rw/bSDFmagw3AyasIM1OpK
-vbDzJXM80KYR77nNHlS6498D3KcCjJ8gyuzk8XpvDZhCHJ/B3Vz+FvK05w/ljaBF
-F0qpQCDoOKK2+fJhV97wVy5jkzTMS/bMCYxiq3/LjxLmEwTBAiNF3MDEV7yW0TZc
-jmyrvL6jOrTTO6ayOI4N8tHTy6lWBKwNkTryZXhlWarL9r2o1R+9bQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNleHBlcnQuYW50YWduaW5nLnNlhiJodHRwczovL2V4cGVy
-dC5hbnRhZ25pbmcuc2UvZWNzLXNwMB0GA1UdDgQWBBQa1efPa+KRN4VdbtmNatIz
-E2xf2DANBgkqhkiG9w0BAQUFAAOCAQEAexJmaW4Kn8/Toc2VB0XxUTxFhVPl1Yvx
-mTNQw/gFEeguL4bQeHTJQ5UIB43vTCR7Z4ZEWpZjdCm7AI88HoxtMF5ktm9YBAIk
-o1ANyEWZ+vjviRUncnudPoutH8xoM+WzyCXLsEHPTfMu5KLb8U80Wgn8/0qDSEwt
-iD+vjf5QaeVmd8i7HUeWg2R6e1EmRNeJssg7wAMeoWD76oOY4s55kmRG3GOY+iVV
-Pi755TKRrhgKLRu6X2ohz0/H8QNDkVpo/0u/zlW4iNVOyLeSzPuQhDl0xy4LTKo7
-hMvkdB9ux/vPq93rCzcdDnW+zoZmsj1EXtqjDSSEgb/6zJ+ExbZ29Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>expert.antagning.se</ds:KeyName>
-        <ds:KeyName>https://expert.antagning.se/ecs-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=expert.antagning.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANSBcY8AW9T/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2V4cGVydC5hbnRhZ25pbmcuc2UwHhcNMTEwNTA5MTc0MTQ3WhcNMjEwNTA2
-MTc0MTQ3WjAeMRwwGgYDVQQDExNleHBlcnQuYW50YWduaW5nLnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtylQ0TngqqfQUnyBdtd1+WfFCBaFa1MY
-Twc7L/toQr6WJ1QfQyFZgWTEM48PySKVxt+NByyY9VXmcIhADPiP+QiPccME4ink
-x+/xmU532IW6IW1lg3QOLh2tG5fplJZvbmW5ni/tv5Rw/bSDFmagw3AyasIM1OpK
-vbDzJXM80KYR77nNHlS6498D3KcCjJ8gyuzk8XpvDZhCHJ/B3Vz+FvK05w/ljaBF
-F0qpQCDoOKK2+fJhV97wVy5jkzTMS/bMCYxiq3/LjxLmEwTBAiNF3MDEV7yW0TZc
-jmyrvL6jOrTTO6ayOI4N8tHTy6lWBKwNkTryZXhlWarL9r2o1R+9bQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNleHBlcnQuYW50YWduaW5nLnNlhiJodHRwczovL2V4cGVy
-dC5hbnRhZ25pbmcuc2UvZWNzLXNwMB0GA1UdDgQWBBQa1efPa+KRN4VdbtmNatIz
-E2xf2DANBgkqhkiG9w0BAQUFAAOCAQEAexJmaW4Kn8/Toc2VB0XxUTxFhVPl1Yvx
-mTNQw/gFEeguL4bQeHTJQ5UIB43vTCR7Z4ZEWpZjdCm7AI88HoxtMF5ktm9YBAIk
-o1ANyEWZ+vjviRUncnudPoutH8xoM+WzyCXLsEHPTfMu5KLb8U80Wgn8/0qDSEwt
-iD+vjf5QaeVmd8i7HUeWg2R6e1EmRNeJssg7wAMeoWD76oOY4s55kmRG3GOY+iVV
-Pi755TKRrhgKLRu6X2ohz0/H8QNDkVpo/0u/zlW4iNVOyLeSzPuQhDl0xy4LTKo7
-hMvkdB9ux/vPq93rCzcdDnW+zoZmsj1EXtqjDSSEgb/6zJ+ExbZ29Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <!-- NEW CERTIFICATES -->
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:KeyName>expert.antagning.se</ds:KeyName>
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>