Skip to content

add migration for encryption keys in wrong location - #35107

Merged
icewind1991 merged 1 commit into
masterfrom
encryption-key-migrate
Nov 29, 2022
Merged

add migration for encryption keys in wrong location#35107
icewind1991 merged 1 commit into
masterfrom
encryption-key-migrate

Conversation

@icewind1991

@icewind1991icewind1991 commented Nov 11, 2022

Copy link
Copy Markdown
Member

Fixes encryption keys for system wide external storages that were put in the wrong location before #32690

To test:

@icewind1991icewind1991 added the 3. to review Waiting for reviews label Nov 11, 2022
@icewind1991icewind1991 added this to the Nextcloud 26 milestone Nov 11, 2022
@icewind1991
icewind1991 requested review from a team, PVince81, blizzz and skjnldsv and removed request for a teamNovember 11, 2022 15:38
github-advanced-security[bot]
github-advanced-securityAI found potential problems Nov 11, 2022
View reviewed changes
Comment threadapps/encryption/lib/Command/FixKeyLocation.php

/**
* @param Folder $folder
* @return \Generator<File>

Check notice

Code scanning / Psalm

MoreSpecificReturnType

The declared return type 'Generator<mixed, OCP\Files\File, mixed, mixed>' for OCA\Encryption\Command\FixKeyLocation::getAllFiles is more specific than the inferred return type 'Generator<int|mixed, OCP\Files\File|OCP\Files\Node, mixed, void>'
PVince81
PVince81 approved these changes Nov 14, 2022
View reviewed changes

@PVince81PVince81 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.

👍 code looks fine

see a few comments + proposed additions

nice usage of "yield from" and I liked seeing comments and justifications

Comment threadapps/encryption/lib/Command/FixKeyLocation.php
return 1;
}

\OC_Util::setupFS($user->getUID());

@PVince81PVince81Nov 14, 2022

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.

I guess you're not using the setup manager to easy backporting ?

Comment threadapps/encryption/lib/Command/FixKeyLocation.php
Comment threadapps/encryption/lib/Command/FixKeyLocation.php Outdated
Comment threadapps/encryption/lib/Command/FixKeyLocation.php
artonge
artonge approved these changes Nov 14, 2022
View reviewed changes

@artongeartonge left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Looks good

blizzz
blizzz reviewed Nov 14, 2022
View reviewed changes
Comment threadapps/encryption/lib/Command/FixKeyLocation.php Outdated
Comment threadapps/encryption/lib/Command/FixKeyLocation.php Outdated
@icewind1991
add migration for encryption keys in wrong location
dd4ebbd
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
icewind1991 merged commit f0a1e1c into masterNov 29, 2022
@icewind1991
icewind1991 deleted the encryption-key-migrate branch November 29, 2022 16:07
@icewind1991

icewind1991 commented Nov 29, 2022

Copy link
Copy Markdown
MemberAuthor

/backport to stable25

@icewind1991

icewind1991 commented Nov 29, 2022

Copy link
Copy Markdown
MemberAuthor

/backport to stable24

This was referenced Nov 29, 2022
Merged
Merged
@PVince81PVince81 mentioned this pull request Dec 9, 2022
Open
8 tasks
@PVince81

PVince81 commented Dec 19, 2022

Copy link
Copy Markdown
Member

/backport to stable23

@PVince81

PVince81 commented Dec 19, 2022

Copy link
Copy Markdown
Member

/backport to stable22

@backportbot-nextcloud

backportbot-nextcloudBot commented Dec 19, 2022

Copy link
Copy Markdown

The backport to stable23 failed. Please do this backport manually.

@backportbot-nextcloud

backportbot-nextcloudBot commented Dec 19, 2022

Copy link
Copy Markdown

The backport to stable22 failed. Please do this backport manually.

@PVince81

PVince81 commented Dec 19, 2022

Copy link
Copy Markdown
Member

stable23: #35825
stable22: #35826

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@blizzzblizzzblizzz left review comments
@PVince81PVince81PVince81 approved these changes
@artongeartongeartonge approved these changes
@skjnldsvskjnldsvAwaiting requested review from skjnldsv
@come-nccome-ncAwaiting requested review from come-nccome-nc is a code owner

Assignees

No one assigned

Labels

3. to reviewWaiting for reviewsfeature: encryption (server-side)

Projects

None yet

Milestone

Nextcloud 26

Development

Successfully merging this pull request may close these issues.

7 participants

@icewind1991@PVince81@blizzz@artonge@github-advanced-security@joshtrichards@skjnldsv