Skip to content
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

Jump to bottom

fix(CalDAV): set acls for DeletedCalendarObjectsCollection #42850

Merged
merged 1 commit into from
Jan 18, 2024
Merged

fix(CalDAV): set acls for DeletedCalendarObjectsCollection #42850

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
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;
Copy link
Member

@tcitworld tcitworld Jan 16, 2024 •
edited
Loading

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.

Copy link
Contributor Author

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,
		]
	];
}

?

Copy link
Member

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 ?

Copy link
Contributor Author

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.

Copy link
Member

@tcitworld tcitworld Jan 17, 2024 •
edited
Loading

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.

Copy link
Contributor Author

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.

Copy link
Member

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.

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.

Copy link
Member

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.


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,
]
];
}
}
Loading