Merge pull request #5568 from nextcloud/bugfix/sortBeforeComputingChe…

…cksum sort encrypted files by their id to compute checksum
nextcloud · Apr 4, 2023 · 27f46eb · 27f46eb
2 parents 3ffdb9b + a76d9fe
commit 27f46eb
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/libsync/clientsideencryption.cpp b/src/libsync/clientsideencryption.cpp
@@ -1722,7 +1722,11 @@ QByteArray FolderMetadata::computeMetadataKeyChecksum(const QByteArray &metadata
     auto hashAlgorithm = QCryptographicHash{QCryptographicHash::Sha256};
 
     hashAlgorithm.addData(_account->e2e()->_mnemonic.remove(' ').toUtf8());
-    for (const auto &singleFile : _files) {
+    auto sortedFiles = _files;
+    std::sort(sortedFiles.begin(), sortedFiles.end(), [] (const auto &first, const auto &second) {
+        return first.encryptedFilename < second.encryptedFilename;
+    });
+    for (const auto &singleFile : sortedFiles) {
         hashAlgorithm.addData(singleFile.encryptedFilename.toUtf8());
     }
     hashAlgorithm.addData(metadataKey);