Strip KeyName elements from export aggregate.

Check that mdui:IPHint CIDR blocks represent networks. Disable cacheing of remote HTTP resources so that a bug in the mda code doesn't cause signing too fail if it is performed too often.
InCommon · Sep 27, 2011 · d718f4c · d718f4c
1 parent c9ad441
commit d718f4c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
@@ -173,6 +173,18 @@
         <property name="id" value="populateItemIds"/>
     </bean>
 
+    <!--
+        stripKeyNames
+        
+        Remove all ds:KeyName elements.
+    -->
+    <bean id="stripKeyNames" class="uk.org.ukfederation.mda.ElementStrippingStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="stripKeyNames"/>
+        <property name="elementName" value="KeyName"/>
+        <property name="elementNamespace" value="http://www.w3.org/2000/09/xmldsig#"/>
+    </bean>
+
     <!--
         Remove any empty Extensions elements.
     -->

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
@@ -319,6 +319,7 @@
         <property name="stages">
             <list>
                 <ref bean="uk_stripExtensions"/>
+                <ref bean="stripKeyNames"/>
                 <ref bean="uk_assemble"/>
                 <ref bean="removeEmptyExtensions"/>
                 <ref bean="uk_finaliseExport"/>

diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
@@ -142,6 +142,7 @@
     <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_iphint"/>
+        <property name="checkingNetworks" value="true"/>
     </bean>
 
     <!--

diff --git a/tools/ukf-mda/ukf-mda-0.6.3.jar → tools/ukf-mda/ukf-mda-0.6.4.jar b/tools/ukf-mda/ukf-mda-0.6.3.jar → tools/ukf-mda/ukf-mda-0.6.4.jar