Skip to content

fix(acl): seed tree permissions from the path, not the base permission #5122

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
bart-doconext wants to merge 1 commit into
base: master
Choose a base branch
from
+41 −4
Open

fix(acl): seed tree permissions from the path, not the base permission #5122

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
14 changes: 10 additions & 4 deletions lib/ACL/ACLManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,18 +245,24 @@ public function getPermissionsForTree(int $folderId, int $storageId, string $pat
$path = ltrim($path, '/');
$rules = $this->ruleManager->getRulesForPrefix($this->user, $storageId, $path);

// Both branches below can only remove permissions, so the starting value is a
// ceiling. Start from what the path itself resolves to rather than from the base
// permission: with "no permissions by default" the base is 0, which would deny
// every delete in the folder even where a rule grants it.
$treePermissions = $this->getACLPermissionsForPath($folderId, $storageId, $path);

if ($this->inheritMergePerUser) {
$pathsWithRules = array_keys($rules);
$permissions = $this->getBasePermission($folderId);
foreach ($pathsWithRules as $path) {
$permissions &= $this->getACLPermissionsForPath($folderId, $storageId, $path);
$permissions = $treePermissions;
foreach ($pathsWithRules as $rulePath) {
$permissions &= $this->getACLPermissionsForPath($folderId, $storageId, $rulePath);
}
return $permissions;
} else {
return array_reduce($rules, function (int $permissions, array $rules): int {
$mergedRule = Rule::mergeRules($rules);
return $mergedRule->applyDenyPermissions($permissions);
}, $this->getBasePermission($folderId));
}, $treePermissions);
}
}

Expand Down
31 changes: 31 additions & 0 deletions tests/ACL/ACLManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use OCA\GroupFolders\ACL\RuleManager;
use OCA\GroupFolders\ACL\UserMapping\IUserMapping;
use OCA\GroupFolders\ACL\UserMapping\IUserMappingManager;
use OCA\GroupFolders\Folder\FolderManager;
use OCP\Constants;
use OCP\IUser;
use PHPUnit\Framework\MockObject\MockObject;
Expand Down Expand Up @@ -336,4 +337,34 @@ public function testGetPermissionsForTree(): void {
$this->assertEquals(Constants::PERMISSION_ALL - Constants::PERMISSION_DELETE, $perUserAclManager->getPermissionsForTree(0, 0, 'foo3'));
$this->assertEquals(Constants::PERMISSION_ALL - Constants::PERMISSION_DELETE, $perUserAclManager->getPermissionsForTree(0, 0, 'foo3/bar'));
}

public function testGetPermissionsForTreeWithDefaultNoPermission(): void {
$folderManager = $this->createMock(FolderManager::class);
$folderManager->method('hasFolderACLDefaultNoPermission')->willReturn(true);
$folderManager->method('canManageACL')->willReturn(false);
$this->overwriteService(FolderManager::class, $folderManager);

try {
$this->rules = [
'foo' => [
new Rule($this->createMapping('1'), 10, Constants::PERMISSION_ALL, Constants::PERMISSION_ALL), // grant everything
],
];

foreach ([$this->getAclManager(), $this->getAclManager(true)] as $aclManager) {
$this->assertEquals(Constants::PERMISSION_ALL, $aclManager->getACLPermissionsForPath(0, 0, 'foo'));
$this->assertEquals(Constants::PERMISSION_ALL, $aclManager->getPermissionsForTree(0, 0, 'foo'));
}

$this->rules['foo/bar'] = [
new Rule($this->createMapping('1'), 10, Constants::PERMISSION_DELETE, 0), // remove delete
];

foreach ([$this->getAclManager(), $this->getAclManager(true)] as $aclManager) {
$this->assertEquals(Constants::PERMISSION_ALL - Constants::PERMISSION_DELETE, $aclManager->getPermissionsForTree(0, 0, 'foo'));
}
} finally {
$this->restoreService(FolderManager::class);
}
}
}