[ofbiz-framework] branch trunk updated: Improved: XML Import fails due to security check (OFBIZ-12602)

[jleroux]

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

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


The following commit(s) were added to refs/heads/trunk by this push:
     new ae146e02ef Improved: XML Import fails due to security check 
(OFBIZ-12602)
ae146e02ef is described below

commit ae146e02efdfdd40e3f4153d5e2afca02481a091
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Tue Jun 7 12:04:05 2022 +0200

    Improved: XML Import fails due to security check (OFBIZ-12602)
    
    Hide the "Received a null Security object from HttpServletRequest" warning 
when
    ControlFilter is in the StackTrace.
---
 .../src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java    | 1 -
 .../src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java      | 2 +-
 2 files changed, 1 insertion(+), 2 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 0a892de606..9256afc11d 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,6 @@ public class ControlFilter extends HttpFilter {
             String uri = uriWithContext.substring(context.length());
 
             GenericValue userLogin = (GenericValue) 
session.getAttribute("userLogin");
-
             if (!LoginWorker.hasBasePermission(userLogin, req)) { // Allows 
UEL and FlexibleString (OFBIZ-12602)
                 if 
(!GenericValue.getStackTraceAsString().contains("ControlFilterTests")
                         && null == System.getProperty("SolrDispatchFilter") // 
Allows Solr tests
diff --git 
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
 
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
index 2e71e537d4..56eca9c5cc 100644
--- 
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
+++ 
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
@@ -1375,7 +1375,7 @@ public final class LoginWorker {
                 }
             }
         } else {
-            if (Debug.warningOn()) {
+            if (Debug.warningOn() && 
!GenericValue.getStackTraceAsString().contains("ControlFilter")) {
                 Debug.logWarning("Received a null Security object from 
HttpServletRequest", MODULE);
             }
         }