E2ee root folder remove issue #2799

allexzander · 2021-01-06T14:16:28Z

Implement nested items removal when removing root encrypted folder.

Signed-off-by: allexzander [email protected]

src/common/syncjournaldb.cpp

src/libsync/clientsideencryptionjobs.cpp

src/libsync/clientsideencryptionjobs.h

src/libsync/deletejob.cpp

src/libsync/propagateremotedeleteencrypted.cpp

src/common/syncjournaldb.h

src/libsync/propagateremotedeleteencrypted.cpp

src/libsync/propagateremotedeleteencrypted.h

src/libsync/propagateremotedelete.cpp

src/libsync/propagateremotedeleteencrypted.cpp

src/libsync/propagateremotedeleteencrypted.h

src/libsync/propagateremotedeleteencryptedrootfolder.cpp

src/libsync/propagateremotedeleteencryptedrootfolder.h

src/libsync/abstractpropagateremotedeleteencrypted.cpp

src/libsync/abstractpropagateremotedeleteencrypted.h

src/libsync/propagateremotedeleteencryptedrootfolder.cpp

src/libsync/abstractpropagateremotedeleteencrypted.cpp

er-vin

Couple of nitpicks, then clean up the history as you see fit and we're good to go I'd say.

src/libsync/abstractpropagateremotedeleteencrypted.cpp

src/libsync/clientsideencryptionjobs.h

src/libsync/propagateremotedeleteencryptedrootfolder.cpp

er-vin

Alright, squash it all and get it in I'd say.

Signed-off-by: allexzander <[email protected]>

nextcloud-desktop-bot · 2021-01-11T19:17:31Z

AppImage file: Nextcloud-PR-2799-4ed7feab2bce2c0c57912264705cbc762e9cc01c-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

gerion0 · 2021-01-28T19:43:09Z

Just a question: Is e2ee folder renaming/moving also possible with this?

Workflow:

Create e2ee folder foo. Move data in it.
Rename it to bar.
Create e2ee folder 'foo2'. Move data in it.
Move it to somewhere/.

allexzander · 2021-01-28T22:05:35Z

@gerion0 Yes. These scenarios are now possible.

tripougnif · 2021-02-05T21:09:34Z

With the appimage (v 3.1.50), I still can't delete folders that are not at the root. For example, if my encrypted folder is at /subfolder/encrypted_folder, the client sends a PROPFIND for /encrypted_folder to which the server replies with a 404...

Real example from the debug log:

2021-02-05 15:54:11:128 [ info nextcloud.gui.folderwatcher ]:   Detected changes in paths: QSet("/home/alain/Documents/Nuage/Secrets")
2021-02-05 15:54:11:129 [ warning nextcloud.sync.filesystem ]:  Could not get modification time for "/home/alain/Documents/Nuage/Secrets" with csync, using QFileIn
fo
2021-02-05 15:54:11:129 [ info nextcloud.gui.socketapi ]:       Sending SocketAPI message --> "STATUS:SYNC:/home/alain/Documents/Nuage/Secrets" to QLocalSocket(0x7
f56dc009e20)
2021-02-05 15:54:11:129 [ debug nextcloud.gui.folderwatcher ]   [ OCC::FolderWatcherPrivate::removeFoldersBelow ]:      Removed watch for "/home/alain/Documents/Nu
age/Secrets"
2021-02-05 15:54:13:455 [ info sync.discovery ]:        Processing "Secrets" | valid: true/false/true | mtime: 1612558418/0/1612558441 | size: 0/0/0 | etag: "601db
052c1115"//"601db06961874" | checksum: ""//"" | perm: 0x55699c927318//0x55699cf5d298 | fileid: "00078533oczpg9ec8302"//"00078533oczpg9ec8302" | inode: 7635242/0/ |
 type: CSyncEnums::ItemTypeDirectory/CSyncEnums::ItemTypeSkip/CSyncEnums::ItemTypeDirectory | e2ee: true/true | e2eeMangledName: ""/""
