Skip to content

[stable25] fix(CalDAV): set acls for DeletedCalendarObjectsCollection #42909

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
ChristophWurst merged 1 commit into from
Jan 22, 2024
Merged

[stable25] fix(CalDAV): set acls for DeletedCalendarObjectsCollection #42909

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(CalDAV): set acls for DeletedCalendarObjectsCollection 
Signed-off-by: Johannes Merkel <[email protected]>
  • Loading branch information
@JohannesGGE @ChristophWurst
JohannesGGE authored and ChristophWurst committed Jan 18, 2024
commit fd6dff89fbd6446ea1074eb2c795e0356bd9b5bd
25 changes: 24 additions & 1 deletion apps/dav/lib/CalDAV/Trashbin/DeletedCalendarObjectsCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,15 @@
use Sabre\DAV\Exception\Forbidden;
use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\Exception\NotImplemented;
use Sabre\DAVACL\ACLTrait;
use Sabre\DAVACL\IACL;
use function array_map;
use function implode;
use function preg_match;

class DeletedCalendarObjectsCollection implements ICalendarObjectContainer {
class DeletedCalendarObjectsCollection implements ICalendarObjectContainer, IACL {
use ACLTrait;

public const NAME = 'objects';

/** @var CalDavBackend */
Expand Down Expand Up @@ -129,4 +133,23 @@ private function getRelativeObjectPath(array $calendarInfo): string {
[$calendarInfo['id'], 'ics'],
);
}

public function getOwner() {
return $this->principalInfo['uri'];
}

public function getACL(): array {
return [
[
'privilege' => '{DAV:}read',
'principal' => $this->getOwner(),
'protected' => true,
],
[
'privilege' => '{DAV:}unbind',
'principal' => '{DAV:}owner',
'protected' => true,
]
];
}
}