[stable-33.0] [master] 2047-Custom_Translation

shell_integration/MacOSX/NextcloudFileProviderKit/Package.swift

@@ -17,7 +17,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/nextcloud/NextcloudCapabilitiesKit.git", from: "2.5.0"),
-        .package(url: "https://github.com/nextcloud/NextcloudKit", from: "7.2.3"),
+        .package(url: "https://github.com/nextcloud/NextcloudKit", from: "7.3.3"),
         .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.55.0"),
         .package(url: "https://github.com/realm/realm-swift.git", from: "20.0.4"),
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.0.0")

shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Interface/NextcloudKit+RemoteInterface.swift

@@ -60,7 +60,17 @@ extension NextcloudKit: RemoteInterface {
                 requestHandler: requestHandler,
                 taskHandler: taskHandler,
                 progressHandler: progressHandler
-            ) { account, ocId, etag, date, size, response, nkError in
+            ) { account, response, nkError in
+                let allHeaderFields = response?.response?.allHeaderFields
+                let ocId = self.nkCommonInstance.findHeader("oc-fileid", allHeaderFields: allHeaderFields)
+                let etag = self.nkCommonInstance.normalizedETag(self.nkCommonInstance.findHeader("oc-etag", allHeaderFields: allHeaderFields))
+                let date = self.nkCommonInstance.findHeader("date", allHeaderFields: allHeaderFields)?.parsedDate(using: "EEE, dd MMM y HH:mm:ss zzz")
+                var size: Int64 = 0
+
+                if let value = allHeaderFields?["Content-Length"] as? String {
+                    size = Int64(value) ?? 0
+                }
+
                 continuation.resume(returning: (
                     account,
                     ocId,

shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Interface/RemoteInterface.swift

@@ -86,11 +86,7 @@ public protocol RemoteInterface: Sendable {
         progressHandler: @escaping (_ progress: Progress) -> Void
     ) async -> (
         account: String,
-        etag: String?,
-        date: Date?,
-        length: Int64,
-        headers: [AnyHashable: any Sendable]?,
-        afError: AFError?,
+        response: AFDownloadResponse<URL?>?,
         nkError: NKError
     )
 

shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Item/Item+Fetch.swift

@@ -66,7 +66,7 @@ public extension Item {
                 } else {
                     let identifier = NSFileProviderItemIdentifier(metadata.ocId)
 
-                    let (_, _, _, _, _, _, error) = await remoteInterface.downloadAsync(
+                    let (_, _, error) = await remoteInterface.downloadAsync(
                         serverUrlFileName: remotePath,
                         fileNameLocalPath: childLocalPath,
                         account: account.ncKitAccount,
@@ -176,7 +176,7 @@ public extension Item {
             }
 
         } else {
-            let (_, _, _, _, _, _, error) = await remoteInterface.downloadAsync(
+            let (_, _, error) = await remoteInterface.downloadAsync(
                 serverUrlFileName: serverUrlFileName,
                 fileNameLocalPath: localPath.path,
                 account: account.ncKitAccount,

shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKitMocks/TestableRemoteInterface.swift

@@ -96,14 +96,10 @@ public struct TestableRemoteInterface: RemoteInterface, @unchecked Sendable {
         progressHandler _: @escaping (_ progress: Progress) -> Void
     ) async -> (
         account: String,
-        etag: String?,
-        date: Date?,
-        length: Int64,
-        headers: [AnyHashable: any Sendable]?,
-        afError: AFError?,
+        response: AFDownloadResponse<URL?>?,
         nkError: NKError
     ) {
-        ("", nil, nil, 0, nil, nil, .invalidResponseError)
+        ("", nil, .invalidResponseError)
     }
 
     public func enumerate(

shell_integration/MacOSX/NextcloudFileProviderKit/Tests/Interface/MockRemoteInterface.swift

@@ -1034,23 +1034,19 @@ public class MockRemoteInterface: RemoteInterface, @unchecked Sendable {
         progressHandler _: @escaping (_ progress: Progress) -> Void = { _ in }
     ) async -> (
         account: String,
-        etag: String?,
-        date: Date?,
-        length: Int64,
-        headers: [AnyHashable: any Sendable]?,
-        afError: AFError?,
+        response: AFDownloadResponse<URL?>?,
         nkError: NKError
     ) {
         guard let serverUrlFileName = serverUrlFileName as? String ?? (serverUrlFileName as? URL)?.absoluteString else {
-            return (account, nil, nil, 0, nil, nil, .urlError)
+            return (account, nil, .urlError)
         }
 
         guard let account = mockedAccounts[account] else {
-            return (account, nil, nil, 0, nil, nil, .urlError)
+            return (account, nil, .urlError)
         }
 
         guard let item = item(remotePath: serverUrlFileName, account: account.ncKitAccount) else {
-            return (account.ncKitAccount, nil, nil, 0, nil, nil, .urlError)
+            return (account.ncKitAccount, nil, .urlError)
         }
 
         let localUrl = URL(fileURLWithPath: fileNameLocalPath)
@@ -1066,18 +1062,10 @@ public class MockRemoteInterface: RemoteInterface, @unchecked Sendable {
             }
         } catch {
             print("Could not write item data: \(error)")
-            return (account.ncKitAccount, nil, nil, 0, nil, nil, .urlError)
+            return (account.ncKitAccount, nil, .urlError)
         }
 
-        return (
-            account.ncKitAccount,
-            item.versionIdentifier,
-            item.creationDate as Date,
-            item.size,
-            nil,
-            nil,
-            .success
-        )
+        return (account.ncKitAccount, nil, .success)
     }
 
     public func enumerate(

src/gui/remotewipe.cpp

@@ -27,6 +27,10 @@ RemoteWipe::RemoteWipe(AccountPtr account, QObject *parent)
             return;
         }
 
+        if (!_account->isRemoteWipeRequested_HACK()) {
+            return;
+        }
+
         notifyServerSuccess();
     });
 

src/libsync/networkjobs.cpp

@@ -555,18 +555,16 @@
         connect(&parser, &LsColXMLParser::finishedWithoutError,
             this, &LsColJob::finishedWithoutError);
 
-        // bool LsColXMLParser::parse takes a while, let's process some events in attempt to make UI more responsive
-        // from https://doc.qt.io/qt-5/qcoreapplication.html#processEvents-1 
-        // "You can call this function occasionally when your program is busy doing a long operation (e.g. copying a file)."
-        // we should not abuse this function, as it affects QObject instances lifetime (when children are getting deleted or when deleteLater is called)
-        // one reason I had to remove ability for LsColJob to have parent, which, otherwise, leads to a crash later
-        QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
-
-        QString expectedPath = reply()->request().url().path(); // something like "/owncloud/remote.php/dav/folder"
+        const auto expectedPath = reply()->request().url().path(); // something like "/owncloud/remote.php/dav/folder"
         if (!parser.parse(reply()->readAll(), &_folderInfos, expectedPath)) {
             // XML parse error
             emit finishedWithError(reply());
         }
+
+        // processEvents is called AFTER all reply() accesses. A pending deleteLater()
+        // processed inside it can zero the QPointer and caused a SIGSEGV when it was
+        // placed before the reply reads. Do not abuse: it affects QObject lifetimes.
+        QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
     } else {
         // wrong content type, wrong HTTP code or any other network error
         emit finishedWithError(reply());

test/testremotediscovery.cpp

@@ -37,6 +37,18 @@
     }
 };
 
+// Reply that queues its own deletion so it fires inside LsColJob::finished()'s processEvents().
+struct FakePropfindReplyWithPendingDeletion : FakePropfindReply {
+    FakePropfindReplyWithPendingDeletion(FileInfo &remoteRootFileInfo, QNetworkAccessManager::Operation op,
+                                         const QNetworkRequest &request, QObject *parent)
+        : FakePropfindReply(remoteRootFileInfo, op, request, parent)
+    {
+        // respond() is queued before this timer, so it fires first; the deletion fires
+        // inside LsColJob::finished()'s processEvents() call.
+        QTimer::singleShot(0, this, &QObject::deleteLater);
+    }
+};
+
 
 enum ErrorKind : int {
     // Lower code are corresponding to HTML error code
@@ -241,6 +253,45 @@
         QVERIFY(fakeFolder.syncOnce());
         QCOMPARE(rootFileIdSpy.size(), 0);
     }
+
+    // Regression: processEvents() inside LsColJob::finished() must not run before reply()
+    // is read. A pending deleteLater() draining during processEvents() zeros the QPointer
+    // and caused a SIGSEGV at reply()->request().url().path() (address 0x8).
+    void testLsColJobDoesNotCrashWhenReplyIsDeletedDuringProcessEvents()
+    {
+        FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};
+        fakeFolder.remoteModifier().mkdir("B/sub");
+
+        const auto errorFolder = QStringLiteral("dav/files/admin/B");
+        fakeFolder.setServerOverride([&](QNetworkAccessManager::Operation op,
+                                         const QNetworkRequest &req,
+                                         QIODevice *) -> QNetworkReply * {
+            if (req.attribute(QNetworkRequest::CustomVerbAttribute).toString() == QStringLiteral("PROPFIND")
+                && req.url().path().endsWith(errorFolder)) {
+                return new FakePropfindReplyWithPendingDeletion(fakeFolder.remoteModifier(), op, req, nullptr);
+            }
+            return nullptr;
+        });
+
+        // The sync must complete without crashing. Discovery of B will fail gracefully
+        // because finishedWithoutError is still emitted before processEvents() runs.
+        QVERIFY(fakeFolder.syncOnce());
+        // Items under A and C must have synced normally.
+        QVERIFY(fakeFolder.currentLocalState().find("A"));
+        QVERIFY(fakeFolder.currentLocalState().find("C"));
+    }
+
+    // Verifies normal listing succeeds when the reply stays alive throughout.
+    void testLsColJobSucceedsNormally()
+    {
+        FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};
+        fakeFolder.remoteModifier().insert("A/newfile.txt");
+
+        // Normal sync with no overrides: all PROPFIND replies remain alive.
+        QVERIFY(fakeFolder.syncOnce());
+        QVERIFY(fakeFolder.currentLocalState().find("A/newfile.txt"));
+        QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
+    }
 };
 
 QTEST_GUILESS_MAIN(TestRemoteDiscovery)