V2.0 Simplified: Factor-out encrypted ancestor detection code.

Signed-off-by: alex-z <[email protected]>
nextcloud · Jul 18, 2023 · f380d66 · f380d66
1 parent fc16f26
commit f380d66
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 19 deletions.
diff --git a/src/common/syncjournaldb.cpp b/src/common/syncjournaldb.cpp
@@ -1072,6 +1072,31 @@ bool SyncJournalDb::listAllE2eeFoldersWithEncryptionStatusLessThan(const int sta
     return true;
 }
 
+bool SyncJournalDb::findEncryptedAncestorForRecord(const QString &filename, SyncJournalFileRecord *rec)
+{
+    Q_ASSERT(rec);
+    rec->_path.clear();
+    Q_ASSERT(!rec->isValid());
+
+    const auto slashPosition = filename.lastIndexOf(QLatin1Char('/'));
+    const auto parentPath = slashPosition >= 0 ? filename.left(slashPosition) : QString();
+
+    auto pathComponents = parentPath.split(QLatin1Char('/'));
+    while (!pathComponents.isEmpty()) {
+        const auto pathCompontentsJointed = pathComponents.join(QLatin1Char('/'));
+        if (!getFileRecord(pathCompontentsJointed, rec)) {
+            qCDebug(lcDb) << "could not get file from local DB" << pathCompontentsJointed;
+            return false;
+        }
+
+        if (rec->isValid() && rec->isE2eEncrypted()) {
+            break;
+        }
+        pathComponents.removeLast();
+    }
+    return true;
+}
+
 void SyncJournalDb::keyValueStoreSet(const QString &key, QVariant value)
 {
     QMutexLocker locker(&_mutex);

diff --git a/src/common/syncjournaldb.h b/src/common/syncjournaldb.h
@@ -69,6 +69,7 @@ class OCSYNC_EXPORT SyncJournalDb : public QObject
     [[nodiscard]] Result<void, QString> setFileRecord(const SyncJournalFileRecord &record);
     [[nodiscard]] bool getRootE2eFolderRecord(const QString &remoteFolderPath, SyncJournalFileRecord *rec);
     [[nodiscard]] bool listAllE2eeFoldersWithEncryptionStatusLessThan(const int status, const std::function<void(const SyncJournalFileRecord &)> &rowCallback);
+    [[nodiscard]] bool findEncryptedAncestorForRecord(const QString &filename, SyncJournalFileRecord *rec);
 
     void keyValueStoreSet(const QString &key, QVariant value);
     [[nodiscard]] qint64 keyValueStoreGetInt(const QString &key, qint64 defaultValue);

diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
@@ -317,25 +317,9 @@ bool PropagateItemJob::hasEncryptedAncestor() const
         return false;
     }
 
-    const auto path = _item->_file;
-    const auto slashPosition = path.lastIndexOf('/');
-    const auto parentPath = slashPosition >= 0 ? path.left(slashPosition) : QString();
-
-    auto pathComponents = parentPath.split('/');
-    while (!pathComponents.isEmpty()) {
-        SyncJournalFileRecord rec;
-        const auto pathCompontentsJointed = pathComponents.join('/');
-        if (!propagator()->_journal->getFileRecord(pathCompontentsJointed, &rec)) {
-            qCWarning(lcPropagator) << "could not get file from local DB" << pathCompontentsJointed;
-        }
-
-        if (rec.isValid() && rec.isE2eEncrypted()) {
-            return true;
-        }
-        pathComponents.removeLast();
-    }
-
-    return false;
+    SyncJournalFileRecord rec;
+    return propagator()->_journal->findEncryptedAncestorForRecord(_item->_file, &rec)
+        && rec.isValid() && rec.isE2eEncrypted();
 }
 
 // ================================================================================