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.

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

Add missing ACLs for deleted calendar objects to fix deletion #27343

Merged
merged 1 commit into from
Jun 2, 2021

Conversation

ChristophWurst
Copy link
Member

Due to a bug in Sabre it's necessary for calendar objects to implement
ACLs. Otherwise the scheduling plugin will throw an error when it tries
to fetch the owner of a calendar object that is being deleted.

Ref sabre-io/dav#1345

Required for nextcloud/calendar#3129

Copy link
Member

@tcitworld tcitworld left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a CS issue as well.

@ChristophWurst ChristophWurst mentioned this pull request Jun 2, 2021
57 tasks
@ChristophWurst ChristophWurst force-pushed the fix/deleted-objects-deletion-missing-acls branch from 9cf8ff3 to 8451975 Compare June 2, 2021 13:31
Due to a bug in Sabre it's necessary for calendar objects to implement
ACLs. Otherwise the scheduling plugin will throw an error when it tries
to fetch the owner of a calendar object that is being deleted.

Ref sabre-io/dav#1345

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
@ChristophWurst ChristophWurst force-pushed the fix/deleted-objects-deletion-missing-acls branch from 8451975 to fc8daf5 Compare June 2, 2021 13:42
@ChristophWurst ChristophWurst added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jun 2, 2021
return [
[
'privilege' => '{DAV:}read', // For queries
'principal' => $this->getOwner(),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a difference between returning the actual owner principal URI and {DAV:}owner? If the former is required, might as well put it everywhere?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no difference right now. There might be one once we allow the trash bin access for shared calendars

@ChristophWurst ChristophWurst merged commit ac4ff6c into master Jun 2, 2021
@ChristophWurst ChristophWurst deleted the fix/deleted-objects-deletion-missing-acls branch June 2, 2021 14:56
@MorrisJobke MorrisJobke mentioned this pull request Jun 10, 2021
59 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: dav
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants