Fix problem with user-encryption when the a shared file is moved#38375
Fix problem with user-encryption when the a shared file is moved#38375jvillafanez merged 2 commits intomasterfrom
Conversation
Checked scenario below but moving a file instead of a folder:
admin creates "folderA"
admins shares "folderA" with user1 and user2
user1 creates "folderB" (in his home) and uploads content inside "folderB"
user1 moves "folderB" inside the shared folder "folderA" (leads to "folderA/folderB" being shared)
user2 moves "folderA/folderB" (step3) in his own home directory
admin has a "folderB" in his trashbin
admin restores the "folderB" from the trashbin -> "folderA/folderB" reappears
contents from "folderA/folderB" (the ones restored that are now shared again) aren't accessible (Bad Encryption exception)
The file / folder in the admin's trashbin had a wrong signature caused
by a wrong update of the encryptedVersion in the DB. This change bypass
that update in that particular scenario. The rest of the scenarios
weren't affected and will work the same way as before
|
Checked both with master-key encryption and user-key encryption. The problematic scenario works |
phil-davis
left a comment
phil-davis
left a comment
There was a problem hiding this comment.
I guess this should have a changelog?
And no tests were changed/added. Is there some way to have a unit test that simulates this problem somehow?
|
There are operations using native resources through the code path to be tested ( core/lib/private/Files/Storage/Wrapper/Encryption.php Lines 792 to 793 in fc8659a Changelog coming soon. |
|
Kudos, SonarCloud Quality Gate passed!
|
|
@jvillafanez anything else to do? Merge? |
|
Note: owncloud/encryption#244 - some trashbin+local-storage+encryption tests failed last night. |
Fix regression that occurred after #38375
3 participants
Checked scenario below but moving a file instead of a folder:
admin creates "folderA"
admins shares "folderA" with user1 and user2
user1 creates "folderB" (in his home) and uploads content inside "folderB"
user1 moves "folderB" inside the shared folder "folderA" (leads to "folderA/folderB" being shared)
user2 moves "folderA/folderB" (step3) in his own home directory
admin has a "folderB" in his trashbin
admin restores the "folderB" from the trashbin -> "folderA/folderB" reappears
contents from "folderA/folderB" (the ones restored that are now shared again) aren't accessible (Bad Encryption exception)
The file / folder in the admin's trashbin had a wrong signature caused
by a wrong update of the encryptedVersion in the DB. This change bypass
that update in that particular scenario. The rest of the scenarios
weren't affected and will work the same way as before
Description
Fix broken signature of a backup copy created from the shared folder when the file is moved to the home directory of another user.
Minor additional changes included:
$sourceStorage->getCache()->get(...)returned false.Related Issue
https://github.com/owncloud/enterprise/issues/4372
steps to reproduce are above and in https://github.com/owncloud/enterprise/issues/4372#issuecomment-769843523
Motivation and Context
The code creates a broken copy of a file inside the trashbin. Restoring the file from the trashbin will still keep the broken signature. This change fixes this behaviour, so the file can be restored if needed.
How Has This Been Tested?
Tested following the reproduction steps.
Screenshots (if appropriate):
Types of changes
Checklist: