From 9f6dd51912b76d13704d3843f9a87eaf38646d15 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Fri, 24 Aug 2018 17:23:14 +0200 Subject: [PATCH] LIMIT is no column but a SQL feature, allow limit on initial sync Signed-off-by: Georg Ehrke --- .../composer/composer/autoload_classmap.php | 1 + .../dav/composer/composer/autoload_static.php | 1 + apps/dav/lib/CalDAV/CachedSubscription.php | 12 ++++++ apps/dav/lib/CalDAV/Calendar.php | 11 +++++ apps/dav/lib/CardDAV/AddressBook.php | 9 ++++ apps/dav/lib/CardDAV/CardDavBackend.php | 2 +- ...UnsupportedLimitOnInitialSyncException.php | 41 +++++++++++++++++++ 7 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 apps/dav/lib/Exception/UnsupportedLimitOnInitialSyncException.php diff --git a/apps/dav/composer/composer/autoload_classmap.php b/apps/dav/composer/composer/autoload_classmap.php index 6452cd298d..b550e37a31 100644 --- a/apps/dav/composer/composer/autoload_classmap.php +++ b/apps/dav/composer/composer/autoload_classmap.php @@ -147,6 +147,7 @@ return array( 'OCA\\DAV\\Direct\\DirectHome' => $baseDir . '/../lib/Direct/DirectHome.php', 'OCA\\DAV\\Direct\\Server' => $baseDir . '/../lib/Direct/Server.php', 'OCA\\DAV\\Direct\\ServerFactory' => $baseDir . '/../lib/Direct/ServerFactory.php', + 'OCA\\DAV\\Exception\\UnsupportedLimitOnInitialSyncException' => $baseDir . '/../lib/Exception/UnsupportedLimitOnInitialSyncException.php', 'OCA\\DAV\\Files\\BrowserErrorPagePlugin' => $baseDir . '/../lib/Files/BrowserErrorPagePlugin.php', 'OCA\\DAV\\Files\\FileSearchBackend' => $baseDir . '/../lib/Files/FileSearchBackend.php', 'OCA\\DAV\\Files\\FilesHome' => $baseDir . '/../lib/Files/FilesHome.php', diff --git a/apps/dav/composer/composer/autoload_static.php b/apps/dav/composer/composer/autoload_static.php index 19c74d3be0..736b77aa11 100644 --- a/apps/dav/composer/composer/autoload_static.php +++ b/apps/dav/composer/composer/autoload_static.php @@ -162,6 +162,7 @@ class ComposerStaticInitDAV 'OCA\\DAV\\Direct\\DirectHome' => __DIR__ . '/..' . '/../lib/Direct/DirectHome.php', 'OCA\\DAV\\Direct\\Server' => __DIR__ . '/..' . '/../lib/Direct/Server.php', 'OCA\\DAV\\Direct\\ServerFactory' => __DIR__ . '/..' . '/../lib/Direct/ServerFactory.php', + 'OCA\\DAV\\Exception\\UnsupportedLimitOnInitialSyncException' => __DIR__ . '/..' . '/../lib/Exception/UnsupportedLimitOnInitialSyncException.php', 'OCA\\DAV\\Files\\BrowserErrorPagePlugin' => __DIR__ . '/..' . '/../lib/Files/BrowserErrorPagePlugin.php', 'OCA\\DAV\\Files\\FileSearchBackend' => __DIR__ . '/..' . '/../lib/Files/FileSearchBackend.php', 'OCA\\DAV\\Files\\FilesHome' => __DIR__ . '/..' . '/../lib/Files/FilesHome.php', diff --git a/apps/dav/lib/CalDAV/CachedSubscription.php b/apps/dav/lib/CalDAV/CachedSubscription.php index a95ee15bbe..da8c5434cf 100644 --- a/apps/dav/lib/CalDAV/CachedSubscription.php +++ b/apps/dav/lib/CalDAV/CachedSubscription.php @@ -23,6 +23,7 @@ declare(strict_types=1); */ namespace OCA\DAV\CalDAV; +use OCA\DAV\Exception\UnsupportedLimitOnInitialSyncException; use Sabre\CalDAV\Backend\BackendInterface; use Sabre\DAV\Exception\MethodNotAllowed; use Sabre\DAV\Exception\NotFound; @@ -195,4 +196,15 @@ class CachedSubscription extends \Sabre\CalDAV\Calendar { public function calendarQuery(array $filters):array { return $this->caldavBackend->calendarQuery($this->calendarInfo['id'], $filters, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION); } + + /** + * @inheritDoc + */ + public function getChanges($syncToken, $syncLevel, $limit = null) { + if (!$syncToken && $limit) { + throw new UnsupportedLimitOnInitialSyncException(); + } + + return parent::getChanges($syncToken, $syncLevel, $limit); + } } diff --git a/apps/dav/lib/CalDAV/Calendar.php b/apps/dav/lib/CalDAV/Calendar.php index e80bffdb9d..f26913d7ce 100644 --- a/apps/dav/lib/CalDAV/Calendar.php +++ b/apps/dav/lib/CalDAV/Calendar.php @@ -27,6 +27,7 @@ namespace OCA\DAV\CalDAV; use OCA\DAV\DAV\Sharing\IShareable; +use OCA\DAV\Exception\UnsupportedLimitOnInitialSyncException; use OCP\IConfig; use OCP\IL10N; use Sabre\CalDAV\Backend\BackendInterface; @@ -339,4 +340,14 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable { return isset($this->calendarInfo['{http://calendarserver.org/ns/}source']); } + /** + * @inheritDoc + */ + public function getChanges($syncToken, $syncLevel, $limit = null) { + if (!$syncToken && $limit) { + throw new UnsupportedLimitOnInitialSyncException(); + } + + return parent::getChanges($syncToken, $syncLevel, $limit); + } } diff --git a/apps/dav/lib/CardDAV/AddressBook.php b/apps/dav/lib/CardDAV/AddressBook.php index 096f5c8b2a..3b02bdf5ba 100644 --- a/apps/dav/lib/CardDAV/AddressBook.php +++ b/apps/dav/lib/CardDAV/AddressBook.php @@ -23,6 +23,7 @@ namespace OCA\DAV\CardDAV; use OCA\DAV\DAV\Sharing\IShareable; +use OCA\DAV\Exception\UnsupportedLimitOnInitialSyncException; use OCP\IL10N; use Sabre\CardDAV\Backend\BackendInterface; use Sabre\CardDAV\Card; @@ -219,4 +220,12 @@ class AddressBook extends \Sabre\CardDAV\AddressBook implements IShareable { } return true; } + + public function getChanges($syncToken, $syncLevel, $limit = null) { + if (!$syncToken && $limit) { + throw new UnsupportedLimitOnInitialSyncException(); + } + + return parent::getChanges($syncToken, $syncLevel, $limit); + } } diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php index f30a12bba4..b16bcd993c 100644 --- a/apps/dav/lib/CardDAV/CardDavBackend.php +++ b/apps/dav/lib/CardDAV/CardDavBackend.php @@ -814,7 +814,7 @@ class CardDavBackend implements BackendInterface, SyncSupport { $query = "SELECT `uri`, `operation` FROM `*PREFIX*addressbookchanges` WHERE `synctoken` >= ? AND `synctoken` < ? AND `addressbookid` = ? ORDER BY `synctoken`"; if ($limit>0) { - $query .= " `LIMIT` " . (int)$limit; + $query .= " LIMIT " . (int)$limit; } // Fetching all changes diff --git a/apps/dav/lib/Exception/UnsupportedLimitOnInitialSyncException.php b/apps/dav/lib/Exception/UnsupportedLimitOnInitialSyncException.php new file mode 100644 index 0000000000..b065a90078 --- /dev/null +++ b/apps/dav/lib/Exception/UnsupportedLimitOnInitialSyncException.php @@ -0,0 +1,41 @@ + + * + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see + * + */ +namespace OCA\DAV\Exception; + +use Sabre\DAV\Exception\InsufficientStorage; +use Sabre\DAV\Server; + +/** + * Class UnsupportedLimitOnInitialSyncException + * + * @package OCA\DAV\Exception + */ +class UnsupportedLimitOnInitialSyncException extends InsufficientStorage { + + /** + * @inheritDoc + */ + public function serialize(Server $server, \DOMElement $errorNode) { + $errorNode->appendChild($errorNode->ownerDocument->createElementNS('DAV:', 'd:number-of-matches-within-limits')); + } +}