Skip to content

feat(encryption): Migrate from hooks to events - #48560

Merged
come-nc merged 17 commits into
masterfrom
fix/migrate-encryption-away-from-hooks
May 14, 2025
Merged

feat(encryption): Migrate from hooks to events#48560
come-nc merged 17 commits into
masterfrom
fix/migrate-encryption-away-from-hooks

Conversation

@come-nc

@come-nccome-nc commented Oct 3, 2024

Copy link
Copy Markdown
Contributor

Part of #32128

Summary

This is not half as clean as I would’ve liked, because original code is convoluted.
The owner thing in the event listener is ugly and probably incorrect but it was there before in HookManager class.

Checklist

@come-nccome-nc added the 3. to review Waiting for reviews label Oct 3, 2024
@come-nccome-nc added this to the Nextcloud 31 milestone Oct 3, 2024
@come-nccome-nc self-assigned this Oct 3, 2024
@come-nc
come-ncforce-pushed the fix/migrate-encryption-away-from-hooks branch 2 times, most recently from 7b456c7 to fc22188CompareNovember 5, 2024 15:53
@come-nc

come-nc commented Nov 26, 2024

Copy link
Copy Markdown
ContributorAuthor

Getting there, only one more failure. For some reason it’s not the same one locally and in the CI 🤷

