Resolves SWAMID-3490

2 files changed, 30 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index fc2f891d..8adb56b3 100644
--- a/Makefile
+++ b/Makefile
@@ -154,7 +154,7 @@ testGeantCoCo:
 							echo "  Known bad link to CoCo in PrivacyStatementURL: $$x" 1>&2 ; \
 						else \
 							if ! grep -q "$$url $$lang $$mdui_PrivacyStatementURL" sp-with-once-ok-coco-link ; then \
-								curl -A 'Mozilla' -s -L -m 5 "$$url" < /dev/null | grep "https*://www.geant.net/uri/dataprotection-code-of-conduct/v1" > /dev/null && echo "$$url $$lang $$mdui_PrivacyStatementURL" >> sp-with-once-ok-coco-link || echo "    Missing link to geant.net/code-of-conduct/v1 in PrivacyStatementURL $$lang ($$url)" ; \
+								curl -A 'Mozilla' -s -L -m 10 "$$url" < /dev/null | grep "http*://www.geant.net/uri/dataprotection-code-of-conduct/v1" > /dev/null && echo "$$url $$lang $$mdui_PrivacyStatementURL" >> sp-with-once-ok-coco-link || echo "    Missing link to geant.net/code-of-conduct/v1 in PrivacyStatementURL $$lang ($$url)" ; \
 							fi ; \
 						fi ; \
 					done ; \
diff --git a/swamid-2.0/vfu-test.su.se-shibboleth.sso.xml b/swamid-2.0/vfu-test.su.se-shibboleth.sso.xml
index ba355ed0..56c017b8 100644
--- a/swamid-2.0/vfu-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfu-test.su.se-shibboleth.sso.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://vfu-test.su.se/Shibboleth.sso">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
@@ -26,9 +22,7 @@ and do *NOT* provide it in real time to your partners.
     <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>
@@ -49,6 +43,7 @@ and do *NOT* provide it in real time to your partners.
         <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>
@@ -99,9 +94,36 @@ XOl0tx98AnNRgDTOuRoPtUa7Bg8w4puwklhK+gg+X01kZA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfu-test.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-test.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu-test.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">VFU-test</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>