Added file-replace action

tomas-soltys · tomas-soltys · commit dea1a1d97af5 · 2025-11-04T12:50:33.000+01:00
diff --git a/doc/rest_api.md b/doc/rest_api.md
@@ -8,6 +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)
   * [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)
@@ -251,6 +252,50 @@ PUT https://<host>:<port>/file-upload/?resource-name=<file-path>
 }
 ```
 
+### Replace file on the cloud server
+All files with given file name and owned by the requestor will be replaced (removed) by provided file.
+_NOTE: All additional information such as tags, version and custom access rights will be reset to initial values._
+```
+PUT https://<host>:<port>/file-replace/?resource-name=<file-path>
+```
+**Body:**
+```
+<content of the file to be uploaded>
+```
+**Response:**
+```
+{
+    "upload": {
+        "id": "<uid>",
+        "path": "<file-path>",
+        "size": "<bytes>",
+        "created": "<seconds-since-epoch>",
+        "updated": "<seconds-since-epoch>",
+        "version": "<version>",
+        "access": {
+            "mode": {
+                "user": <access-mode>,
+                "group": <access-mode>,
+                "other": <access-mode>
+            },
+            "owner": {
+                "user": "<owner-username>",
+                "group": "<owner-group>"
+            }
+        },
+        "tags": [
+            "<tag-1>",
+            "<tag-2>",
+            ...
+            "<tag-n>"
+        ]
+    },
+    "remove": [
+        ...
+    ]
+}
+```
+
 ### Update file on the cloud server
 ```
 POST https://<host>:<port>/file-update/?resource-id=<uid>&resource-name=<file-path>
diff --git a/src/cloud-tool/src/application.cpp b/src/cloud-tool/src/application.cpp
@@ -197,6 +197,13 @@ void Application::onStarted()
             this->toolInput.addAction(RCloudToolAction::requestFileUpload(this->httpClient, path, name, authUser, authToken));
         }
 
