[ofbiz-framework] branch release22.01 updated: Fixed: Prevent Freemarker interpolation in fields (OFBIZ-12594)

[jl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch release22.01
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release22.01 by this push:
     new 80b0d9c33f Fixed: Prevent Freemarker interpolation in fields (OFBIZ-12594)
80b0d9c33f is described below

commit 80b0d9c33f8a17b83abc97659bd410a5f52b1ba7
Author: Jacques Le Roux <ja...@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   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 31c6fc78e1..e87a538eed 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
@@ -150,7 +150,8 @@ public class ControlFilter extends HttpFilter {
             String uri = uriWithContext.substring(context.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
                     && SecurityUtil.containsFreemarkerInterpolation(req, resp, uri)) {
                 return;
             }