fix: ensure proper upload of locked files

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

Author: mgallien

src/libsync/propagateuploadng.cpp

@@ -321,7 +321,9 @@ void PropagateUploadFileNG::finishUpload()
     const auto fileSize = _fileToUpload._size;
     headers[QByteArrayLiteral("OC-Total-Length")] = QByteArray::number(fileSize);
     if (_item->_lockOwnerType == SyncFileItem::LockOwnerType::TokenLock &&
-        _item->_locked == SyncFileItem::LockStatus::LockedItem) {
+        _item->_locked == SyncFileItem::LockStatus::LockedItem &&
+        _item->_instruction != CSYNC_INSTRUCTION_NEW &&
+        _item->_instruction != CSYNC_INSTRUCTION_TYPE_CHANGE) {
         headers[QByteArrayLiteral("If")] = (QLatin1String("<") + propagator()->account()->davUrl().toString() + _fileToUpload._file + "> (<opaquelocktoken:" + _item->_lockToken.toUtf8() + ">)").toUtf8();
     }
 

src/libsync/propagateuploadv1.cpp

@@ -95,7 +95,9 @@ void PropagateUploadFileV1::startNextChunk()
     QString path = _fileToUpload._file;
 
     if (_item->_lockOwnerType == SyncFileItem::LockOwnerType::TokenLock &&
-        _item->_locked == SyncFileItem::LockStatus::LockedItem) {
+        _item->_locked == SyncFileItem::LockStatus::LockedItem &&
+        _item->_instruction != CSYNC_INSTRUCTION_NEW &&
+        _item->_instruction != CSYNC_INSTRUCTION_TYPE_CHANGE) {
         headers[QByteArrayLiteral("If")] = (QLatin1String("<") + propagator()->account()->davUrl().toString() + _fileToUpload._file + "> (<opaquelocktoken:" + _item->_lockToken.toUtf8() + ">)").toUtf8();
     }
 

test/testlockfile.cpp

@@ -880,13 +880,19 @@ private slots:
         QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
 
         int nGET = 0, nPUT = 0;
+        auto verifyLackOfTokenIfHeader = false;
         QObject parent;
         fakeFolder.setServerOverride([&](QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData) -> QNetworkReply * {
             Q_UNUSED(outgoingData)
             Q_UNUSED(request)
 
             if (op == QNetworkAccessManager::PutOperation) {
                 ++nPUT;
+                if (verifyLackOfTokenIfHeader) {
+                    if (request.hasRawHeader("If")) {
+                        Q_ASSERT(false);
+                    }
+                }
             } else if (op == QNetworkAccessManager::GetOperation) {
                 ++nGET;
             }
@@ -943,11 +949,13 @@ private slots:
         QVERIFY(!fakeFolder.syncOnce());
         QCOMPARE(nGET, 0);
         QCOMPARE(nPUT, 1);
+        fakeFolder.syncJournal().wipeErrorBlacklistCategory(OCC::SyncJournalErrorBlacklistRecord::Normal);
+        verifyLackOfTokenIfHeader = true;
 
         fakeFolder.remoteModifier().mkdir(u"parent/child"_s);
         cleanUpHelper();
         fakeFolder.syncEngine().setLocalDiscoveryOptions(OCC::LocalDiscoveryStyle::DatabaseAndFilesystem, {u"parent"_s, u"parent/child"_s, u"parent/child/.~lock.hello.odt#"_s, u"parent/child/hello.odt"_s});
-        QVERIFY(!fakeFolder.syncOnce());
+        QVERIFY(fakeFolder.syncOnce());
         QCOMPARE(nGET, 0);
         QCOMPARE(nPUT, 1);
     }