nextcloud / server

apps/files_trashbin/composer/composer/autoload_real.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
     public static function loadClassLoader($class)
     {
         if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
+            require __DIR__.'/ClassLoader.php';
         }
     }
 
@@ -26,7 +26,7 @@ 
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInitFiles_Trashbin', 'loadClassLoader'));
 
-        require __DIR__ . '/autoload_static.php';
+        require __DIR__.'/autoload_static.php';
         call_user_func(\Composer\Autoload\ComposerStaticInitFiles_Trashbin::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);

apps/theming/lib/Themes/DyslexiaFont.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 		$originalFontFace = $variables['--font-face'];
 
 		$variables = [
-			'--font-face' => 'OpenDyslexic, ' . $originalFontFace
+			'--font-face' => 'OpenDyslexic, '.$originalFontFace
 		];
 
 		return $variables;

Indentation +28 added lines, -28 removed lines

@@ -11,42 +11,42 @@ 
 
 class DyslexiaFont extends DefaultTheme implements ITheme {
 
-	public function getId(): string {
-		return 'opendyslexic';
-	}
+    public function getId(): string {
+        return 'opendyslexic';
+    }
 
-	public function getType(): int {
-		return ITheme::TYPE_FONT;
-	}
+    public function getType(): int {
+        return ITheme::TYPE_FONT;
+    }
 
-	public function getTitle(): string {
-		return $this->l->t('Dyslexia font');
-	}
+    public function getTitle(): string {
+        return $this->l->t('Dyslexia font');
+    }
 
-	public function getEnableLabel(): string {
-		return $this->l->t('Enable dyslexia font');
-	}
+    public function getEnableLabel(): string {
+        return $this->l->t('Enable dyslexia font');
+    }
 
-	public function getDescription(): string {
-		return $this->l->t('OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia.');
-	}
+    public function getDescription(): string {
+        return $this->l->t('OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia.');
+    }
 
-	public function getCSSVariables(): array {
-		$variables = parent::getCSSVariables();
-		$originalFontFace = $variables['--font-face'];
+    public function getCSSVariables(): array {
+        $variables = parent::getCSSVariables();
+        $originalFontFace = $variables['--font-face'];
 
-		$variables = [
-			'--font-face' => 'OpenDyslexic, ' . $originalFontFace
-		];
+        $variables = [
+            '--font-face' => 'OpenDyslexic, ' . $originalFontFace
+        ];
 
-		return $variables;
-	}
+        return $variables;
+    }
 
-	public function getCustomCss(): string {
-		$fontPathOtf = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Regular.otf');
-		$boldFontPathOtf = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Bold.otf');
+    public function getCustomCss(): string {
+        $fontPathOtf = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Regular.otf');
+        $boldFontPathOtf = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Bold.otf');
 
-		return "
+        return "
 			@font-face {
 				font-family: 'OpenDyslexic';
 				font-style: normal;
@@ -61,5 +61,5 @@ 
 				src: url('$boldFontPathOtf') format('opentype');
 			}
 		";
-	}
+    }
 }

core/Migrations/Version24000Date20220425072957.php

Indentation +16 added lines, -16 removed lines

@@ -32,22 +32,22 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version24000Date20220425072957 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('mounts');
-		if (!$table->hasIndex('mount_user_storage')) {
-			$table->addIndex(['storage_id', 'user_id'], 'mount_user_storage');
-			return $schema;
-		}
+        $table = $schema->getTable('mounts');
+        if (!$table->hasIndex('mount_user_storage')) {
+            $table->addIndex(['storage_id', 'user_id'], 'mount_user_storage');
+            return $schema;
+        }
 
-		return null;
-	}
+        return null;
+    }
 }

lib/public/IEmojiHelper.php

Indentation +8 added lines, -8 removed lines

@@ -27,13 +27,13 @@
  * @since 24.0.0
  */
 interface IEmojiHelper {
-	/**
-	 * @since 24.0.0
-	 */
-	public function doesPlatformSupportEmoji(): bool;
+    /**
+     * @since 24.0.0
+     */
+    public function doesPlatformSupportEmoji(): bool;
 
-	/**
-	 * @since 24.0.0
-	 */
-	public function isValidSingleEmoji(string $emoji): bool;
+    /**
+     * @since 24.0.0
+     */
+    public function isValidSingleEmoji(string $emoji): bool;
 }

lib/private/DateTimeZone.php

Spacing +4 added lines, -4 removed lines

@@ -65,7 +65,7 @@ 
 		try {
 			return new \DateTimeZone($timeZone);
 		} catch (\Exception $e) {
-			\OC::$server->get(LoggerInterface::class)->debug('Failed to created DateTimeZone "' . $timeZone . '"', ['app' => 'datetimezone']);
+			\OC::$server->get(LoggerInterface::class)->debug('Failed to created DateTimeZone "'.$timeZone.'"', ['app' => 'datetimezone']);
 			return new \DateTimeZone($this->getDefaultTimeZone());
 		}
 	}
@@ -86,9 +86,9 @@ 
 			// so a positive offset means negative timeZone
 			// and the other way around.
 			if ($offset > 0) {
-				$timeZone = 'Etc/GMT-' . $offset;
+				$timeZone = 'Etc/GMT-'.$offset;
 			} else {
-				$timeZone = 'Etc/GMT+' . abs($offset);
+				$timeZone = 'Etc/GMT+'.abs($offset);
 			}
 
 			return new \DateTimeZone($timeZone);
@@ -110,7 +110,7 @@ 
 			}
 
 			// No timezone found, fallback to UTC
-			\OC::$server->get(LoggerInterface::class)->debug('Failed to find DateTimeZone for offset "' . $offset . '"', ['app' => 'datetimezone']);
+			\OC::$server->get(LoggerInterface::class)->debug('Failed to find DateTimeZone for offset "'.$offset.'"', ['app' => 'datetimezone']);
 			return new \DateTimeZone($this->getDefaultTimeZone());
 		}
 	}

Indentation +86 added lines, -86 removed lines

@@ -13,100 +13,100 @@
 use Psr\Log\LoggerInterface;
 
 class DateTimeZone implements IDateTimeZone {
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/** @var ISession */
-	protected $session;
+    /** @var ISession */
+    protected $session;
 
-	/**
-	 * Constructor
-	 *
-	 * @param IConfig $config
-	 * @param ISession $session
-	 */
-	public function __construct(IConfig $config, ISession $session) {
-		$this->config = $config;
-		$this->session = $session;
-	}
+    /**
+     * Constructor
+     *
+     * @param IConfig $config
+     * @param ISession $session
+     */
+    public function __construct(IConfig $config, ISession $session) {
+        $this->config = $config;
+        $this->session = $session;
+    }
 
-	/**
-	 * Get the timezone of the current user, based on their session information and config data
-	 *
-	 * @param bool|int $timestamp
-	 * @return \DateTimeZone
-	 */
-	public function getTimeZone($timestamp = false) {
-		$timeZone = $this->config->getUserValue($this->session->get('user_id'), 'core', 'timezone', null);
-		if ($timeZone === null) {
-			if ($this->session->exists('timezone')) {
-				return $this->guessTimeZoneFromOffset($this->session->get('timezone'), $timestamp);
-			}
-			$timeZone = $this->getDefaultTimeZone();
-		}
+    /**
+     * Get the timezone of the current user, based on their session information and config data
+     *
+     * @param bool|int $timestamp
+     * @return \DateTimeZone
+     */
+    public function getTimeZone($timestamp = false) {
+        $timeZone = $this->config->getUserValue($this->session->get('user_id'), 'core', 'timezone', null);
+        if ($timeZone === null) {
+            if ($this->session->exists('timezone')) {
+                return $this->guessTimeZoneFromOffset($this->session->get('timezone'), $timestamp);
+            }
+            $timeZone = $this->getDefaultTimeZone();
+        }
 
-		try {
-			return new \DateTimeZone($timeZone);
-		} catch (\Exception $e) {
-			\OC::$server->get(LoggerInterface::class)->debug('Failed to created DateTimeZone "' . $timeZone . '"', ['app' => 'datetimezone']);
-			return new \DateTimeZone($this->getDefaultTimeZone());
-		}
-	}
+        try {
+            return new \DateTimeZone($timeZone);
+        } catch (\Exception $e) {
+            \OC::$server->get(LoggerInterface::class)->debug('Failed to created DateTimeZone "' . $timeZone . '"', ['app' => 'datetimezone']);
+            return new \DateTimeZone($this->getDefaultTimeZone());
+        }
+    }
 
-	/**
-	 * Guess the DateTimeZone for a given offset
-	 *
-	 * We first try to find a Etc/GMT* timezone, if that does not exist,
-	 * we try to find it manually, before falling back to UTC.
-	 *
-	 * @param mixed $offset
-	 * @param bool|int $timestamp
-	 * @return \DateTimeZone
-	 */
-	protected function guessTimeZoneFromOffset($offset, $timestamp) {
-		try {
-			// Note: the timeZone name is the inverse to the offset,
-			// so a positive offset means negative timeZone
-			// and the other way around.
-			if ($offset > 0) {
-				$timeZone = 'Etc/GMT-' . $offset;
-			} else {
-				$timeZone = 'Etc/GMT+' . abs($offset);
-			}
+    /**
+     * Guess the DateTimeZone for a given offset
+     *
+     * We first try to find a Etc/GMT* timezone, if that does not exist,
+     * we try to find it manually, before falling back to UTC.
+     *
+     * @param mixed $offset
+     * @param bool|int $timestamp
+     * @return \DateTimeZone
+     */
+    protected function guessTimeZoneFromOffset($offset, $timestamp) {
+        try {
+            // Note: the timeZone name is the inverse to the offset,
+            // so a positive offset means negative timeZone
+            // and the other way around.
+            if ($offset > 0) {
+                $timeZone = 'Etc/GMT-' . $offset;
+            } else {
+                $timeZone = 'Etc/GMT+' . abs($offset);
+            }
 
-			return new \DateTimeZone($timeZone);
-		} catch (\Exception $e) {
-			// If the offset has no Etc/GMT* timezone,
-			// we try to guess one timezone that has the same offset
-			foreach (\DateTimeZone::listIdentifiers() as $timeZone) {
-				$dtz = new \DateTimeZone($timeZone);
-				$dateTime = new \DateTime();
+            return new \DateTimeZone($timeZone);
+        } catch (\Exception $e) {
+            // If the offset has no Etc/GMT* timezone,
+            // we try to guess one timezone that has the same offset
+            foreach (\DateTimeZone::listIdentifiers() as $timeZone) {
+                $dtz = new \DateTimeZone($timeZone);
+                $dateTime = new \DateTime();
 
-				if ($timestamp !== false) {
-					$dateTime->setTimestamp($timestamp);
-				}
+                if ($timestamp !== false) {
+                    $dateTime->setTimestamp($timestamp);
+                }
 
-				$dtOffset = $dtz->getOffset($dateTime);
-				if ($dtOffset == 3600 * $offset) {
-					return $dtz;
-				}
-			}
+                $dtOffset = $dtz->getOffset($dateTime);
+                if ($dtOffset == 3600 * $offset) {
+                    return $dtz;
+                }
+            }
 
-			// No timezone found, fallback to UTC
-			\OC::$server->get(LoggerInterface::class)->debug('Failed to find DateTimeZone for offset "' . $offset . '"', ['app' => 'datetimezone']);
-			return new \DateTimeZone($this->getDefaultTimeZone());
-		}
-	}
+            // No timezone found, fallback to UTC
+            \OC::$server->get(LoggerInterface::class)->debug('Failed to find DateTimeZone for offset "' . $offset . '"', ['app' => 'datetimezone']);
+            return new \DateTimeZone($this->getDefaultTimeZone());
+        }
+    }
 
-	/**
-	 * Get the default timezone of the server
-	 *
-	 * Falls back to UTC if it is not yet set.
-	 *
-	 * @return string
-	 */
-	protected function getDefaultTimeZone() {
-		$serverTimeZone = date_default_timezone_get();
-		return $serverTimeZone ?: 'UTC';
-	}
+    /**
+     * Get the default timezone of the server
+     *
+     * Falls back to UTC if it is not yet set.
+     *
+     * @return string
+     */
+    protected function getDefaultTimeZone() {
+        $serverTimeZone = date_default_timezone_get();
+        return $serverTimeZone ?: 'UTC';
+    }
 }

lib/public/Lock/ILockingProvider.php

Indentation +38 added lines, -38 removed lines

