This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch release18.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit b24dcff3448870c48c011ccfb1364e474c9a02aa Author: Jacques Le Roux <jacques.le.r...@les7arts.com> AuthorDate: Wed Apr 6 10:59:56 2022 +0200 Fixed: Prevent Freemarker interpolation in fields (OFBIZ-12594) 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: <<Unfortunately, the stream was empty / not available. This may be caused by another servlet filter calling ServletRequest.getParameter*() before SolrDispatchFilter>> Conflicts handled by hand --- .../src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java | 1 + 1 file changed, 1 insertion(+) 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 index 750a85658f..9da445c3ad 100644 --- 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,6 +135,7 @@ public class ControlFilter implements Filter { offset = requestUri.length(); } if (!GenericValue.getStackTraceAsString().contains("ControlFilterTests") + && !System.getProperty("java.class.path").contains("--test component=solr") // Allows Solr tests && SecurityUtil.containsFreemarkerInterpolation(httpRequest, httpResponse, requestUri)) { return; }