From 80041f1955d528b2fbd7bbba100ba945871fde33 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 12 Sep 2013 15:08:56 +0000
Subject: [PATCH] Move URL-encoding check out of the general set and apply it
 only for the import transform and on already registered UKf metadata.  This
 means that it will no longer be applied to metadata imported from partners
 such as eduGAIN.

---
 mdx/_rules/check_misc.xsl  | 11 -----------
 mdx/uk/beans.xml           | 14 ++++++++++++++
 mdx/uk/check_uk_urlenc.xsl | 32 ++++++++++++++++++++++++++++++++
 mdx/uk/verbs.xml           |  1 +
 4 files changed, 47 insertions(+), 11 deletions(-)
 create mode 100644 mdx/uk/check_uk_urlenc.xsl

diff --git a/mdx/_rules/check_misc.xsl b/mdx/_rules/check_misc.xsl
index 80ec2836..3bb2f013 100644
--- a/mdx/_rules/check_misc.xsl
+++ b/mdx/_rules/check_misc.xsl
@@ -67,17 +67,6 @@
 	</xsl:template>
 	
 	
-	<!--
-        Check for endpoint locations that include a '%' character,
-        which is symptomatic of their being URL-encoded instead of entity-encoded.
-    -->
-	<xsl:template match="@Location[contains(., '%')]">
-		<xsl:call-template name="error">
-			<xsl:with-param name="m">URL-encoded Location attribute; should be entity-encoded</xsl:with-param>
-		</xsl:call-template>
-	</xsl:template>
-	
-
 	<!--
 		Check for Locations that don't start with https://
 		
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 3f4c87df..eaa7a218 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -253,6 +253,19 @@
     </bean>
     
     
+    <!--
+        check_uk_urlenc
+    -->
+    <bean id="check_uk_urlenc" parent="XSLValidationStage"
+        p:id="check_uk_urlenc">
+        <property name="xslResource">
+            <bean parent="FilesystemResource">
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_uk_urlenc.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+
     <!--
         uk_trustRootsDocument
         
@@ -375,6 +388,7 @@
                 <ref bean="checkSchemas"/>
                 <ref bean="CHECK_std"/>
                 <ref bean="check_ukreg"/>
+                <ref bean="check_uk_urlenc"/>
                 <ref bean="mdui_dn_en_present"/>
                 <ref bean="mdui_dn_en_match"/>
                 <ref bean="check_dup_display"/>
diff --git a/mdx/uk/check_uk_urlenc.xsl b/mdx/uk/check_uk_urlenc.xsl
new file mode 100644
index 00000000..d9806fc9
--- /dev/null
+++ b/mdx/uk/check_uk_urlenc.xsl
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+	check_uk_urlenc.xsl
+	
+    UKf-specific check for endpoint locations that include a '%' character,
+    which is symptomatic of their being URL-encoded instead of entity-encoded.
+	
+	Author: Ian A. Young <ian@iay.org.uk>
+
+-->
+<xsl:stylesheet version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+	<!--
+		Common support functions.
+	-->
+	<xsl:import href="../_rules/check_framework.xsl"/>
+
+
+	<xsl:template match="@Location[contains(., '%')]">
+		<xsl:call-template name="error">
+			<xsl:with-param name="m">URL-encoded Location attribute; should be entity-encoded</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
+	
+</xsl:stylesheet>
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index cb867dac..c33f66eb 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -296,6 +296,7 @@
                 <ref bean="check_shibboleth"/>
                 <ref bean="check_uk_trust"/>
                 
+                <ref bean="check_uk_urlenc"/>
                 <ref bean="check_future"/>
                 <ref bean="check_imported"/>
                 <ref bean="check_vhosts"/>