2021-02-05 15:54:13:455 [ info sync.discovery ]:        Discovered "Secrets" CSyncEnums::CSYNC_INSTRUCTION_REMOVE OCC::SyncFileItem::Up CSyncEnums::ItemTypeDirectory
2021-02-05 15:54:13:456 [ info sync.discovery ]:        STARTING "Secrets" OCC::ProcessDirectoryJob::NormalQuery "Secrets" OCC::ProcessDirectoryJob::ParentDontExist
2021-02-05 15:54:13:456 [ info nextcloud.sync.accessmanager ]:  6 "PROPFIND" "https://nuage.zenfolie.org/remote.php/dav/files/alain/Documents/Nuage/Secrets" has X-Request-ID "042a82bc-e009-4326-be17-2a495a9fe181"
2021-02-05 15:54:13:457 [ debug nextcloud.sync.cookiejar ]      [ OCC::CookieJar::cookiesForUrl ]:      QUrl("https://nuage.zenfolie.org/remote.php/dav/files/alain/Documents/Nuage/Secrets") requests: (QNetworkCookie("__Host-nc_sameSiteCookielax=true; secure; HttpOnly; expires=Fri, 31-Dec-2100 23:59:59 GMT; domain=nuage.zenfolie.org; path=/"), QNetworkCookie("__Host-nc_sameSiteCookiestrict=true; secure; HttpOnly; expires=Fri, 31-Dec-2100 23:59:59 GMT; domain=nuage.zenfolie.org; path=/"), QNetworkCookie("oc_sessionPassphrase=HnRb%2F3CE2sYFlb5nbtSVLgpATjTCLb2EfA%2BwS79sT%2F0PA0KIMmaEtOmZtzKLDJdcRtdy4uD%2BVPVuL3vGdnrl80b%2FffAoc3twYWp1o8M5mkFPRz8Ps5bm5nMaTAXXHgex; secure; HttpOnly; domain=nuage.zenfolie.org; path=/"), QNetworkCookie("oczpg9ec8302=sk14632b60dqro1c2k86en190b; secure; HttpOnly; domain=nuage.zenfolie.org; path=/"))
2021-02-05 15:54:13:457 [ info nextcloud.sync.networkjob ]:     OCC::LsColJob created for "https://nuage.zenfolie.org" + "/Documents/Nuage/Secrets" "OCC::DiscoverySingleDirectoryJob"
2021-02-05 15:54:13:611 [ info nextcloud.sync.networkjob.lscol ]:       LSCOL of QUrl("https://nuage.zenfolie.org/remote.php/dav/files/alain/Documents/Nuage/Secrets") FINISHED WITH STATUS "OK"
2021-02-05 15:54:13:612 [ debug nextcloud.sync.networkjob ]     [ OCC::AbstractNetworkJob::slotFinished ]:      Network job OCC::LsColJob finished for "/Documents/Nuage/Secrets"
2021-02-05 15:54:14:044 [ info sync.discovery ]:        Processing "Secrets/rénos salle de bain.ods" | valid: true/false/true | mtime: 1604876472/0/1604876472 | size: 12092/0/12108 | etag: "601db068b3f52"//"601db068b3f52" | checksum: "SHA1:c26ef1562996df12f6a9d9a227ceb29baaa4a646"//"SHA1:c26ef1562996df12f6a9d9a227ceb29baaa4a646</checksum>" | perm: 0x7f5713dc4158//0x55699c9c9318 | fileid: "00078538oczpg9ec8302"//"00078538oczpg9ec8302" | inode: 7635243/0/ | type: CSyncEnums::ItemTypeFile/CSyncEnums::ItemTypeSkip/CSyncEnums::ItemTypeFile | e2ee: true/true | e2eeMangledName: "Secrets/24de59ee88c349a784f8e6b9821341c9"/"Documents/Nuage/Secrets/24de59ee88c349a784f8e6b9821341c9"
2021-02-05 15:54:14:044 [ info sync.discovery ]:        Discovered "Secrets/rénos salle de bain.ods" CSyncEnums::CSYNC_INSTRUCTION_REMOVE OCC::SyncFileItem::Up CSyncEnums::ItemTypeFile
2021-02-05 15:54:14:044 [ debug nextcloud.sync.database.sql ]   [ OCC::SqlQuery::bindValue ]:   SQL bind 1 "Secrets/rénos salle de bain.ods"
2021-02-05 15:54:14:044 [ debug nextcloud.sync.database.sql ]   [ OCC::SqlQuery::bindValue ]:   SQL bind 1 "Secrets"
2021-02-05 15:54:14:045 [ debug nextcloud.sync.statustracker ]  [ OCC::SyncFileStatusTracker::slotAboutToPropagate ]:   Investigating "Secrets" OCC::SyncFileItem::NoStatus CSyncEnums::CSYNC_INSTRUCTION_REMOVE
2021-02-05 15:54:14:045 [ info nextcloud.gui.socketapi ]:       Sending SocketAPI message --> "STATUS:SYNC:/home/alain/Documents/Nuage/Secrets" to QLocalSocket(0x7f56dc009e20)
2021-02-05 15:54:14:045 [ debug nextcloud.sync.statustracker ]  [ OCC::SyncFileStatusTracker::slotAboutToPropagate ]:   Investigating "Secrets/rénos salle de bain.ods" OCC::SyncFileItem::NoStatus CSyncEnums::CSYNC_INSTRUCTION_REMOVE
2021-02-05 15:54:14:054 [ info nextcloud.sync.propagator ]:     Starting CSyncEnums::CSYNC_INSTRUCTION_REMOVE propagation of "Secrets" by OCC::PropagateRemoteDelete(0x7f56c808e5a0)
2021-02-05 15:54:14:054 [ info nextcloud.sync.accessmanager ]:  6 "PROPFIND" "https://nuage.zenfolie.org/remote.php/dav/files/alain/Secrets" has X-Request-ID "f85dc4bd-62cf-4521-ad30-2fcd3616d509"
2021-02-05 15:54:14:054 [ debug nextcloud.sync.cookiejar ]      [ OCC::CookieJar::cookiesForUrl ]:      QUrl("https://nuage.zenfolie.org/remote.php/dav/files/alain/Secrets") requests: (QNetworkCookie("__Host-nc_sameSiteCookielax=true; secure; HttpOnly; expires=Fri, 31-Dec-2100 23:59:59 GMT; domain=nuage.zenfolie.org; path=/"), QNetworkCookie("__Host-nc_sameSiteCookiestrict=true; secure; HttpOnly; expires=Fri, 31-Dec-2100 23:59:59 GMT; domain=nuage.zenfolie.org; path=/"), QNetworkCookie("oc_sessionPassphrase=HnRb%2F3CE2sYFlb5nbtSVLgpATjTCLb2EfA%2BwS79sT%2F0PA0KIMmaEtOmZtzKLDJdcRtdy4uD%2BVPVuL3vGdnrl80b%2FffAoc3twYWp1o8M5mkFPRz8Ps5bm5nMaTAXXHgex; secure; HttpOnly; domain=nuage.zenfolie.org; path=/"), QNetworkCookie("oczpg9ec8302=sk14632b60dqro1c2k86en190b; secure; HttpOnly; domain=nuage.zenfolie.org; path=/"))
2021-02-05 15:54:14:055 [ info nextcloud.sync.networkjob ]:     OCC::LsColJob created for "https://nuage.zenfolie.org" + "Secrets" "OCC::PropagateRemoteDeleteEncryptedRootFolder"
2021-02-05 15:54:14:207 [ warning nextcloud.sync.networkjob ]:  QNetworkReply::ContentNotFoundError "Server replied \"404 Not Found\" to \"PROPFIND https://nuage.zenfolie.org/remote.php/dav/files/alain/Secrets\"" QVariant(int, 404)
2021-02-05 15:54:14:207 [ warning nextcloud.sync.credentials.webflow ]: "Error transferring https://nuage.zenfolie.org/remote.php/dav/files/alain/Secrets - server replied: Not Found"
2021-02-05 15:54:14:207 [ info nextcloud.sync.networkjob.lscol ]:       LSCOL of QUrl("https://nuage.zenfolie.org/remote.php/dav/files/alain/Secrets") FINISHED WITH STATUS "ContentNotFoundError Server replied \"404 Not Found\" to \"PROPFIND https://nuage.zenfolie.org/remote.php/dav/files/alain/Secrets\""

