From 879911c73f8d9b38c4a37b7c150c6abec810e611 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 3 Aug 2012 20:58:23 +0000
Subject: [PATCH] Move the namespace normaliser for normal UK federation
 metadata into the mdx/uk directory. Duplicate it as ns_norm_test and use that
 as the namespace normaliser for the test aggregate.  This will allow the test
 aggregate to have its own normalisation rules.

---
 mdx/uk/beans.xml                 |   2 +-
 mdx/uk/generate.xml              |  29 +++++---
 mdx/uk/ns_norm_test.xsl          | 117 +++++++++++++++++++++++++++++++
 {build => mdx/uk}/ns_norm_uk.xsl |   2 +-
 4 files changed, 138 insertions(+), 12 deletions(-)
 create mode 100644 mdx/uk/ns_norm_test.xsl
 rename {build => mdx/uk}/ns_norm_uk.xsl (98%)

diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 27ed317a..f0eb2b65 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -367,7 +367,7 @@
         p:id="uk_normaliseNamespaces">
         <property name="xslResource">
             <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/ns_norm_uk.xsl"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_uk.xsl"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index cd928208..dd1348c9 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -265,6 +265,15 @@
         </property>
     </bean>
     
+    <bean id="uk_normaliseTest" parent="xslt_parent"
+        p:id="uk_normaliseTest">
+        <property name="xslResource">
+            <bean parent="file_parent">
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_test.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
     <bean id="serializeUnsignedTestAggregate" parent="serialize_parent"
         p:id="serializeUnsignedTestAggregate">
         <property name="outputFile">
@@ -282,15 +291,6 @@
         *******************************************
     -->
     
-    <bean id="uk_normaliseExport" parent="xslt_parent"
-        p:id="uk_normaliseExport">
-        <property name="xslResource">
-            <bean parent="file_parent">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_export.xsl"/>
-            </bean>
-        </property>
-    </bean>
-    
     <bean id="uk_finaliseExport" parent="xslt_parent"
         p:id="uk_finaliseExport">
         <property name="xslResource">
@@ -306,6 +306,15 @@
         </property>
     </bean>
     
+    <bean id="uk_normaliseExport" parent="xslt_parent"
+        p:id="uk_normaliseExport">
+        <property name="xslResource">
+            <bean parent="file_parent">
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_export.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
     <bean id="uk_exportSelector" class="net.shibboleth.metadata.dom.XPathItemSelectionStrategy">
         <constructor-arg value="/md:EntityDescriptor[md:Extensions/ukfedlabel:ExportOptIn]"/>
         <constructor-arg ref="commonNamespaces"/>
@@ -459,7 +468,7 @@
                 <ref bean="uk_assembleHierarchicalAggregate"/>
                 <ref bean="uk_addTrustRoots"/>
                 <ref bean="uk_finaliseTest"/>
-                <ref bean="uk_normaliseNamespaces"/>
+                <ref bean="uk_normaliseTest"/>
                 
                 <!-- test aggregate MUST pass publishability test -->
                 <ref bean="uk_checkPublishable"/>
diff --git a/mdx/uk/ns_norm_test.xsl b/mdx/uk/ns_norm_test.xsl
new file mode 100644
index 00000000..71fcbd86
--- /dev/null
+++ b/mdx/uk/ns_norm_test.xsl
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+	ns_norm_test.xsl
+	
+	Normalise the namespaces in the UK federation's test aggregate.
+	
+	The main constraint on the output of this transform is that it should minimise the size
+	of the output file while not having "too many" namespace prefix definitions in scope
+	at any point in the document.  "Too many" is more than about ten, as a result of a bug
+	in the metadatatool application used by Shibboleth 1.3 IdPs to download and verify
+	metadata.
+	
+	The strategy is to define the most commonly-used prefixes in the document element.
+	
+	Prefixes which are less often used, but which may be used by container elements
+	(e.g., mdui:) or for attributes are normalised to use a prefix, but not declared
+	on the document element.
+	
+	Prefixes which are less often used and are only used for non-containers can be
+	normalised to non-prefix use (i.e., to redefine the default namespace) if required
+	to cut the numbers down.
+	
+	Author: Ian A. Young <ian@iay.org.uk>
+
+-->
+<xsl:stylesheet version="1.0"
+	xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport"
+	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+	xmlns:elab="http://eduserv.org.uk/labels"
+	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
+	xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
+	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
+	xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
+	xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
+	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
+	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
+	
+	exclude-result-prefixes="alg md mdattr mdrpi saml"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+	<!--
+		Import templates for basic normalisation.
+	-->
+	<xsl:import href="../../build/ns_norm.xsl"/>
+	
+
+	<!--
+		Force UTF-8 encoding for the output.
+	-->
+	<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8"/>
+	
+
+	<!--
+		*******************************************
+		***                                     ***
+		***   D O C U M E N T   E L E M E N T   ***
+		***                                     ***
+		*******************************************
+	-->
+	
+	
+	<!--
+		We need to handle the document element specially in order to arrange
+		for all appropriate namespace prefix definitions to appear on it.
+		
+		There are only two possible document elements in SAML metadata.
+	-->
+	
+	
+	<!--
+		Document element is <EntityDescriptor>.
+	-->
+	<xsl:template match="/md:EntityDescriptor">
+		<EntityDescriptor>
+			<xsl:apply-templates select="node()|@*"/>
+		</EntityDescriptor>
+	</xsl:template>
+	
+	<!--
+		Document element is <EntitiesDescriptor>.
+	-->
+	<xsl:template match="/md:EntitiesDescriptor">
+		<EntitiesDescriptor>
+			<xsl:apply-templates select="node()|@*"/>
+		</EntitiesDescriptor>
+	</xsl:template>
+	
+	
+	<!--
+		*************************************
+		***                               ***
+		***   A L G   N A M E S P A C E   ***
+		***                               ***
+		*************************************
+	-->
+	
+	
+	<!--
+		alg:*
+		
+		Normalise namespace to not use a prefix.
+	-->
+	<xsl:template match="alg:*">
+		<xsl:element name="{local-name()}" namespace="urn:oasis:names:tc:SAML:metadata:algsupport">
+			<xsl:apply-templates select="node()|@*"/>
+		</xsl:element>
+	</xsl:template>
+	
+	
+</xsl:stylesheet>
diff --git a/build/ns_norm_uk.xsl b/mdx/uk/ns_norm_uk.xsl
similarity index 98%
rename from build/ns_norm_uk.xsl
rename to mdx/uk/ns_norm_uk.xsl
index 51b0fb7c..3432fe31 100644
--- a/build/ns_norm_uk.xsl
+++ b/mdx/uk/ns_norm_uk.xsl
@@ -48,7 +48,7 @@
 	<!--
 		Import templates for basic normalisation.
 	-->
-	<xsl:import href="ns_norm.xsl"/>
+	<xsl:import href="../../build/ns_norm.xsl"/>
 	
 
 	<!--