V2.0 Simplified: Do not allow uploading nested folders within encrypt…

…ed parent. Signed-off-by: alex-z <[email protected]>
nextcloud · Jul 18, 2023 · a4f31ff · a4f31ff
1 parent f380d66
commit a4f31ff
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
@@ -1352,6 +1352,19 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
             item->_e2eEncryptionMaximumAvailableStatus = EncryptionStatusEnums::fromEndToEndEncryptionApiVersion(_discoveryData->_account->capabilities().clientSideEncryptionVersion());
         }
         postProcessLocalNew();
+        if (item->_instruction == CSYNC_INSTRUCTION_NEW && item->_direction == SyncFileItem::Up
+            && _discoveryData->_account->capabilities().clientSideEncryptionVersion() >= 2.0) {
+            OCC::SyncJournalFileRecord rec;
+            _discoveryData->_statedb->findEncryptedAncestorForRecord(item->_file, &rec);
+            if (rec.isValid() && rec._e2eEncryptionStatus >= OCC::SyncJournalFileRecord::EncryptionStatus::EncryptedMigratedV2_0) {
+                qCDebug(lcDisco) << "Attempting to create a subfolder in top-level E2EE V2 folder. Ignoring.";
+                item->_instruction = CSYNC_INSTRUCTION_IGNORE;
+                item->_direction = SyncFileItem::None;
+                item->_status = SyncFileItem::NormalError;
+                item->_errorString = tr("Creating nested encrypted folders is not supported yet.");
+            }
+        }
+
         finalize();
         return;
     }