upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 18:21:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Merge pull request #60641 from nextcloud/fix/delegation/sharee-acls
Some checks failed
CodeQL Advanced / Analyze (actions) (push) Waiting to run
Details
CodeQL Advanced / Analyze (javascript-typescript) (push) Waiting to run
Details
Integration sqlite / changes (push) Waiting to run
Details
Integration sqlite / integration-sqlite (master, main, 8.4, main, --tags ~@large files_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (master, main, 8.4, main, capabilities_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (master, main, 8.4, main, collaboration_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (master, main, 8.4, main, comments_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (master, main, 8.4, main, dav_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (master, main, 8.4, main, features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (master, main, 8.4, main, federation_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (master, main, 8.4, main, file_conversions) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (master, main, 8.4, main, files_reminders) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (master, main, 8.4, main, filesdrop_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (master, main, 8.4, main, guests_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (master, main, 8.4, main, ldap_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (master, main, 8.4, main, openldap_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (master, main, 8.4, main, openldap_numerical_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (master, main, 8.4, main, remoteapi_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (master, main, 8.4, main, routing_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (master, main, 8.4, main, setup_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (master, main, 8.4, main, sharees_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (master, main, 8.4, main, sharing_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (master, main, 8.4, main, theming_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (master, main, 8.4, main, videoverification_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite-summary (push) Blocked by required conditions
Details
Psalm static code analysis / changes (push) Has been cancelled
Details
Psalm static code analysis / static-code-analysis (push) Has been cancelled
Details
Psalm static code analysis / static-code-analysis-security (push) Has been cancelled
Details
Psalm static code analysis / static-code-analysis-ocp (push) Has been cancelled
Details
Psalm static code analysis / static-code-analysis-ncu (push) Has been cancelled
Details
Psalm static code analysis / static-code-analysis-strict (push) Has been cancelled
Details
Psalm static code analysis / static-code-analysis-summary (push) Has been cancelled
Details

Browse source 
fix(caldav): grant sharee Acls to the delegate
This commit is contained in:
Andy Scherzinger 2026-05-21 19:17:33 +02:00 committed by GitHub
commit 2f6041feb3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/dav/lib/CalDAV/Calendar.php
View file

@ -177,18 +177,38 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IRestorable, IShareable
'principal' => parent::getOwner(),
'protected' => true,
];
$acl[] = [
'privilege' => '{DAV:}read',
'principal' => parent::getOwner() . '/calendar-proxy-read',
'protected' => true,
];
$acl[] = [
'privilege' => '{DAV:}read',
'principal' => parent::getOwner() . '/calendar-proxy-write',
'protected' => true,
];
if ($this->canWrite()) {
$acl[] = [
'privilege' => '{DAV:}write',
'principal' => parent::getOwner(),
'protected' => true,
];
$acl[] = [
'privilege' => '{DAV:}write',
'principal' => parent::getOwner() . '/calendar-proxy-write',
'protected' => true,
];
} else {
$acl[] = [
'privilege' => '{DAV:}write-properties',
'principal' => parent::getOwner(),
'protected' => true,
];
$acl[] = [
'privilege' => '{DAV:}write-properties',
'principal' => parent::getOwner() . '/calendar-proxy-write',
'protected' => true,
];
}
}
if ($this->isPublic()) {
@ -205,6 +225,8 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IRestorable, IShareable
$this->getOwner() . '/calendar-proxy-read',
$this->getOwner() . '/calendar-proxy-write',
parent::getOwner(),
parent::getOwner() . '/calendar-proxy-read',
parent::getOwner() . '/calendar-proxy-write',
'principals/system/public',
];
/** @var list<array{privilege: string, principal: string, protected: bool}> $acl */

20
apps/dav/tests/unit/CalDAV/CalendarTest.php
View file

@ -236,18 +236,38 @@ class CalendarTest extends TestCase {
'principal' => 'user2',
'protected' => true
];
$expectedAcl[] = [
'privilege' => '{DAV:}read',
'principal' => 'user2/calendar-proxy-read',
'protected' => true
];
$expectedAcl[] = [
'privilege' => '{DAV:}read',
'principal' => 'user2/calendar-proxy-write',
'protected' => true
];
if ($expectsWrite) {
$expectedAcl[] = [
'privilege' => '{DAV:}write',
'principal' => 'user2',
'protected' => true
];
$expectedAcl[] = [
'privilege' => '{DAV:}write',
'principal' => 'user2/calendar-proxy-write',
'protected' => true
];
} else {
$expectedAcl[] = [
'privilege' => '{DAV:}write-properties',
'principal' => 'user2',
'protected' => true
];
$expectedAcl[] = [
'privilege' => '{DAV:}write-properties',
'principal' => 'user2/calendar-proxy-write',
'protected' => true
];
}
}
$this->assertEquals($expectedAcl, $acl);