SWAMID-769 and SWAMID-768 updates to SND GU SPs

2 files changed, 82 insertions, 46 deletions

diff --git a/swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
index 67df320f..dc6357dc 100644
--- a/swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
@@ -4,19 +4,18 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-02-28T15:35:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Swedish National Data Service</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Svensk Nationell Datatjänst</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Siten är en öppen demoversion och är främst ämnad för SND:s konsortium, dess medlemmar och användare.</mdui:Description>
-        <mdui:Description xml:lang="en">The site is an open demo version and is primarily intended for SND's consortium, its members and users.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">SND Service Provider</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SND Service Provider</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SSO service for SND.</mdui:Description>
+        <mdui:Description xml:lang="sv">SSO tjänst för SND.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://snd.gu.se/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://snd.gu.se/sv</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.gu.se/en/about-the-website/processing-personal-data</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.gu.se/om-webbplatsen/behandling-av-personuppgifter</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -42,23 +41,45 @@
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">Swedish National Data Service</md:ServiceName>
       <md:ServiceName xml:lang="sv">Svensk Nationell Datatjänst</md:ServiceName>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" FriendlyName="sn"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" FriendlyName="givenName"/>
+      <md:ServiceDescription xml:lang="sv">Siten &amp;#xE4;r en &amp;#xF6;ppen demoversion och &amp;#xE4;r fr&amp;#xE4;mst &amp;#xE4;mnad f&amp;#xF6;r SND:s konsortium, dess medlemmar och anv&amp;#xE4;ndare.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The site is an open demo version and is primarily intended for SND&amp;#x27;s consortium, its members and users.</md:ServiceDescription>
+      <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="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrcid" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <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="false"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Svensk Nationell Datatjänst</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Swedish National Data Service</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Demo - Svensk Nationell Datatjänst</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Demo - Swedish National Data Service</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Svensk Nationell Datatjänst</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish National Data Service</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://snd.gu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://snd.gu.se/sv</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://snd.gu.se/en</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>SND</md:Company>
+    <md:GivenName>SND</md:GivenName>
+    <md:SurName>Administrative</md:SurName>
+    <md:EmailAddress>mailto:snd@snd.gu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>SND</md:Company>
+    <md:GivenName>SND</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:webmaster@snd.gu.se</md:EmailAddress>
+  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:GivenName>SND</md:GivenName>
     <md:SurName>Administrator</md:SurName>
     <md:EmailAddress>mailto:webmaster@snd.gu.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>SND</md:Company>
+    <md:GivenName>SND</md:GivenName>
+    <md:SurName>Security</md:SurName>
+    <md:EmailAddress>mailto:webmaster@snd.gu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
index 9b24e4f0..1c9fa601 100644
--- a/swamid-2.0/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
@@ -4,21 +4,18 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-03-21T10:11:06Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Svensk Nationell Datatjänst</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Swedish National Data Service</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">På Svensk nationell datatjänst tar vi emot forskningsdata för bevarande med syfte att göra dem tillgängliga för ny forskning.</mdui:Description>
-        <mdui:Description xml:lang="en">SND is a national resource that facilitates access to new and existing Swedish research data within and outside of Sweden.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://snd.gu.se/sv/om-oss</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://snd.gu.se/en/about-us</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="en">SND Service Provider</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SND Service Provider</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SSO service for SND.</mdui:Description>
+        <mdui:Description xml:lang="sv">SSO tjänst för SND.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://snd.gu.se/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://snd.gu.se/sv</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.gu.se/en/about-the-website/processing-personal-data</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.gu.se/om-webbplatsen/behandling-av-personuppgifter</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -36,33 +33,51 @@
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.snd.gu.se/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.snd.gu.se/module.php/saml/sp/saml2-logout.php/default-sp"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.snd.gu.se/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.snd.gu.se/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.snd.gu.se/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.snd.gu.se/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="1">
+    <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">Swedish National Data Service</md:ServiceName>
       <md:ServiceName xml:lang="sv">Svensk Nationell Datatjänst</md:ServiceName>
-      <md:ServiceDescription xml:lang="sv">På Svensk nationell datatjänst tar vi emot forskningsdata för bevarande med syfte att göra dem tillgängliga för ny forskning.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">SND is a national resource that facilitates access to new and existing Swedish research data within and outside of Sweden.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" isRequired="true" 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"/>
-      <md:RequestedAttribute FriendlyName="mail" isRequired="false" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" isRequired="false" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="cn" isRequired="false" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="givenName" isRequired="false" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <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="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrcid" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <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="false"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">SND Gothenburg University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">SND Göteborgs universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish National Data Service Gothenburg University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Svensk Nationell Datatjänsti Göteborgs universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://snd.gu.se/en</md:OrganizationURL>
+    <md:OrganizationName xml:lang="sv">Svensk Nationell Datatjänst</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Swedish National Data Service</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Svensk Nationell Datatjänst</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish National Data Service</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://snd.gu.se/sv</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://snd.gu.se/en</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>SND</md:Company>
+    <md:GivenName>SND</md:GivenName>
+    <md:SurName>Administrative</md:SurName>
+    <md:EmailAddress>mailto:snd@snd.gu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>SND</md:Company>
+    <md:GivenName>SND</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:webmaster@snd.gu.se</md:EmailAddress>
+  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Pablo</md:GivenName>
-    <md:SurName>Millet</md:SurName>
-    <md:EmailAddress>mailto:pablo.millet@gu.se</md:EmailAddress>
+    <md:GivenName>SND</md:GivenName>
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>mailto:webmaster@snd.gu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>SND</md:Company>
+    <md:GivenName>SND</md:GivenName>
+    <md:SurName>Security</md:SurName>
+    <md:EmailAddress>mailto:webmaster@snd.gu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>