Skip to content

Conversation

@icewind1991
Copy link
Member

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

To test:

@icewind1991 icewind1991 added the 3. to review Waiting for reviews label Nov 11, 2022
@icewind1991 icewind1991 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 team November 11, 2022 15:38

/**
* @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 requested review from artonge and come-nc November 14, 2022 14:39
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.

👍 code looks fine

see a few comments + proposed additions

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

return 1;
}

\OC_Util::setupFS($user->getUID());
Copy link
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 ?

Copy link
Contributor

@artonge artonge left a comment

Choose a reason for hiding this comment

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

Looks good

@icewind1991 icewind1991 force-pushed the encryption-key-migrate branch from 5de2b74 to dd4ebbd Compare November 28, 2022 15:12
@icewind1991 icewind1991 merged commit f0a1e1c into master Nov 29, 2022
@icewind1991 icewind1991 deleted the encryption-key-migrate branch November 29, 2022 16:07
@icewind1991
Copy link
Member Author

/backport to stable25

@icewind1991
Copy link
Member Author

/backport to stable24

@PVince81
Copy link
Member

/backport to stable23

@PVince81
Copy link
Member

/backport to stable22

@backportbot-nextcloud
Copy link

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

@backportbot-nextcloud
Copy link

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

@PVince81
Copy link
Member

stable23: #35825
stable22: #35826

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants