Skip to content

fix(dav): calculate permissions based on addressbook principal #54298

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

Merged
susnux merged 1 commit into from
Aug 6, 2025
+13 −8
Merged

fix(dav): calculate permissions based on addressbook principal #54298

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
fix(dav): calculate permissions based on addressbook principal 
Signed-off-by: Christoph Wurst <[email protected]>
  • Loading branch information
@ChristophWurst
ChristophWurst committed Aug 6, 2025
commit 0c4bb5e8c59f2f24bcf6f0751f354839b9c15cd4
4 changes: 4 additions & 0 deletions apps/dav/lib/CardDAV/AddressBookImpl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,10 @@ public function getPermissions() {
$permissions = $this->addressBook->getACL();
$result = 0;
foreach ($permissions as $permission) {
if ($this->addressBookInfo['principaluri'] !== $permission['principal']) {
continue;
}

switch ($permission['privilege']) {
case '{DAV:}read':
$result |= Constants::PERMISSION_READ;
Expand Down
17 changes: 9 additions & 8 deletions apps/dav/tests/unit/CardDAV/AddressBookImplTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,14 +241,15 @@ public function testGetPermissions(array $permissions, int $expected): void {
public static function dataTestGetPermissions(): array {
return [
[[], 0],
[[['privilege' => '{DAV:}read']], 1],
[[['privilege' => '{DAV:}write']], 6],
[[['privilege' => '{DAV:}all']], 31],
[[['privilege' => '{DAV:}read'],['privilege' => '{DAV:}write']], 7],
[[['privilege' => '{DAV:}read'],['privilege' => '{DAV:}all']], 31],
[[['privilege' => '{DAV:}all'],['privilege' => '{DAV:}write']], 31],
[[['privilege' => '{DAV:}read'],['privilege' => '{DAV:}write'],['privilege' => '{DAV:}all']], 31],
[[['privilege' => '{DAV:}all'],['privilege' => '{DAV:}read'],['privilege' => '{DAV:}write']], 31],
[[['privilege' => '{DAV:}read', 'principal' => 'principals/system/system']], 1],
[[['privilege' => '{DAV:}read', 'principal' => 'principals/system/system'], ['privilege' => '{DAV:}write', 'principal' => 'principals/someone/else']], 1],
[[['privilege' => '{DAV:}write', 'principal' => 'principals/system/system']], 6],
[[['privilege' => '{DAV:}all', 'principal' => 'principals/system/system']], 31],
[[['privilege' => '{DAV:}read', 'principal' => 'principals/system/system'],['privilege' => '{DAV:}write', 'principal' => 'principals/system/system']], 7],
[[['privilege' => '{DAV:}read', 'principal' => 'principals/system/system'],['privilege' => '{DAV:}all', 'principal' => 'principals/system/system']], 31],
[[['privilege' => '{DAV:}all', 'principal' => 'principals/system/system'],['privilege' => '{DAV:}write', 'principal' => 'principals/system/system']], 31],
[[['privilege' => '{DAV:}read', 'principal' => 'principals/system/system'],['privilege' => '{DAV:}write', 'principal' => 'principals/system/system'],['privilege' => '{DAV:}all', 'principal' => 'principals/system/system']], 31],
[[['privilege' => '{DAV:}all', 'principal' => 'principals/system/system'],['privilege' => '{DAV:}read', 'principal' => 'principals/system/system'],['privilege' => '{DAV:}write', 'principal' => 'principals/system/system']], 31],
];
}

Expand Down
Loading