Fixed: Remote Code Execution (File Upload) Vulnerability (OFBIZ-11948)
Lion Tree <liontree0110@gmail.com> has reported us that "CVE-2020-1938 is not fully fixed". Though it was fixed by OFBIZ-11407, it still possible for an authenticated user to upload a webshell included in an image using one of the upload possibilities in OFBiz. That is not new and covered by OFBIZ-12080 "Secure the uploads", but was still incomplete. This enforces the secured uploads by * checking in SecuredUpload::isValidImageFile that a webshell is not embedded in an image. * Keeping only "<%" as a denied token for JSP webshells, instead of currently "<%@ page" * Adds "application/text/x-ruby" to SecuredUpload::isExecutable Also * Adds "<jsp", and "<?" for PHP. Even if OFBiz does not use PHP at all, it's often installed on servers. * Removes "import=\"java" and "runtime.getruntime().exec(". They are no longer useful since "<%" and "<jsp" block them. * Remove php token since I'll put "<?" in. * Adds "#!", rather than adding other shebangs like perl,python and ruby This will make deniedWebShellTokens more understandable. But I'm conscious that despite SecuredUpload::isExecutableI I still need to better handle encoded webshells. I'll do that soon in a second approach. I'll also certainly more prune PHP related tokens. Thanks: Lion Tree for report
This commit is contained in:
@@ -205,9 +205,9 @@ allowAllUploads=
|
||||
#-- eg: https://www.acunetix.com/blog/articles/detection-prevention-introduction-web-shells-part-5/
|
||||
#-- "freemarker" should be OK, should not be used in Freemarker templates, not part of the syntax.
|
||||
#-- Else "template.utility.Execute" is a good replacement but not as much catching, who knows...
|
||||
deniedWebShellTokens=freemarker,import=\"java,runtime.getruntime().exec(,<%@ page,<script,<body>,<form,php,\
|
||||
javascript,%eval,@eval,import os,passthru,exec,shell_exec,assert,str_rot13,system,phpinfo,base64_decode,chmod,mkdir,\
|
||||
fopen,fclose,new file,import,upload,getfilename,download,getoutputstring,readfile
|
||||
deniedWebShellTokens=<%,<jsp:,<?,#!,freemarker,<script,javascript,%eval,@eval,<body>,<form,\
|
||||
import os,passthru,exec,shell_exec,assert,str_rot13,system,base64_decode,chmod,mkdir,\
|
||||
fopen,fclose,new file,import,upload,getfilename,download,getoutputstring,readfile
|
||||
|
||||
#-- uri used for login (cf jira OFBIZ-12047)
|
||||
#-- it's a list, each uri should be separated by comma, without space
|
||||
|
||||
@@ -242,7 +242,8 @@ public class SecuredUpload {
|
||||
|| imageFormat.equals(ImageFormats.GIF)
|
||||
|| imageFormat.equals(ImageFormats.TIFF)
|
||||
|| imageFormat.equals(ImageFormats.JPEG))
|
||||
&& imageMadeSafe(fileName);
|
||||
&& imageMadeSafe(fileName)
|
||||
&& isValidTextFile(fileName);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -422,6 +423,7 @@ public class SecuredUpload {
|
||||
if ("application/x-elf".equals(mimeType)
|
||||
|| "application/x-sh".equals(mimeType)
|
||||
|| "application/text/x-perl".equals(mimeType)
|
||||
|| "application/text/x-ruby".equals(mimeType)
|
||||
|| "application/text/x-python".equals(mimeType)) {
|
||||
Debug.logError("The file" + fileName + " is a Linux executable, for security reason it's not accepted :", MODULE);
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user