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.

Sign up for GitHub

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

Jump to bottom

Add ability to disable E2EE #5167

Merged
merged 23 commits into from
Jan 24, 2023
Merged

Add ability to disable E2EE #5167

merged 23 commits into from
Jan 24, 2023

Conversation

claucambra
Copy link
Collaborator

@claucambra claucambra commented Nov 11, 2022 •
edited
Loading

This PR adds the ability to disable E2EE through the account settings. It deletes encrypted files that are locally synced when E2EE is disabled.

Screen.Recording.2022-11-11.at.21.38.57.mov

Part of #5126

@claucambra claucambra self-assigned this Nov 11, 2022
@codecov
Copy link

codecov bot commented Nov 11, 2022 •
edited
Loading

Codecov Report

Merging #5167 (544f15b) into master (bca3d94) will increase coverage by 0.61%.
The diff coverage is 31.03%.

❗ Current head 544f15b differs from pull request most recent head 3e00df4. Consider uploading reports for the commit 3e00df4 to get more accurate results

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #5167      +/-   ##
==========================================
+ Coverage   57.38%   57.99%   +0.61%     
==========================================
  Files         139      139              
  Lines       17697    17728      +31     
==========================================
+ Hits        10155    10281     +126     
+ Misses       7542     7447      -95
Impacted Files Coverage Δ
src/csync/csync_exclude.h 0.00% <ø> (ø)
src/libsync/discovery.cpp 86.21% <21.42%> (+0.27%) ⬆️
src/libsync/clientsideencryption.cpp 27.42% <30.95%> (+1.45%) ⬆️
src/libsync/clientsideencryption.h 33.33% <100.00%> (-5.13%) ⬇️
src/libsync/discoveryphase.cpp 78.83% <100.00%> (+5.29%) ⬆️
src/libsync/syncengine.cpp 81.17% <0.00%> (+0.14%) ⬆️
src/libsync/configfile.cpp 26.90% <0.00%> (+1.86%) ⬆️
src/libsync/progressdispatcher.cpp 54.11% <0.00%> (+2.94%) ⬆️
... and 5 more

@tobiasKaminsky tobiasKaminsky linked an issue Nov 15, 2022 that may be closed by this pull request
E2E: better UX #5126
Closed
3 tasks
@tobiasKaminsky tobiasKaminsky mentioned this pull request Nov 15, 2022
Closed
@sonarcloud
Copy link

sonarcloud bot commented Dec 8, 2022

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 5 Code Smells

47.2% 47.2% Coverage
0.0% 0.0% Duplication

mgallien
mgallien requested changes Dec 9, 2022
View reviewed changes
Copy link
Collaborator

@mgallien mgallien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FolderManTest test is crashing
can you have a look ?

@claucambra
Copy link
Collaborator Author

FolderManTest test is crashing
can you have a look ?

fixed

@mgallien
Copy link
Collaborator

mgallien commented Dec 9, 2022

FolderManTest test is crashing
can you have a look ?

fixed

I will try to have another look today

allexzander
allexzander suggested changes Dec 19, 2022
View reviewed changes
src/gui/folder.cpp Show resolved Hide resolved
claucambra
claucambra commented Dec 30, 2022
View reviewed changes
src/libsync/discovery.cpp Show resolved Hide resolved
src/gui/folder.cpp Outdated Show resolved Hide resolved
@claucambra claucambra force-pushed the feature/disable-e2ee branch 2 times, most recently from b5ce4ab to 1ecb2c0 Compare January 3, 2023 18:44
@mgallien
Copy link
Collaborator

mgallien commented Jan 6, 2023

@claucambra there are build issues in the drone check and sonarcloud analysis failed due to failing tests

@claucambra
Copy link
Collaborator Author

@claucambra there are build issues in the drone check and sonarcloud analysis failed due to failing tests

Fixed

@claucambra claucambra force-pushed the feature/disable-e2ee branch 2 times, most recently from 4b5a9d4 to 394fc05 Compare January 23, 2023 20:41
claucambra and others added 23 commits January 24, 2023 17:00
@claucambra
Clean up declarations in ClientSideEncryption
2c4dc7e 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Clean up declarations in AccountSettings
f9fb03b 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Properly handle sensitive data deletion in ClientSideEncryption
689dee6 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add ability to remove local encryption keys through settings
cc6bdc9 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Delete E2EE files/folders for accounts that have had E2EE disabled
b57b35e 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Make accountstate fakeable for tests
c59ab85 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add test for deleting encrypted files
12b2673 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Use e2ee folder blacklist instead of deleting folders directly
1fc1e95 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Only shedule affected paths for remote discovery after disabling e2ee
093810f 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Make sure to add e2ee files to normal blacklist too
7d208ec 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Only add root-most encrypted folder to the blacklist
fdaedc4 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Clean up sync termination and restart procedure after file blacklisti…
b333310 
…ng done

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Ensure blacklisted e2ee files get deleted
efcd23e 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@allexzander @claucambra
Fix issue of e2ee folders not disappearing when disabling the e2e. Pr…
ad25847 
…operly process blacklisted e2ee folders instead of ignoring them.

Signed-off-by: alex-z <blackslayer4@gmail.com>
@claucambra
Split if statement conditions in enqueueDirectoryToDelete into separa…
8c55628 
…te lines

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Don't use foreach in Folder::removeLocalE2eFiles
d93fc8e 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Ensure blacklists get updated when removing folder sync
4c1a9f7 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Replace use of deprecated QSet::toList() with QSet::values()
6f4c784 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Fix folderman delete encrypted files test
b731127 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Make encrypted folder paths to delete non-relative when checking if t…
95aa3ee 
…hey are encrypted

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Ensure mocked database entries are correct in TestFolderMan
352c660 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Remove faulty else statement from TestFolderman that would erroneousl…
e993684 
…y cause failure

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Don't shadow rec variable in removeLocalE2eFiles
3e00df4 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@sonarcloud
Copy link

sonarcloud bot commented Jan 24, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 9 Code Smells

38.5% 38.5% Coverage
0.0% 0.0% Duplication

@claucambra claucambra merged commit 8ffaf34 into master Jan 24, 2023
@claucambra claucambra deleted the feature/disable-e2ee branch January 24, 2023 16:35
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5167-3e00df4732c7cad76e800827588ba57530370fec-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.

@mgallien mgallien added this to the 3.7.0 milestone Jan 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@allexzander allexzander allexzander approved these changes

@camilasan camilasan Awaiting requested review from camilasan

@mgallien mgallien Awaiting requested review from mgallien

Assignees

@claucambra claucambra

Labels
None yet
Projects
None yet
Milestone
3.7.0
Development

Successfully merging this pull request may close these issues.

E2E: better UX
4 participants
@claucambra @mgallien @nextcloud-desktop-bot @allexzander