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

clear encrypted flag when moving away from encrypted storage #35961

Merged
merged 2 commits into from
Apr 1, 2023

Conversation

icewind1991
Copy link
Member

When moving a file from an encrypted storage to a non-encrypted storage, the encrypted flag isn't cleared currently.

This usually isn't a problem since the encrypted flag isn't checked when encrypted isn't enabled on a storage.
However, when encryption is then enabled for the storage after files have been moved into them, the encryption wrapper will check the encrypted flag, try to decrypt it, and fail.

To test

@icewind1991 icewind1991 added the 3. to review Waiting for reviews label Jan 3, 2023
@icewind1991 icewind1991 added this to the Nextcloud 26 milestone Jan 3, 2023
@icewind1991 icewind1991 requested review from a team, ArtificialOwl, blizzz and come-nc and removed request for a team January 3, 2023 14:26
Copy link
Contributor

@come-nc come-nc left a comment

Choose a reason for hiding this comment

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

Code looks fine.
Is it possible to add tests for it?

Copy link
Member

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

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

👍

@PVince81
Copy link
Member

PVince81 commented Jan 4, 2023

/backport to stable25

@PVince81
Copy link
Member

PVince81 commented Jan 4, 2023

/backport to stable24

@blizzz blizzz mentioned this pull request Feb 1, 2023
@icewind1991 icewind1991 force-pushed the move-from-encryption-remove-flag branch 2 times, most recently from 8692073 to b4c810e Compare February 15, 2023 12:54
@skjnldsv skjnldsv mentioned this pull request Feb 23, 2023
@blizzz blizzz mentioned this pull request Mar 7, 2023
@blizzz blizzz modified the milestones: Nextcloud 26, Nextcloud 27 Mar 9, 2023
@icewind1991 icewind1991 force-pushed the move-from-encryption-remove-flag branch 2 times, most recently from b1bd148 to 5274f39 Compare March 24, 2023 14:29
@PVince81
Copy link
Member

PVince81 commented Apr 1, 2023

test failure unrelated, merge ? @come-nc @szaimen @icewind1991

@szaimen
Copy link
Contributor

szaimen commented Apr 1, 2023

Lets rebase and merge :)

@szaimen
Copy link
Contributor

szaimen commented Apr 1, 2023

/rebase

@szaimen szaimen enabled auto-merge April 1, 2023 15:32
@szaimen szaimen merged commit 57bd5e7 into master Apr 1, 2023
@szaimen szaimen deleted the move-from-encryption-remove-flag branch April 1, 2023 16:14
@szaimen
Copy link
Contributor

szaimen commented Apr 1, 2023

/backport to stable26

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

Successfully merging this pull request may close these issues.

5 participants