From a8cc244faf03c0b3b9975e3bce7ecc659626603d Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 5 Jul 2013 12:38:14 +0000
Subject: [PATCH] Promote two UK-specific tests for mdui:DisplayName to
 production, but only when checking UK-registered entities.

---
 mdx/_rules/check_future_0.xsl     | 22 -----------------
 mdx/_rules/check_future_1.xsl     | 13 ----------
 mdx/_rules/mdui_dn_en_match.xsl   | 41 +++++++++++++++++++++++++++++++
 mdx/_rules/mdui_dn_en_present.xsl | 31 +++++++++++++++++++++++
 mdx/uk/beans.xml                  |  2 ++
 mdx/validation-beans.xml          | 38 ++++++++++++++++++++++++++++
 6 files changed, 112 insertions(+), 35 deletions(-)
 create mode 100644 mdx/_rules/mdui_dn_en_match.xsl
 create mode 100644 mdx/_rules/mdui_dn_en_present.xsl

diff --git a/mdx/_rules/check_future_0.xsl b/mdx/_rules/check_future_0.xsl
index 36c45399..fe932075 100644
--- a/mdx/_rules/check_future_0.xsl
+++ b/mdx/_rules/check_future_0.xsl
@@ -30,26 +30,4 @@
 	-->
 	<xsl:import href="check_framework.xsl"/>
 
-	<!--
-		If an IdP has both an OrganizationDisplayName in English, and an
-		mdui:DisplayName in English, they must be identical.
-		
-		UKFTS 1.4 section 3.3
-	-->
-	<xsl:template match="md:EntityDescriptor[md:IDPSSODescriptor]">
-		<xsl:variable name="mdui" select="md:IDPSSODescriptor/md:Extensions/mdui:UIInfo/mdui:DisplayName[@xml:lang='en']"/>
-		<xsl:variable name="odn" select="md:Organization/md:OrganizationDisplayName[@xml:lang='en']"/>
-		<xsl:if test="$mdui and $odn and $mdui != $odn">
-			<xsl:call-template name="error">
-				<xsl:with-param name="m">
-					<xsl:text>mismatched xml:lang='en' DisplayNames: '</xsl:text>
-					<xsl:value-of select="$mdui"/>
-					<xsl:text>' in mdui vs. '</xsl:text>
-					<xsl:value-of select="$odn"/>
-					<xsl:text>' in ODN</xsl:text>
-				</xsl:with-param>
-			</xsl:call-template>
-		</xsl:if>
-	</xsl:template>
-	
 </xsl:stylesheet>
diff --git a/mdx/_rules/check_future_1.xsl b/mdx/_rules/check_future_1.xsl
index 79a01dd2..969be471 100644
--- a/mdx/_rules/check_future_1.xsl
+++ b/mdx/_rules/check_future_1.xsl
@@ -30,17 +30,4 @@
 	-->
 	<xsl:import href="check_framework.xsl"/>
 
-	<!--
-		If an entity has mdui:UIInfo, then that must include at least an
-		mdui:DisplayName with an English name.
-	-->
-	<xsl:template match="mdui:UIInfo[not(mdui:DisplayName[@xml:lang='en'])]">
-		<xsl:call-template name="error">
-			<xsl:with-param name="m">
-				<xsl:text>mdui:UIInfo with no xml:lang='en' DisplayName</xsl:text>
-			</xsl:with-param>
-		</xsl:call-template>
-		
-	</xsl:template>
-	
 </xsl:stylesheet>
