ENH: refs #446. Server side quota validation for uploading new revisions

Author: zachmullen

core/controllers/UploadController.php

@@ -417,6 +417,22 @@ public function saveuploadedAction()
         $changes = $this->_getParam('changes');
         $itemId = $itemId_itemRevisionNumber[0];
         $itemRevisionNumber = $itemId_itemRevisionNumber[1];
+
+        $validations = Zend_Registry::get('notifier')->callback('CALLBACK_CORE_VALIDATE_UPLOAD_REVISION',
+                                                                array('filename' => $filename,
+                                                                      'size' => $file_size,
+                                                                      'path' => $path,
+                                                                      'itemId' => $itemId,
+                                                                      'changes' => $changes,
+                                                                      'revisionNumber' => $itemRevisionNumber));
+        foreach($validations as $validation)
+          {
+          if(!$validation['status'])
+            {
+            unlink($path);
+            throw new Zend_Exception($validation['message']);
+            }
+          }
         $this->Component->Upload->createNewRevision($this->userSession->Dao, $filename, $path, $changes, $itemId, $itemRevisionNumber, $license);
         }
       else

modules/sizequota/Notification.php

@@ -36,6 +36,7 @@ public function init()
     $this->addCallBack('CALLBACK_CORE_GET_JAVAUPLOAD_EXTRA_HTML', 'getExtraHtmlSimple');
     $this->addCallBack('CALLBACK_CORE_GET_REVISIONUPLOAD_EXTRA_HTML', 'getExtraHtmlRevision');
     $this->addCallBack('CALLBACK_CORE_VALIDATE_UPLOAD', 'validateUpload');
+    $this->addCallBack('CALLBACK_CORE_VALIDATE_UPLOAD_REVISION', 'validateUploadRevision');
 
     $this->enableWebAPI($this->moduleName);
     }
@@ -175,5 +176,49 @@ public function validateUpload($args)
       }
     return array('status' => true);
     }
+
+  /**
+   * Return whether or not the upload is allowed.  If uploading the revision
+   * will cause the size to surpass the quota, it will be rejected.
+   * @param size Size of the uploaded file
+   * @param itemId The id of the item being uploaded into
+   * @return array('status' => boolean, 'message' => 'error message if status is false')
+   */
+  public function validateUploadRevision($args)
+    {
+    $modelLoader = new MIDAS_ModelLoader();
+    $folderModel = $modelLoader->loadModel('Folder');
+    $itemModel = $modelLoader->loadModel('Item');
+    $folderQuotaModel = $modelLoader->loadModel('FolderQuota', $this->moduleName);
+
+    $item = $itemModel->load($args['itemId']);
+    if(!$item)
+      {
+      return array('status' => false, 'message' => 'Invalid item id');
+      }
+    $folders = $item->getFolders();
+    if(count($folders) == 0)
+      {
+      return array('status' => false, 'message' => 'Cannot upload into an orphaned item');
+      }
+    $rootFolder = $folderModel->getRoot($folders[0]);
+    $quota = $folderQuotaModel->getFolderQuota($rootFolder);
+    if($quota == '')
+      {
+      return array('status' => true);
+      }
+
+    $freeSpace = $quota - $folderModel->getSize($rootFolder);
+    $uploadSize = $args['size'];
+    if($uploadSize > $freeSpace)
+      {
+      return array('status' => false,
+                   'message' => 'Upload quota exceeded. Free space: '.$freeSpace.
+                                '. Attempted upload size: '.$uploadSize.
+                                ' into item '.$args['itemId']);
+      }
+    return array('status' => true);
+    }
+
   } //end class
 ?>