upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-07-14 12:21:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 66

Merge pull request #61891 from nextcloud/backport/61881/stable33

Browse source 
[stable33] fix(CalDav): Force trashbin deletion when re-creating item with same UID
This commit is contained in:
Andy Scherzinger 2026-07-08 21:15:34 +02:00 committed by GitHub
commit 308e3facbc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 41 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/dav/lib/CalDAV/CalDavBackend.php
View file

@ -1541,7 +1541,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
if ($found !== false) {
// the object existed previously but has been deleted
// remove the trashbin entry and continue as if it was a new object
$this->deleteCalendarObject($calendarId, $found['uri']);
$this->deleteCalendarObject($calendarId, $found['uri'], $calendarType, true);
}
$query = $this->db->getQueryBuilder();

40
apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
View file

@ -294,6 +294,46 @@ EOD;
$this->backend->createCalendarObject($calendarId, $uri1, $calData);
}
public function testCreateCalendarObjectWithSameUidAsObjectInTrashbin(): void {
$calendarId = $this->createTestCalendar();
$calData = <<<'EOD'
BEGIN:VCALENDAR
VERSION:2.0
PRODID:ownCloud Calendar
BEGIN:VEVENT
CREATED;VALUE=DATE-TIME:20130910T125139Z
UID:47d15e3ec8
LAST-MODIFIED;VALUE=DATE-TIME:20130910T125139Z
DTSTAMP;VALUE=DATE-TIME:20130910T125139Z
SUMMARY:Test Event
DTSTART;VALUE=DATE-TIME:20130912T130000Z
DTEND;VALUE=DATE-TIME:20130912T140000Z
CLASS:PUBLIC
END:VEVENT
END:VCALENDAR
EOD;
$uri = static::getUniqueID('event') . '.ics';
$this->backend->createCalendarObject($calendarId, $uri, $calData);
// Soft-delete the object so it is moved to the trashbin but keeps its UID
$this->backend->deleteCalendarObject($calendarId, $uri);
$trashbinUri = str_replace('.ics', '-deleted.ics', $uri);
$trashedObject = $this->backend->getCalendarObject($calendarId, $trashbinUri);
$this->assertNotNull($trashedObject);
// Recreating an object with the same UID must purge the trashbin entry
// instead of violating the unique index on (calendarid, calendartype, uid)
$newUri = static::getUniqueID('event') . '.ics';
$this->backend->createCalendarObject($calendarId, $newUri, $calData);
$this->assertNull($this->backend->getCalendarObject($calendarId, $trashbinUri));
$newObject = $this->backend->getCalendarObject($calendarId, $newUri);
$this->assertNotNull($newObject);
$this->assertEquals($calData, $newObject['calendardata']);
}
public function testMultiCalendarObjects(): void {
$calendarId = $this->createTestCalendar();