From f9dd92725fb22d5078b8cedca6da5857044ac244 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 16 Sep 2011 14:23:38 +0000
Subject: [PATCH] Make "publishable" test specific to the UK channel. Include
 schema validity in the publishability test. Move cleaning up empty Extensions
 element out of strip_extensions to use new ukf-mda stage.

---
 mdx/uk/beans.xml            | 22 ++++++++++++++++++++++
 mdx/uk/collect.xml          |  2 +-
 mdx/uk/generate.xml         | 15 +++++++++++----
 mdx/uk/strip_extensions.xsl | 22 ----------------------
 mdx/validation-beans.xml    | 20 --------------------
 5 files changed, 34 insertions(+), 47 deletions(-)

diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 3b27a311..63aeb2f5 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -120,6 +120,28 @@
     </bean>
     
     
+    <!--
+        uk_checkPublishable
+        
+        Check an aggregate metadata document for publishability.  This is applied during
+        all UK publication flows prior to any signature step.  It is not applied to
+        export flows, for which we desire the closest possible correspondence to
+        the registered metadata.
+    -->
+    <bean id="uk_checkPublishable" class="net.shibboleth.metadata.pipeline.CompositeStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="uk_checkPublishable"/>
+        <property name="composedStages">
+            <list>
+                <ref bean="checkSchemas"/>
+                <ref bean="check_aggregate"/>
+                <ref bean="check_filtered"/>
+                <ref bean="check_fixups"/>
+            </list>
+        </property>
+    </bean>
+    
+
     <!--
         uk_trustRootsDocument
         
diff --git a/mdx/uk/collect.xml b/mdx/uk/collect.xml
index 550c3a7d..6e4ae6c0 100644
--- a/mdx/uk/collect.xml
+++ b/mdx/uk/collect.xml
@@ -40,7 +40,7 @@
                 <ref bean="uk_assemble"/>
                 <ref bean="uk_addTrustRoots"/>
                 <ref bean="normaliseNamespaces"/>
-                <ref bean="CHECK_publishable"/>
+                <ref bean="uk_checkPublishable"/>
                 <ref bean="errorTerminatingFilter"/>
                 <ref bean="serializeCollected"/>
             </list>
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index cda7bf5b..095ba55b 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -135,7 +135,7 @@
                 <ref bean="uk_normaliseNamespaces"/>
                 
                 <!-- production aggregate MUST pass publishability test -->
-                <ref bean="CHECK_publishable"/>
+                <ref bean="uk_checkPublishable"/>
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="serializeUnsignedProductionAggregate"/>
@@ -178,7 +178,7 @@
                 <ref bean="uk_normaliseNamespaces"/>
 
                 <!-- WAYF aggregate MUST pass publishability test -->
-                <ref bean="CHECK_publishable"/>
+                <ref bean="uk_checkPublishable"/>
                 <ref bean="errorTerminatingFilter"/>
 
                 <ref bean="serializeUnsignedWayfAggregate"/>
@@ -231,7 +231,7 @@
                 <ref bean="uk_normaliseNamespaces"/>
                 
                 <!-- fallback aggregate MUST pass publishability test -->
-                <ref bean="CHECK_publishable"/>
+                <ref bean="uk_checkPublishable"/>
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="serializeUnsignedFallbackAggregate"/>
@@ -320,8 +320,14 @@
             <list>
                 <ref bean="uk_stripExtensions"/>
                 <ref bean="uk_assemble"/>
+                <ref bean="removeEmptyExtensions"/>
                 <ref bean="uk_finaliseExport"/>
                 <ref bean="uk_normaliseNamespaces"/>
+                
+                <!-- schema validity check MUST pass -->
+                <ref bean="checkSchemas"/>
+                <ref bean="errorTerminatingFilter"/>
+                
                 <ref bean="serializeUnsignedExportAggregate"/>
             </list>
         </property>
@@ -386,6 +392,7 @@
                     selection for that pipeline is based on these same extensions.
                 -->
                 <ref bean="uk_stripExtensions"/>
+                <ref bean="removeEmptyExtensions"/>
                 
                 <!--
                     Perform fixups on UK federation entities.  We need to make sure
@@ -443,7 +450,7 @@
                 <ref bean="uk_normaliseNamespaces"/>
                 
                 <!-- test aggregate MUST pass publishability test -->
-                <ref bean="CHECK_publishable"/>
+                <ref bean="uk_checkPublishable"/>
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="serializeUnsignedTestAggregate"/>
diff --git a/mdx/uk/strip_extensions.xsl b/mdx/uk/strip_extensions.xsl
index dc835832..edf0ca14 100644
--- a/mdx/uk/strip_extensions.xsl
+++ b/mdx/uk/strip_extensions.xsl
@@ -17,28 +17,6 @@
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	exclude-result-prefixes="md">
 
-	<!--
-		Handle <md:Extensions> elements.
-		
-		In general, at this stage in the flow we pass through any Extensions unaltered.
-		However, certain changes (such as the filtering we perform on extensions in the
-		ukfedlabel namespace) may cause the Extensions element to become empty, which is not
-		permitted by the schema.  We therefore precompute the resulting Extensions element
-		and suppress it entirely if it would have no child elements.
-	-->
-	<xsl:template match="md:Extensions">
-		<!-- compute result -->
-		<xsl:variable name="ext">
-			<xsl:copy>
-				<xsl:apply-templates select="node()|@*"/>
-			</xsl:copy>
-		</xsl:variable>
-		<!-- copy through only if schema-valid -->
-		<xsl:if test="count(exsl:node-set($ext)/md:Extensions/*) != 0">
-			<xsl:copy-of select="$ext"/>
-		</xsl:if>
-	</xsl:template>
-	
 	<!--
 		Pass through certain ukfedlabel namespace elements.
 	-->
diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
index 56fd22f6..b1f8d8de 100644
--- a/mdx/validation-beans.xml
+++ b/mdx/validation-beans.xml
@@ -314,24 +314,4 @@
         </property>
     </bean>
     
-    <!--
-        CHECK_publishable
-
-        Check an aggregate metadata document for publishability.  This is applied during
-        all UK publication flows prior to any signature step.  It is not applied to
-        export flows, for which we desire the closest possible correspondence to
-        the registered metadata.
-    -->
-    <bean id="CHECK_publishable" class="net.shibboleth.metadata.pipeline.CompositeStage"
-        init-method="initialize" lazy-init="true">
-        <property name="id" value="CHECK_publishable"/>
-        <property name="composedStages">
-            <list>
-                <ref bean="check_aggregate"/>
-                <ref bean="check_filtered"/>
-                <ref bean="check_fixups"/>
-            </list>
-        </property>
-    </bean>
-    
 </beans>