Skip to content

fix: Don't apply the ACL wrapper to trash storage on separate storages #5054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
solracsf wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Don't apply the ACL wrapper to trash storage on separate storages #5054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/Mount/FolderStorageManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ private function getBaseStorageForFolderSeparate(
$storage = $this->getBaseStorageForFolderSeparateStorageLocal($folderId, $init);
}

if ($folder?->acl && $user) {
// apply acl before jail, trash doesn't get the ACL wrapper as it does its own ACL filtering
if ($folder?->acl && $user && $type !== 'trash') {
$aclManager = $this->aclManagerFactory->getACLManager($user);
$storage = new ACLStorageWrapper([
'storage' => $storage,
Expand Down
24 changes: 24 additions & 0 deletions tests/Trash/TrashBackendTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,30 @@ public function testHideDeletedTrashItemInDeletedParentFolderAcl(): void {
$this->logout();
}

public function testRemoveTrashedFolderWithRestrictedChild(): void {
$this->loginAsUser('manager');

$folder = $this->managerUserFolder->newFolder("{$this->folderName}/folder");
$child = $folder->newFile('file.txt', 'content');

$this->trashBackend->moveToTrash($folder->getStorage(), $folder->getInternalPath());
$this->assertFalse($this->managerUserFolder->nodeExists("{$this->folderName}/folder"));

// the rule follows the child's file id into the trash, where the storage must not
// enforce it: the trash backend does its own ACL filtering
$this->ruleManager->saveRule(new Rule(new UserMapping('user', 'manager'), $child->getId(), Constants::PERMISSION_DELETE, 0));

$items = $this->trashBackend->listTrashRoot($this->managerUser);
$this->assertCount(1, $items);

$this->trashBackend->removeItem($items[0]);

$this->assertCount(0, $this->trashBackend->listTrashRoot($this->managerUser));
$this->assertCount(0, $this->trashManager->listTrashForFolders([$this->folderId]));

$this->logout();
}

public function testWrongOriginalLocation(): void {
$shareManager = Server::get(Share\IManager::class);

Expand Down
Loading