Fixed: Prevent Freemarker interpolation in fields (OFBIZ-12594)

JacquesLeRoux · JacquesLeRoux · commit 871ce2aa2e9e · 2022-04-06T13:25:56.000+02:00
I did not catch an issue put in by this feature because BuildBot is not running
for few days (see INFRA-23076) and i don't always run tests locally (relying on
BuildBot and GH actions don't run tests).

This is the error Solr tests throw else:
&lt;&lt;Unfortunately, the stream was empty / not available. This may be caused by
another servlet filter calling ServletRequest.getParameter*() before
SolrDispatchFilter&gt;&gt;

Conflicts handled by hand
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java
@@ -135,7 +135,9 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
                 offset = requestUri.length();
             }
             if (!GenericValue.getStackTraceAsString().contains("ControlFilterTests")
-                    && !System.getProperty("java.class.path").contains("--test component=solr") // Allows Solr tests
+                    && !(System.getProperty("java.class.path").contains("--test component=solr") // Allows Solr tests
+                            || System.getProperty("java.class.path").contains("ofbiz --test_ManifestJar.jar") // Allows Solr tests in testIntegration
+                            || System.getProperty("java.class.path").contains("ofbiz.jar")) // Allows Solr tests in testIntegration in 18.12
                     && SecurityUtil.containsFreemarkerInterpolation(httpRequest, httpResponse, requestUri)) {
                 return;
             }

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,9 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha`
`135`	`135`	`offset = requestUri.length();`
`136`	`136`	`}`
`137`	`137`	`if (!GenericValue.getStackTraceAsString().contains("ControlFilterTests")`
`138`		`- && !System.getProperty("java.class.path").contains("--test component=solr") // Allows Solr tests`
	`138`	`+ && !(System.getProperty("java.class.path").contains("--test component=solr") // Allows Solr tests`
	`139`	`+ \|\| System.getProperty("java.class.path").contains("ofbiz --test_ManifestJar.jar") // Allows Solr tests in testIntegration`
	`140`	`+ \|\| System.getProperty("java.class.path").contains("ofbiz.jar")) // Allows Solr tests in testIntegration in 18.12`
`139`	`141`	`&& SecurityUtil.containsFreemarkerInterpolation(httpRequest, httpResponse, requestUri)) {`
`140`	`142`	`return;`
`141`	`143`	`}`