@come-nc
come-ncforce-pushed the fix/migrate-encryption-away-from-hooks branch from 1d2e3f4 to f392a55CompareDecember 16, 2024 14:45
@blizzzblizzz mentioned this pull request Jan 8, 2025
Merged
@come-nc
come-ncforce-pushed the fix/migrate-encryption-away-from-hooks branch from efb5812 to 4a3def9CompareJanuary 13, 2025 08:58
@skjnldsvskjnldsv mentioned this pull request Jan 14, 2025
Merged
@come-nc
come-ncforce-pushed the fix/migrate-encryption-away-from-hooks branch from 314010a to 14b8770CompareJanuary 16, 2025 17:05
@skjnldsvskjnldsv mentioned this pull request Jan 16, 2025
Merged
github-advanced-security[bot]
github-advanced-securityAI found potential problems Jan 20, 2025
View reviewed changes
Comment threadlib/private/Files/Storage/Wrapper/Encryption.php Fixed
Comment threadlib/private/Files/Storage/Wrapper/Encryption.php Fixed
Comment threadlib/private/Files/Storage/Wrapper/Encryption.php Fixed
Comment threadlib/private/Files/Storage/Wrapper/Encryption.php Fixed
@come-nc
come-ncforce-pushed the fix/migrate-encryption-away-from-hooks branch from d47a006 to bfbc787CompareJanuary 20, 2025 09:40
@come-nccome-nc added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jan 20, 2025
github-advanced-security[bot]
github-advanced-securityAI found potential problems Jan 20, 2025
View reviewed changes
Comment threadlib/private/Files/Storage/Wrapper/Encryption.php Fixed
Comment threadlib/private/Files/Storage/Wrapper/Encryption.php Fixed
Comment threadlib/private/Files/Storage/Wrapper/Encryption.php Fixed
Comment threadlib/private/Files/Storage/Wrapper/Encryption.php Fixed
Comment threadlib/private/Files/Storage/Wrapper/Encryption.php Fixed
Comment threadlib/private/Files/Storage/Wrapper/Encryption.php Fixed
Comment threadlib/private/Files/Storage/Wrapper/Encryption.php Fixed
Comment threadlib/private/Files/Storage/Wrapper/Encryption.php Fixed
Comment threadlib/private/Files/Storage/Wrapper/Encryption.php Fixed
Comment threadlib/private/Files/Storage/Wrapper/Encryption.php Fixed
@come-nc
come-ncforce-pushed the fix/migrate-encryption-away-from-hooks branch from bfbc787 to f299305CompareJanuary 20, 2025 10:24
github-advanced-security[bot]
github-advanced-securityAI found potential problems Jan 20, 2025
View reviewed changes
Comment threadlib/private/Files/ObjectStore/ObjectStoreStorage.php Fixed
Comment threadlib/private/Files/ObjectStore/ObjectStoreStorage.php Fixed
Comment threadlib/private/Files/Storage/Wrapper/Encryption.php Fixed
Comment threadlib/private/Files/Storage/Wrapper/Encryption.php Fixed
Comment threadlib/private/Files/Storage/Wrapper/Encryption.php Fixed
Comment threadlib/private/Files/Storage/Wrapper/Encryption.php Fixed
Comment threadlib/private/Files/Storage/Wrapper/Encryption.php Fixed
Comment threadlib/private/Files/Storage/Wrapper/Encryption.php Fixed
@AltahrimAltahrim mentioned this pull request Jan 21, 2025
Merged
icewind1991
icewind1991 reviewed Jan 21, 2025
View reviewed changes
Comment threadlib/private/Encryption/Update.php Outdated
@AltahrimAltahrim mentioned this pull request Jan 23, 2025
Merged
@come-nc
come-ncforce-pushed the fix/migrate-encryption-away-from-hooks branch from f299305 to d5fcd9bCompareFebruary 11, 2025 13:40
@come-nc
come-ncforce-pushed the fix/migrate-encryption-away-from-hooks branch from 840489b to f059ba8CompareApril 1, 2025 11:24
@come-nc
come-nc requested a review from a team as a code ownerApril 1, 2025 11:24
@come-nc
come-nc requested review from ArtificialOwl and icewind1991 and removed request for a teamApril 1, 2025 11:24
come-nc added 16 commits May 13, 2025 23:37
@come-nc
fix(tests): Unregister encryption modules in ViewTest to avoid side e…
38f341c
…ffects
It was clearing the hooks with the same results before
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
fix(tests): Remove Encryption disabling in ViewTest to avoid side eff…
21233b7
…ects
Adapt tests a bit to make them pass with Encryption wrapper registered
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
fix(encryption): Fix filesize for part files in Encryption wrapper
8779ae3
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
fix: Fix mtime preservation when moving a directory across storages w…
9bb0721
…ith encryption registered
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
fix(tests): Disable encryption wrapper when it makes sense
e35a8ed
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
chore(files_versions): Only mock getSystemValue method to avoid probl…
14872c8
…ems in files_versions tests
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
chore(trashbin): Fix configuration mocking in trashbin tests
561b590
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
chore: Update psalm baseline to remove fixed issue
f6f8343
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
fix(tests): Avoid user login before a private key is setup
367c877
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
fix(admin_audit): Survive if file change id after rename (it should not)
08bff4c
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
fix(encryption): Fix a PHP error in Encryption Util in specific situa…
27599ef
…tions
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
fix: Preserve file id when moving from object store even if encryptio…
e6275f8
…n wrapper is present
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
chore: Assert rename success in versionning tests
2d8f6b3
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
fix(encryption): Improve Update class and event listenening
a79b5de
 to avoid back&forth between path and Node object
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
fix(encryption): Only prevent cache deletion if target is not object …
a86d917
…store in moveFromStorage
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
fix(tests): Set encryption configuration even earlier so that all use…
43418ee
…rs are created with private key
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
come-ncforce-pushed the fix/migrate-encryption-away-from-hooks branch from a7e8847 to 43418eeCompareMay 13, 2025 21:37
@come-nccome-nc added 3. to review Waiting for reviews and removed 2. developing Work in progress labels May 14, 2025
@come-nc
come-nc requested a review from artongeMay 14, 2025 09:49
@come-nc
come-nc merged commit 2cd491f into masterMay 14, 2025
@come-nc
come-nc deleted the fix/migrate-encryption-away-from-hooks branch May 14, 2025 17:25
@nextcloud-botnextcloud-bot mentioned this pull request Aug 19, 2025
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@skjnldsvskjnldsvskjnldsv left review comments
@icewind1991icewind1991icewind1991 approved these changes
@susnuxsusnuxsusnux approved these changes
@artongeartongeartonge approved these changes
@ArtificialOwlArtificialOwlAwaiting requested review from ArtificialOwlArtificialOwl is a code owner automatically assigned from nextcloud/server-backend

Assignees

@come-nccome-nc

Labels

3. to reviewWaiting for reviews

Projects

None yet

Milestone

Nextcloud 32

Development

Successfully merging this pull request may close these issues.

6 participants

@come-nc@icewind1991@susnux@artonge@skjnldsv@github-advanced-security