I haven't tried with encrypted folder created at the root...

er-vin · 2021-02-06T11:24:10Z

With the appimage (v 3.1.50), I still can't delete folders that are not at the root. For example, if my encrypted folder is at /subfolder/encrypted_folder, the client sends a PROPFIND for /encrypted_folder to which the server replies with a 404...

Which appimage version is this exactly? Because I produced another fix which should have addressed this a couple of days ago.

tripougnif · 2021-02-06T12:25:15Z

AppImage file: Nextcloud-PR-2799-4ed7feab2bce2c0c57912264705cbc762e9cc01c-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

That one.

I guess I should try the daily build...

allexzander · 2021-02-06T13:53:06Z

AppImage file: Nextcloud-PR-2799-4ed7feab2bce2c0c57912264705cbc762e9cc01c-x86_64.AppImage
To test this change/fix you can simply download above AppImage file and test it.
Please make sure to quit your existing Nextcloud app and backup your data.

That one.

I guess I should try the daily build...

@tripougnif

You can also try this is the one with the latest fix from @er-vin #2892.

allexzander force-pushed the e2ee-root-folder-remove-issue branch 2 times, most recently from 591afc3 to 798e094 Compare January 6, 2021 14:21

er-vin reviewed Jan 6, 2021

View reviewed changes

