From 34d68d5f6f9037323f73f7780d2d3ecd6b030d9e Mon Sep 17 00:00:00 2001 From: Jacques Le Roux Date: Sun, 27 Feb 2022 10:14:59 +0100 Subject: [PATCH] Improved: Reflected XSS in content component (OFBIZ-11840) This was already fixed but we can do better by using SecuredUpload::isValidText Also grabs some tokens to security.properties::deniedWebShellTokens from DataEvents.java, and adds "alert" even it's harmless as is, as it's often used by attackers to demonstrate issues, so will earn time. Though an improvement, I backport as it's related to security Conflicts handled by hand in data/DataEvents.java --- .../apache/ofbiz/content/data/DataEvents.java | 16 ++++++++++++---- framework/security/config/security.properties | 13 ++++++++++--- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataEvents.java b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataEvents.java index 1c81434978..1c233ca8c8 100644 --- a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataEvents.java +++ b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataEvents.java @@ -21,6 +21,7 @@ package org.apache.ofbiz.content.data; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.util.Collections; import java.util.Locale; import java.util.Map; @@ -41,6 +42,7 @@ import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.entity.util.EntityQuery; import org.apache.ofbiz.entity.util.EntityUtilProperties; +import org.apache.ofbiz.security.SecuredUpload; import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.service.ServiceUtil; @@ -82,10 +84,16 @@ public class DataEvents { // get the permission service required for streaming data; default is always the genericContentPermission String permissionService = EntityUtilProperties.getPropertyValue("content", "stream.permission.service", "genericContentPermission", delegator); - // This is counterintuitive but it works, for OFBIZ-11840 - // It could be improved by checking for possible events associated with svg - // As listed at https://portswigger.net/web-security/cross-site-scripting/cheat-sheet - if (contentId.contains("