-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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.
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
fix(CalDAV): set acls for DeletedCalendarObjectsCollection #42850
fix(CalDAV): set acls for DeletedCalendarObjectsCollection #42850
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Makes sense
use function array_map; | ||
use function implode; | ||
use function preg_match; | ||
|
||
class DeletedCalendarObjectsCollection implements ICalendarObjectContainer { | ||
class DeletedCalendarObjectsCollection implements ICalendarObjectContainer, IACL { | ||
use ACLTrait; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This brings
'privilege' => '{DAV:}all',
I think {DAV:}read
should be enough, as the collection itself shouldn't be changed, but you'll need to test it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You mean by adding:
public function getACL(): array {
return [
[
'privilege' => '{DAV:}read',
'principal' => $this->getOwner(),
'protected' => true,
],
[
'privilege' => '{DAV:}unbind',
'principal' => '{DAV:}owner',
'protected' => true,
]
];
}
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you need {DAV:}unbind
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes. Otherwise the owner can no longer delete it themself.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But the owner should be able to delete the elements in the collection, not the collection itself, right?
DeletedCalendarObject
already has {DAV:}unbind
.
And in any case the delete
method here throws Forbidden
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The deletion does not work either via cadaver or via web interface without {DAV:}unbind
for the owner. At least in my setup.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But the owner should be able to delete the elements in the collection, not the collection itself, right?
DeletedCalendarObject
already has{DAV:}unbind
.And in any case the
delete
method here throwsForbidden
.
It's a bit strange. If you drop unbind from the collection, objects in the collection can't be deleted neither. Sabre returns a Node with name 'objects' could not be found
.
Since deletion is indeed protected by the Forbidden, I would like to move forward with this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
\Sabre\DAVACL\Plugin::beforeUnbind
checks the parent for unbind before a node is unbound.
Signed-off-by: Johannes Merkel <mail@johannesgge.de>
9fd0d9c
to
b454156
Compare
Summary
TODO
Checklist