permissions

nextcloud · Mar 11, 2024 · d4387d6 · d4387d6
1 parent 7c3410e
commit d4387d6
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 35 deletions.
diff --git a/src/libsync/filesystem.cpp b/src/libsync/filesystem.cpp
@@ -195,15 +195,21 @@ bool FileSystem::getInode(const QString &filename, quint64 *inode)
 }
 
 bool FileSystem::setFolderPermissions(const QString &path,
-                                      FileSystem::FolderPermissions permissions)
+                                      FileSystem::FolderPermissions permissions) noexcept
 {
-    switch (permissions) {
-    case OCC::FileSystem::FolderPermissions::ReadOnly:
-        std::filesystem::permissions(path.toStdWString(), std::filesystem::perms::owner_write | std::filesystem::perms::group_write | std::filesystem::perms::others_write, std::filesystem::perm_options::remove);
-        qCInfo(lcFileSystem) << "new permissions" << static_cast<int>(std::filesystem::status(path.toStdWString()).permissions());
-        break;
-    case OCC::FileSystem::FolderPermissions::ReadWrite:
-        break;
+    try {
+        switch (permissions) {
+        case OCC::FileSystem::FolderPermissions::ReadOnly:
+            std::filesystem::permissions(path.toStdWString(), std::filesystem::perms::owner_write | std::filesystem::perms::group_write | std::filesystem::perms::others_write, std::filesystem::perm_options::remove);
+            break;
+        case OCC::FileSystem::FolderPermissions::ReadWrite:
+            break;
+        }
+    }
+    catch (const std::filesystem::filesystem_error &e)
+    {
+        qCWarning(lcFileSystem()) << "exception when modifying folder permissions" << e.what() << e.path1().c_str() << e.path2().c_str();
+        return false;
     }
 
 #ifdef Q_OS_WIN
@@ -324,23 +330,36 @@ bool FileSystem::setFolderPermissions(const QString &path,
     }
 #endif
 
-    switch (permissions) {
-    case OCC::FileSystem::FolderPermissions::ReadOnly:
-        break;
-    case OCC::FileSystem::FolderPermissions::ReadWrite:
-        std::filesystem::permissions(path.toStdWString(), std::filesystem::perms::owner_write, std::filesystem::perm_options::add);
-        qCInfo(lcFileSystem) << "new permissions" << static_cast<int>(std::filesystem::status(path.toStdWString()).permissions());
-        break;
+    try {
+        switch (permissions) {
+        case OCC::FileSystem::FolderPermissions::ReadOnly:
+            break;
+        case OCC::FileSystem::FolderPermissions::ReadWrite:
+            std::filesystem::permissions(path.toStdWString(), std::filesystem::perms::owner_write, std::filesystem::perm_options::add);
+            break;
+        }
+    }
+    catch (const std::filesystem::filesystem_error &e)
+    {
+        qCWarning(lcFileSystem()) << "exception when modifying folder permissions" << e.what() << e.path1().c_str() << e.path2().c_str();
+        return false;
     }
 
     return true;
 }
 
-bool FileSystem::isFolderReadOnly(const std::filesystem::path &path)
+bool FileSystem::isFolderReadOnly(const std::filesystem::path &path) noexcept
 {
-    const auto folderStatus = std::filesystem::status(path);
-    const auto folderPermissions = folderStatus.permissions();
-    return (folderPermissions & std::filesystem::perms::owner_write) != std::filesystem::perms::owner_write;
+    try {
+        const auto folderStatus = std::filesystem::status(path);
+        const auto folderPermissions = folderStatus.permissions();
+        return (folderPermissions & std::filesystem::perms::owner_write) != std::filesystem::perms::owner_write;
+    }
+    catch (const std::filesystem::filesystem_error &e)
+    {
+        qCWarning(lcFileSystem()) << "exception when checking folder permissions" << e.what() << e.path1().c_str() << e.path2().c_str();
+        return false;
+    }
 }
 
 

diff --git a/src/libsync/filesystem.h b/src/libsync/filesystem.h
@@ -99,9 +99,9 @@ namespace FileSystem {
         QStringList *errors = nullptr);
 
     bool OWNCLOUDSYNC_EXPORT setFolderPermissions(const QString &path,
-                                                  FileSystem::FolderPermissions permissions);
+                                                  FileSystem::FolderPermissions permissions) noexcept;
 
-    bool OWNCLOUDSYNC_EXPORT isFolderReadOnly(const std::filesystem::path &path);
+    bool OWNCLOUDSYNC_EXPORT isFolderReadOnly(const std::filesystem::path &path) noexcept;
 }
 
 /** @} */

diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp
@@ -677,17 +677,18 @@ void PropagateDownloadFile::startDownload()
         const auto newDirPath = std::filesystem::path{_tmpFile.fileName().toStdWString()};
         Q_ASSERT(newDirPath.has_parent_path());
         _parentPath = newDirPath.parent_path();
-        if (FileSystem::isFolderReadOnly(_parentPath)) {
-            FileSystem::setFolderPermissions(QString::fromStdWString(_parentPath.wstring()), FileSystem::FolderPermissions::ReadWrite);
-            emit propagator()->touchedFile(QString::fromStdWString(_parentPath.wstring()));
-            _needParentFolderRestorePermissions = true;
-        }
     }
     catch (const std::filesystem::filesystem_error &e)
     {
         qCWarning(lcPropagateDownload) << "exception when checking parent folder access rights" << e.what() << e.path1().c_str() << e.path2().c_str();
     }
 
+    if (FileSystem::isFolderReadOnly(_parentPath)) {
+        FileSystem::setFolderPermissions(QString::fromStdWString(_parentPath.wstring()), FileSystem::FolderPermissions::ReadWrite);
+        emit propagator()->touchedFile(QString::fromStdWString(_parentPath.wstring()));
+        _needParentFolderRestorePermissions = true;
+    }
+
     if (!_tmpFile.open(QIODevice::Append | QIODevice::Unbuffered)) {
         qCWarning(lcPropagateDownload) << "could not open temporary file" << _tmpFile.fileName();
         done(SyncFileItem::NormalError, _tmpFile.errorString(), ErrorCategory::GenericError);
@@ -1287,15 +1288,9 @@ void PropagateDownloadFile::downloadFinished()
     }
 
     if (_needParentFolderRestorePermissions) {
-        try {
-            FileSystem::setFolderPermissions(QString::fromStdWString(_parentPath.wstring()), FileSystem::FolderPermissions::ReadWrite);
-            emit propagator()->touchedFile(QString::fromStdWString(_parentPath.wstring()));
-            _needParentFolderRestorePermissions = false;
-        }
-        catch (const std::filesystem::filesystem_error &e)
-        {
-            qCWarning(lcPropagateDownload) << "exception when checking parent folder access rights" << e.what() << e.path1().c_str() << e.path2().c_str();
-        }
+        FileSystem::setFolderPermissions(QString::fromStdWString(_parentPath.wstring()), FileSystem::FolderPermissions::ReadWrite);
+        emit propagator()->touchedFile(QString::fromStdWString(_parentPath.wstring()));
+        _needParentFolderRestorePermissions = false;
     }
 
     FileSystem::setFileHidden(filename, false);