Skip to content

fix(dav): allow ExternalCalendar as schedule-default-calendar-URL #61602

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

Open
stephan1827 wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −2
Open

fix(dav): allow ExternalCalendar as schedule-default-calendar-URL #61602

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
16 changes: 14 additions & 2 deletions apps/dav/lib/DAV/CustomPropertiesBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,11 +344,23 @@ private function validateProperty(string $path, string $propName, mixed $propVal

// $path is the principal here as this prop is only set on principals
$node = $this->tree->getNodeForPath($href);
if (!($node instanceof Calendar) || $node->getOwner() !== $path) {
if ((!($node instanceof Calendar) && !($node instanceof ExternalCalendar)) || $node->getOwner() !== $path) {
throw new DavException('No such calendar');
}

$this->defaultCalendarValidator->validateScheduleDefaultCalendar($node);
if ($node instanceof Calendar) {
$this->defaultCalendarValidator->validateScheduleDefaultCalendar($node);
} else {
// ExternalCalendar: verify VEVENT support; these calendars are always writable and not subscriptions/shared/deleted
$sCCS = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
$calendarProperties = $node->getProperties([$sCCS]);
if (isset($calendarProperties[$sCCS])) {
$supportedComponents = $calendarProperties[$sCCS]->getValue();
if (!in_array('VEVENT', $supportedComponents, true)) {
throw new DavException('Calendar does not support VEVENT components');
}
}
}
break;
}
}
Expand Down