Skip to content

fix(dav): ignore calendars in the trash bin for free-busy and user status #62667

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
ndo84bw wants to merge 2 commits into
base: master
Choose a base branch
from
+84 −0
Open

fix(dav): ignore calendars in the trash bin for free-busy and user status #62667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6f14f3
fix(caldav): stop querying objects of calendars in the trash bin
ndo84bw Jul 29, 2026
d47d19a
fix(caldav): stop searching objects of calendars in the trash bin
ndo84bw Jul 29, 2026
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
5 changes: 5 additions & 0 deletions apps/dav/lib/CalDAV/Calendar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,11 @@ public function childExists($name) {

#[\Override]
public function calendarQuery(array $filters) {
// Objects of a calendar in the trash bin must not be matched, e.g. in free-busy reports
if ($this->isDeleted()) {
return [];
}

$uris = $this->caldavBackend->calendarQuery($this->calendarInfo['id'], $filters, $this->getCalendarType());
if ($this->isShared()) {
return array_filter($uris, function ($uri) {
Expand Down
5 changes: 5 additions & 0 deletions apps/dav/lib/CalDAV/CalendarImpl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@ public function getSchedulingTimezone(): ?VTimeZone {

#[\Override]
public function search(string $pattern, array $searchProperties = [], array $options = [], $limit = null, $offset = null): array {
// Objects of a calendar in the trash bin must not be matched, e.g. when calculating the user status
if ($this->isDeleted()) {
return [];
}

return $this->backend->search($this->calendarInfo, $pattern,
$searchProperties, $options, $limit, $offset);
}
Expand Down
10 changes: 10 additions & 0 deletions apps/dav/tests/unit/CalDAV/CalendarImplTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,16 @@ public function testSearch(): void {
$this->assertEquals($result, ['SEARCHRESULTS']);
}

public function testSearchDeletedCalendar(): void {
$this->calendar->expects($this->once())
->method('isDeleted')
->willReturn(true);
$this->backend->expects($this->never())
->method('search');

$this->assertEquals([], $this->calendarImpl->search('abc'));
}

public function testGetPermissionRead(): void {
$this->calendar->expects($this->once())
->method('getACL')
Expand Down
64 changes: 64 additions & 0 deletions apps/dav/tests/unit/CalDAV/CalendarTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use OCA\DAV\CalDAV\BirthdayService;
use OCA\DAV\CalDAV\CalDavBackend;
use OCA\DAV\CalDAV\Calendar;
use OCA\DAV\CalDAV\Trashbin\Plugin as TrashbinPlugin;
use OCP\IConfig;
use OCP\IL10N;
use PHPUnit\Framework\MockObject\MockObject;
Expand Down Expand Up @@ -451,6 +452,69 @@ public static function providesConfidentialClassificationData(): array {
];
}

public function testCalendarQuery(): void {
/** @var CalDavBackend&MockObject $backend */
$backend = $this->createMock(CalDavBackend::class);
$backend->expects($this->once())
->method('calendarQuery')
->with(666, [], CalDavBackend::CALENDAR_TYPE_CALENDAR)
->willReturn(['event-0.ics']);

// A calendar that is not in the trash bin has the property set to null
$calendarInfo = [
'principaluri' => 'user1',
'id' => 666,
'uri' => 'cal',
TrashbinPlugin::PROPERTY_DELETED_AT => null,
];
$c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger);

$this->assertEquals(['event-0.ics'], $c->calendarQuery([]));
}

public function testCalendarQuerySharedCalendar(): void {
/** @var CalDavBackend&MockObject $backend */
$backend = $this->createMock(CalDavBackend::class);
$backend->expects($this->once())
->method('calendarQuery')
->with(666, [], CalDavBackend::CALENDAR_TYPE_CALENDAR)
->willReturn(['event-public.ics', 'event-private.ics']);
$backend->expects($this->any())
->method('getCalendarObject')
->willReturnMap([
[666, 'event-public.ics', CalDavBackend::CALENDAR_TYPE_CALENDAR, ['uri' => 'event-public.ics', 'classification' => CalDavBackend::CLASSIFICATION_PUBLIC]],
[666, 'event-private.ics', CalDavBackend::CALENDAR_TYPE_CALENDAR, ['uri' => 'event-private.ics', 'classification' => CalDavBackend::CLASSIFICATION_PRIVATE]],
]);

$calendarInfo = [
'{http://owncloud.org/ns}owner-principal' => 'user1',
'principaluri' => 'user2',
'id' => 666,
'uri' => 'cal',
TrashbinPlugin::PROPERTY_DELETED_AT => null,
];
$c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger);

$this->assertEquals(['event-public.ics'], $c->calendarQuery([]));
}

public function testCalendarQueryDeletedCalendar(): void {
/** @var CalDavBackend&MockObject $backend */
$backend = $this->createMock(CalDavBackend::class);
$backend->expects($this->never())
->method('calendarQuery');

$calendarInfo = [
'principaluri' => 'user1',
'id' => 666,
'uri' => 'cal',
TrashbinPlugin::PROPERTY_DELETED_AT => 1234567890,
];
$c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger);

$this->assertEquals([], $c->calendarQuery([]));
}

public function testRemoveVAlarms(): void {
$publicObjectData = <<<EOD
BEGIN:VCALENDAR
Expand Down
Loading