Fix review comments.

Signed-off-by: alex-z <[email protected]>

src/common/checksums.h

@@ -56,7 +56,7 @@ OCSYNC_EXPORT QByteArray parseChecksumHeaderType(const QByteArray &header);
 /// Checks OWNCLOUD_DISABLE_CHECKSUM_UPLOAD
 OCSYNC_EXPORT bool uploadChecksumEnabled();
 
-QByteArray OCSYNC_EXPORT calcSha256(const QByteArray &data);
+OCSYNC_EXPORT QByteArray calcSha256(const QByteArray &data);
 
 /**
  * Computes the checksum of a file.

src/gui/folderman.cpp

@@ -1587,7 +1587,7 @@ void FolderMan::slotLeaveShare(const QString &localFile, const QByteArray &folde
         qCDebug(lcFolderMan) << "slotLeaveShare callback statusCode" << statusCode;
         Q_UNUSED(statusCode);
         if (_removeE2eeShareJob) {
-            _removeE2eeShareJob->unlockFolder(true);
+            _removeE2eeShareJob->unlockFolder(EncryptedFolderMetadataHandler::UnlockFolderWithResult::Success);
             connect(_removeE2eeShareJob.data(), &UpdateE2eeFolderUsersMetadataJob::folderUnlocked, this, [this, folder] {
                 scheduleFolder(folder);
             });

src/libsync/basepropagateremotedeleteencrypted.cpp

@@ -82,10 +82,9 @@ void BasePropagateRemoteDeleteEncrypted::fetchMetadataForPath(const QString &pat
     _encryptedFolderMetadataHandler->fetchMetadata();
 }
 
-void BasePropagateRemoteDeleteEncrypted::uploadMetadata(bool keepLock)
+void BasePropagateRemoteDeleteEncrypted::uploadMetadata(const EncryptedFolderMetadataHandler::UploadMode uploadMode)
 {
-    _encryptedFolderMetadataHandler->uploadMetadata(keepLock ? EncryptedFolderMetadataHandler::UploadMode::KeepLock
-                                                             : EncryptedFolderMetadataHandler::UploadMode::DoNotKeepLock);
+    _encryptedFolderMetadataHandler->uploadMetadata(uploadMode);
 }
 
 void BasePropagateRemoteDeleteEncrypted::slotFolderUnLockFinished(const QByteArray &folderId, int statusCode)
@@ -147,7 +146,7 @@ void BasePropagateRemoteDeleteEncrypted::slotDeleteRemoteItemFinished()
     }
     _propagator->_journal->commit("Remote Remove");
 
-    unlockFolder(true);
+    unlockFolder(EncryptedFolderMetadataHandler::UnlockFolderWithResult::Success);
 }
 
 void BasePropagateRemoteDeleteEncrypted::deleteRemoteItem(const QString &filename)
@@ -164,7 +163,7 @@ void BasePropagateRemoteDeleteEncrypted::deleteRemoteItem(const QString &filenam
     deleteJob->start();
 }
 
-void BasePropagateRemoteDeleteEncrypted::unlockFolder(bool success)
+void BasePropagateRemoteDeleteEncrypted::unlockFolder(const EncryptedFolderMetadataHandler::UnlockFolderWithResult result)
 {
     if (!_encryptedFolderMetadataHandler) {
         qCWarning(ABSTRACT_PROPAGATE_REMOVE_ENCRYPTED) << "Null _encryptedFolderMetadataHandler";
@@ -177,15 +176,15 @@ void BasePropagateRemoteDeleteEncrypted::unlockFolder(bool success)
     qCDebug(ABSTRACT_PROPAGATE_REMOVE_ENCRYPTED) << "Unlocking folder" << _encryptedFolderMetadataHandler->folderId();
 
     connect(_encryptedFolderMetadataHandler.data(), &EncryptedFolderMetadataHandler::folderUnlocked, this, &BasePropagateRemoteDeleteEncrypted::slotFolderUnLockFinished);
-    _encryptedFolderMetadataHandler->unlockFolder(success);
+    _encryptedFolderMetadataHandler->unlockFolder(result);
 }
 
 void BasePropagateRemoteDeleteEncrypted::taskFailed()
 {
     qCDebug(ABSTRACT_PROPAGATE_REMOVE_ENCRYPTED) << "Task failed for job" << sender();
     _isTaskFailed = true;
     if (_encryptedFolderMetadataHandler && _encryptedFolderMetadataHandler->isFolderLocked()) {
-        unlockFolder(false);
+        unlockFolder(EncryptedFolderMetadataHandler::UnlockFolderWithResult::Failure);
     } else {
         emit finished(false);
     }

src/libsync/basepropagateremotedeleteencrypted.h

@@ -47,13 +47,14 @@ class BasePropagateRemoteDeleteEncrypted : public QObject
     void storeFirstErrorString(const QString &errString);
 
     void fetchMetadataForPath(const QString &path);
-    void uploadMetadata(bool keepLock = false);
+    void uploadMetadata(const EncryptedFolderMetadataHandler::UploadMode uploadMode = EncryptedFolderMetadataHandler::UploadMode::DoNotKeepLock);
 
     [[nodiscard]] QSharedPointer<FolderMetadata> folderMetadata() const;
     [[nodiscard]] const QByteArray folderToken() const;
 
     void deleteRemoteItem(const QString &filename);
-    void unlockFolder(bool success);
+
+    void unlockFolder(const EncryptedFolderMetadataHandler::UnlockFolderWithResult result);
     void taskFailed();
 
 protected slots:

src/libsync/discovery.cpp

@@ -629,7 +629,7 @@ void ProcessDirectoryJob::processFileAnalyzeRemoteInfo(const SyncFileItemPtr &it
     item->_directDownloadCookies = serverEntry.directDownloadCookies;
     item->_e2eEncryptionStatus = serverEntry.isE2eEncrypted() ? SyncFileItem::EncryptionStatus::Encrypted : SyncFileItem::EncryptionStatus::NotEncrypted;
     if (serverEntry.isE2eEncrypted()) {
-        item->_e2eEncryptionMaximumAvailableStatus = EncryptionStatusEnums::fromEndToEndEncryptionApiVersion(_discoveryData->_account->capabilities().clientSideEncryptionVersion());
+        item->_e2eEncryptionServerCapability = EncryptionStatusEnums::fromEndToEndEncryptionApiVersion(_discoveryData->_account->capabilities().clientSideEncryptionVersion());
     }
     item->_encryptedFileName = [=] {
         if (serverEntry.e2eMangledName.isEmpty()) {
@@ -1025,7 +1025,7 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
         if (dbEntry.isValid() && item->isDirectory()) {
             item->_e2eEncryptionStatus = EncryptionStatusEnums::fromDbEncryptionStatus(dbEntry._e2eEncryptionStatus);
             if (item->isEncrypted()) {
-                item->_e2eEncryptionMaximumAvailableStatus = EncryptionStatusEnums::fromEndToEndEncryptionApiVersion(_discoveryData->_account->capabilities().clientSideEncryptionVersion());
+                item->_e2eEncryptionServerCapability = EncryptionStatusEnums::fromEndToEndEncryptionApiVersion(_discoveryData->_account->capabilities().clientSideEncryptionVersion());
             }
         }
 
@@ -1385,7 +1385,7 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
             // renaming the encrypted folder is done via remove + re-upload hence we need to mark the newly created folder as encrypted
             // base is a record in the SyncJournal database that contains the data about the being-renamed folder with it's old name and encryption information
             item->_e2eEncryptionStatus = EncryptionStatusEnums::fromDbEncryptionStatus(base._e2eEncryptionStatus);
-            item->_e2eEncryptionMaximumAvailableStatus = EncryptionStatusEnums::fromEndToEndEncryptionApiVersion(_discoveryData->_account->capabilities().clientSideEncryptionVersion());
+            item->_e2eEncryptionServerCapability = EncryptionStatusEnums::fromEndToEndEncryptionApiVersion(_discoveryData->_account->capabilities().clientSideEncryptionVersion());
         }
         postProcessLocalNew();
         /*if (item->isDirectory() && item->_instruction == CSYNC_INSTRUCTION_NEW && item->_direction == SyncFileItem::Up
@@ -1988,7 +1988,7 @@ DiscoverySingleDirectoryJob *ProcessDirectoryJob::startAsyncServerQuery()
                 _dirItem->_isEncryptedMetadataNeedUpdate = alreadyDownloaded && serverJob->encryptedMetadataNeedUpdate();
                 _dirItem->_e2eEncryptionStatus = serverJob->currentEncryptionStatus();
                 _dirItem->_e2eEncryptionStatusRemote = serverJob->currentEncryptionStatus();
-                _dirItem->_e2eEncryptionMaximumAvailableStatus = serverJob->requiredEncryptionStatus();
+                _dirItem->_e2eEncryptionServerCapability = serverJob->requiredEncryptionStatus();
                 _discoveryData->_anotherSyncNeeded = !alreadyDownloaded && serverJob->encryptedMetadataNeedUpdate();
             }
             qCInfo(lcDisco) << "serverJob has finished for folder:" << _dirItem->_file << " and it has _isFileDropDetected:" << true;

src/libsync/encryptedfoldermetadatahandler.cpp

@@ -213,7 +213,7 @@ void EncryptedFolderMetadataHandler::slotFolderLockedError(const QByteArray &fol
     emit fetchFinished(httpErrorCode, tr("Error locking folder."));
 }
 
-void EncryptedFolderMetadataHandler::unlockFolder(bool success)
+void EncryptedFolderMetadataHandler::unlockFolder(const UnlockFolderWithResult result)
 {
     Q_ASSERT(!_isUnlockRunning);
     Q_ASSERT(_isFolderLocked);
@@ -230,7 +230,7 @@ void EncryptedFolderMetadataHandler::unlockFolder(bool success)
     }
 
     if (_uploadMode == UploadMode::DoNotKeepLock) {
-        if (success) {
+        if (result == UnlockFolderWithResult::Success) {
             connect(this, &EncryptedFolderMetadataHandler::folderUnlocked, this, &EncryptedFolderMetadataHandler::slotEmitUploadSuccess);
         } else {
             connect(this, &EncryptedFolderMetadataHandler::folderUnlocked, this, &EncryptedFolderMetadataHandler::slotEmitUploadError);
@@ -295,7 +295,7 @@ void EncryptedFolderMetadataHandler::slotUploadMetadataSuccess(const QByteArray
         return;
     }
     connect(this, &EncryptedFolderMetadataHandler::folderUnlocked, this, &EncryptedFolderMetadataHandler::slotEmitUploadSuccess);
-    unlockFolder(true);
+    unlockFolder(UnlockFolderWithResult::Success);
 }
 
 void EncryptedFolderMetadataHandler::slotUploadMetadataError(const QByteArray &folderId, int httpReturnCode)
@@ -305,7 +305,7 @@ void EncryptedFolderMetadataHandler::slotUploadMetadataError(const QByteArray &f
     _uploadErrorCode = httpReturnCode;
     if (_isFolderLocked && _uploadMode == UploadMode::DoNotKeepLock) {
         connect(this, &EncryptedFolderMetadataHandler::folderUnlocked, this, &EncryptedFolderMetadataHandler::slotEmitUploadError);
-        unlockFolder(false);
+        unlockFolder(UnlockFolderWithResult::Failure);
         return;
     }
     emit uploadFinished(_uploadErrorCode);

src/libsync/encryptedfoldermetadatahandler.h

@@ -41,6 +41,11 @@ class OWNCLOUDSYNC_EXPORT EncryptedFolderMetadataHandler : public QObject
         KeepLock
     };
 
+    enum class UnlockFolderWithResult {
+        Success = 0,
+        Failure
+    };
+
     explicit EncryptedFolderMetadataHandler(const AccountPtr &account,
                                                  const QString &folderPath,
                                                  SyncJournalDb *const journalDb,
@@ -64,7 +69,7 @@ class OWNCLOUDSYNC_EXPORT EncryptedFolderMetadataHandler : public QObject
     void fetchMetadata(const RootEncryptedFolderInfo &rootEncryptedFolderInfo, const FetchMode fetchMode = FetchMode::NonEmptyMetadata);
     void fetchMetadata(const FetchMode fetchMode = FetchMode::NonEmptyMetadata);
     void uploadMetadata(const UploadMode uploadMode = UploadMode::DoNotKeepLock);
-    void unlockFolder(bool success = true);
+    void unlockFolder(const UnlockFolderWithResult result = UnlockFolderWithResult::Success);
 
 private:
     void lockFolder();

src/libsync/foldermetadata.cpp

@@ -416,7 +416,7 @@ void FolderMetadata::emitSetupComplete()
 }
 
 // RSA/ECB/OAEPWithSHA-256AndMGF1Padding using private / public key.
-QByteArray FolderMetadata::encryptDataWithPublicKey(const QByteArray &data, const QSslKey key) const
+QByteArray FolderMetadata::encryptDataWithPublicKey(const QByteArray &data, const QSslKey &key) const
 {
     ClientSideEncryption::Bio publicKeyBio;
     const auto publicKeyPem = key.toPem();
@@ -825,7 +825,7 @@ quint64 FolderMetadata::newCounter() const
     return _counter + 1;
 }
 
-EncryptionStatusEnums::ItemEncryptionStatus FolderMetadata::fromMedataVersionToItemEncryptionStatus(const MetadataVersion &metadataVersion)
+EncryptionStatusEnums::ItemEncryptionStatus FolderMetadata::fromMedataVersionToItemEncryptionStatus(const MetadataVersion metadataVersion)
 {
     switch (metadataVersion) {
     case FolderMetadata::MetadataVersion::Version2_0:
@@ -840,7 +840,7 @@ EncryptionStatusEnums::ItemEncryptionStatus FolderMetadata::fromMedataVersionToI
     return SyncFileItem::EncryptionStatus::NotEncrypted;
 }
 
-FolderMetadata::MetadataVersion FolderMetadata::fromItemEncryptionStatusToMedataVersion(const EncryptionStatusEnums::ItemEncryptionStatus &encryptionStatus)
+FolderMetadata::MetadataVersion FolderMetadata::fromItemEncryptionStatusToMedataVersion(const EncryptionStatusEnums::ItemEncryptionStatus encryptionStatus)
 {
     switch (encryptionStatus) {
     case EncryptionStatusEnums::ItemEncryptionStatus::Encrypted:

src/libsync/foldermetadata.h

@@ -15,8 +15,8 @@
 
 #include "accountfwd.h"
 #include "encryptedfoldermetadatahandler.h"
-#include <csync.h>
-#include <rootencryptedfolderinfo.h>
+#include "csync.h"
+#include "rootencryptedfolderinfo.h"
 #include <QByteArray>
 #include <QHash>
 #include <QJsonObject>
@@ -151,7 +151,7 @@ public slots:
 
     [[nodiscard]] bool verifyMetadataKey(const QByteArray &metadataKey) const;
 
-    [[nodiscard]] QByteArray encryptDataWithPublicKey(const QByteArray &data, const QSslKey key) const;
+    [[nodiscard]] QByteArray encryptDataWithPublicKey(const QByteArray &data, const QSslKey &key) const;
     [[nodiscard]] QByteArray decryptDataWithPrivateKey(const QByteArray &data) const;
 
     [[nodiscard]] QByteArray encryptJsonObject(const QByteArray& obj, const QByteArray pass) const;
@@ -171,8 +171,8 @@ public slots:
 
     void setFileDrop(const QJsonObject &fileDrop);
 
-    static EncryptionStatusEnums::ItemEncryptionStatus fromMedataVersionToItemEncryptionStatus(const MetadataVersion &metadataVersion);
-    static MetadataVersion fromItemEncryptionStatusToMedataVersion(const EncryptionStatusEnums::ItemEncryptionStatus &encryptionStatus);
+    static EncryptionStatusEnums::ItemEncryptionStatus fromMedataVersionToItemEncryptionStatus(const MetadataVersion metadataVersion);
+    static MetadataVersion fromItemEncryptionStatusToMedataVersion(const EncryptionStatusEnums::ItemEncryptionStatus encryptionStatus);
 
     static QByteArray prepareMetadataForSignature(const QJsonDocument &fullMetadata);
 

src/libsync/owncloudpropagator.cpp

@@ -710,7 +710,7 @@ void OwncloudPropagator::startFilePropagation(const SyncFileItemPtr &item,
 
 void OwncloudPropagator::processE2eeMetadataMigration(const SyncFileItemPtr &item, QStack<QPair<QString, PropagateDirectory *>> &directories)
 {
-    if (item->_e2eEncryptionMaximumAvailableStatus >= EncryptionStatusEnums::ItemEncryptionStatus::EncryptedMigratedV2_0) {
+    if (item->_e2eEncryptionServerCapability >= EncryptionStatusEnums::ItemEncryptionStatus::EncryptedMigratedV2_0) {
         // migrating to v2.0+
         const auto rootE2eeFolderPath = item->_file.split('/').first();
         const auto rootE2eeFolderPathWithSlash = QString(rootE2eeFolderPath + "/");

src/libsync/propagateremotedeleteencrypted.cpp

@@ -82,7 +82,7 @@ void PropagateRemoteDeleteEncrypted::slotFetchMetadataJobFinished(int statusCode
     }
 
     qCDebug(PROPAGATE_REMOVE_ENCRYPTED) << "Metadata updated, sending to the server.";
-    uploadMetadata(true);
+    uploadMetadata(EncryptedFolderMetadataHandler::UploadMode::KeepLock);
 }
 
 void PropagateRemoteDeleteEncrypted::slotUpdateMetadataJobFinished(int statusCode, const QString &message)

src/libsync/propagateremotedeleteencryptedrootfolder.cpp

@@ -98,7 +98,7 @@ void PropagateRemoteDeleteEncryptedRootFolder::slotFetchMetadataJobFinished(int
     metadata->removeAllEncryptedFiles();
 
     qCDebug(PROPAGATE_REMOVE_ENCRYPTED_ROOTFOLDER) << "Metadata updated, sending to the server.";
-    uploadMetadata(true);
+    uploadMetadata(EncryptedFolderMetadataHandler::UploadMode::KeepLock);
 }
 
 void PropagateRemoteDeleteEncryptedRootFolder::slotUpdateMetadataJobFinished(int statusCode, const QString &message)
@@ -173,7 +173,7 @@ void PropagateRemoteDeleteEncryptedRootFolder::slotDeleteNestedRemoteItemFinishe
             taskFailed();
             return;
         }
-        unlockFolder(true);
+        unlockFolder(EncryptedFolderMetadataHandler::UnlockFolderWithResult::Success);
     }
 }
 

src/libsync/propagateremotemkdir.cpp

@@ -253,7 +253,7 @@ void PropagateRemoteMkdir::slotEncryptFolderFinished(int status, EncryptionStatu
     _item->_e2eEncryptionStatus = encryptionStatus;
     _item->_e2eEncryptionStatusRemote = encryptionStatus;
     if (_item->isEncrypted()) {
-        _item->_e2eEncryptionMaximumAvailableStatus = EncryptionStatusEnums::fromEndToEndEncryptionApiVersion(propagator()->account()->capabilities().clientSideEncryptionVersion());
+        _item->_e2eEncryptionServerCapability = EncryptionStatusEnums::fromEndToEndEncryptionApiVersion(propagator()->account()->capabilities().clientSideEncryptionVersion());
     }
     success();
 }

src/libsync/propagateuploadencrypted.cpp

@@ -143,7 +143,7 @@ void PropagateUploadEncrypted::slotFetchMetadataJobFinished(int statusCode, cons
 
     _item->_encryptedFileName = _remoteParentPath + QLatin1Char('/') + encryptedFile.encryptedFilename;
     _item->_e2eEncryptionStatusRemote = metadata->existingMetadataEncryptionStatus();
-    _item->_e2eEncryptionMaximumAvailableStatus =
+    _item->_e2eEncryptionServerCapability =
         EncryptionStatusEnums::fromEndToEndEncryptionApiVersion(_propagator->account()->capabilities().clientSideEncryptionVersion());
 
     qCDebug(lcPropagateUploadEncrypted) << "Creating the encrypted file.";

src/libsync/syncfileitem.cpp

@@ -155,7 +155,7 @@ SyncFileItemPtr SyncFileItem::fromSyncJournalFileRecord(const SyncJournalFileRec
     item->_checksumHeader = rec._checksumHeader;
     item->_encryptedFileName = rec.e2eMangledName();
     item->_e2eEncryptionStatus = EncryptionStatusEnums::fromDbEncryptionStatus(rec._e2eEncryptionStatus);
-    item->_e2eEncryptionMaximumAvailableStatus = item->_e2eEncryptionStatus;
+    item->_e2eEncryptionServerCapability = item->_e2eEncryptionStatus;
     item->_locked = rec._lockstate._locked ? LockStatus::LockedItem : LockStatus::UnlockedItem;
     item->_lockOwnerDisplayName = rec._lockstate._lockOwnerDisplayName;
     item->_lockOwnerId = rec._lockstate._lockOwnerId;
@@ -194,7 +194,7 @@ SyncFileItemPtr SyncFileItem::fromProperties(const QString &filePath, const QMap
 
     item->_e2eEncryptionStatus = (properties.value(QStringLiteral("is-encrypted")) == QStringLiteral("1") ? SyncFileItem::EncryptionStatus::Encrypted : SyncFileItem::EncryptionStatus::NotEncrypted);
     if (item->isEncrypted()) {
-        item->_e2eEncryptionMaximumAvailableStatus = item->_e2eEncryptionStatus;
+        item->_e2eEncryptionServerCapability = item->_e2eEncryptionStatus;
     }
     item->_locked =
         properties.value(QStringLiteral("lock")) == QStringLiteral("1") ? SyncFileItem::LockStatus::LockedItem : SyncFileItem::LockStatus::UnlockedItem;

src/libsync/syncfileitem.h

@@ -284,7 +284,7 @@ class OWNCLOUDSYNC_EXPORT SyncFileItem
     bool _isRestoration BITFIELD(1); // The original operation was forbidden, and this is a restoration
     bool _isSelectiveSync BITFIELD(1); // The file is removed or ignored because it is in the selective sync list
     EncryptionStatus _e2eEncryptionStatus = EncryptionStatus::NotEncrypted; // The file is E2EE or the content of the directory should be E2EE
-    EncryptionStatus _e2eEncryptionMaximumAvailableStatus = EncryptionStatus::NotEncrypted;
+    EncryptionStatus _e2eEncryptionServerCapability = EncryptionStatus::NotEncrypted;
     EncryptionStatus _e2eEncryptionStatusRemote = EncryptionStatus::NotEncrypted;
     quint16 _httpErrorCode = 0;
     RemotePermissions _remotePerm;