ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #5547 from nextcloud/backport/5542/stable27

Browse Source 
[stable27] fix(PermissionService#getPermissions): Catch exceptions from getBoard method
This commit is contained in:
Julius Härtl
2024-02-05 07:12:02 +01:00
committed by GitHub
parent db2d80a2b9 16286010ef
commit fe7c4430f5
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Service/PermissionService.php
View File

@@ -108,9 +108,15 @@ class PermissionService {
return $cached; return $cached;
} }
try {
$board = $this->getBoard($boardId); $board = $this->getBoard($boardId);
$owner = $this->userIsBoardOwner($boardId, $userId); $owner = $this->userIsBoardOwner($boardId, $userId);
$acls = $board->getDeletedAt() === 0 ? $this->aclMapper->findAll($boardId) : []; $acls = $board->getDeletedAt() === 0 ? $this->aclMapper->findAll($boardId) : [];
} catch (MultipleObjectsReturnedException|DoesNotExistException $e) {
$owner = false;
$acls = [];
}
$permissions = [ $permissions = [
Acl::PERMISSION_READ => $owner || $this->userCan($acls, Acl::PERMISSION_READ, $userId), Acl::PERMISSION_READ => $owner || $this->userCan($acls, Acl::PERMISSION_READ, $userId),
Acl::PERMISSION_EDIT => $owner || $this->userCan($acls, Acl::PERMISSION_EDIT, $userId), Acl::PERMISSION_EDIT => $owner || $this->userCan($acls, Acl::PERMISSION_EDIT, $userId),