feat(cardav): support result truncation for addressbook federation

Signed-off-by: Hamza Mahjoubi <[email protected]>

apps/dav/lib/CardDAV/CardDavBackend.php

@@ -27,6 +27,7 @@
 use OCP\IDBConnection;
 use OCP\IUserManager;
 use PDO;
+use Psr\Log\LoggerInterface;
 use Sabre\CardDAV\Backend\BackendInterface;
 use Sabre\CardDAV\Backend\SyncSupport;
 use Sabre\CardDAV\Plugin;
@@ -60,6 +61,7 @@ public function __construct(
 		private IUserManager $userManager,
 		private IEventDispatcher $dispatcher,
 		private Sharing\Backend $sharingBackend,
+		private LoggerInterface $logger,
 		private IConfig $config,
 	) {
 	}
@@ -897,10 +899,10 @@ public function getChangesForAddressBook($addressBookId, $syncToken, $syncLevel,
 					$result['result_truncated'] = false;
 					$result['added'] = [];
 				} else {
-					$lastID = $values[array_key_last($values)]['id'];
+					$lastID = end($values)['id'];
 					$result['added'] = array_column($values, 'uri');
-					$result['syncToken'] = count($result['added']) >= $limit ? "init_{$lastID}_$initialSyncToken" : $initialSyncToken ;
-					$result['result_truncated'] = count($result['added']) >= $limit;
+					$result['syncToken'] = count($result['added']) === $limit ? "init_{$lastID}_$initialSyncToken" : $initialSyncToken ;
+					$result['result_truncated'] = count($result['added']) === $limit;
 				}
 			} elseif ($syncToken) {
 				$qb = $this->db->getQueryBuilder();
@@ -931,11 +933,6 @@ public function getChangesForAddressBook($addressBookId, $syncToken, $syncLevel,
 					$result['syncToken'] = $row['synctoken'];
 				}
 				$stmt->closeCursor();
-
-				// No changes found, use current token
-				if (empty($changes)) {
-					$result['syncToken'] = $currentToken;
-				}
 
 				foreach ($changes as $uri => $operation) {
 					switch ($operation) {
@@ -961,12 +958,8 @@ public function getChangesForAddressBook($addressBookId, $syncToken, $syncLevel,
 				$qb->setMaxResults($limit);
 				$stmt = $qb->executeQuery();
 				$values = $stmt->fetchAll(\PDO::FETCH_ASSOC);
-				if (empty($values)) {
-					$result['added'] = [];
-					return $result;
-				}
 				$lastID = $values[array_key_last($values)]['id'];
-				if (count($values) >= $limit) {
+				if (count(array_values($values)) >= $limit) {
 					$result['syncToken'] = 'init_' . $lastID . '_' . $currentToken;
 					$result['result_truncated'] = true;
 				}

apps/dav/lib/RootCollection.php

@@ -132,6 +132,7 @@ public function __construct() {
 		);
 
 		$contactsSharingBackend = Server::get(\OCA\DAV\CardDAV\Sharing\Backend::class);
+		$logger = Server::get(\Psr\Log\LoggerInterface::class);
 		$config = Server::get(IConfig::class);
 
 		$pluginManager = new PluginManager(\OC::$server, Server::get(IAppManager::class));
@@ -141,6 +142,7 @@ public function __construct() {
 			$userManager,
 			$dispatcher,
 			$contactsSharingBackend,
+			$logger,
 			$config
 		);
 		$usersAddressBookRoot = new AddressBookRoot($userPrincipalBackend, $usersCardDavBackend, $pluginManager, $userSession->getUser(), $groupManager, 'principals/users');
@@ -152,6 +154,7 @@ public function __construct() {
 			$userManager,
 			$dispatcher,
 			$contactsSharingBackend,
+			$logger,
 			$config
 		);
 		$systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, $pluginManager, $userSession->getUser(), $groupManager, 'principals/system');

apps/dav/lib/Server.php

@@ -175,7 +175,6 @@ public function __construct(
 
 		$this->server->addPlugin(new ExceptionLoggerPlugin('webdav', $logger));
 		$this->server->addPlugin(new LockPlugin());
-		$this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
 
 		// acl
 		$acl = new DavAclPlugin();

config/config.sample.php

@@ -359,6 +359,11 @@
  */
 'carddav_sync_request_truncation' => 50000,
 
+/**
+ * The limit applied to the synchronization report request, e.g. federated system address books (as run by `occ federation:sync-addressbooks`).
+ */
+'carddav_sync_request_truncation' => 50000,
+
 /**
  * `true` enables a relaxed session timeout, where the session timeout would no longer be
  * handled by Nextcloud but by either the PHP garbage collection or the expiration of