scratch – Diff between revs 7 and 11

Subversion Repositories:

?pathlinks?

Rev 7 – Rev 13 – Go to most recent revision – Details – Blame – Last modification – View Log

 require_once('includes/pseudocrypt.php');
 require_once('includes/functions.php');
-require_once('config.php');
-# Upload data can be POST'ed as raw form data or uploaded via <iframe> and
+require_once('config.php');
 # <form> using regular multipart/form-data enctype (which is handled by
-# PHP $_FILES).
+#### Retrieve uploaded file.
 if (!empty($_FILES['file']) and
     is_uploaded_file($_FILES['file']['tmp_name'])) {
     # Regular multipart/form-data upload.
     # Raw POST data.
     $name = urldecode(@$_SERVER['HTTP_X_FILE_NAME']);
     $data = file_get_contents("php://input");
+}
 ## Hash filename and check storage in the upload folder.
+$fileExtension = pathinfo($name, PATHINFO_EXTENSION);
-$fileExtension = pathinfo($name, PATHINFO_EXTENSION);
+#### Check that the file extension is allowed.
+if(!isset($fileExtension) ||
+    !in_array(strtoupper($fileExtension), $ALLOWED_FILE_EXTENSIONS))
+    return;
-if ($fileExtension != '') {
+#### Hash filename and check storage in the upload folder.
-    $storePath = realpath($STORE_FOLDER);
+$storePath = realpath($STORE_FOLDER);
-    $file = strtolower(
+$file = strtolower(
-        PseudoCrypt::hash(
+    PseudoCrypt::hash(
-            preg_replace(
+        preg_replace(
-        array(
+    array(
-            $STORE_FOLDER,
+        $STORE_FOLDER,
-            $file
+        $file
+    )
-    );
+);
+#### Check for path traversals.
-    $pathPart = pathinfo($userPath);
+$pathPart = pathinfo($userPath);
-    if (realpath($pathPart['dirname']) == $storePath) {
+if (realpath($pathPart['dirname']) == $storePath) {
-        atomized_put_contents($userPath, $data);
+    atomized_put_contents($userPath, $data);
-        $output = sprintf('%s/%s', trim($URL_PATH, '/'), $file);
+    $output = sprintf('%s/%s', trim($URL_PATH, '/'), $file);
+}
-}
-# Return the URL to the file.
+### Return the URL to the file.
 header('Content-Type: text/plain; charset=utf-8');