Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Repair E2EE on sync folders which don't point to the root of the server on the remote end #2892

Merged
merged 2 commits into from
Feb 4, 2021

Conversation

er-vin
Copy link
Member

@er-vin er-vin commented Feb 1, 2021

Found a couple of regressions related to the use of E2EE in the context of sync folders configured to not point to / but to some other subfolders on the server. They were introduced during the big changes in the discovery which made the content of the e2eMangledName field change in the database with a different convention to what almost all the jobs were expecting. The only exception was one place in the newer changes done by @allexzander around deletion.

@allexzander
Copy link
Contributor

/rebase

Kevin Ottens added 2 commits February 4, 2021 11:16
This got broken during the huge discovery refactoring. I wrongly passed
the mangled name as is out of discovery, but coming from listing jobs it
was fully qualified while the jobs at propagation time and the db expect
those paths to be relative to the remote folder.

Signed-off-by: Kevin Ottens <[email protected]>
Indeed the path we have is supposedly not fully qualified in case of a
sync folder which doesn't point to / on the remote end. But LSCOL works
with absolute paths on the server so make sure this is what we give it
out.

Signed-off-by: Kevin Ottens <[email protected]>
@github-actions github-actions bot force-pushed the repair_e2ee_on_non_remote_root_sync_folder branch from f788d68 to 856f056 Compare February 4, 2021 11:16
@nextcloud-desktop-bot
Copy link

AppImage file: Nextcloud-PR-2892-856f0567a7488fc34eb79af705bb25b92f3f6a99-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.

@er-vin er-vin merged commit 1c1301e into master Feb 4, 2021
@er-vin er-vin deleted the repair_e2ee_on_non_remote_root_sync_folder branch February 4, 2021 12:24
@tripougnif
Copy link

The fix works for me. Thanks! I am also impressed with the performance. Looking forward to the official release.

@er-vin
Copy link
Member Author

er-vin commented Feb 7, 2021

The fix works for me. Thanks! I am also impressed with the performance. Looking forward to the official release.

Excellent news, thanks for your time testing this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants