upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 00:32:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

fix(carddav): Handle race for SAB creation better

Browse source 
* Accept non repeatable read and INSERT conflict by another read
* Handle replication edge case

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2023-12-06 13:52:37 +01:00 committed by skjnldsv
parent 452e4be4f5
commit 0bb68ab734
2 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/dav/lib/CardDAV/CardDavBackend.php
View file

@ -351,6 +351,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
* @param array $properties
* @return int
* @throws BadRequest
* @throws Exception
*/
public function createAddressBook($principalUri, $url, array $properties) {
if (strlen($url) > 255) {

35
apps/dav/lib/CardDAV/SyncService.php
View file

@ -10,6 +10,7 @@ namespace OCA\DAV\CardDAV;
use OCP\AppFramework\Db\TTransactional;
use OCP\AppFramework\Http;
use OCP\DB\Exception;
use OCP\Http\Client\IClient;
use OCP\Http\Client\IClientService;
use OCP\IConfig;
@ -89,15 +90,33 @@ class SyncService {
* @throws \Sabre\DAV\Exception\BadRequest
*/
public function ensureSystemAddressBookExists(string $principal, string $uri, array $properties): ?array {
return $this->atomic(function () use ($principal, $uri, $properties) {
$book = $this->backend->getAddressBooksByUri($principal, $uri);
if (!is_null($book)) {
return $book;
}
$this->backend->createAddressBook($principal, $uri, $properties);
try {
return $this->atomic(function () use ($principal, $uri, $properties) {
$book = $this->backend->getAddressBooksByUri($principal, $uri);
if (!is_null($book)) {
return $book;
}
$this->backend->createAddressBook($principal, $uri, $properties);
return $this->backend->getAddressBooksByUri($principal, $uri);
}, $this->dbConnection);
return $this->backend->getAddressBooksByUri($principal, $uri);
}, $this->dbConnection);
} catch (Exception $e) {
// READ COMMITTED doesn't prevent a nonrepeatable read above, so
// two processes might create an address book here. Ignore our
// failure and continue loading the entry written by the other process
if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
throw $e;
}
// If this fails we might have hit a replication node that does not
// have the row written in the other process.
// TODO: find an elegant way to handle this
$ab = $this->backend->getAddressBooksByUri($principal, $uri);
if ($ab === null) {
throw new Exception('Could not create system address book', $e->getCode(), $e);
}
return $ab;
}
}
private function prepareUri(string $host, string $path): string {