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

[stable-3.8] properly preserve the format of e2ee metadata during DB operations #5599

Merged
merged 3 commits into from
Apr 13, 2023

Conversation

backportbot-nextcloud[bot]
Copy link

backport of #5577

@backportbot-nextcloud backportbot-nextcloud bot added this to the 3.8.1 milestone Apr 12, 2023
@mgallien mgallien force-pushed the backport/5577/stable-3.8 branch from 3110e94 to 9055845 Compare April 12, 2023 17:12
@codecov
Copy link

codecov bot commented Apr 12, 2023

Codecov Report

Merging #5599 (6f0ac4c) into stable-3.8 (4f680cd) will increase coverage by 0.03%.
The diff coverage is 62.50%.

Additional details and impacted files
@@              Coverage Diff               @@
##           stable-3.8    #5599      +/-   ##
==============================================
+ Coverage       59.24%   59.28%   +0.03%     
==============================================
  Files             143      143              
  Lines           18435    18445      +10     
==============================================
+ Hits            10922    10935      +13     
+ Misses           7513     7510       -3     
Impacted Files Coverage Δ
src/common/syncjournalfilerecord.h 54.54% <0.00%> (ø)
src/csync/csync.h 75.00% <ø> (ø)
src/libsync/encryptfolderjob.cpp 0.00% <0.00%> (ø)
src/libsync/owncloudpropagator.cpp 84.95% <0.00%> (ø)
src/libsync/propagatedownloadencrypted.cpp 0.00% <ø> (ø)
src/libsync/propagateremotedeleteencrypted.cpp 0.00% <ø> (ø)
...bsync/propagateremotedeleteencryptedrootfolder.cpp 0.00% <ø> (ø)
src/libsync/propagateremotemkdir.cpp 64.78% <0.00%> (+0.70%) ⬆️
src/libsync/propagateuploadencrypted.cpp 0.00% <0.00%> (ø)
src/libsync/discovery.cpp 86.29% <50.00%> (+0.28%) ⬆️
... and 4 more

before this patch we may put the e2ee version format to v1.2 when it was
not the case

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
will consider v1.2 stored encryption status in DB to be equivalent to v1
due to bugs in the v3.8.0 release

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@mgallien mgallien force-pushed the backport/5577/stable-3.8 branch from 9055845 to 6f0ac4c Compare April 13, 2023 08:25
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5599-6f0ac4cd8c8cd7dd4c005dd3932ad56b9edb4a2c-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.

@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.    Quality Gate failed

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

58.7% 58.7% Coverage
0.0% 0.0% Duplication

@mgallien mgallien merged commit 985f50a into stable-3.8 Apr 13, 2023
@mgallien mgallien deleted the backport/5577/stable-3.8 branch April 13, 2023 13:45
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.

2 participants