diff --git a/applications/product/template/category/EditCategory.ftl b/applications/product/template/category/EditCategory.ftl index fd4174ee23..e09f9c68cc 100644 --- a/applications/product/template/category/EditCategory.ftl +++ b/applications/product/template/category/EditCategory.ftl @@ -219,9 +219,9 @@ function insertImageName(type,nameValue) {
- - - + + + diff --git a/applications/product/template/product/EditProductContent.ftl b/applications/product/template/product/EditProductContent.ftl index a851999c60..a9e136362d 100644 --- a/applications/product/template/product/EditProductContent.ftl +++ b/applications/product/template/product/EditProductContent.ftl @@ -192,11 +192,11 @@ under the License.   - - - - - + + + + + diff --git a/framework/security/config/security.properties b/framework/security/config/security.properties index 2f09db9baf..7c0836fa3a 100644 --- a/framework/security/config/security.properties +++ b/framework/security/config/security.properties @@ -260,7 +260,7 @@ deniedWebShellTokens=java.,beans,freemarker, allowed) { - return !content.toLowerCase().contains(string) || allowed.contains(string); + boolean isOK = !content.toLowerCase().contains(string) || allowed.contains(string); + if (!isOK) { + Debug.logInfo("############### BEWARE, Image contains " + string, MODULE); + } + return isOK; } private static void deleteBadFile(String fileToCheck) { diff --git a/framework/security/src/test/java/org/apache/ofbiz/security/SecurityUtilTest.java b/framework/security/src/test/java/org/apache/ofbiz/security/SecurityUtilTest.java index b4dadb84ed..3eac13c9c6 100644 --- a/framework/security/src/test/java/org/apache/ofbiz/security/SecurityUtilTest.java +++ b/framework/security/src/test/java/org/apache/ofbiz/security/SecurityUtilTest.java @@ -63,7 +63,7 @@ public class SecurityUtilTest { // %eval,@eval,eval(,runtime,import,passthru,shell_exec,assert,str_rot13,system,decode,include,page ,\ // chmod,mkdir,fopen,fclose,new file,upload,getfilename,download,getoutputstring,readfile,iframe,object,embed,onload,build\ // python,perl ,/perl,ruby ,/ruby,process,function,class,InputStream,to_server,wget ,static,assign,webappPath,\ - // ifconfig,route,crontab,netstat,uname ,hostname,iptables,whoami,"cmd",*cmd|,+cmd|,=cmd|,localhost,\ + // ifconfig,route,crontab,netstat,uname ,hostname,iptables,whoami,"cmd",*cmd|,+cmd|,=cmd|,localhost try { List allowed = new ArrayList<>();