properly preserve the format of e2ee metadata during DB operations #5577
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
allexzander
suggested changes
Apr 5, 2023
mgallien
force-pushed
the
bugfix/migrateE2eeMetadata
branch
2 times, most recently
from
9ecd98f to
d84d215
Compare
claucambra
approved these changes
Apr 6, 2023
allexzander
reviewed
Apr 6, 2023
mgallien
force-pushed
the
bugfix/migrateE2eeMetadata
branch
from
8dc9d14 to
fcc9d38
Compare
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #5577 +/- ##
=======================================
Coverage 59.23% 59.24%
=======================================
Files 143 143
Lines 18437 18445 +8
=======================================
+ Hits 10922 10928 +6
- Misses 7515 7517 +2
|
mgallien
force-pushed
the
bugfix/migrateE2eeMetadata
branch
from
fcc9d38 to
2610944
Compare
allexzander
reviewed
Apr 12, 2023
src/common/syncjournalfilerecord.h
Outdated
| @@ -73,7 +69,7 @@ class OCSYNC_EXPORT SyncJournalFileRecord | |||
| [[nodiscard]] bool isVirtualFile() const { return _type == ItemTypeVirtualFile || _type == ItemTypeVirtualFileDownload; } | |||
| [[nodiscard]] QString path() const { return QString::fromUtf8(_path); } | |||
| [[nodiscard]] QString e2eMangledName() const { return QString::fromUtf8(_e2eMangledName); } | |||
| [[nodiscard]] bool isE2eEncrypted() const { return _isE2eEncrypted != SyncJournalFileRecord::EncryptionStatus::NotEncrypted; } | |||
| [[nodiscard]] bool isE2eEncrypted() const { return _e2eEncryptionStatus != SyncJournalFileRecord::EncryptionStatus::NotEncrypted; } | |||
There was a problem hiding this comment.
SyncJournalFileRecord::EncryptionStatus::NotEncrypted -> EncryptionStatus::NotEncrypted
src/libsync/syncfileitem.h
Outdated
| @@ -234,7 +229,7 @@ class OWNCLOUDSYNC_EXPORT SyncFileItem | |||
| && !(_instruction == CSYNC_INSTRUCTION_CONFLICT && _status == SyncFileItem::Success); | |||
| } | |||
|
|
|||
| [[nodiscard]] bool isEncrypted() const { return _isEncrypted != SyncFileItem::EncryptionStatus::NotEncrypted; } | |||
| [[nodiscard]] bool isEncrypted() const { return _e2eEncryptionStatus != SyncFileItem::EncryptionStatus::NotEncrypted; } | |||
There was a problem hiding this comment.
SyncFileItem::EncryptionStatus::NotEncrypted -> EncryptionStatus::NotEncrypted
mgallien
force-pushed
the
bugfix/migrateE2eeMetadata
branch
from
2610944 to
4f00374
Compare
allexzander
approved these changes
Apr 12, 2023
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
force-pushed
the
bugfix/migrateE2eeMetadata
branch
from
4f00374 to
9486978
Compare
|
AppImage file: nextcloud-PR-5577-94869783d3443da3f66b9e9431945674090bc330-x86_64.AppImage |
|
SonarCloud Quality Gate failed. |
|
/backport to stable-3.8 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
before this patch we may put the e2ee version format to v1.2 when it was not the case