From 9c7b0c50066c2358fde08723a7803750b50182fe Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 7 Nov 2017 15:10:41 +0000
Subject: [PATCH] Add mdui:Description to generated IdP mdui:UIInfo

Iterate on the generation of mdui:UIInfo for identitify providers which do not have mdui:UIInfo already. Reduces the number of warnings we get from the eduGAIN validator.
See ukf/ukf-meta#150.
---
 mdx/uk/README.md       |  6 ++++--
 mdx/uk/odn_to_mdui.xsl | 22 +++++++++++++++++-----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/mdx/uk/README.md b/mdx/uk/README.md
index 8531bd91..bbb609e0 100644
--- a/mdx/uk/README.md
+++ b/mdx/uk/README.md
@@ -31,7 +31,8 @@ before being included in the `export` version consumed by interfederation partne
 Status (2017-10-25):
 
 * The export preview aggregate ensures that all UKf-registered identity providers have `mdui:DisplayName`
-metadata by copying data from `md:OrganizationDisplayName` if required.
+metadata by copying data from `md:OrganizationDisplayName` if required. The copying process also
+generates `mdui:Description` elements with the same content.
 
 ## Production Maturity Pipeline
 
@@ -63,7 +64,8 @@ when it appeared in the fallback aggregate, which would be too late to take corr
 Status (2017-10-25):
 
 * The test aggregate ensures that all UKf-registered identity providers have `mdui:DisplayName`
-metadata by copying data from `md:OrganizationDisplayName` if required.
+metadata by copying data from `md:OrganizationDisplayName` if required. The copying process also
+generates `mdui:Description` elements with the same content.
 
 ### Fallback Aggregate vs. Production Aggregate
 
diff --git a/mdx/uk/odn_to_mdui.xsl b/mdx/uk/odn_to_mdui.xsl
index 55576407..6512cb8b 100644
--- a/mdx/uk/odn_to_mdui.xsl
+++ b/mdx/uk/odn_to_mdui.xsl
@@ -4,7 +4,8 @@
     odn_to_mdui.xsl
 
     If an identity provider does not have at least one MDUI-based discovery
-    name, give it one by copying data from its md:OrganizationDisplayName.
+    name, give it mdui:DisplayName and mdui:Description by copying data from
+    its md:OrganizationDisplayName.
 
     This transform will only be applied to UKf-registered entities.
 
@@ -39,8 +40,8 @@
         Match the md:IDPSSODescriptor/md:Extensions element of an identity provider
         which does not have mdui:UIInfo.
 
-        We must fabricate the mdui:UIInfo as well as the mdui:DisplayName
-        elements.
+        We must fabricate the mdui:UIInfo as well as the mdui:DisplayName and
+        mdui:Description elements.
     -->
     <xsl:template match="/md:EntityDescriptor/md:IDPSSODescriptor/md:Extensions[not(mdui:UIInfo)]">
         <xsl:variable name="odns" select="../../md:Organization/md:OrganizationDisplayName"/>
@@ -57,8 +58,8 @@
     </xsl:template>
 
     <!--
-        Make a new mdui:DisplayName for each of the md:OrganizationDisplayName
-        elements in the $odns parameter.
+        Make a new mdui:DisplayName and mdui:Description for each of the
+        md:OrganizationDisplayName elements in the $odns parameter.
 
         Each of the new elements copies the value and xml:lang attribute of
         the md:OrganizationDisplayName, and is indented appropriately to
@@ -66,6 +67,7 @@
     -->
     <xsl:template name="generateDisplayNames">
         <xsl:param name="odns"/>
+        <!-- Generate mdui:DisplayName elements. -->
         <xsl:for-each select="$odns">
             <xsl:text>&#10;&#9;&#9;&#9;&#9;</xsl:text>
             <mdui:DisplayName>
@@ -75,6 +77,16 @@
                 <xsl:value-of select="."/>
             </mdui:DisplayName>
         </xsl:for-each>
+        <!-- Generate mdui:Description elements. -->
+        <xsl:for-each select="$odns">
+            <xsl:text>&#10;&#9;&#9;&#9;&#9;</xsl:text>
+            <mdui:Description>
+                <xsl:attribute name="xml:lang">
+                    <xsl:value-of select="@xml:lang"/>
+                </xsl:attribute>
+                <xsl:value-of select="."/>
+            </mdui:Description>
+        </xsl:for-each>
     </xsl:template>