[ofbiz-framework] branch release18.12 updated: Fixed: Post-auth XSS vulnerability at catalog/control/EditProductPromo (OFBIZ-12096)

[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


The following commit(s) were added to refs/heads/release18.12 by this push:
     new 42571fb  Fixed: Post-auth XSS vulnerability at 
catalog/control/EditProductPromo (OFBIZ-12096)
42571fb is described below

commit 42571fb635964540ff217f5ecd0753a1fefd3078
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Sat Dec 19 17:59:02 2020 +0100

    Fixed: Post-auth XSS vulnerability at catalog/control/EditProductPromo 
(OFBIZ-12096)
    
    Prevents issues with integration tests
    
    Conflicts handled by hand:
    framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
---
 .../base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java 
b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
index 6d90e35..1433977 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
@@ -457,8 +457,8 @@ public class UtilCodec {
         }
 
         if (value != null) {
-            String filtered = 
StringEscapeUtils.unescapeEcmaScript(policy.sanitize(value));
-            if (filtered != null && 
!value.equals(StringEscapeUtils.unescapeHtml4(filtered))) {
+            String filtered = policy.sanitize(value);
+            if (filtered != null && 
!value.equals(StringEscapeUtils.unescapeEcmaScript(StringEscapeUtils.unescapeHtml4(filtered))))
 {
                 String issueMsg = null;
                 if (locale.equals(new Locale("test"))) {
                     issueMsg = "In field [" + valueName + "] by our input 
policy, your input has not been accepted "