From c9ad4417cc78dbff28e91625785ee83d745ffb59 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 20 Sep 2011 14:30:57 +0000
Subject: [PATCH] Introduce a non-XSLT test for mdui:IPHint elements, requiring
 an updated opensaml-util for a more heavyweight implementation of IPRange.
 Moved post-import validation of metadata into an aggregator verb so that
 non-XSLT rules can be checked.

---
 build.xml                | 30 +-------------------------
 mdx/uk/verbs.xml         | 46 ++++++++++++++++++++++++++++++++++++++++
 mdx/validation-beans.xml | 42 +++++++++++++++++++++++++++++++++---
 3 files changed, 86 insertions(+), 32 deletions(-)

diff --git a/build.xml b/build.xml
index 72e2e049..fd3d1264 100644
--- a/build.xml
+++ b/build.xml
@@ -772,11 +772,7 @@
             i="${temp.xml}" o="${entities.dir}/imported.xml"/>
 		
 		<echo>Imported metadata to ${entities.dir}/imported.xml</echo>
-        <CHECK.std i="${entities.dir}/imported.xml">
-        	<arg value="${build.dir}/check_future.xsl"/>
-            <arg value="${build.dir}/check_imported.xsl"/>
-            <arg value="${build.dir}/check_vhosts.xsl"/>
-        </CHECK.std>
+		<CHANNEL.do channel="uk" verb="validateImportedMetadata"/>
 		<echo>Checked.</echo>
 	</target>
 	
@@ -836,30 +832,6 @@
         </sequential>
 	</macrodef>
 
-	<macrodef name="CHECK.std">
-		<attribute name="i"/>
-		<element name="std.args" implicit="yes"/>
-		<sequential>
-			<CHECK.base i="@{i}">
-                <!-- set of checking stylesheets applied in every case -->
-                <arg value="${build.dir}/check_adfs.xsl"/>
-                <arg value="${build.dir}/check_idpdisc.xsl"/>
-                <arg value="${build.dir}/check_init.xsl"/>
-                <arg value="${build.dir}/check_mdiop.xsl"/>
-                <arg value="${build.dir}/check_mdui.xsl"/>
-                <arg value="${build.dir}/check_misc.xsl"/>
-                <arg value="${build.dir}/check_namespaces.xsl"/>
-				<arg value="${build.dir}/check_reqattr.xsl"/>
-				<arg value="${build.dir}/check_saml2.xsl"/>
-				<arg value="${build.dir}/check_saml2meta.xsl"/>
-                <arg value="${build.dir}/check_shibboleth.xsl"/>
-				
-				<!-- additional arguments -->
-				<std.args/>
-			</CHECK.base>
-		</sequential>
-	</macrodef>
-	
     <!--
         *********************************************
         ***                                       ***
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index 20b4f75f..acf63123 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -81,4 +81,50 @@
         </property>
     </bean>
 
+    <!--
+        *****************************************
+        ***                                   ***
+        ***   M E T A D A T A   I M P O R T   ***
+        ***                                   ***
+        *****************************************
+    -->
+    
+    <!--
+        importedMetadata
+        
+        Fetches the contents of the file used to hold metadata just imported
+        by the federation's import transform.
+    -->
+    <bean id="importedMetadata" class="net.shibboleth.metadata.dom.DomFilesystemSourceStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="importedMetadata"/>
+        <property name="parserPool" ref="parserPool"/>
+        <property name="source">
+            <bean class="java.io.File">
+                <constructor-arg value="#{ systemProperties['basedir'] }/entities/imported.xml"/>
+            </bean>
+        </property>
+    </bean>
+
+    <!--
+        validateImportedMetadata
+        
+        Perform custom validation on metadata just imported by the
+        federation's import transform.
+    -->
+    <bean id="validateImportedMetadata" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="validateImportedMetadat"/>
+        <property name="stages">
+            <list>
+                <ref bean="importedMetadata"/>
+                <ref bean="CHECK_std"/>
+                <ref bean="check_future"/>
+                <ref bean="check_imported"/>
+                <ref bean="check_vhosts"/>
+                <ref bean="errorTerminatingFilter"/>
+            </list>
+        </property>
+    </bean>
+    
 </beans>
diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
index b1f8d8de..fe62e043 100644
--- a/mdx/validation-beans.xml
+++ b/mdx/validation-beans.xml
@@ -127,11 +127,31 @@
     </bean>
     
     <!--
-        check_mdui
+        ***********************************************
+        ***                                         ***
+        ***   M D U I   S P E C I F I C A T I O N   ***
+        ***                                         ***
+        ***********************************************
+    -->
+    
+    <!--
+        check_mdui_iphint
+        
+        Checks for the mdui:IPHint element.
     -->
-    <bean id="check_mdui" class="net.shibboleth.metadata.dom.XSLValidationStage"
+    <bean id="check_mdui_iphint" class="uk.org.ukfederation.mda.validate.mdui.IPHintValidationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="check_mdui"/>
+        <property name="id" value="check_mdui_iphint"/>
+    </bean>
+    
+    <!--
+        check_mdui_xslt
+        
+        Miscellaneous MDUI tests, in XSLT.
+    -->
+    <bean id="check_mdui_xslt" class="net.shibboleth.metadata.dom.XSLValidationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="check_mdui_xslt"/>
         <property name="xslResource">
             <bean class="org.opensaml.util.resource.FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/build/check_mdui.xsl"/>
@@ -139,6 +159,22 @@
         </property>
     </bean>
     
+    <!--
+        check_mdui
+        
+        Composite check for the MDUI specification.
+    -->
+    <bean id="check_mdui" class="net.shibboleth.metadata.pipeline.CompositeStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="check_mdui"/>
+        <property name="composedStages">
+            <list>
+                <ref bean="check_mdui_iphint"/>
+                <ref bean="check_mdui_xslt"/>
+            </list>
+        </property>
+    </bean>
+    
     <!--
         check_misc
     -->