[ofbiz-framework] 02/02: Fixed: Prevent Freemarker interpolation in fields (OFBIZ-12594)

[jleroux]

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 871ce2aa2e9efb63ba4e97d4a06f1c6664a81a9d
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  | 4 +++-
 1 file changed, 3 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 9da445c3ad..ad8b351cfe 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,7 +135,9 @@ 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
+                    && 
!(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;
             }