From 3a8ecdcceec74bbd9d74f38a061c831fce74d2ce Mon Sep 17 00:00:00 2001
From: Phil Smart <philip.smart@jisc.ac.uk>
Date: Fri, 9 Feb 2024 12:30:19 +0000
Subject: [PATCH] 21 - Hitting the JDK 11 XML processing limits

 - Add XML processing limit attribute overides to non-xalan branches.
 - Remove bean override from xalan branches.

https://github.com/ukf/ukf-testbed/issues/21
---
 .../010/default-validator-beans-overrides.xml       | 13 +++++++++++++
 .../010x/default-validator-beans-overrides.xml      |  9 +--------
 .../09/default-validator-beans-overrides.xml        | 12 ++++++++++++
 .../09x/default-validator-beans-overrides.xml       |  7 -------
 .../all/classes/default-validator-beans.xml         |  5 -----
 5 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/validators/overlays/010/default-validator-beans-overrides.xml b/validators/overlays/010/default-validator-beans-overrides.xml
index 82a3c88..f98c180 100644
--- a/validators/overlays/010/default-validator-beans-overrides.xml
+++ b/validators/overlays/010/default-validator-beans-overrides.xml
@@ -10,6 +10,19 @@
     http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
     <bean id="child.MigrationAssistanceBean" lazy-init="false" parent="mda.MigrationAssistanceBean"/>
+
+    <!--
+        check_reqattr - override to disable jdk.xml.xpathExprOpLimit attribute required for 
+        the native JDK XSLT processor
+    -->
+    <bean id="check_reqattr" parent="mda.XSLValidationStage"
+        p:XSLResource="classpath:_rules/check_reqattr.xsl">
+        <property name="transformAttributes">
+            <map>
+                <entry key="jdk.xml.xpathExprOpLimit" value="0"/>
+            </map>
+        </property>
+    </bean>
     
     <!-- Locations of these lists have changed in 0.10 -->
     <bean id="compromised.2048" parent="X509RSAOpenSSLBlacklistValidator"
diff --git a/validators/overlays/010x/default-validator-beans-overrides.xml b/validators/overlays/010x/default-validator-beans-overrides.xml
index 57d2eec..c7c8125 100644
--- a/validators/overlays/010x/default-validator-beans-overrides.xml
+++ b/validators/overlays/010x/default-validator-beans-overrides.xml
@@ -23,12 +23,5 @@
     <bean id="debian.4096" parent="X509RSAOpenSSLBlacklistValidator"
         p:keySize="4096"
         p:blacklistResource="classpath:net/shibboleth/metadata/keylists/rsa/debian-4096.txt"/>
-
-     <!--
-        check_reqattr - override to disable jdk.xml.xpathExprOpLimit attribute required for 
-        the native JDK XSLT processor
-    -->
-    <bean id="check_reqattr" parent="mda.XSLValidationStage"
-        p:XSLResource="classpath:_rules/check_reqattr.xsl"/>
-
+        
 </beans>
diff --git a/validators/overlays/09/default-validator-beans-overrides.xml b/validators/overlays/09/default-validator-beans-overrides.xml
index 8cefd46..7aeac79 100644
--- a/validators/overlays/09/default-validator-beans-overrides.xml
+++ b/validators/overlays/09/default-validator-beans-overrides.xml
@@ -9,6 +9,18 @@
     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
     http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
+    <!--
+        check_reqattr - override to disable jdk.xml.xpathExprOpLimit attribute required for 
+        the native JDK XSLT processor
+    -->
+    <bean id="check_reqattr" parent="mda.XSLValidationStage"
+        p:XSLResource="classpath:_rules/check_reqattr.xsl">
+        <property name="transformAttributes">
+            <map>
+                <entry key="jdk.xml.xpathExprOpLimit" value="0"/>
+            </map>
+        </property>
+    </bean>
 
     <bean id="ukf.IPHintValidationStage" abstract="true" parent="ukf.stage_parent"
         class="uk.org.ukfederation.mda.validate.mdui.IPHintValidationStage"/>
diff --git a/validators/overlays/09x/default-validator-beans-overrides.xml b/validators/overlays/09x/default-validator-beans-overrides.xml
index 2795a2b..3588074 100644
--- a/validators/overlays/09x/default-validator-beans-overrides.xml
+++ b/validators/overlays/09x/default-validator-beans-overrides.xml
@@ -9,13 +9,6 @@
     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
     http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
-    <!--
-        check_reqattr - override to disable jdk.xml.xpathExprOpLimit attribute required for 
-        the native JDK XSLT processor
-    -->
-    <bean id="check_reqattr" parent="mda.XSLValidationStage"
-        p:XSLResource="classpath:_rules/check_reqattr.xsl"/>
-
     <bean id="ukf.IPHintValidationStage" abstract="true" parent="ukf.stage_parent"
         class="uk.org.ukfederation.mda.validate.mdui.IPHintValidationStage"/>
 
diff --git a/validators/overlays/all/classes/default-validator-beans.xml b/validators/overlays/all/classes/default-validator-beans.xml
index e934302..8564485 100644
--- a/validators/overlays/all/classes/default-validator-beans.xml
+++ b/validators/overlays/all/classes/default-validator-beans.xml
@@ -400,11 +400,6 @@
     -->
     <bean id="check_reqattr" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_reqattr.xsl">
-        <property name="transformAttributes">
-            <map>
-                <entry key="jdk.xml.xpathExprOpLimit" value="0"/>
-            </map>
-        </property>
     </bean>
 
     <!--