@@ -36,47 +36,47 @@
  * @since 8.1.0
  */
 interface ILockingProvider {
-	/**
-	 * @since 8.1.0
-	 */
-	public const LOCK_SHARED = 1;
-	/**
-	 * @since 8.1.0
-	 */
-	public const LOCK_EXCLUSIVE = 2;
+    /**
+     * @since 8.1.0
+     */
+    public const LOCK_SHARED = 1;
+    /**
+     * @since 8.1.0
+     */
+    public const LOCK_EXCLUSIVE = 2;
 
-	/**
-	 * @psalm-param self::LOCK_SHARED|self::LOCK_EXCLUSIVE $type
-	 * @since 8.1.0
-	 */
-	public function isLocked(string $path, int $type): bool;
+    /**
+     * @psalm-param self::LOCK_SHARED|self::LOCK_EXCLUSIVE $type
+     * @since 8.1.0
+     */
+    public function isLocked(string $path, int $type): bool;
 
-	/**
-	 * @psalm-param self::LOCK_SHARED|self::LOCK_EXCLUSIVE $type
-	 * @param ?string $readablePath A human-readable path to use in error messages, since 20.0.0
-	 * @throws LockedException
-	 * @since 8.1.0
-	 */
-	public function acquireLock(string $path, int $type, ?string $readablePath = null): void;
+    /**
+     * @psalm-param self::LOCK_SHARED|self::LOCK_EXCLUSIVE $type
+     * @param ?string $readablePath A human-readable path to use in error messages, since 20.0.0
+     * @throws LockedException
+     * @since 8.1.0
+     */
+    public function acquireLock(string $path, int $type, ?string $readablePath = null): void;
 
-	/**
-	 * @psalm-param self::LOCK_SHARED|self::LOCK_EXCLUSIVE $type
-	 * @since 8.1.0
-	 */
-	public function releaseLock(string $path, int $type): void;
+    /**
+     * @psalm-param self::LOCK_SHARED|self::LOCK_EXCLUSIVE $type
+     * @since 8.1.0
+     */
+    public function releaseLock(string $path, int $type): void;
 
-	/**
-	 * Change the target type of an existing lock
-	 *
-	 * @psalm-param self::LOCK_SHARED|self::LOCK_EXCLUSIVE $targetType
-	 * @throws LockedException
-	 * @since 8.1.0
-	 */
-	public function changeLock(string $path, int $targetType): void;
+    /**
+     * Change the target type of an existing lock
+     *
+     * @psalm-param self::LOCK_SHARED|self::LOCK_EXCLUSIVE $targetType
+     * @throws LockedException
+     * @since 8.1.0
+     */
+    public function changeLock(string $path, int $targetType): void;
 
-	/**
-	 * Release all lock acquired by this instance
-	 * @since 8.1.0
-	 */
-	public function releaseAll(): void;
+    /**
+     * Release all lock acquired by this instance
+     * @since 8.1.0
+     */
+    public function releaseAll(): void;
 }

lib/private/Lock/DBLockingProvider.php

Spacing +2 added lines, -2 removed lines

@@ -113,7 +113,7 @@ 
 			->from('file_locks')
 			->where($query->expr()->eq('key', $query->createNamedParameter($path)));
 		$result = $query->executeQuery();