allexzander closed this Jan 7, 2021

allexzander reopened this Jan 7, 2021

allexzander force-pushed the e2ee-root-folder-remove-issue branch 4 times, most recently from 064f7ab to dfb670e Compare January 11, 2021 07:44

allexzander marked this pull request as ready for review January 11, 2021 07:45

allexzander requested review from er-vin, FlexW and camilasan January 11, 2021 07:45

er-vin reviewed Jan 11, 2021

View reviewed changes

src/libsync/abstractpropagateremotedeleteencrypted.cpp Outdated Show resolved Hide resolved

src/libsync/clientsideencryptionjobs.h Outdated Show resolved Hide resolved

src/libsync/propagateremotedeleteencryptedrootfolder.cpp Outdated Show resolved Hide resolved

allexzander force-pushed the e2ee-root-folder-remove-issue branch from f2b9eb3 to c1ff803 Compare January 11, 2021 15:15

allexzander requested a review from er-vin January 11, 2021 15:16

er-vin approved these changes Jan 11, 2021

View reviewed changes

Implement nested items removal when removing root encrypted folder.

4ed7fea

Signed-off-by: allexzander <[email protected]>

allexzander force-pushed the e2ee-root-folder-remove-issue branch from c1ff803 to 4ed7fea Compare January 11, 2021 19:13

allexzander linked an issue Jan 11, 2021 that may be closed by this pull request

Deleting e2ee folder failed? #2342

Closed

allexzander merged commit 7dc19b9 into master Jan 11, 2021

allexzander deleted the e2ee-root-folder-remove-issue branch January 11, 2021 19:20

allexzander restored the e2ee-root-folder-remove-issue branch January 14, 2021 07:20

tobiasKaminsky deleted the e2ee-root-folder-remove-issue branch August 19, 2021 10:42

joshtrichards mentioned this pull request Dec 26, 2023

stuck with an encrypted folder nextcloud/end_to_end_encryption#197

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

E2ee root folder remove issue #2799

E2ee root folder remove issue #2799

allexzander commented Jan 6, 2021 •

edited

Loading

er-vin left a comment

er-vin left a comment

nextcloud-desktop-bot commented Jan 11, 2021

gerion0 commented Jan 28, 2021

allexzander commented Jan 28, 2021

tripougnif commented Feb 5, 2021 •

edited

Loading

er-vin commented Feb 6, 2021

tripougnif commented Feb 6, 2021 •

edited

Loading

allexzander commented Feb 6, 2021

E2ee root folder remove issue #2799

E2ee root folder remove issue #2799

Conversation

allexzander commented Jan 6, 2021 • edited Loading

er-vin left a comment

Choose a reason for hiding this comment

er-vin left a comment

Choose a reason for hiding this comment

nextcloud-desktop-bot commented Jan 11, 2021

gerion0 commented Jan 28, 2021

allexzander commented Jan 28, 2021

tripougnif commented Feb 5, 2021 • edited Loading

er-vin commented Feb 6, 2021

tripougnif commented Feb 6, 2021 • edited Loading

allexzander commented Feb 6, 2021

allexzander commented Jan 6, 2021 •

edited

Loading

tripougnif commented Feb 5, 2021 •

edited

Loading

tripougnif commented Feb 6, 2021 •

edited

Loading