upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-13 10:40:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix(dav): Abort incomplete CalDAV changes sync

Browse source 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2024-03-11 14:52:56 +01:00
parent 9b6424e5ca
commit 4e80ae6b43
No known key found for this signature in database
GPG key ID: CC42AC2A7F0E56D8
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2376,7 +2376,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
if ($syncToken) {
$qb = $this->db->getQueryBuilder();
$qb->select('uri', 'operation')
$qb->select('uri', 'operation', 'synctoken')
->from('calendarchanges')
->where(
$qb->expr()->andX(
@ -2385,7 +2385,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
$qb->expr()->eq('calendarid', $qb->createNamedParameter($calendarId)),
$qb->expr()->eq('calendartype', $qb->createNamedParameter($calendarType))
)
)->orderBy('synctoken');
)->orderBy('synctoken', 'ASC');
if (is_int($limit) && $limit > 0) {
$qb->setMaxResults($limit);
}
@ -2396,8 +2396,19 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
// This loop ensures that any duplicates are overwritten, only the
// last change on a node is relevant.
$rowNr = 0;
while ($row = $stmt->fetch()) {
if ($rowNr === 0 && $row['synctoken'] > $syncToken) {
// The oldest change should have a synctoken equal to the
// token sent by the client. Only then we have the full
// history of changes. Else the data cleanup happened too
// fast (or the client was offline for a long time) and
// we would return an incomplete diff.
// Abort to force a clean and full sync.
return null;
}
$changes[$row['uri']] = $row['operation'];
$rowNr++;
}
$stmt->closeCursor();