-		$lockValue = (int)$result->fetchOne();
+		$lockValue = (int) $result->fetchOne();
 		if ($type === self::LOCK_SHARED) {
 			if ($this->isLocallyLocked($path)) {
 				// if we have a shared lock we kept open locally but it's released we always have at least 1 shared lock in the db
@@ -247,7 +247,7 @@ 
 		}
 		// since we keep shared locks we need to manually clean those
 		$lockedPaths = array_keys($this->sharedLocks);
-		$lockedPaths = array_filter($lockedPaths, function ($path) {
+		$lockedPaths = array_filter($lockedPaths, function($path) {
 			return $this->sharedLocks[$path];
 		});
 

Indentation +219 added lines, -219 removed lines

@@ -18,223 +18,223 @@
  * Locking provider that stores the locks in the database
  */
 class DBLockingProvider extends AbstractLockingProvider {
-	private array $sharedLocks = [];
-
-	public function __construct(
-		private IDBConnection $connection,
-		private ITimeFactory $timeFactory,
-		int $ttl = 3600,
-		private bool $cacheSharedLocks = true,
-	) {
-		parent::__construct($ttl);
-	}
-
-	/**
-	 * Check if we have an open shared lock for a path
-	 */
-	protected function isLocallyLocked(string $path): bool {
-		return isset($this->sharedLocks[$path]) && $this->sharedLocks[$path];
-	}
-
-	/** @inheritDoc */
-	protected function markAcquire(string $path, int $targetType): void {
-		parent::markAcquire($path, $targetType);
-		if ($this->cacheSharedLocks) {
-			if ($targetType === self::LOCK_SHARED) {
-				$this->sharedLocks[$path] = true;
-			}
-		}
-	}
-
-	/**
-	 * Change the type of an existing tracked lock
-	 */
-	protected function markChange(string $path, int $targetType): void {
-		parent::markChange($path, $targetType);
-		if ($this->cacheSharedLocks) {
-			if ($targetType === self::LOCK_SHARED) {
-				$this->sharedLocks[$path] = true;
-			} elseif ($targetType === self::LOCK_EXCLUSIVE) {
-				$this->sharedLocks[$path] = false;
-			}
-		}
-	}
-
-	/**
-	 * Insert a file locking row if it does not exists.
-	 */
-	protected function initLockField(string $path, int $lock = 0): int {
-		$expire = $this->getExpireTime();
-		return $this->connection->insertIgnoreConflict('file_locks', [
-			'key' => $path,
-			'lock' => $lock,
-			'ttl' => $expire
-		]);
-	}
-
-	protected function getExpireTime(): int {
-		return $this->timeFactory->getTime() + $this->ttl;
-	}
-
-	/** @inheritDoc */
-	public function isLocked(string $path, int $type): bool {
-		if ($this->hasAcquiredLock($path, $type)) {
-			return true;
-		}
-		$query = $this->connection->getQueryBuilder();
-		$query->select('lock')
-			->from('file_locks')
-			->where($query->expr()->eq('key', $query->createNamedParameter($path)));
-		$result = $query->executeQuery();
-		$lockValue = (int)$result->fetchOne();
-		if ($type === self::LOCK_SHARED) {
-			if ($this->isLocallyLocked($path)) {
-				// if we have a shared lock we kept open locally but it's released we always have at least 1 shared lock in the db
-				return $lockValue > 1;
-			} else {
-				return $lockValue > 0;
-			}
-		} elseif ($type === self::LOCK_EXCLUSIVE) {
-			return $lockValue === -1;
-		} else {
-			return false;
-		}
-	}
-
-	/** @inheritDoc */
-	public function acquireLock(string $path, int $type, ?string $readablePath = null): void {
-		$expire = $this->getExpireTime();
-		if ($type === self::LOCK_SHARED) {
-			if (!$this->isLocallyLocked($path)) {
-				$result = $this->initLockField($path, 1);
-				if ($result <= 0) {
-					$query = $this->connection->getQueryBuilder();
-					$query->update('file_locks')
-						->set('lock', $query->func()->add('lock', $query->createNamedParameter(1, IQueryBuilder::PARAM_INT)))
-						->set('ttl', $query->createNamedParameter($expire))
-						->where($query->expr()->eq('key', $query->createNamedParameter($path)))
-						->andWhere($query->expr()->gte('lock', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
-					$result = $query->executeStatement();
-				}
-			} else {
-				$result = 1;
-			}
-		} else {
-			$existing = 0;
-			if ($this->hasAcquiredLock($path, ILockingProvider::LOCK_SHARED) === false && $this->isLocallyLocked($path)) {
-				$existing = 1;
-			}
-			$result = $this->initLockField($path, -1);
-			if ($result <= 0) {
-				$query = $this->connection->getQueryBuilder();
-				$query->update('file_locks')
-					->set('lock', $query->createNamedParameter(-1, IQueryBuilder::PARAM_INT))
-					->set('ttl', $query->createNamedParameter($expire, IQueryBuilder::PARAM_INT))
-					->where($query->expr()->eq('key', $query->createNamedParameter($path)))
-					->andWhere($query->expr()->eq('lock', $query->createNamedParameter($existing)));
-				$result = $query->executeStatement();
-			}
-		}
-		if ($result !== 1) {
-			throw new LockedException($path, null, null, $readablePath);
-		}
-		$this->markAcquire($path, $type);
-	}
-
-	/** @inheritDoc */
-	public function releaseLock(string $path, int $type): void {
-		$this->markRelease($path, $type);
-
-		// we keep shared locks till the end of the request so we can re-use them
-		if ($type === self::LOCK_EXCLUSIVE) {
-			$qb = $this->connection->getQueryBuilder();
-			$qb->update('file_locks')
-				->set('lock', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT))
-				->where($qb->expr()->eq('key', $qb->createNamedParameter($path)))
-				->andWhere($qb->expr()->eq('lock', $qb->createNamedParameter(-1, IQueryBuilder::PARAM_INT)));
-			$qb->executeStatement();
-		} elseif (!$this->cacheSharedLocks) {
-			$qb = $this->connection->getQueryBuilder();
-			$qb->update('file_locks')
-				->set('lock', $qb->func()->subtract('lock', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT)))
-				->where($qb->expr()->eq('key', $qb->createNamedParameter($path)))
-				->andWhere($qb->expr()->gt('lock', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
-			$qb->executeStatement();
-		}
-	}
-
-	/** @inheritDoc */
-	public function changeLock(string $path, int $targetType): void {
-		$expire = $this->getExpireTime();
-		if ($targetType === self::LOCK_SHARED) {
-			$qb = $this->connection->getQueryBuilder();
-			$result = $qb->update('file_locks')
-				->set('lock', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT))
-				->set('ttl', $qb->createNamedParameter($expire, IQueryBuilder::PARAM_INT))
-				->where($qb->expr()->andX(
-					$qb->expr()->eq('key', $qb->createNamedParameter($path)),
-					$qb->expr()->eq('lock', $qb->createNamedParameter(-1, IQueryBuilder::PARAM_INT))
-				))->executeStatement();
-		} else {
-			// since we only keep one shared lock in the db we need to check if we have more then one shared lock locally manually
-			if (isset($this->acquiredLocks['shared'][$path]) && $this->acquiredLocks['shared'][$path] > 1) {
-				throw new LockedException($path);
-			}
-			$qb = $this->connection->getQueryBuilder();
-			$result = $qb->update('file_locks')
-				->set('lock', $qb->createNamedParameter(-1, IQueryBuilder::PARAM_INT))
-				->set('ttl', $qb->createNamedParameter($expire, IQueryBuilder::PARAM_INT))
-				->where($qb->expr()->andX(
-					$qb->expr()->eq('key', $qb->createNamedParameter($path)),
-					$qb->expr()->eq('lock', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT))
-				))->executeStatement();
-		}
-		if ($result !== 1) {
-			throw new LockedException($path);
-		}
-		$this->markChange($path, $targetType);
-	}
-
-	/** @inheritDoc */
-	public function cleanExpiredLocks(): void {
-		$expire = $this->timeFactory->getTime();
-		try {
-			$qb = $this->connection->getQueryBuilder();
-			$qb->delete('file_locks')
-				->where($qb->expr()->lt('ttl', $qb->createNamedParameter($expire, IQueryBuilder::PARAM_INT)))
-				->executeStatement();
-		} catch (\Exception $e) {
-			// If the table is missing, the clean up was successful
-			if ($this->connection->tableExists('file_locks')) {
-				throw $e;
-			}
-		}
-	}
-
-	/** @inheritDoc */
-	public function releaseAll(): void {
-		parent::releaseAll();
-
-		if (!$this->cacheSharedLocks) {
-			return;
-		}
-		// since we keep shared locks we need to manually clean those
-		$lockedPaths = array_keys($this->sharedLocks);
-		$lockedPaths = array_filter($lockedPaths, function ($path) {
-			return $this->sharedLocks[$path];
-		});
-
-		$chunkedPaths = array_chunk($lockedPaths, 100);
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->update('file_locks')
-			->set('lock', $qb->func()->subtract('lock', $qb->expr()->literal(1)))
-			->where($qb->expr()->in('key', $qb->createParameter('chunk')))
-			->andWhere($qb->expr()->gt('lock', new Literal(0)));
-
-		foreach ($chunkedPaths as $chunk) {
-			$qb->setParameter('chunk', $chunk, IQueryBuilder::PARAM_STR_ARRAY);
-			$qb->executeStatement();
-		}
-	}
+    private array $sharedLocks = [];
+
+    public function __construct(
+        private IDBConnection $connection,
+        private ITimeFactory $timeFactory,
+        int $ttl = 3600,
+        private bool $cacheSharedLocks = true,
+    ) {
+        parent::__construct($ttl);
+    }
+
+    /**
+     * Check if we have an open shared lock for a path
+     */
+    protected function isLocallyLocked(string $path): bool {
+        return isset($this->sharedLocks[$path]) && $this->sharedLocks[$path];
+    }
+
+    /** @inheritDoc */
+    protected function markAcquire(string $path, int $targetType): void {
+        parent::markAcquire($path, $targetType);
+        if ($this->cacheSharedLocks) {
+            if ($targetType === self::LOCK_SHARED) {
+                $this->sharedLocks[$path] = true;
+            }
+        }
+    }
+
+    /**
+     * Change the type of an existing tracked lock
+     */
+    protected function markChange(string $path, int $targetType): void {
+        parent::markChange($path, $targetType);
+        if ($this->cacheSharedLocks) {
+            if ($targetType === self::LOCK_SHARED) {
+                $this->sharedLocks[$path] = true;
+            } elseif ($targetType === self::LOCK_EXCLUSIVE) {
+                $this->sharedLocks[$path] = false;
+            }
+        }
+    }
+
+    /**
+     * Insert a file locking row if it does not exists.
+     */
+    protected function initLockField(string $path, int $lock = 0): int {
+        $expire = $this->getExpireTime();
+        return $this->connection->insertIgnoreConflict('file_locks', [
+            'key' => $path,
+            'lock' => $lock,
+            'ttl' => $expire
+        ]);
+    }
+
+    protected function getExpireTime(): int {
+        return $this->timeFactory->getTime() + $this->ttl;
+    }
+
+    /** @inheritDoc */
+    public function isLocked(string $path, int $type): bool {
+        if ($this->hasAcquiredLock($path, $type)) {
+            return true;
+        }
+        $query = $this->connection->getQueryBuilder();
+        $query->select('lock')
+            ->from('file_locks')
+            ->where($query->expr()->eq('key', $query->createNamedParameter($path)));
+        $result = $query->executeQuery();
+        $lockValue = (int)$result->fetchOne();
+        if ($type === self::LOCK_SHARED) {
+            if ($this->isLocallyLocked($path)) {
+                // if we have a shared lock we kept open locally but it's released we always have at least 1 shared lock in the db
+                return $lockValue > 1;
+            } else {
+                return $lockValue > 0;
+            }
+        } elseif ($type === self::LOCK_EXCLUSIVE) {
+            return $lockValue === -1;
+        } else {
+            return false;
+        }
+    }
+
+    /** @inheritDoc */
+    public function acquireLock(string $path, int $type, ?string $readablePath = null): void {
+        $expire = $this->getExpireTime();
+        if ($type === self::LOCK_SHARED) {
+            if (!$this->isLocallyLocked($path)) {
+                $result = $this->initLockField($path, 1);
+                if ($result <= 0) {
+                    $query = $this->connection->getQueryBuilder();
+                    $query->update('file_locks')
+                        ->set('lock', $query->func()->add('lock', $query->createNamedParameter(1, IQueryBuilder::PARAM_INT)))
+                        ->set('ttl', $query->createNamedParameter($expire))
+                        ->where($query->expr()->eq('key', $query->createNamedParameter($path)))
+                        ->andWhere($query->expr()->gte('lock', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
+                    $result = $query->executeStatement();
+                }
+            } else {
+                $result = 1;
+            }
+        } else {
+            $existing = 0;
+            if ($this->hasAcquiredLock($path, ILockingProvider::LOCK_SHARED) === false && $this->isLocallyLocked($path)) {
+                $existing = 1;
+            }
+            $result = $this->initLockField($path, -1);
+            if ($result <= 0) {
+                $query = $this->connection->getQueryBuilder();
+                $query->update('file_locks')
+                    ->set('lock', $query->createNamedParameter(-1, IQueryBuilder::PARAM_INT))
+                    ->set('ttl', $query->createNamedParameter($expire, IQueryBuilder::PARAM_INT))
+                    ->where($query->expr()->eq('key', $query->createNamedParameter($path)))
+                    ->andWhere($query->expr()->eq('lock', $query->createNamedParameter($existing)));
+                $result = $query->executeStatement();
+            }
+        }
+        if ($result !== 1) {
+            throw new LockedException($path, null, null, $readablePath);
+        }
+        $this->markAcquire($path, $type);
+    }
+
+    /** @inheritDoc */
+    public function releaseLock(string $path, int $type): void {
+        $this->markRelease($path, $type);
+
+        // we keep shared locks till the end of the request so we can re-use them
+        if ($type === self::LOCK_EXCLUSIVE) {
+            $qb = $this->connection->getQueryBuilder();
+            $qb->update('file_locks')
+                ->set('lock', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT))
+                ->where($qb->expr()->eq('key', $qb->createNamedParameter($path)))
+                ->andWhere($qb->expr()->eq('lock', $qb->createNamedParameter(-1, IQueryBuilder::PARAM_INT)));
+            $qb->executeStatement();
+        } elseif (!$this->cacheSharedLocks) {
+            $qb = $this->connection->getQueryBuilder();
+            $qb->update('file_locks')
+                ->set('lock', $qb->func()->subtract('lock', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT)))
+                ->where($qb->expr()->eq('key', $qb->createNamedParameter($path)))
+                ->andWhere($qb->expr()->gt('lock', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
+            $qb->executeStatement();
+        }
+    }
+
+    /** @inheritDoc */
+    public function changeLock(string $path, int $targetType): void {
+        $expire = $this->getExpireTime();
+        if ($targetType === self::LOCK_SHARED) {
+            $qb = $this->connection->getQueryBuilder();
+            $result = $qb->update('file_locks')
+                ->set('lock', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT))
+                ->set('ttl', $qb->createNamedParameter($expire, IQueryBuilder::PARAM_INT))
+                ->where($qb->expr()->andX(
+                    $qb->expr()->eq('key', $qb->createNamedParameter($path)),
+                    $qb->expr()->eq('lock', $qb->createNamedParameter(-1, IQueryBuilder::PARAM_INT))
+                ))->executeStatement();
+        } else {
+            // since we only keep one shared lock in the db we need to check if we have more then one shared lock locally manually
+            if (isset($this->acquiredLocks['shared'][$path]) && $this->acquiredLocks['shared'][$path] > 1) {
+                throw new LockedException($path);
+            }
+            $qb = $this->connection->getQueryBuilder();
+            $result = $qb->update('file_locks')
+                ->set('lock', $qb->createNamedParameter(-1, IQueryBuilder::PARAM_INT))
+                ->set('ttl', $qb->createNamedParameter($expire, IQueryBuilder::PARAM_INT))
+                ->where($qb->expr()->andX(
+                    $qb->expr()->eq('key', $qb->createNamedParameter($path)),
+                    $qb->expr()->eq('lock', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT))
+                ))->executeStatement();
+        }
+        if ($result !== 1) {
+            throw new LockedException($path);
+        }
+        $this->markChange($path, $targetType);
+    }
+
+    /** @inheritDoc */
+    public function cleanExpiredLocks(): void {
+        $expire = $this->timeFactory->getTime();
+        try {
+            $qb = $this->connection->getQueryBuilder();
+            $qb->delete('file_locks')
+                ->where($qb->expr()->lt('ttl', $qb->createNamedParameter($expire, IQueryBuilder::PARAM_INT)))
+                ->executeStatement();
+        } catch (\Exception $e) {
+            // If the table is missing, the clean up was successful
+            if ($this->connection->tableExists('file_locks')) {
+                throw $e;
+            }
+        }
+    }
+
+    /** @inheritDoc */
+    public function releaseAll(): void {
+        parent::releaseAll();
+
+        if (!$this->cacheSharedLocks) {
+            return;
+        }
+        // since we keep shared locks we need to manually clean those
+        $lockedPaths = array_keys($this->sharedLocks);
+        $lockedPaths = array_filter($lockedPaths, function ($path) {
+            return $this->sharedLocks[$path];
+        });
+
+        $chunkedPaths = array_chunk($lockedPaths, 100);
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->update('file_locks')
+            ->set('lock', $qb->func()->subtract('lock', $qb->expr()->literal(1)))
+            ->where($qb->expr()->in('key', $qb->createParameter('chunk')))
+            ->andWhere($qb->expr()->gt('lock', new Literal(0)));
+
+        foreach ($chunkedPaths as $chunk) {
+            $qb->setParameter('chunk', $chunk, IQueryBuilder::PARAM_STR_ARRAY);
+            $qb->executeStatement();
+        }
+    }
 }

lib/private/Diagnostics/QueryLogger.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 	public function stopQuery() {
 		if ($this->activated && $this->activeQuery) {
 			$this->activeQuery->end(microtime(true));
-			$this->queries[(string)$this->index] = $this->activeQuery;
+			$this->queries[(string) $this->index] = $this->activeQuery;
 			$this->index++;
 			$this->activeQuery = null;
 		}

Indentation +52 added lines, -52 removed lines

@@ -11,64 +11,64 @@
 use OCP\Diagnostics\IQueryLogger;
 
 class QueryLogger implements IQueryLogger {
-	protected int $index = 0;
-	protected ?Query $activeQuery = null;
-	/** @var CappedMemoryCache<Query> */
-	protected CappedMemoryCache $queries;
+    protected int $index = 0;
+    protected ?Query $activeQuery = null;
+    /** @var CappedMemoryCache<Query> */
+    protected CappedMemoryCache $queries;
 
-	/**
-	 * QueryLogger constructor.
-	 */
-	public function __construct() {
-		$this->queries = new CappedMemoryCache(1024);
-	}
+    /**
+     * QueryLogger constructor.
+     */
+    public function __construct() {
+        $this->queries = new CappedMemoryCache(1024);
+    }
 
 
-	/**
-	 * @var bool - Module needs to be activated by some app
-	 */
-	private $activated = false;
+    /**
+     * @var bool - Module needs to be activated by some app
+     */
+    private $activated = false;
 
-	/**
-	 * @inheritdoc
-	 */
-	public function startQuery($sql, ?array $params = null, ?array $types = null) {
-		if ($this->activated) {
-			$this->activeQuery = new Query($sql, $params, microtime(true), $this->getStack());
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function startQuery($sql, ?array $params = null, ?array $types = null) {
+        if ($this->activated) {
+            $this->activeQuery = new Query($sql, $params, microtime(true), $this->getStack());
+        }
+    }
 
-	private function getStack() {
-		$stack = debug_backtrace();
-		array_shift($stack);
-		array_shift($stack);
-		array_shift($stack);
-		return $stack;
-	}
+    private function getStack() {
+        $stack = debug_backtrace();
+        array_shift($stack);
+        array_shift($stack);
+        array_shift($stack);
+        return $stack;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function stopQuery() {
-		if ($this->activated && $this->activeQuery) {
-			$this->activeQuery->end(microtime(true));
-			$this->queries[(string)$this->index] = $this->activeQuery;
-			$this->index++;
-			$this->activeQuery = null;
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function stopQuery() {
+        if ($this->activated && $this->activeQuery) {
+            $this->activeQuery->end(microtime(true));
+            $this->queries[(string)$this->index] = $this->activeQuery;
+            $this->index++;
+            $this->activeQuery = null;
+        }
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getQueries() {
-		return $this->queries->getData();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getQueries() {
+        return $this->queries->getData();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function activate() {
-		$this->activated = true;
-	}
+    /**
+     * @inheritdoc
+     */
+    public function activate() {
+        $this->activated = true;
+    }
 }

apps/federation/lib/DbHandler.php

Spacing +5 added lines, -5 removed lines

@@ -80,7 +80,7 @@ 
 			return $query->getLastInsertId();
 		}
 
-		$message = 'Internal failure, Could not add trusted server: ' . $url;
+		$message = 'Internal failure, Could not add trusted server: '.$url;
 		$message_t = $this->IL10N->t('Could not add server');
 		throw new HintException($message, $message_t);
 		return -1;
@@ -114,7 +114,7 @@ 
 		$qResult->closeCursor();
 
 		if (empty($result)) {
-			throw new \Exception('No Server found with ID: ' . $id);
+			throw new \Exception('No Server found with ID: '.$id);
 		}
 
 		return $result[0];
@@ -183,7 +183,7 @@ 
 		$statement->closeCursor();
 
 		if (!isset($result['token'])) {
-			throw new \Exception('No token found for: ' . $url);
+			throw new \Exception('No token found for: '.$url);
 		}
 
 		return $result['token'];
@@ -216,7 +216,7 @@ 
 		$statement = $query->executeQuery();
 		$result = $statement->fetch();
 		$statement->closeCursor();
-		return (string)$result['shared_secret'];
+		return (string) $result['shared_secret'];
 	}
 
 	/**
@@ -247,7 +247,7 @@ 
 		$statement = $query->executeQuery();
 		$result = $statement->fetch();
 		$statement->closeCursor();
-		return (int)$result['status'];
+		return (int) $result['status'];
 	}
 
 	/**

Indentation +240 added lines, -240 removed lines

@@ -25,244 +25,244 @@
  * @package OCA\Federation
  */
 class DbHandler {
-	private string $dbTable = 'trusted_servers';
-
-	public function __construct(
-		private IDBConnection $connection,
-		private IL10N $IL10N,
-	) {
-	}
-
-	/**
-	 * Add server to the list of trusted servers
-	 *
-	 * @throws HintException
-	 */
-	public function addServer(string $url): int {
-		$hash = $this->hash($url);
-		$url = rtrim($url, '/');
-		$query = $this->connection->getQueryBuilder();
-		$query->insert($this->dbTable)
-			->values([
-				'url' => $query->createParameter('url'),
-				'url_hash' => $query->createParameter('url_hash'),
-			])
-			->setParameter('url', $url)
-			->setParameter('url_hash', $hash);
-
-		$result = $query->executeStatement();
-
-		if ($result) {
-			return $query->getLastInsertId();
-		}
-
-		$message = 'Internal failure, Could not add trusted server: ' . $url;
-		$message_t = $this->IL10N->t('Could not add server');
-		throw new HintException($message, $message_t);
-		return -1;
-	}
-
-	/**
-	 * Remove server from the list of trusted servers
-	 */
-	public function removeServer(int $id): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete($this->dbTable)
-			->where($query->expr()->eq('id', $query->createParameter('id')))
-			->setParameter('id', $id);
-		$query->executeStatement();
-	}
-
-	/**
-	 * Get trusted server with given ID
-	 *
-	 * @return array{id: int, url: string, url_hash: string, token: ?string, shared_secret: ?string, status: int, sync_token: ?string}
-	 * @throws \Exception
-	 */
-	public function getServerById(int $id): array {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')->from($this->dbTable)
-			->where($query->expr()->eq('id', $query->createParameter('id')))
-			->setParameter('id', $id, IQueryBuilder::PARAM_INT);
-
-		$qResult = $query->executeQuery();
-		$result = $qResult->fetchAll();
-		$qResult->closeCursor();
-
-		if (empty($result)) {
-			throw new \Exception('No Server found with ID: ' . $id);
-		}
-
-		return $result[0];
-	}
-
-	/**
-	 * Get all trusted servers
-	 *
-	 * @return list<array{id: int, url: string, url_hash: string, shared_secret: ?string, status: int, sync_token: ?string}>
-	 * @throws DBException
-	 */
-	public function getAllServer(): array {
-		$query = $this->connection->getQueryBuilder();
-		$query->select(['url', 'url_hash', 'id', 'status', 'shared_secret', 'sync_token'])
-			->from($this->dbTable);
-		$statement = $query->executeQuery();
-		$result = $statement->fetchAll();
-		$statement->closeCursor();
-		return $result;
-	}
-
-	/**
-	 * Check if server already exists in the database table
-	 */
-	public function serverExists(string $url): bool {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->select('url')
-			->from($this->dbTable)
-			->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-			->setParameter('url_hash', $hash);
-		$statement = $query->executeQuery();
-		$result = $statement->fetchAll();
-		$statement->closeCursor();
-
-		return !empty($result);
-	}
-
-	/**
-	 * Write token to database. Token is used to exchange the secret
-	 */
-	public function addToken(string $url, string $token): void {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->update($this->dbTable)
-			->set('token', $query->createParameter('token'))
-			->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-			->setParameter('url_hash', $hash)
-			->setParameter('token', $token);
-		$query->executeStatement();
-	}
-
-	/**
-	 * Get token stored in database
-	 * @throws \Exception
-	 */
-	public function getToken(string $url): string {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->select('token')->from($this->dbTable)
-			->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-			->setParameter('url_hash', $hash);
-
-		$statement = $query->executeQuery();
-		$result = $statement->fetch();
-		$statement->closeCursor();
-
-		if (!isset($result['token'])) {
-			throw new \Exception('No token found for: ' . $url);
-		}
-
-		return $result['token'];
-	}
-
-	/**
-	 * Add shared Secret to database
-	 */
-	public function addSharedSecret(string $url, string $sharedSecret): void {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->update($this->dbTable)
-			->set('shared_secret', $query->createParameter('sharedSecret'))
-			->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-			->setParameter('url_hash', $hash)
-			->setParameter('sharedSecret', $sharedSecret);
-		$query->executeStatement();
-	}
-
-	/**
-	 * Get shared secret from database
-	 */
-	public function getSharedSecret(string $url): string {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->select('shared_secret')->from($this->dbTable)
-			->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-			->setParameter('url_hash', $hash);
-
-		$statement = $query->executeQuery();
-		$result = $statement->fetch();
-		$statement->closeCursor();
-		return (string)$result['shared_secret'];
-	}
-
-	/**
-	 * Set server status
-	 */
-	public function setServerStatus(string $url, int $status, ?string $token = null): void {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->update($this->dbTable)
-			->set('status', $query->createNamedParameter($status))
-			->where($query->expr()->eq('url_hash', $query->createNamedParameter($hash)));
-		if (!is_null($token)) {
-			$query->set('sync_token', $query->createNamedParameter($token));
-		}
-		$query->executeStatement();
-	}
-
-	/**
-	 * Get server status
-	 */
-	public function getServerStatus(string $url): int {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->select('status')->from($this->dbTable)
-			->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-			->setParameter('url_hash', $hash);
-
-		$statement = $query->executeQuery();
-		$result = $statement->fetch();
-		$statement->closeCursor();
-		return (int)$result['status'];
-	}
-
-	/**
-	 * Create hash from URL
-	 */
-	protected function hash(string $url): string {
-		$normalized = $this->normalizeUrl($url);
-		return sha1($normalized);
-	}
-
-	/**
-	 * Normalize URL, used to create the sha1 hash
-	 */
-	protected function normalizeUrl(string $url): string {
-		$normalized = $url;
-
-		if (strpos($url, 'https://') === 0) {
-			$normalized = substr($url, strlen('https://'));
-		} elseif (strpos($url, 'http://') === 0) {
-			$normalized = substr($url, strlen('http://'));
-		}
-
-		$normalized = Filesystem::normalizePath($normalized);
-		$normalized = trim($normalized, '/');
-
-		return $normalized;
-	}
-
-	public function auth(string $username, string $password): bool {
-		if ($username !== 'system') {
-			return false;
-		}
-		$query = $this->connection->getQueryBuilder();
-		$query->select('url')->from($this->dbTable)
-			->where($query->expr()->eq('shared_secret', $query->createNamedParameter($password)));
-
-		$statement = $query->executeQuery();
-		$result = $statement->fetch();
-		$statement->closeCursor();
-		return !empty($result);
-	}
+    private string $dbTable = 'trusted_servers';
+
+    public function __construct(
+        private IDBConnection $connection,
+        private IL10N $IL10N,
+    ) {
+    }
+
+    /**
+     * Add server to the list of trusted servers
+     *
+     * @throws HintException
+     */
+    public function addServer(string $url): int {
+        $hash = $this->hash($url);
+        $url = rtrim($url, '/');
+        $query = $this->connection->getQueryBuilder();
+        $query->insert($this->dbTable)
+            ->values([
+                'url' => $query->createParameter('url'),
+                'url_hash' => $query->createParameter('url_hash'),
+            ])
+            ->setParameter('url', $url)
+            ->setParameter('url_hash', $hash);
+
+        $result = $query->executeStatement();
+
+        if ($result) {
+            return $query->getLastInsertId();
+        }
+
+        $message = 'Internal failure, Could not add trusted server: ' . $url;
+        $message_t = $this->IL10N->t('Could not add server');
+        throw new HintException($message, $message_t);
+        return -1;
+    }
+
+    /**
+     * Remove server from the list of trusted servers
+     */
+    public function removeServer(int $id): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete($this->dbTable)
+            ->where($query->expr()->eq('id', $query->createParameter('id')))
+            ->setParameter('id', $id);
+        $query->executeStatement();
+    }
+
+    /**
+     * Get trusted server with given ID
+     *
+     * @return array{id: int, url: string, url_hash: string, token: ?string, shared_secret: ?string, status: int, sync_token: ?string}
+     * @throws \Exception
+     */
+    public function getServerById(int $id): array {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')->from($this->dbTable)
+            ->where($query->expr()->eq('id', $query->createParameter('id')))
+            ->setParameter('id', $id, IQueryBuilder::PARAM_INT);
+
+        $qResult = $query->executeQuery();
+        $result = $qResult->fetchAll();
+        $qResult->closeCursor();
+
+        if (empty($result)) {
+            throw new \Exception('No Server found with ID: ' . $id);
+        }
+
+        return $result[0];
+    }
+
+    /**
+     * Get all trusted servers
+     *
+     * @return list<array{id: int, url: string, url_hash: string, shared_secret: ?string, status: int, sync_token: ?string}>
+     * @throws DBException
+     */
+    public function getAllServer(): array {
+        $query = $this->connection->getQueryBuilder();
+        $query->select(['url', 'url_hash', 'id', 'status', 'shared_secret', 'sync_token'])
+            ->from($this->dbTable);
+        $statement = $query->executeQuery();
+        $result = $statement->fetchAll();
+        $statement->closeCursor();
+        return $result;
+    }
+
+    /**
+     * Check if server already exists in the database table
+     */
+    public function serverExists(string $url): bool {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('url')
+            ->from($this->dbTable)
+            ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+            ->setParameter('url_hash', $hash);
+        $statement = $query->executeQuery();
+        $result = $statement->fetchAll();
+        $statement->closeCursor();
+
+        return !empty($result);
+    }
+
+    /**
+     * Write token to database. Token is used to exchange the secret
+     */
+    public function addToken(string $url, string $token): void {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->update($this->dbTable)
+            ->set('token', $query->createParameter('token'))
+            ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+            ->setParameter('url_hash', $hash)
+            ->setParameter('token', $token);
+        $query->executeStatement();
+    }
+
+    /**
+     * Get token stored in database
+     * @throws \Exception
+     */
+    public function getToken(string $url): string {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('token')->from($this->dbTable)
+            ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+            ->setParameter('url_hash', $hash);
+
+        $statement = $query->executeQuery();
+        $result = $statement->fetch();
+        $statement->closeCursor();
+
+        if (!isset($result['token'])) {
+            throw new \Exception('No token found for: ' . $url);
+        }
+
+        return $result['token'];
+    }
+
+    /**
+     * Add shared Secret to database
+     */
+    public function addSharedSecret(string $url, string $sharedSecret): void {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->update($this->dbTable)
+            ->set('shared_secret', $query->createParameter('sharedSecret'))
+            ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+            ->setParameter('url_hash', $hash)
+            ->setParameter('sharedSecret', $sharedSecret);
+        $query->executeStatement();
+    }
+
+    /**
+     * Get shared secret from database
+     */
+    public function getSharedSecret(string $url): string {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('shared_secret')->from($this->dbTable)
+            ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+            ->setParameter('url_hash', $hash);
+
+        $statement = $query->executeQuery();
+        $result = $statement->fetch();
+        $statement->closeCursor();
+        return (string)$result['shared_secret'];
+    }
+
+    /**
+     * Set server status
+     */
+    public function setServerStatus(string $url, int $status, ?string $token = null): void {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->update($this->dbTable)
+            ->set('status', $query->createNamedParameter($status))
+            ->where($query->expr()->eq('url_hash', $query->createNamedParameter($hash)));
+        if (!is_null($token)) {
+            $query->set('sync_token', $query->createNamedParameter($token));
+        }
+        $query->executeStatement();
+    }
+
+    /**
+     * Get server status
+     */
+    public function getServerStatus(string $url): int {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('status')->from($this->dbTable)
+            ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+            ->setParameter('url_hash', $hash);
+
+        $statement = $query->executeQuery();
+        $result = $statement->fetch();
+        $statement->closeCursor();
+        return (int)$result['status'];
+    }
+
+    /**
+     * Create hash from URL
+     */
+    protected function hash(string $url): string {
+        $normalized = $this->normalizeUrl($url);
+        return sha1($normalized);
+    }
+
+    /**
+     * Normalize URL, used to create the sha1 hash
+     */
+    protected function normalizeUrl(string $url): string {
+        $normalized = $url;
+
+        if (strpos($url, 'https://') === 0) {
+            $normalized = substr($url, strlen('https://'));
+        } elseif (strpos($url, 'http://') === 0) {
+            $normalized = substr($url, strlen('http://'));
+        }
+
+        $normalized = Filesystem::normalizePath($normalized);
+        $normalized = trim($normalized, '/');
+
+        return $normalized;
+    }
+
+    public function auth(string $username, string $password): bool {
+        if ($username !== 'system') {
+            return false;
+        }
+        $query = $this->connection->getQueryBuilder();
+        $query->select('url')->from($this->dbTable)
+            ->where($query->expr()->eq('shared_secret', $query->createNamedParameter($password)));
+
+        $statement = $query->executeQuery();
+        $result = $statement->fetch();
+        $statement->closeCursor();
+        return !empty($result);
+    }
 }