From 46326d7a02535f8f43a48cd12e9ff009739112c2 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Wed, 19 Apr 2017 16:35:49 +0200
Subject: Resolves SWAMIDOPS-8554

---
 ...e-module.php-saml-sp-metadata.php-default-sp.xml | 21 +++++++++++++++++++--
 swamid-edugain-sp-1.0.mxml                          |  1 +
 2 files changed, 20 insertions(+), 2 deletions(-)

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 b071b3f7..957efc4a 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
@@ -1,6 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.snd.gu.se/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <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:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <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:UIInfo>
+    </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
@@ -22,8 +39,8 @@
     <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:SPSSODescriptor>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>SND</md:GivenName>
-    <md:SurName>Administrator</md:SurName>
+    <md:GivenName>Pablo</md:GivenName>
+    <md:SurName>Millet</md:SurName>
     <md:EmailAddress>mailto:pablo.millet@gu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index 8c16b1eb..28c0d81a 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -25,4 +25,5 @@
   <xi:include href="swamid-2.0/test.scalable-learning.com.xml"/>
   <xi:include href="swamid-2.0/www.scalable-learning.com.xml"/>
   <xi:include href="swamid-2.0/inacademia.org-metadata-inacademia-simple-validation.xml"/>
+  <xi:include href="swamid-2.0/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3