Encryption trash fixes #3425
Merged
Encryption trash fixes #3425
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
icewind1991
force-pushed
the
encryption-trash-fixes
branch
from
6778cd9 to
8c13d67
Compare
icewind1991
requested review from
provokateurin,
artonge,
a team and
skjnldsv
and removed request for
a team
come-nc
reviewed
Dec 2, 2024
| if ($groupFolder['folder_id'] === (int)$folderId) { | ||
| $trashRoot = $this->getTrashFolder((int)$folderId); | ||
| if ($groupFolder['folder_id'] === $folderId) { | ||
| $trashRoot = $this->rootFolder->get('/' . $user->getUID() . '/files_trashbin/groupfolders/' . $folderId); |
There was a problem hiding this comment.
How does that work with the user uid in the path for the groupfolder trash?
Is the trash for a groupfolders mounted in each of the users (having access) trashbin path? Where is that handled?
There was a problem hiding this comment.
Yes, the trash is now mounted for each user for the groupfolder, see the changes to MountProvider
artonge
approved these changes
Dec 2, 2024
icewind1991
force-pushed
the
encryption-trash-fixes
branch
from
3821522 to
7699828
Compare
Signed-off-by: Robin Appelman <[email protected]>
… handles this properly* *: expect for the mentioned bug Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: Robin Appelman <[email protected]>
icewind1991
force-pushed
the
encryption-trash-fixes
branch
from
7699828 to
630caec
Compare
|
Force-merging as the failing cypress test is caused by an upstream regression |
|
/backport to stable30 |
2 tasks
|
29: #3484 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, the groupfolders trashbin doesn't actually support encryption. Things are only somewhat working by chance.
This is because currently the trash/restore operations for groupfolders don't go through the encryption storage wrapper. This PR makes sure the encryption storage wrappers are in effect when trashing/restoring files.
.To test
occ config:app:set groupfolders enable_encryption --value='true'