Provide response when user file quota exceeded

Author: tomas-soltys

README.md

@@ -6,14 +6,15 @@ Simple cloud service with HTTPs based [REST API](doc/rest_api.md) interface.
 
 1. Store files
     * Upload
+    * Replace
     * Update
     * Download
     * Set tags (alphanumeric string)
     * Set version
     * Set access rights
 2. User management
     * Add user
-    * Modify user
+    * Modify user (change user name, modify user groups and configure file quotas)
     * Remove user
     * Grant/revoke access to actions
 3. HTTPs interface
@@ -24,11 +25,11 @@ Simple cloud service with HTTPs based [REST API](doc/rest_api.md) interface.
 5. Submit reports
 
 ## Prepare build environment
-Initialize all submodules
+Initialize all sub modules
 ```
 git submodule init && git submodule update --remote
 ```
-Following command will attempt to download and install all required packages, therefore it must be executed under priviledged (root) user
+Following command will attempt to download and install all required packages, therefore it must be executed under privileged (root) user
 ```
 sudo ./src/range-build-tools/prereqs.sh
 ```
@@ -70,7 +71,7 @@ $ <install-dir>/scripts/cloud_setup.sh \
 Where `<deploy-dir>` is a directory where cloud instance will be deployed.
 _NOTE: There can be multiple deployments on the same host._
 
-### Start/stop cloud as a beckground process
+### Start/stop cloud as a background process
 
 Following command will start Cloud as a background process.
 ```

doc/rest_api.md

@@ -8,7 +8,7 @@
   * [List files on the cloud server](#list-files-on-the-cloud-server)
   * [Get file information](#get-file-information)
   * [Upload file to the cloud server](#upload-file-to-the-cloud-server)
-  * [Replace file on the cloud server](#replace-file-to-the-cloud-server)
+  * [Replace file on the cloud server](#replace-file-on-the-cloud-server)
   * [Update file on the cloud server](#update-file-on-the-cloud-server)
   * [Update file access owner on the cloud server](#update-file-access-owner-on-the-cloud-server)
   * [Update file access mode on the cloud server](#update-file-access-mode-on-the-cloud-server)
@@ -784,7 +784,14 @@ GET https://<host>:<port>/list-users/
             "<group-name-2>",
             ...
             "<group-name-n>"
-        ]
+        ],
+        "quotas": {
+            "files": {
+                "fileCount": "100",
+                "fileSize": "104857600",
+                "storeSize": "104857600"
+            }
+        }
     }
 ]
 ```
@@ -806,7 +813,14 @@ GET https://<host>:<port>/user-info/?resource-name=<user-name>
         "<group-name-2>",
         ...
         "<group-name-n>"
-    ]
+    ],
+    "quotas": {
+        "files": {
+            "fileCount": "100",
+            "fileSize": "104857600",
+            "storeSize": "104857600"
+        }
+    }
 }
 ```
 If no `<user-name>` is provided caller user information will be returned.
@@ -828,7 +842,14 @@ GET https://<host>:<port>/user-add/?resource-name=<user-name>
         "<group-name-2>",
         ...
         "<group-name-n>"
-    ]
+    ],
+    "quotas": {
+        "files": {
+            "fileCount": "100",
+            "fileSize": "104857600",
+            "storeSize": "104857600"
+        }
+    }
 }
 ```
 
@@ -845,10 +866,18 @@ POST https://<host>:<port>/user-update/?resource-name=<user-name>
         "<group-name-2>",
         ...
         "<group-name-n>"