diff --git a/mdx/_rules/mdui_dn_en_match.xsl b/mdx/_rules/mdui_dn_en_match.xsl
new file mode 100644
index 00000000..8281fe9d
--- /dev/null
+++ b/mdx/_rules/mdui_dn_en_match.xsl
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+	mdui_dn_en_match.xsl
+	
+    If an IdP has both an OrganizationDisplayName in English, and an
+    mdui:DisplayName in English, they must be identical.
+    
+    UKFTS 1.4 section 3.3
+	
+	Author: Ian A. Young <ian@iay.org.uk>
+
+-->
+<xsl:stylesheet version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
+	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+	<!--
+		Common support functions.
+	-->
+	<xsl:import href="check_framework.xsl"/>
+
+	<xsl:template match="md:EntityDescriptor[md:IDPSSODescriptor]">
+		<xsl:variable name="mdui" select="md:IDPSSODescriptor/md:Extensions/mdui:UIInfo/mdui:DisplayName[@xml:lang='en']"/>
+		<xsl:variable name="odn" select="md:Organization/md:OrganizationDisplayName[@xml:lang='en']"/>
+		<xsl:if test="$mdui and $odn and $mdui != $odn">
+			<xsl:call-template name="error">
+				<xsl:with-param name="m">
+					<xsl:text>mismatched xml:lang='en' DisplayNames: '</xsl:text>
+					<xsl:value-of select="$mdui"/>
+					<xsl:text>' in mdui vs. '</xsl:text>
+					<xsl:value-of select="$odn"/>
+					<xsl:text>' in ODN</xsl:text>
+				</xsl:with-param>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:template>
+	
+</xsl:stylesheet>
diff --git a/mdx/_rules/mdui_dn_en_present.xsl b/mdx/_rules/mdui_dn_en_present.xsl
new file mode 100644
index 00000000..16e2ab15
--- /dev/null
+++ b/mdx/_rules/mdui_dn_en_present.xsl
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+	mdui_dn_en_present.xsl
+	
+    If an entity has mdui:UIInfo, then that must include at least an
+    mdui:DisplayName with an English name.
+	
+	Author: Ian A. Young <ian@iay.org.uk>
+
+-->
+<xsl:stylesheet version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
+	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+	<!--
+		Common support functions.
+	-->
+	<xsl:import href="check_framework.xsl"/>
+
+	<xsl:template match="mdui:UIInfo[not(mdui:DisplayName[@xml:lang='en'])]">
+		<xsl:call-template name="error">
+			<xsl:with-param name="m">
+				<xsl:text>mdui:UIInfo with no xml:lang='en' DisplayName</xsl:text>
+			</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
+</xsl:stylesheet>
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index c774e0e2..68ed010e 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -374,6 +374,8 @@
                 <ref bean="checkSchemas"/>
                 <ref bean="CHECK_std"/>
                 <ref bean="check_ukreg"/>
+                <ref bean="mdui_dn_en_present"/>
+                <ref bean="mdui_dn_en_match"/>
                 
                 <!-- failure of any check on registered metadata is fatal -->
                 <ref bean="errorTerminatingFilter"/>
diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
index 37b828ac..014dbc4a 100644
--- a/mdx/validation-beans.xml
+++ b/mdx/validation-beans.xml
@@ -411,10 +411,48 @@
         </property>
     </bean>
     
+    <!--
+        mdui_dn_en_match
+        
+        If an IdP has both an OrganizationDisplayName in English, and an
+        mdui:DisplayName in English, they must be identical.
+        
+        UKFTS 1.4 section 3.3
+    -->
+    <bean id="mdui_dn_en_match" parent="XSLValidationStage"
+        p:id="mdui_dn_en_match">
+        <property name="xslResource">
+            <bean parent="FilesystemResource">
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/mdui_dn_en_match.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        mdui_dn_en_present
+        
+        If an entity has mdui:UIInfo, then that must include at least an
+        mdui:DisplayName with an English name.
+    -->
+    <bean id="mdui_dn_en_present" parent="XSLValidationStage"
+        p:id="mdui_dn_en_present">
+        <property name="xslResource">
+            <bean parent="FilesystemResource">
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/mdui_dn_en_present.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
     <!--
         check_mdui
         
         Composite check for the MDUI specification.
+        
+        Omitted the following, which are only applied to
+        UK-registered metadata:
+        
+            mdui_dn_en_present
+            mdui_dn_en_match
     -->
     <bean id="check_mdui" parent="CompositeStage"
         p:id="check_mdui">