v2.0.4

* Add more file extension and mime type. * Add more security scan.
Rundiz · Mar 8, 2019 · 9d8abea · 9d8abea
1 parent 54c1ea5
commit 9d8abea
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/Rundiz/Upload/Upload.php b/Rundiz/Upload/Upload.php
@@ -13,7 +13,7 @@
  * PHP upload class that is able to validate requirements and limitations, real file's mime type check, detect the errors and report.
  *
  * @package Upload
- * @version 2.0.3
+ * @version 2.0.4
  * @author Vee W.
  */
 class Upload
@@ -445,6 +445,31 @@ protected function securityScan()
                     return false;
                 }
 
+                // scan shell script
+                // reference: https://en.wikipedia.org/wiki/Shell_script 
+                // https://stackoverflow.com/questions/10591086/shell-script-headers-bin-sh-vs-bin-csh
+                // https://www.shellscript.sh/
+                if (
+                    stripos($file_content, '#!/') !== false && 
+                    (
+                        stripos($file_content, '/bin/sh') !== false ||
+                        stripos($file_content, '/bin/bash') !== false ||
+                        stripos($file_content, '/bin/csh') !== false ||
+                        stripos($file_content, '/bin/tcsh') !== false
+                    )
+                ) {
+                    // found shell script.
+                    $this->setErrorMessage(
+                        sprintf(static::__('Error! Found shell script embedded in the uploaded file. (%s).'), $this->files[$this->input_file_name]['name']),
+                        'RDU_SEC_ERR_CGI',
+                        $this->files[$this->input_file_name]['name'],
+                        $this->files[$this->input_file_name]['name'],
+                        $this->files[$this->input_file_name]['size'],
+                        $this->files[$this->input_file_name]['type']
+                    );
+                    return false;
+                }
+
                 unset($file_content);
             }
         }

diff --git a/Rundiz/Upload/file-extensions-mime-types.php b/Rundiz/Upload/file-extensions-mime-types.php
@@ -52,11 +52,11 @@
     'shtml' => array('text/html', 'text/x-server-parsed-html'),
     'svg' => array('image/svg+xml'),
     'tar' => array('application/x-tar'),
+    'text' => array('text/plain'),
+    'tgz' => array('application/x-gzip-compressed', 'application/x-tar'),
     'tif' => array('image/tiff', 'image/x-tiff'),
     'tiff' => array('image/tiff', 'image/x-tiff'),
-    'tar' => array('application/x-tar'),
-    'tgz' => array('application/x-gzip-compressed', 'application/x-tar'),
-    'text' => array('text/plain'),
+    'torrent' => array('application/x-bittorrent'),
     'txt' => array('text/plain'),
     'wav' => array('audio/wav', 'audio/wave', 'audio/x-wav'),
     'wbmp' => array('image/vnd.wap.wbmp'),