BUG: refs #68. Changed error codes to constants, added mkdir error handling.

Author: Michael Grauer

core/controllers/components/HttpuploadComponent.php

@@ -10,6 +10,15 @@
 PURPOSE.  See the above copyright notices for more information.
 =========================================================================*/
 
+// HTTPUPLOAD error codes
+define('MIDAS_HTTPUPLOAD_UPLOAD_FAILED', -105);
+define('MIDAS_HTTPUPLOAD_UPLOAD_TOKEN_GENERATION_FAILED', -140);
+define('MIDAS_HTTPUPLOAD_INVALID_UPLOAD_TOKEN', -141);
+define('MIDAS_HTTPUPLOAD_INPUT_FILE_OPEN_FAILED', -142);
+define('MIDAS_HTTPUPLOAD_OUTPUT_FILE_OPEN_FAILED', -143);
+define('MIDAS_HTTPUPLOAD_TMP_DIR_CREATION_FAILED', -144);
+define('MIDAS_HTTPUPLOAD_PARAM_UNDEFINED', -150);
+
 /**
  * This component is used for large uploads and is used by
  * the web api and the java uploader.  It generates an authenticated
@@ -50,14 +59,17 @@ public function generateToken($args, $dirname = '')
     {
     if(!array_key_exists('filename', $args))
       {
-      throw new Exception('Parameter filename is not defined', -150);
+      throw new Exception('Parameter filename is not defined', MIDAS_HTTPUPLOAD_FILENAME_PARAM_UNDEFINED);
       }
     $dir = $dirname == '' ? '' : '/'.$dirname;
     $dir = $this->tmpDirectory.$dir;
 
     if(!file_exists($dir))
       {
-      mkdir($dir, 0700, true);
+      if(!mkdir($dir, 0700, true))
+        {
+        throw new Exception('Failed to create temporary upload dir', MIDAS_HTTPUPLOAD_TMP_DIR_CREATION_FAILED);
+        }
       }
     // create a unique temporary file in the dirname directory
     $unique_identifier = basename(tempnam($dir, $args['filename']));
@@ -68,7 +80,7 @@ public function generateToken($args, $dirname = '')
 
     if(empty($unique_identifier))
       {
-      throw new Exception('Failed to generate upload token', -140);
+      throw new Exception('Failed to generate upload token', MIDAS_HTTPUPLOAD_UPLOAD_TOKEN_GENERATION_FAILED);
       }
     return array('token' => $unique_identifier);
     }
@@ -80,19 +92,19 @@ public function process($args)
 
     if(!array_key_exists('filename', $args))
       {
-      throw new Exception('Parameter filename is not defined', -150);
+      throw new Exception('Parameter filename is not defined', MIDAS_HTTPUPLOAD_PARAM_UNDEFINED);
       }
     $filename = $args['filename'];
 
     if(!array_key_exists($this->tokenParamName, $args))
       {
-      throw new Exception('Parameter '.$this->tokenParamName.' is not defined', -150);
+      throw new Exception('Parameter '.$this->tokenParamName.' is not defined', MIDAS_HTTPUPLOAD_PARAM_UNDEFINED);
       }
     $uploadToken = $args[$this->tokenParamName];
 
     if(!array_key_exists('length', $args))
       {
-      throw new Exception('Parameter length is not defined', -150);
+      throw new Exception('Parameter length is not defined', MIDAS_HTTPUPLOAD_PARAM_UNDEFINED);
       }
     $length = (float)($args['length']);
 
@@ -105,7 +117,7 @@ public function process($args)
     $pathTemporaryFilename = $this->tmpDirectory.'/'.$uploadToken;
     if(!file_exists($pathTemporaryFilename))
       {
-      throw new Exception('Invalid upload token', -141);
+      throw new Exception('Invalid upload token', MIDAS_HTTPUPLOAD_INVALID_UPLOAD_TOKEN);
       }
     else
       {
@@ -127,14 +139,14 @@ public function process($args)
     $in = fopen($inputfile, 'rb'); // Stream (LocalServerFile -> Server) Mode: Read, Binary
     if($in === false)
       {
-      throw new Exception('Failed to open ['.$inputfile.'] source', -142);
+      throw new Exception('Failed to open ['.$inputfile.'] source', MIDAS_HTTPUPLOAD_INPUT_FILE_OPEN_FAILED);
       }
 
     // open target output
     $out = fopen($pathTemporaryFilename, 'ab'); // Stream (Server -> TempFile) Mode: Append, Binary
     if($out === false)
       {
-      throw new Exception('Failed to open output file ['.$pathTemporaryFilename.']', -143);
+      throw new Exception('Failed to open output file ['.$pathTemporaryFilename.']', MIDAS_HTTPUPLOAD_OUTPUT_FILE_OPEN_FAILED);
       }
 
     if($streamChecksum)
@@ -163,7 +175,7 @@ public function process($args)
 
     if($uploadOffset < $length)
       {
-      throw new Exception('Failed to upload file - '.$uploadOffset.'/'.$length.' bytes transferred', -105);
+      throw new Exception('Failed to upload file - '.$uploadOffset.'/'.$length.' bytes transferred', MIDAS_HTTPUPLOAD_UPLOAD_FAILED);
       }
 
     $data['filename'] = $filename;
@@ -180,7 +192,7 @@ public function getOffset($args)
     //check parameters
     if(!array_key_exists($this->tokenParamName, $args))
       {
-      throw new Exception('Parameter '.$this->tokenParamName.' is not defined', -150);
+      throw new Exception('Parameter '.$this->tokenParamName.' is not defined', MIDAS_HTTPUPLOAD_PARAM_UNDEFINED);
       }
     $uploadToken = $args[$this->tokenParamName];
     $offset = filesize($this->tmpDirectory.'/'.$uploadToken);