upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #60602 from nextcloud/backport/60211/stable32

Browse source 
[stable32] fix: add proper ACLs for trashbin proxys
This commit is contained in:
Andy Scherzinger 2026-05-21 10:30:59 +02:00 committed by GitHub
commit 83a6b2f4d0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 49 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/dav/lib/CalDAV/Trashbin/DeletedCalendarObject.php
View file

@ -94,7 +94,17 @@ class DeletedCalendarObject implements IACL, ICalendarObject, IRestorable {
],
[
'privilege' => '{DAV:}unbind', // For moving and deletion
'principal' => '{DAV:}owner',
'principal' => $this->getOwner(),
'protected' => true,
],
[
'privilege' => '{DAV:}all',
'principal' => $this->getOwner() . '/calendar-proxy-write',
'protected' => true,
],
[
'privilege' => '{DAV:}read',
'principal' => $this->getOwner() . '/calendar-proxy-read',
'protected' => true,
],
];

19
apps/dav/lib/CalDAV/Trashbin/DeletedCalendarObjectsCollection.php
View file

@ -125,9 +125,24 @@ class DeletedCalendarObjectsCollection implements ICalendarObjectContainer, IACL
],
[
'privilege' => '{DAV:}unbind',
'principal' => '{DAV:}owner',
'principal' => $this->getOwner(),
'protected' => true,
]
],
[
'privilege' => '{DAV:}read',
'principal' => $this->getOwner() . '/calendar-proxy-write',
'protected' => true,
],
[
'privilege' => '{DAV:}unbind',
'principal' => $this->getOwner() . '/calendar-proxy-write',
'protected' => true,
],
[
'privilege' => '{DAV:}read',
'principal' => $this->getOwner() . '/calendar-proxy-read',
'protected' => true,
],
];
}
}

21
apps/dav/lib/CalDAV/Trashbin/TrashbinHome.php
View file

@ -36,6 +36,27 @@ class TrashbinHome implements IACL, ICollection, IProperties {
return $this->principalInfo['uri'];
}
#[\Override]
public function getACL(): array {
return [
[
'privilege' => '{DAV:}all',
'principal' => $this->getOwner(),
'protected' => true,
],
[
'privilege' => '{DAV:}all',
'principal' => $this->getOwner() . '/calendar-proxy-write',
'protected' => true,
],
[
'privilege' => '{DAV:}read',
'principal' => $this->getOwner() . '/calendar-proxy-read',
'protected' => true,
],
];
}
public function createFile($name, $data = null) {
throw new Forbidden('Permission denied to create files in the trashbin');
}