[ofbiz-framework] branch trunk updated: Improved: Secure the uploads (OFBIZ-12080)

[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 658552e4fb Improved: Secure the uploads (OFBIZ-12080)
658552e4fb is described below

commit 658552e4fb13a51e1adbc2f02f788e87631b552f
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Sat Jun 11 14:45:09 2022 +0200

    Improved: Secure the uploads (OFBIZ-12080)
    
    Few more debug log texts changes for clarity
    
    I backport to ease future merging while backporting
---
 .../java/org/apache/ofbiz/security/SecuredUpload.java     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git 
a/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java 
b/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
index d86e5c594c..de36530c70 100644
--- 
a/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
+++ 
b/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
@@ -455,7 +455,8 @@ public class SecuredUpload {
             }
         } catch (Exception e) {
             safeState = false;
-            Debug.logError(e, "for security reason the PDF file " + 
file.getAbsolutePath() + " can't be uploaded !", MODULE);
+            Debug.logInfo(e, "The file " + file.getAbsolutePath() + " is not a 
valid PDF file. For security reason it's not accepted as a such file",
+                    MODULE);
         }
         return safeState;
     }
@@ -500,7 +501,7 @@ public class SecuredUpload {
         String mimeType = getMimeTypeFromFileName(fileName);
         // Check for Windows executable. Neglect .bat and .ps1: 
https://s.apache.org/c8sim
         if ("application/x-msdownload".equals(mimeType) || 
"application/x-ms-installer".equals(mimeType)) {
-            Debug.logError("The file" + fileName + " is a Windows executable, 
for security reason it's not accepted", MODULE);
+            Debug.logError("The file " + fileName + " is a Windows executable, 
for security reason it's not accepted", MODULE);
             return true;
         }
         // Check for ELF (Linux) and scripts
@@ -509,7 +510,7 @@ public class SecuredUpload {
                 || "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);
+            Debug.logError("The file " + fileName + " is a Linux executable, 
for security reason it's not accepted", MODULE);
             return true;
         }
         return false;
@@ -661,7 +662,7 @@ public class SecuredUpload {
                 || "audio/x-flac".equals(mimeType)) {
             return true;
         }
-        Debug.logInfo("The file" + fileName + " is not a valid audio file. For 
security reason it's not accepted as a such file", MODULE);
+        Debug.logInfo("The file " + fileName + " is not a valid audio file. 
For security reason it's not accepted as a such file", MODULE);
         return false;
     }
 
@@ -686,7 +687,7 @@ public class SecuredUpload {
                 || "video/x-ms-wmx".equals(mimeType)) {
             return true;
         }
-        Debug.logInfo("The file" + fileName + " is not a valid video file. For 
security reason it's not accepted as a such file", MODULE);
+        Debug.logInfo("The file " + fileName + " is not a valid video file. 
For security reason it's not accepted as a such file", MODULE);
         return false;
     }
 
@@ -726,10 +727,10 @@ public class SecuredUpload {
     }
 
     private static void deleteBadFile(String fileToCheck) {
-        Debug.logError("File :" + fileToCheck + ", can't be uploaded for 
security reason", MODULE);
+        Debug.logError("File : " + fileToCheck + ", can't be uploaded for 
security reason", MODULE);
         File badFile = new File(fileToCheck);
         if (badFile.exists() && !badFile.delete()) {
-            Debug.logError("File :" + fileToCheck + ", couldn't be deleted", 
MODULE);
+            Debug.logError("File : " + fileToCheck + ", couldn't be deleted", 
MODULE);
         }
     }