+        if (argumentsParser.isSet(RCloudAction::Action::FileReplace::key))
+        {
+            QString path = argumentsParser.getValue(RCloudAction::Resource::Path::key).toString();
+            QString name = argumentsParser.getValue(RCloudAction::Resource::Name::key).toString();
+            this->toolInput.addAction(RCloudToolAction::requestFileReplace(this->httpClient, path, name, authUser, authToken));
+        }
+
         if (argumentsParser.isSet(RCloudAction::Action::FileUpdate::key))
         {
             QString path = argumentsParser.getValue(RCloudAction::Resource::Path::key).toString();
diff --git a/src/cloud/src/action_handler.cpp b/src/cloud/src/action_handler.cpp
@@ -116,6 +116,32 @@ void ActionHandler::resolveAction(const RCloudAction &action, const QString &fro
         QUuid requestId = this->fileManager->requestStoreFile(executorInfo,fileObject);
         this->fileRequests.insert(requestId,action.getId());
     }
+    else if (action.getAction() == RCloudAction::Action::FileReplace::key)
+    {
+        FileObject *fileObject = new FileObject;
+        fileObject->getInfo().setPath(action.getResourceName());
+        fileObject->getInfo().setId(QUuid::createUuid());
+
+        RAccessOwner accessOwner;
+        accessOwner.setUser(executorInfo.getName());
+        accessOwner.setGroup(RUserInfo::userGroup);
+
+        RAccessMode accessMode;
+        accessMode.setUserModeMask(RAccessMode::Mode::Read | RAccessMode::Mode::Write);
+        accessMode.setGroupModeMask(RAccessMode::Mode::Read);
+        accessMode.setOtherModeMask(RAccessMode::Mode::None);
+
+        RAccessRights accessRights;
+        accessRights.setOwner(accessOwner);
+        accessRights.setMode(accessMode);
+
+        fileObject->getInfo().setAccessRights(accessRights);
+
+        fileObject->setContent(action.getData());
+
+        QUuid requestId = this->fileManager->requestReplaceFile(executorInfo,fileObject);
+        this->fileRequests.insert(requestId,action.getId());
+    }
     else if (action.getAction() == RCloudAction::Action::FileUpdate::key)
     {
         FileObject *fileObject = new FileObject;
diff --git a/src/cloud/src/file_manager.cpp b/src/cloud/src/file_manager.cpp
@@ -62,6 +62,11 @@ int FileManager::perform()
                     resultErrorType = this->storeFile(task.getExecutor(),*task.getObject(),result);
                     writeIndex = true;
                 }
+                else if (task.getAction() == FileManagerTask::Action::ReplaceFile)
+                {
+                    resultErrorType = this->replaceFile(task.getExecutor(),*task.getObject(),result);
+                    writeIndex = true;
+                }
                 else if (task.getAction() == FileManagerTask::Action::UpdateFile)
                 {
                     resultErrorType = this->updateFile(task.getExecutor(),*task.getObject(),result);
@@ -188,6 +193,11 @@ QUuid FileManager::requestStoreFile(const RUserInfo &executor, FileObject *objec
     return this->enqueueTask(FileManagerTask(executor,FileManagerTask::StoreFile,object));
 }
 
+QUuid FileManager::requestReplaceFile(const RUserInfo &executor, FileObject *object)
+{
+    return this->enqueueTask(FileManagerTask(executor,FileManagerTask::ReplaceFile,object));
+}
+
 QUuid FileManager::requestUpdateFile(const RUserInfo &executor, FileObject *object)
 {
     return this->enqueueTask(FileManagerTask(executor,FileManagerTask::UpdateFile,object));
@@ -434,6 +444,57 @@ RError::Type FileManager::storeFile(const RUserInfo &executor, const FileObject
     R_LOG_TRACE_RETURN(RError::None);
 }
 
+RError::Type FileManager::replaceFile(const RUserInfo &executor, const FileObject &object, QByteArray &output)
+{
+    R_LOG_TRACE_IN;
+    RLogger::debug("[%s] replaceFile: executor=\"%s\", storePath=\"%s\".\n",
+                   this->settings.getName().toUtf8().constData(),
+                   executor.getName().toUtf8().constData(),
+                   this->storePath.toUtf8().constData());
+
+    // List all files owned by executor.
+    QList<RFileInfo> files = this->fileIndex.listUserObjects(
+        [=](const RFileInfo &fileInfo)
+        {
+
+            return (fileInfo.getPath() == object.getInfo().getPath() && // File paths must be equal
+                    executor.isUser(fileInfo.getAccessRights().getOwner().getUser()) && // File must be owned by the executor
+                    UserManager::authorizeUserAccess(executor,fileInfo.getAccessRights(),RAccessMode::Write)); // File must be writable
+        }
+    );
+
+    QJsonObject jsonOutput;
+    QJsonArray jsonRemoveFileArray;
+
+    // Store new file object.
+    QByteArray uploadFileOutput;
+    RError::Type errorType = this->storeFile(executor,object,uploadFileOutput);
+    if (errorType == RError::None)
+    {
+        if (!files.isEmpty())
+        {
+            // 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)
+                {
+                    break;
+                }
+            }
+        }
+    }
+
+    jsonOutput["upload"] = QJsonDocument::fromJson(uploadFileOutput).object();
+    jsonOutput["remove"] = jsonRemoveFileArray;
+
+    output = QJsonDocument(jsonOutput).toJson();
+
+    R_LOG_TRACE_RETURN(errorType);
+}
+
 RError::Type FileManager::updateFile(const RUserInfo &executor, const FileObject &object, QByteArray &output)
 {
     R_LOG_TRACE_IN;
@@ -757,7 +818,7 @@ RError::Type FileManager::removeFile(const RUserInfo &executor, const QUuid &id,
         R_LOG_TRACE_RETURN(RError::InvalidInput);
     }
 
-    RFileInfo fileInfo = this->fileIndex.unregisterObject(id);
+    RFileInfo fileInfo(this->fileIndex.getObjectInfo(id));
 
     if (!UserManager::authorizeUserAccess(executor,fileInfo.getAccessRights(),RAccessMode::Write))
     {
@@ -767,6 +828,7 @@ RError::Type FileManager::removeFile(const RUserInfo &executor, const QUuid &id,
                        output.constData());
         R_LOG_TRACE_RETURN(RError::Unauthorized);
     }
+    fileInfo = this->fileIndex.unregisterObject(id);
 
     QDir storeDir(this->storePath);
     if (!storeDir.remove(fileInfo.getId().toString(QUuid::WithoutBraces)))
diff --git a/src/cloud/src/file_manager.h b/src/cloud/src/file_manager.h
@@ -68,6 +68,9 @@ class FileManager : public RJob
         //! Request store file.
         QUuid requestStoreFile(const RUserInfo &executor, FileObject *object);
 
+        //! Request replace file.
+        QUuid requestReplaceFile(const RUserInfo &executor, FileObject *object);
+
         //! Request update file.
         QUuid requestUpdateFile(const RUserInfo &executor, FileObject *object);
 
@@ -118,6 +121,9 @@ class FileManager : public RJob
         //! Store file.
         RError::Type storeFile(const RUserInfo &executor, const FileObject &object, QByteArray &output);
 
+        //! Replace file.
+        RError::Type replaceFile(const RUserInfo &executor, const FileObject &object, QByteArray &output);
+
         //! Update file.
         RError::Type updateFile(const RUserInfo &executor, const FileObject &object, QByteArray &output);
 
diff --git a/src/cloud/src/file_manager_task.cpp b/src/cloud/src/file_manager_task.cpp
@@ -73,6 +73,8 @@ QString FileManagerTask::actionToString(const Action &action)
             return QString("File information");
         case StoreFile:
             return QString("Store file");
+        case ReplaceFile:
+            return QString("Replace file");
         case UpdateFile:
             return QString("Update file");
         case UpdateFileAccessOwner:
diff --git a/src/cloud/src/file_manager_task.h b/src/cloud/src/file_manager_task.h
@@ -23,6 +23,7 @@ class FileManagerTask
             ListFiles,
             FileInfo,
             StoreFile,
+            ReplaceFile,
             UpdateFile,
             UpdateFileAccessOwner,
             UpdateFileAccessMode,
diff --git a/src/range-build-tools b/src/range-build-tools
@@ -1 +1 @@
-Subproject commit 87dd003b2a24249d7e515bd014a0590237c3e25a
+Subproject commit f14067dfdeb301e5009e58710407ee476d210364
diff --git a/src/range-cloud-lib b/src/range-cloud-lib
@@ -1 +1 @@
-Subproject commit f26e3a24ce6955aa724908e6e0ff13959600d9c2
+Subproject commit 3291aa6e256a1ce3c210e3f7be996d6ea01abc86

Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,13 @@ void Application::onStarted()`
`197`	`197`	`this->toolInput.addAction(RCloudToolAction::requestFileUpload(this->httpClient, path, name, authUser, authToken));`
`198`	`198`	`}`
`199`	`199`
	`200`	`+ if (argumentsParser.isSet(RCloudAction::Action::FileReplace::key))`
	`201`	`+ {`
	`202`	`+ QString path = argumentsParser.getValue(RCloudAction::Resource::Path::key).toString();`
	`203`	`+ QString name = argumentsParser.getValue(RCloudAction::Resource::Name::key).toString();`
	`204`	`+ this->toolInput.addAction(RCloudToolAction::requestFileReplace(this->httpClient, path, name, authUser, authToken));`
	`205`	`+ }`
	`206`	`+`
`200`	`207`	`if (argumentsParser.isSet(RCloudAction::Action::FileUpdate::key))`
`201`	`208`	`{`
`202`	`209`	`QString path = argumentsParser.getValue(RCloudAction::Resource::Path::key).toString();`