-    ]
+    ],
+    "quotas": {
+        "files": {
+            "fileCount": "100",
+            "fileSize": "104857600",
+            "storeSize": "104857600"
+        }
+    }
 }
 
 ```
+_NOTE: If **"quotas:"** object is not provided or empty, default values will be set._
 **Response:**
 ```
 {
@@ -858,7 +887,14 @@ POST https://<host>:<port>/user-update/?resource-name=<user-name>
         "<group-name-2>",
         ...
         "<group-name-n>"
-    ]
+    ],
+    "quotas": {
+        "files": {
+            "fileCount": "100",
+            "fileSize": "104857600",
+            "storeSize": "104857600"
+        }
+    }
 }
 ```
 
@@ -881,6 +917,10 @@ GET https://<host>:<port>/user-register/?resource-name=<user-name>
 ```
 **Body:**
 ```
+<empty>
+```
+**Response:**
+```
 {
     "user": {
         "name": "<user-name>",
@@ -889,6 +929,13 @@ GET https://<host>:<port>/user-register/?resource-name=<user-name>
             "<group-name-2>"
         ]
     },
+    "quotas": {
+        "files": {
+            "fileCount": "100",
+            "fileSize": "104857600",
+            "storeSize": "104857600"
+        }
+    },
     "tokens": [
         {
             "content": "<token>",

src/cloud-tool/src/main_task.cpp

@@ -82,8 +82,13 @@ void MainTask::actionFinished(const QSharedPointer<RToolAction> &action)
 void MainTask::actionFailed(const QSharedPointer<RToolAction> &action)
 {
     R_LOG_TRACE_IN;
-    RHttpMessage response = action.staticCast<RCloudToolAction>().data()->getResponseMessage();
+    RHttpMessage responseMessage = action.staticCast<RCloudToolAction>().data()->getResponseMessage();
     RLogger::info("Action has failed.\n");
+    if (action.staticCast<RCloudToolAction>().data()->getType() != RCloudToolAction::FileDownload)
+    {
+        RLogger::info("Unhandled action response:\n");
+        RLogger::info("%s\n",responseMessage.getBody().constData());
+    }
     R_LOG_TRACE_OUT;
 }
 

src/cloud/src/file_manager.cpp

@@ -393,7 +393,10 @@ RError::Type FileManager::storeFile(const RUserInfo &executor, const FileObject
 
     if (executor.getFileQuota().quotaExceeded(userStoreQuota))
     {
-        RLogger::error("[%s] User file quota exceeded.\n",this->settings.getName().toUtf8().constData());
+        output = QString("User file quota exceeded.").toUtf8();
+        RLogger::error("[%s] %s.\n",
+                       this->settings.getName().toUtf8().constData(),
+                       output.constData());
         R_LOG_TRACE_RETURN(RError::InvalidInput);
     }
 
@@ -479,20 +482,24 @@ RError::Type FileManager::replaceFile(const RUserInfo &executor, const FileObjec
     // Store new file object.
     QByteArray uploadFileOutput;
     RError::Type errorType = this->storeFile(executor,object,uploadFileOutput);
-    if (errorType == RError::None)
+    if (errorType != RError::None)
+    {
+        output = uploadFileOutput;
+        R_LOG_TRACE_RETURN(errorType);
+    }
+
+    if (!files.isEmpty())
     {
-        if (!files.isEmpty())
+        // Remove all replaced files.
+        for (const RFileInfo &fileInfo : std::as_const(files))
         {
-            // Remove all replaced files.
-            for (const RFileInfo &fileInfo : std::as_const(files))
+            QByteArray removeFileOutput;
+            errorType = this->removeFile(executor,fileInfo.getId(),removeFileOutput);
+            jsonRemoveFileArray.append(QJsonDocument::fromJson(removeFileOutput).object());
+            if (errorType != RError::None)
             {
-                QByteArray removeFileOutput;
-                errorType = this->removeFile(executor,fileInfo.getId(),removeFileOutput);
-                jsonRemoveFileArray.append(QJsonDocument::fromJson(removeFileOutput).object());
-                if (errorType != RError::None)
-                {
-                    break;
-                }
+                output = uploadFileOutput;
+                R_LOG_TRACE_RETURN(errorType);
             }
         }
     }
@@ -539,7 +546,10 @@ RError::Type FileManager::updateFile(const RUserInfo &executor, const FileObject
 
     if (executor.getFileQuota().quotaExceeded(userStoreQuota))
     {
-        RLogger::error("[%s] User file quota exceeded.\n",this->settings.getName().toUtf8().constData());
+        output = QString("User file quota exceeded.").toUtf8();
+        RLogger::error("[%s] %s.\n",
+                       this->settings.getName().toUtf8().constData(),
+                       output.constData());
         R_LOG_TRACE_RETURN(RError::InvalidInput);
     }