(ofbiz-framework) branch release24.09 updated: Improved: Move solr component to Attic (OFBIZ-13220)

[jleroux]

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

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


The following commit(s) were added to refs/heads/release24.09 by this push:
     new fa11d34490 Improved: Move solr component to Attic (OFBIZ-13220)
fa11d34490 is described below

commit fa11d344906a28454d85d0bf8aa601547769ce58
Author: Nicolas Malin <nicolas.ma...@nereide.fr>
AuthorDate: Mon Apr 14 16:37:28 2025 +0200

    Improved: Move solr component to Attic (OFBIZ-13220)
    
    After move solr plugin to Attic, we remove dependency code present on 
framework
    
    jleroux: conflicts handled by hand in ControlFilter.java (twice)
---
 .../java/org/apache/ofbiz/webapp/control/ControlFilter.java  | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

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 cc1845fdba..4b044d827e 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
@@ -67,7 +67,7 @@ import org.apache.ofbiz.security.SecuredUpload;
  *     non matching request paths are redirected, or an error code is returned,
  *     according to the setup of redirectPath and errorCode
  *   - redirectPath: if the path requested is not in the allowedPaths, or 
forceRedirectAll is set to Y,
- *     specifies the the path to which the request is redirected to;
+ *     specifies the path to which the request is redirected to;
  *   - errorCode: the error code set in the response if the path requested is 
not in the allowedPaths
  *     and redirectPath is not set; defaults to 403
  *
@@ -140,10 +140,6 @@ public class ControlFilter extends HttpFilter {
                                : 
Arrays.stream(paths.split(":")).collect(Collectors.toSet());
     }
 
-    private static boolean isSolrTest() {
-        return null != System.getProperty("SolrDispatchFilter");
-    }
-
     /**
      * Sends an HTTP response redirecting to {@code redirectPath}.
      * @param resp The response to send
@@ -176,7 +172,7 @@ public class ControlFilter extends HttpFilter {
         boolean isEntityImport = 
req.getRequestURI().equals("/webtools/control/entityImport");
         boolean isProgramExport = 
req.getRequestURI().equals("/webtools/control/ProgramExport");
 
-        if (!(isSolrTest() || isControlFilterTests() || isEntityImport || 
isProgramExport)) {
+        if (!(isControlFilterTests() || isEntityImport || isProgramExport)) {
             // Prevents stream exploitation
             UrlServletHelper.setRequestAttributes(req, null, 
req.getServletContext());
             Map<String, Object> parameters = UtilHttp.getParameterMap(req);
@@ -227,10 +223,10 @@ public class ControlFilter extends HttpFilter {
 
             //// Block with several steps for rejecting wrong URLs, allowing 
specific ones
 
-            // Allows UEL and FlexibleString (OFBIZ-12602). Also allows 
SolrTest to pass. No need to check these URLs
+            // Allows UEL and FlexibleString (OFBIZ-12602).
             GenericValue userLogin = (GenericValue) 
session.getAttribute("userLogin");
             if (!LoginWorker.hasBasePermission(userLogin, req)) { // Allows 
UEL and FlexibleString (OFBIZ-12602)
-                if (isSolrTest() && 
SecuredFreemarker.containsFreemarkerInterpolation(req, resp, uri)) { // Reject 
Freemarker interpolation in URL
+                if (SecuredFreemarker.containsFreemarkerInterpolation(req, 
resp, uri)) { // Reject Freemarker interpolation in URL
                     return;
                 }
             }