From 658ce0094fc0f91b328c7ff60f327398dd05221e Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 8 Feb 2017 11:25:10 +0000
Subject: [PATCH] Separate normalisation transforms for export and export
 preview

---
 mdx/uk/generate.xml               |  15 ++--
 mdx/uk/ns_norm_export.xsl         |   8 +--
 mdx/uk/ns_norm_export_preview.xsl | 111 ++++++++++++++++++++++++++++++
 3 files changed, 120 insertions(+), 14 deletions(-)
 create mode 100644 mdx/uk/ns_norm_export_preview.xsl

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index d4fcbaaa..d8be9833 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -661,9 +661,6 @@
         </property>
     </bean>
     
-    <bean id="uk_normaliseExport" parent="XSLTransformationStage"
-        p:XSLResource="classpath:uk/ns_norm_export.xsl"/>
-    
     <bean id="uk_exportSelector" parent="XPathItemSelectionStrategy">
         <constructor-arg value="/md:EntityDescriptor[not(md:Extensions/ukfedlabel:ExportOptOut)]"/>
         <constructor-arg ref="commonNamespaces"/>
@@ -756,8 +753,10 @@
                 <ref bean="stripEntityScopes"/>
                 <ref bean="stripEmptyExtensions"/>
                 <ref bean="uk_finaliseExport"/>
-                <ref bean="uk_normaliseExport"/>
-                
+
+                <bean id="uk_normaliseExport" parent="XSLTransformationStage"
+                    p:XSLResource="classpath:uk/ns_norm_export.xsl"/>
+
                 <!--
                     Schema validity and other checks MUST pass.
                     
@@ -866,8 +865,10 @@
                 <ref bean="stripEntityScopes"/>
                 <ref bean="stripEmptyExtensions"/>
                 <ref bean="uk_finaliseExport"/>
-                <ref bean="uk_normaliseExport"/>
-                
+
+                <bean id="uk_normaliseExportPreview" parent="XSLTransformationStage"
+                    p:XSLResource="classpath:uk/ns_norm_export_preview.xsl"/>
+
                 <!--
                     Schema validity and other checks MUST pass.
                     
diff --git a/mdx/uk/ns_norm_export.xsl b/mdx/uk/ns_norm_export.xsl
index 45f91dd9..99806323 100644
--- a/mdx/uk/ns_norm_export.xsl
+++ b/mdx/uk/ns_norm_export.xsl
@@ -3,13 +3,7 @@
 
 	ns_norm_export.xsl
 	
-	Normalise the namespaces in a metadata file for export.
-	
-	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.
+	Normalise the namespaces in the export aggregate.
 	
 	The strategy is to define the most commonly-used prefixes in the document element.
 	
diff --git a/mdx/uk/ns_norm_export_preview.xsl b/mdx/uk/ns_norm_export_preview.xsl
new file mode 100644
index 00000000..f5c3833b
--- /dev/null
+++ b/mdx/uk/ns_norm_export_preview.xsl
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+	ns_norm_export_preview.xsl
+	
+	Normalise the namespaces in the export preview aggregate.
+	
+	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: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:remd="http://refeds.org/metadata"
+	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 saml ukfedlabel wayf"
+	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="../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>