From 4ae626638d5646d640c0ad4c1dbebb0d38a57d18 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Tue, 21 Jun 2016 11:56:12 +0200
Subject: Resolves SWAMIDOPS-8242

---
 swamid-2.0/luvittest1.education.lu.se-shibboleth.xml | 12 ++++++++++++
 swamid-2.0/luvittest2.ced.lu.se-shibboleth.xml       | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/swamid-2.0/luvittest1.education.lu.se-shibboleth.xml b/swamid-2.0/luvittest1.education.lu.se-shibboleth.xml
index 67f2b607..03f4a29b 100644
--- a/swamid-2.0/luvittest1.education.lu.se-shibboleth.xml
+++ b/swamid-2.0/luvittest1.education.lu.se-shibboleth.xml
@@ -17,11 +17,23 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <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:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="http://luvittest1.education.lu.se/Shibboleth.sso/Login-lu"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://luvittest1.education.lu.se/Shibboleth.sso/Login-swamid" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Lund University LUVIT Test1</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lund University LUVIT Test1</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Testmiljö för Lund University LUVIT</mdui:Description>
+        <mdui:Description xml:lang="en">Test system for Lund University LUVIT</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-2.0/luvittest2.ced.lu.se-shibboleth.xml b/swamid-2.0/luvittest2.ced.lu.se-shibboleth.xml
index 30196d56..8e483139 100644
--- a/swamid-2.0/luvittest2.ced.lu.se-shibboleth.xml
+++ b/swamid-2.0/luvittest2.ced.lu.se-shibboleth.xml
@@ -17,11 +17,23 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <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:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="http://luvittest2.education.lu.se/Shibboleth.sso/Login-lu"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://luvittest2.education.lu.se/Shibboleth.sso/Login-swamid" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Lund University LUVIT Test2</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lund University LUVIT Test2</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Testmiljö för Lund University LUVIT</mdui:Description>
+        <mdui:Description xml:lang="en">Test system for Lund University LUVIT</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-- 
cgit v1.2.3