Skip to content

feat(transfer-ownership): Correctly react to encrypted files - #47519

Merged
sorbaugh merged 2 commits into
masterfrom
fix/transfer-ownership-encrypted-files
Sep 5, 2024
Merged

feat(transfer-ownership): Correctly react to encrypted files#47519
sorbaugh merged 2 commits into
masterfrom
fix/transfer-ownership-encrypted-files

Conversation

@come-nc

@come-nccome-nc commented Aug 27, 2024•
edited by solracsf
Loading

Copy link
Copy Markdown
Contributor
  • Resolves: #

Summary

  1. For E2EE encrypted files, we abort the transfer.
  2. For SSE encrypted files, we abort only if not using master key.
  3. Also fixed the check for when the path to a single file is used.

Checklist

@come-nccome-nc added bug 3. to review Waiting for reviews labels Aug 27, 2024
@come-nccome-nc added this to the Nextcloud 31 milestone Aug 27, 2024
@come-nccome-nc self-assigned this Aug 27, 2024
@come-nc

come-nc commented Aug 27, 2024

Copy link
Copy Markdown
ContributorAuthor

/backport to stable30

@come-nc

come-nc commented Aug 27, 2024

Copy link
Copy Markdown
ContributorAuthor

/backport to stable29

@come-nc

come-nc commented Aug 27, 2024

Copy link
Copy Markdown
ContributorAuthor

/backport to stable28

@come-nc
come-nc requested review from a team, artonge, skjnldsv and yemkareems and removed request for a teamAugust 27, 2024 11:07
ChristophWurst
ChristophWurst approved these changes Sep 2, 2024
View reviewed changes

@ChristophWurstChristophWurst left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is not my area of expertise but the changes make sense and look good

artonge
artonge reviewed Sep 2, 2024
View reviewed changes
Comment threadapps/files/lib/Service/OwnershipTransferService.php Outdated
@come-nc
come-nc requested a review from artongeSeptember 3, 2024 07:47
@come-nc
feat(transfer-ownership): Correctly react to encrypted files
d92bf38
For E2EE encrypted files, we abort the transfer.
For SSE encrypted files, we abort only if not using master key.
Also fixed the check for when the path to a single file is used.
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
fix(transfer-ownership): Improve comments according to code review
0555900
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
come-ncforce-pushed the fix/transfer-ownership-encrypted-files branch from 5f73f3c to 0555900CompareSeptember 5, 2024 12:44
@sorbaugh
sorbaugh merged commit 3f79566 into masterSep 5, 2024
@sorbaugh
sorbaugh deleted the fix/transfer-ownership-encrypted-files branch September 5, 2024 15:58
This was referenced Sep 5, 2024
Merged
Merged
Merged
@skjnldsvskjnldsv mentioned this pull request Jan 7, 2025
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChristophWurstChristophWurstChristophWurst approved these changes
@artongeartongeartonge approved these changes
@skjnldsvskjnldsvAwaiting requested review from skjnldsvskjnldsv is a code owner automatically assigned from nextcloud/server-backend
@yemkareemsyemkareemsAwaiting requested review from yemkareemsyemkareems is a code owner automatically assigned from nextcloud/server-backend

Assignees

@come-nccome-nc

Labels

3. to reviewWaiting for reviewsbug

Projects

None yet

Milestone

Nextcloud 31

Development

Successfully merging this pull request may close these issues.

4 participants

@come-nc@ChristophWurst@artonge@sorbaugh