nextcloud / server

apps/files_versions/lib/Db/VersionsMapper.php

Indentation +84 added lines, -84 removed lines

@@ -17,88 +17,88 @@
  * @extends QBMapper<VersionEntity>
  */
 class VersionsMapper extends QBMapper {
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'files_versions', VersionEntity::class);
-	}
-
-	/**
-	 * @return VersionEntity[]
-	 */
-	public function findAllVersionsForFileId(int $fileId): array {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('file_id', $qb->createNamedParameter($fileId)));
-
-		return $this->findEntities($qb);
-	}
-
-	/**
-	 * @return VersionEntity
-	 */
-	public function findCurrentVersionForFileId(int $fileId): VersionEntity {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('file_id', $qb->createNamedParameter($fileId)))
-			->orderBy('timestamp', 'DESC')
-			->setMaxResults(1);
-
-		return $this->findEntity($qb);
-	}
-
-	public function findVersionForFileId(int $fileId, int $timestamp): VersionEntity {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('file_id', $qb->createNamedParameter($fileId)))
-			->andWhere($qb->expr()->eq('timestamp', $qb->createNamedParameter($timestamp)));
-
-		return $this->findEntity($qb);
-	}
-
-	public function deleteAllVersionsForFileId(int $fileId): int {
-		$qb = $this->db->getQueryBuilder();
-
-		return $qb->delete($this->getTableName())
-			->where($qb->expr()->eq('file_id', $qb->createNamedParameter($fileId)))
-			->executeStatement();
-	}
-
-	public function deleteAllVersionsForUser(int $storageId, ?string $path = null): void {
-		$fileIdsGenerator = $this->getFileIdsGenerator($storageId, $path);
-
-		$versionEntitiesDeleteQuery = $this->db->getQueryBuilder();
-		$versionEntitiesDeleteQuery->delete($this->getTableName())
-			->where($versionEntitiesDeleteQuery->expr()->in('file_id', $versionEntitiesDeleteQuery->createParameter('file_ids')));
-
-		foreach ($fileIdsGenerator as $fileIds) {
-			$versionEntitiesDeleteQuery->setParameter('file_ids', $fileIds, IQueryBuilder::PARAM_INT_ARRAY);
-			$versionEntitiesDeleteQuery->executeStatement();
-		}
-	}
-
-	private function getFileIdsGenerator(int $storageId, ?string $path): \Generator {
-		$offset = 0;
-		do {
-			$filesIdsSelect = $this->db->getQueryBuilder();
-			$filesIdsSelect->select('fileid')
-				->from('filecache')
-				->where($filesIdsSelect->expr()->eq('storage', $filesIdsSelect->createNamedParameter($storageId, IQueryBuilder::PARAM_STR)))
-				->andWhere($filesIdsSelect->expr()->like('path', $filesIdsSelect->createNamedParameter('files' . ($path ? '/' . $this->db->escapeLikeParameter($path) : '') . '/%', IQueryBuilder::PARAM_STR)))
-				->andWhere($filesIdsSelect->expr()->gt('fileid', $filesIdsSelect->createParameter('offset')))
-				->setMaxResults(1000)
-				->orderBy('fileid', 'ASC');
-
-			$filesIdsSelect->setParameter('offset', $offset, IQueryBuilder::PARAM_INT);
-			$result = $filesIdsSelect->executeQuery();
-			$fileIds = $result->fetchFirstColumn();
-			$offset = end($fileIds);
-
-			yield $fileIds;
-		} while (!empty($fileIds));
-	}
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'files_versions', VersionEntity::class);
+    }
+
+    /**
+     * @return VersionEntity[]
+     */
+    public function findAllVersionsForFileId(int $fileId): array {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('file_id', $qb->createNamedParameter($fileId)));
+
+        return $this->findEntities($qb);
+    }
+
+    /**
+     * @return VersionEntity
+     */
+    public function findCurrentVersionForFileId(int $fileId): VersionEntity {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('file_id', $qb->createNamedParameter($fileId)))
+            ->orderBy('timestamp', 'DESC')
+            ->setMaxResults(1);
+
+        return $this->findEntity($qb);
+    }
+
+    public function findVersionForFileId(int $fileId, int $timestamp): VersionEntity {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('file_id', $qb->createNamedParameter($fileId)))
+            ->andWhere($qb->expr()->eq('timestamp', $qb->createNamedParameter($timestamp)));
+
+        return $this->findEntity($qb);
+    }
+
+    public function deleteAllVersionsForFileId(int $fileId): int {
+        $qb = $this->db->getQueryBuilder();
+
+        return $qb->delete($this->getTableName())
+            ->where($qb->expr()->eq('file_id', $qb->createNamedParameter($fileId)))
+            ->executeStatement();
+    }
+
+    public function deleteAllVersionsForUser(int $storageId, ?string $path = null): void {
+        $fileIdsGenerator = $this->getFileIdsGenerator($storageId, $path);
+
+        $versionEntitiesDeleteQuery = $this->db->getQueryBuilder();
+        $versionEntitiesDeleteQuery->delete($this->getTableName())
+            ->where($versionEntitiesDeleteQuery->expr()->in('file_id', $versionEntitiesDeleteQuery->createParameter('file_ids')));
+
+        foreach ($fileIdsGenerator as $fileIds) {
+            $versionEntitiesDeleteQuery->setParameter('file_ids', $fileIds, IQueryBuilder::PARAM_INT_ARRAY);
+            $versionEntitiesDeleteQuery->executeStatement();
+        }
+    }
+
+    private function getFileIdsGenerator(int $storageId, ?string $path): \Generator {
+        $offset = 0;
+        do {
+            $filesIdsSelect = $this->db->getQueryBuilder();
+            $filesIdsSelect->select('fileid')
+                ->from('filecache')
+                ->where($filesIdsSelect->expr()->eq('storage', $filesIdsSelect->createNamedParameter($storageId, IQueryBuilder::PARAM_STR)))
+                ->andWhere($filesIdsSelect->expr()->like('path', $filesIdsSelect->createNamedParameter('files' . ($path ? '/' . $this->db->escapeLikeParameter($path) : '') . '/%', IQueryBuilder::PARAM_STR)))
+                ->andWhere($filesIdsSelect->expr()->gt('fileid', $filesIdsSelect->createParameter('offset')))
+                ->setMaxResults(1000)
+                ->orderBy('fileid', 'ASC');
+
+            $filesIdsSelect->setParameter('offset', $offset, IQueryBuilder::PARAM_INT);
+            $result = $filesIdsSelect->executeQuery();
+            $fileIds = $result->fetchFirstColumn();
+            $offset = end($fileIds);
+
+            yield $fileIds;
+        } while (!empty($fileIds));
+    }
 }

apps/oauth2/lib/Migration/Version011601Date20230522143227.php

Indentation +39 added lines, -39 removed lines

@@ -18,48 +18,48 @@
 
 class Version011601Date20230522143227 extends SimpleMigrationStep {
 
-	public function __construct(
-		private IDBConnection $connection,
-		private ICrypto $crypto,
-	) {
-	}
+    public function __construct(
+        private IDBConnection $connection,
+        private ICrypto $crypto,
+    ) {
+    }
 
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if ($schema->hasTable('oauth2_clients')) {
-			$table = $schema->getTable('oauth2_clients');
-			if ($table->hasColumn('secret')) {
-				$column = $table->getColumn('secret');
-				$column->setLength(512);
-				return $schema;
-			}
-		}
+        if ($schema->hasTable('oauth2_clients')) {
+            $table = $schema->getTable('oauth2_clients');
+            if ($table->hasColumn('secret')) {
+                $column = $table->getColumn('secret');
+                $column->setLength(512);
+                return $schema;
+            }
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
-		$qbUpdate = $this->connection->getQueryBuilder();
-		$qbUpdate->update('oauth2_clients')
-			->set('secret', $qbUpdate->createParameter('updateSecret'))
-			->where(
-				$qbUpdate->expr()->eq('id', $qbUpdate->createParameter('updateId'))
-			);
+    public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
+        $qbUpdate = $this->connection->getQueryBuilder();
+        $qbUpdate->update('oauth2_clients')
+            ->set('secret', $qbUpdate->createParameter('updateSecret'))
+            ->where(
+                $qbUpdate->expr()->eq('id', $qbUpdate->createParameter('updateId'))
+            );
 
-		$qbSelect = $this->connection->getQueryBuilder();
-		$qbSelect->select('id', 'secret')
-			->from('oauth2_clients');
-		$req = $qbSelect->executeQuery();
-		while ($row = $req->fetchAssociative()) {
-			$id = $row['id'];
-			$secret = $row['secret'];
-			$encryptedSecret = $this->crypto->encrypt($secret);
-			$qbUpdate->setParameter('updateSecret', $encryptedSecret, IQueryBuilder::PARAM_STR);
-			$qbUpdate->setParameter('updateId', $id, IQueryBuilder::PARAM_INT);
-			$qbUpdate->executeStatement();
-		}
-		$req->closeCursor();
-	}
+        $qbSelect = $this->connection->getQueryBuilder();
+        $qbSelect->select('id', 'secret')
+            ->from('oauth2_clients');
+        $req = $qbSelect->executeQuery();
+        while ($row = $req->fetchAssociative()) {
+            $id = $row['id'];
+            $secret = $row['secret'];
+            $encryptedSecret = $this->crypto->encrypt($secret);
+            $qbUpdate->setParameter('updateSecret', $encryptedSecret, IQueryBuilder::PARAM_STR);
+            $qbUpdate->setParameter('updateId', $id, IQueryBuilder::PARAM_INT);
+            $qbUpdate->executeStatement();
+        }
+        $req->closeCursor();
+    }
 }

apps/oauth2/lib/Migration/SetTokenExpiration.php

Indentation +30 added lines, -30 removed lines

@@ -18,34 +18,34 @@
 
 class SetTokenExpiration implements IRepairStep {
 
-	public function __construct(
-		private IDBConnection $connection,
-		private ITimeFactory $time,
-		private TokenProvider $tokenProvider,
-	) {
-	}
-
-	public function getName(): string {
-		return 'Update OAuth token expiration times';
-	}
-
-	public function run(IOutput $output) {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('*')
-			->from('oauth2_access_tokens');
-
-		$cursor = $qb->executeQuery();
-
-		while ($row = $cursor->fetchAssociative()) {
-			$token = AccessToken::fromRow($row);
-			try {
-				$appToken = $this->tokenProvider->getTokenById($token->getTokenId());
-				$appToken->setExpires($this->time->getTime() + 3600);
-				$this->tokenProvider->updateToken($appToken);
-			} catch (InvalidTokenException $e) {
-				//Skip this token
-			}
-		}
-		$cursor->closeCursor();
-	}
+    public function __construct(
+        private IDBConnection $connection,
+        private ITimeFactory $time,
+        private TokenProvider $tokenProvider,
+    ) {
+    }
+
+    public function getName(): string {
+        return 'Update OAuth token expiration times';
+    }
+
+    public function run(IOutput $output) {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('*')
+            ->from('oauth2_access_tokens');
+
+        $cursor = $qb->executeQuery();
+
+        while ($row = $cursor->fetchAssociative()) {
+            $token = AccessToken::fromRow($row);
+            try {
+                $appToken = $this->tokenProvider->getTokenById($token->getTokenId());
+                $appToken->setExpires($this->time->getTime() + 3600);
+                $this->tokenProvider->updateToken($appToken);
+            } catch (InvalidTokenException $e) {
+                //Skip this token
+            }
+        }
+        $cursor->closeCursor();
+    }
 }

apps/oauth2/lib/Migration/Version011901Date20240829164356.php

Indentation +27 added lines, -27 removed lines

@@ -17,33 +17,33 @@
 
 class Version011901Date20240829164356 extends SimpleMigrationStep {
 
-	public function __construct(
-		private IDBConnection $connection,
-		private ICrypto $crypto,
-	) {
-	}
+    public function __construct(
+        private IDBConnection $connection,
+        private ICrypto $crypto,
+    ) {
+    }
 
-	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
-		$qbUpdate = $this->connection->getQueryBuilder();
-		$qbUpdate->update('oauth2_clients')
-			->set('secret', $qbUpdate->createParameter('updateSecret'))
-			->where(
-				$qbUpdate->expr()->eq('id', $qbUpdate->createParameter('updateId'))
-			);
+    public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+        $qbUpdate = $this->connection->getQueryBuilder();
+        $qbUpdate->update('oauth2_clients')
+            ->set('secret', $qbUpdate->createParameter('updateSecret'))
+            ->where(
+                $qbUpdate->expr()->eq('id', $qbUpdate->createParameter('updateId'))
+            );
 
-		$qbSelect = $this->connection->getQueryBuilder();
-		$qbSelect->select('id', 'secret')
-			->from('oauth2_clients');
-		$req = $qbSelect->executeQuery();
-		while ($row = $req->fetchAssociative()) {
-			$id = $row['id'];
-			$storedEncryptedSecret = $row['secret'];
-			$secret = $this->crypto->decrypt($storedEncryptedSecret);
-			$hashedSecret = bin2hex($this->crypto->calculateHMAC($secret));
-			$qbUpdate->setParameter('updateSecret', $hashedSecret, IQueryBuilder::PARAM_STR);
-			$qbUpdate->setParameter('updateId', $id, IQueryBuilder::PARAM_INT);
-			$qbUpdate->executeStatement();
-		}
-		$req->closeCursor();
-	}
+        $qbSelect = $this->connection->getQueryBuilder();
+        $qbSelect->select('id', 'secret')
+            ->from('oauth2_clients');
+        $req = $qbSelect->executeQuery();
+        while ($row = $req->fetchAssociative()) {
+            $id = $row['id'];
+            $storedEncryptedSecret = $row['secret'];
+            $secret = $this->crypto->decrypt($storedEncryptedSecret);
+            $hashedSecret = bin2hex($this->crypto->calculateHMAC($secret));
+            $qbUpdate->setParameter('updateSecret', $hashedSecret, IQueryBuilder::PARAM_STR);
+            $qbUpdate->setParameter('updateId', $id, IQueryBuilder::PARAM_INT);
+            $qbUpdate->executeStatement();
+        }
+        $req->closeCursor();
+    }
 }

apps/files_external/lib/Service/DBConfigService.php

Indentation +504 added lines, -504 removed lines

@@ -17,508 +17,508 @@
  * Stores the mount config in the database
  */
 class DBConfigService {
-	public const MOUNT_TYPE_ADMIN = 1;
-	public const MOUNT_TYPE_PERSONAL = 2;
-	/** @deprecated use MOUNT_TYPE_PERSONAL (full uppercase) instead */
-	public const MOUNT_TYPE_PERSONAl = 2;
-
-	public const APPLICABLE_TYPE_GLOBAL = 1;
-	public const APPLICABLE_TYPE_GROUP = 2;
-	public const APPLICABLE_TYPE_USER = 3;
-
-	public function __construct(
-		private IDBConnection $connection,
-		private ICrypto $crypto,
-	) {
-	}
-
-	public function getMountById(int $mountId): ?array {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select(['mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'type'])
-			->from('external_mounts', 'm')
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-		$mounts = $this->getMountsFromQuery($query);
-		if (count($mounts) > 0) {
-			return $mounts[0];
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Get all configured mounts
-	 *
-	 * @return array
-	 */
-	public function getAllMounts() {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select(['mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'type'])
-			->from('external_mounts');
-		return $this->getMountsFromQuery($query);
-	}
-
-	public function getMountsForUser($userId, $groupIds) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select(['m.mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'm.type'])
-			->from('external_mounts', 'm')
-			->innerJoin('m', 'external_applicable', 'a', $builder->expr()->eq('m.mount_id', 'a.mount_id'))
-			->where($builder->expr()->orX(
-				$builder->expr()->andX( // global mounts
-					$builder->expr()->eq('a.type', $builder->createNamedParameter(self::APPLICABLE_TYPE_GLOBAL, IQueryBuilder::PARAM_INT)),
-					$builder->expr()->isNull('a.value'),
-				),
-				$builder->expr()->andX( // mounts for user
-					$builder->expr()->eq('a.type', $builder->createNamedParameter(self::APPLICABLE_TYPE_USER, IQueryBuilder::PARAM_INT)),
-					$builder->expr()->eq('a.value', $builder->createNamedParameter($userId)),
-				),
-				$builder->expr()->andX( // mounts for group
-					$builder->expr()->eq('a.type', $builder->createNamedParameter(self::APPLICABLE_TYPE_GROUP, IQueryBuilder::PARAM_INT)),
-					$builder->expr()->in('a.value', $builder->createNamedParameter($groupIds, IQueryBuilder::PARAM_STR_ARRAY)),
-				),
-			));
-
-		return $this->getMountsFromQuery($query);
-	}
-
-	public function modifyMountsOnUserDelete(string $uid): void {
-		$this->modifyMountsOnDelete($uid, self::APPLICABLE_TYPE_USER);
-	}
-
-	public function modifyMountsOnGroupDelete(string $gid): void {
-		$this->modifyMountsOnDelete($gid, self::APPLICABLE_TYPE_GROUP);
-	}
-
-	protected function modifyMountsOnDelete(string $applicableId, int $applicableType): void {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select(['a.mount_id', $builder->func()->count('a.mount_id', 'count')])
-			->from('external_applicable', 'a')
-			->leftJoin('a', 'external_applicable', 'b', $builder->expr()->eq('a.mount_id', 'b.mount_id'))
-			->where($builder->expr()->andX(
-				$builder->expr()->eq('b.type', $builder->createNamedParameter($applicableType, IQueryBuilder::PARAM_INT)),
-				$builder->expr()->eq('b.value', $builder->createNamedParameter($applicableId)),
-			),
-			)
-			->groupBy(['a.mount_id']);
-		$stmt = $query->executeQuery();
-		$result = $stmt->fetchAllAssociative();
-		$stmt->closeCursor();
-
-		foreach ($result as $row) {
-			if ((int)$row['count'] > 1) {
-				$this->removeApplicable($row['mount_id'], $applicableType, $applicableId);
-			} else {
-				$this->removeMount($row['mount_id']);
-			}
-		}
-	}
-
-	/**
-	 * Get admin defined mounts
-	 *
-	 * @return array
-	 */
-	public function getAdminMounts() {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select(['mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'type'])
-			->from('external_mounts')
-			->where($builder->expr()->eq('type', $builder->expr()->literal(self::MOUNT_TYPE_ADMIN, IQueryBuilder::PARAM_INT)));
-		return $this->getMountsFromQuery($query);
-	}
-
-	protected function getForQuery(IQueryBuilder $builder, $type, $value) {
-		$query = $builder->select(['m.mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'm.type'])
-			->from('external_mounts', 'm')
-			->innerJoin('m', 'external_applicable', 'a', $builder->expr()->eq('m.mount_id', 'a.mount_id'))
-			->where($builder->expr()->eq('a.type', $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)));
-
-		if (is_null($value)) {
-			$query = $query->andWhere($builder->expr()->isNull('a.value'));
-		} else {
-			$query = $query->andWhere($builder->expr()->eq('a.value', $builder->createNamedParameter($value)));
-		}
-
-		return $query;
-	}
-
-	/**
-	 * Get mounts by applicable
-	 *
-	 * @param int $type any of the self::APPLICABLE_TYPE_ constants
-	 * @param string|null $value user_id, group_id or null for global mounts
-	 * @return array
-	 */
-	public function getMountsFor($type, $value) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $this->getForQuery($builder, $type, $value);
-
-		return $this->getMountsFromQuery($query);
-	}
-
-	/**
-	 * Get admin defined mounts by applicable
-	 *
-	 * @param int $type any of the self::APPLICABLE_TYPE_ constants
-	 * @param string|null $value user_id, group_id or null for global mounts
-	 * @return array
-	 */
-	public function getAdminMountsFor($type, $value) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $this->getForQuery($builder, $type, $value);
-		$query->andWhere($builder->expr()->eq('m.type', $builder->expr()->literal(self::MOUNT_TYPE_ADMIN, IQueryBuilder::PARAM_INT)));
-
-		return $this->getMountsFromQuery($query);
-	}
-
-	/**
-	 * Get admin defined mounts for multiple applicable
-	 *
-	 * @param int $type any of the self::APPLICABLE_TYPE_ constants
-	 * @param string[] $values user_ids or group_ids
-	 * @return array
-	 */
-	public function getAdminMountsForMultiple($type, array $values) {
-		$builder = $this->connection->getQueryBuilder();
-		$params = array_map(function ($value) use ($builder) {
-			return $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR);
-		}, $values);
-
-		$query = $builder->select(['m.mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'm.type'])
-			->from('external_mounts', 'm')
-			->innerJoin('m', 'external_applicable', 'a', $builder->expr()->eq('m.mount_id', 'a.mount_id'))
-			->where($builder->expr()->eq('a.type', $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)))
-			->andWhere($builder->expr()->in('a.value', $params));
-		$query->andWhere($builder->expr()->eq('m.type', $builder->expr()->literal(self::MOUNT_TYPE_ADMIN, IQueryBuilder::PARAM_INT)));
-
-		return $this->getMountsFromQuery($query);
-	}
-
-	/**
-	 * Get user defined mounts by applicable
-	 *
-	 * @param int $type any of the self::APPLICABLE_TYPE_ constants
-	 * @param string|null $value user_id, group_id or null for global mounts
-	 * @return array
-	 */
-	public function getUserMountsFor($type, $value) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $this->getForQuery($builder, $type, $value);
-		$query->andWhere($builder->expr()->eq('m.type', $builder->expr()->literal(self::MOUNT_TYPE_PERSONAL, IQueryBuilder::PARAM_INT)));
-
-		return $this->getMountsFromQuery($query);
-	}
-
-	/**
-	 * Add a mount to the database
-	 *
-	 * @param string $mountPoint
-	 * @param string $storageBackend
-	 * @param string $authBackend
-	 * @param int $priority
-	 * @param int $type self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAL
-	 * @return int the id of the new mount
-	 */
-	public function addMount($mountPoint, $storageBackend, $authBackend, $priority, $type) {
-		if (!$priority) {
-			$priority = 100;
-		}
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->insert('external_mounts')
-			->values([
-				'mount_point' => $builder->createNamedParameter($mountPoint, IQueryBuilder::PARAM_STR),
-				'storage_backend' => $builder->createNamedParameter($storageBackend, IQueryBuilder::PARAM_STR),
-				'auth_backend' => $builder->createNamedParameter($authBackend, IQueryBuilder::PARAM_STR),
-				'priority' => $builder->createNamedParameter($priority, IQueryBuilder::PARAM_INT),
-				'type' => $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT),
-			]);
-		$query->executeStatement();
-		return $query->getLastInsertId();
-	}
-
-	/**
-	 * Remove a mount from the database
-	 *
-	 * @param int $mountId
-	 */
-	public function removeMount($mountId) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->delete('external_mounts')
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->delete('external_applicable')
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->delete('external_config')
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->delete('external_options')
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-	}
-
-	/**
-	 * @param int $mountId
-	 * @param string $newMountPoint
-	 */
-	public function setMountPoint($mountId, $newMountPoint) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->update('external_mounts')
-			->set('mount_point', $builder->createNamedParameter($newMountPoint))
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-
-		$query->executeStatement();
-	}
-
-	/**
-	 * @param int $mountId
-	 * @param string $newAuthBackend
-	 */
-	public function setAuthBackend($mountId, $newAuthBackend) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->update('external_mounts')
-			->set('auth_backend', $builder->createNamedParameter($newAuthBackend))
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-
-		$query->executeStatement();
-	}
-
-	/**
-	 * @param int $mountId
-	 * @param string $key
-	 * @param string $value
-	 */
-	public function setConfig($mountId, $key, $value) {
-		if ($key === 'password') {
-			$value = $this->encryptValue($value);
-		}
-
-		try {
-			$builder = $this->connection->getQueryBuilder();
-			$builder->insert('external_config')
-				->setValue('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT))
-				->setValue('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR))
-				->setValue('value', $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR))
-				->executeStatement();
-		} catch (Exception $e) {
-			if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-				throw $e;
-			}
-			$builder = $this->connection->getQueryBuilder();
-			$query = $builder->update('external_config')
-				->set('value', $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR))
-				->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
-				->andWhere($builder->expr()->eq('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR)));
-			$query->executeStatement();
-		}
-	}
-
-	/**
-	 * @param int $mountId
-	 * @param string $key
-	 * @param string $value
-	 */
-	public function setOption($mountId, $key, $value) {
-		try {
-			$builder = $this->connection->getQueryBuilder();
-			$builder->insert('external_options')
-				->setValue('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT))
-				->setValue('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR))
-				->setValue('value', $builder->createNamedParameter(json_encode($value), IQueryBuilder::PARAM_STR))
-				->executeStatement();
-		} catch (Exception $e) {
-			if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-				throw $e;
-			}
-			$builder = $this->connection->getQueryBuilder();
-			$query = $builder->update('external_options')
-				->set('value', $builder->createNamedParameter(json_encode($value), IQueryBuilder::PARAM_STR))
-				->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
-				->andWhere($builder->expr()->eq('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR)));
-			$query->executeStatement();
-		}
-	}
-
-	public function addApplicable($mountId, $type, $value) {
-		try {
-			$builder = $this->connection->getQueryBuilder();
-			$builder->insert('external_applicable')
-				->setValue('mount_id', $builder->createNamedParameter($mountId))
-				->setValue('type', $builder->createNamedParameter($type))
-				->setValue('value', $builder->createNamedParameter($value))
-				->executeStatement();
-		} catch (Exception $e) {
-			// applicable exists already
-			if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-				throw $e;
-			}
-		}
-	}
-
-	public function removeApplicable($mountId, $type, $value) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->delete('external_applicable')
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
-			->andWhere($builder->expr()->eq('type', $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)));
-
-		if (is_null($value)) {
-			$query = $query->andWhere($builder->expr()->isNull('value'));
-		} else {
-			$query = $query->andWhere($builder->expr()->eq('value', $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR)));
-		}
-
-		$query->executeStatement();
-	}
-
-	private function getMountsFromQuery(IQueryBuilder $query) {
-		$result = $query->executeQuery();
-		$mounts = $result->fetchAllAssociative();
-		$uniqueMounts = [];
-		foreach ($mounts as $mount) {
-			$id = $mount['mount_id'];
-			if (!isset($uniqueMounts[$id])) {
-				$uniqueMounts[$id] = $mount;
-			}
-		}
-		$uniqueMounts = array_values($uniqueMounts);
-
-		$mountIds = array_map(function ($mount) {
-			return $mount['mount_id'];
-		}, $uniqueMounts);
-		$mountIds = array_values(array_unique($mountIds));
-
-		$applicable = $this->getApplicableForMounts($mountIds);
-		$config = $this->getConfigForMounts($mountIds);
-		$options = $this->getOptionsForMounts($mountIds);
-
-		return array_map(function ($mount, $applicable, $config, $options) {
-			$mount['type'] = (int)$mount['type'];
-			$mount['priority'] = (int)$mount['priority'];
-			$mount['applicable'] = $applicable;
-			$mount['config'] = $config;
-			$mount['options'] = $options;
-			return $mount;
-		}, $uniqueMounts, $applicable, $config, $options);
-	}
-
-	/**
-	 * Get mount options from a table grouped by mount id
-	 *
-	 * @param string $table
-	 * @param string[] $fields
-	 * @param int[] $mountIds
-	 * @return array [$mountId => [['field1' => $value1, ...], ...], ...]
-	 */
-	private function selectForMounts($table, array $fields, array $mountIds) {
-		if (count($mountIds) === 0) {
-			return [];
-		}
-		$builder = $this->connection->getQueryBuilder();
-		$fields[] = 'mount_id';
-		$placeHolders = array_map(function ($id) use ($builder) {
-			return $builder->createPositionalParameter($id, IQueryBuilder::PARAM_INT);
-		}, $mountIds);
-		$query = $builder->select($fields)
-			->from($table)
-			->where($builder->expr()->in('mount_id', $placeHolders));
-
-		$result = $query->executeQuery();
-		$rows = $result->fetchAllAssociative();
-		$result->closeCursor();
-
-		$result = [];
-		foreach ($mountIds as $mountId) {
-			$result[$mountId] = [];
-		}
-		foreach ($rows as $row) {
-			if (isset($row['type'])) {
-				$row['type'] = (int)$row['type'];
-			}
-			$result[$row['mount_id']][] = $row;
-		}
-		return $result;
-	}
-
-	/**
-	 * @param int[] $mountIds
-	 * @return array [$id => [['type' => $type, 'value' => $value], ...], ...]
-	 */
-	public function getApplicableForMounts($mountIds) {
-		return $this->selectForMounts('external_applicable', ['type', 'value'], $mountIds);
-	}
-
-	/**
-	 * @param int[] $mountIds
-	 * @return array [$id => ['key1' => $value1, ...], ...]
-	 */
-	public function getConfigForMounts($mountIds) {
-		$mountConfigs = $this->selectForMounts('external_config', ['key', 'value'], $mountIds);
-		return array_map([$this, 'createKeyValueMap'], $mountConfigs);
-	}
-
-	/**
-	 * @param int[] $mountIds
-	 * @return array [$id => ['key1' => $value1, ...], ...]
-	 */
-	public function getOptionsForMounts($mountIds) {
-		$mountOptions = $this->selectForMounts('external_options', ['key', 'value'], $mountIds);
-		$optionsMap = array_map([$this, 'createKeyValueMap'], $mountOptions);
-		return array_map(function (array $options) {
-			return array_map(function ($option) {
-				return json_decode($option);
-			}, $options);
-		}, $optionsMap);
-	}
-
-	/**
-	 * @param array $keyValuePairs [['key'=>$key, 'value=>$value], ...]
-	 * @return array ['key1' => $value1, ...]
-	 */
-	private function createKeyValueMap(array $keyValuePairs) {
-		$decryptedPairts = array_map(function ($pair) {
-			if ($pair['key'] === 'password') {
-				$pair['value'] = $this->decryptValue($pair['value']);
-			}
-			return $pair;
-		}, $keyValuePairs);
-		$keys = array_map(function ($pair) {
-			return $pair['key'];
-		}, $decryptedPairts);
-		$values = array_map(function ($pair) {
-			return $pair['value'];
-		}, $decryptedPairts);
-
-		return array_combine($keys, $values);
-	}
-
-	private function encryptValue($value) {
-		return $this->crypto->encrypt($value);
-	}
-
-	private function decryptValue($value) {
-		try {
-			return $this->crypto->decrypt($value);
-		} catch (\Exception $e) {
-			return $value;
-		}
-	}
-
-	/**
-	 * Check if any mountpoint is configured that overwrite the home folder
-	 */
-	public function hasHomeFolderOverwriteMount(): bool {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select('mount_id')
-			->from('external_mounts')
-			->where($builder->expr()->eq('mount_point', $builder->createNamedParameter('/')))
-			->setMaxResults(1);
-		$result = $query->executeQuery();
-		return count($result->fetchAllAssociative()) > 0;
-	}
+    public const MOUNT_TYPE_ADMIN = 1;
+    public const MOUNT_TYPE_PERSONAL = 2;
+    /** @deprecated use MOUNT_TYPE_PERSONAL (full uppercase) instead */
+    public const MOUNT_TYPE_PERSONAl = 2;
+
+    public const APPLICABLE_TYPE_GLOBAL = 1;
+    public const APPLICABLE_TYPE_GROUP = 2;
+    public const APPLICABLE_TYPE_USER = 3;
+
+    public function __construct(
+        private IDBConnection $connection,
+        private ICrypto $crypto,
+    ) {
+    }
+
+    public function getMountById(int $mountId): ?array {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select(['mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'type'])
+            ->from('external_mounts', 'm')
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+        $mounts = $this->getMountsFromQuery($query);
+        if (count($mounts) > 0) {
+            return $mounts[0];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Get all configured mounts
+     *
+     * @return array
+     */
+    public function getAllMounts() {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select(['mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'type'])
+            ->from('external_mounts');
+        return $this->getMountsFromQuery($query);
+    }
+
+    public function getMountsForUser($userId, $groupIds) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select(['m.mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'm.type'])
+            ->from('external_mounts', 'm')
+            ->innerJoin('m', 'external_applicable', 'a', $builder->expr()->eq('m.mount_id', 'a.mount_id'))
+            ->where($builder->expr()->orX(
+                $builder->expr()->andX( // global mounts
+                    $builder->expr()->eq('a.type', $builder->createNamedParameter(self::APPLICABLE_TYPE_GLOBAL, IQueryBuilder::PARAM_INT)),
+                    $builder->expr()->isNull('a.value'),
+                ),
+                $builder->expr()->andX( // mounts for user
+                    $builder->expr()->eq('a.type', $builder->createNamedParameter(self::APPLICABLE_TYPE_USER, IQueryBuilder::PARAM_INT)),
+                    $builder->expr()->eq('a.value', $builder->createNamedParameter($userId)),
+                ),
+                $builder->expr()->andX( // mounts for group
+                    $builder->expr()->eq('a.type', $builder->createNamedParameter(self::APPLICABLE_TYPE_GROUP, IQueryBuilder::PARAM_INT)),
+                    $builder->expr()->in('a.value', $builder->createNamedParameter($groupIds, IQueryBuilder::PARAM_STR_ARRAY)),
+                ),
+            ));
+
+        return $this->getMountsFromQuery($query);
+    }
+
+    public function modifyMountsOnUserDelete(string $uid): void {
+        $this->modifyMountsOnDelete($uid, self::APPLICABLE_TYPE_USER);
+    }
+
+    public function modifyMountsOnGroupDelete(string $gid): void {
+        $this->modifyMountsOnDelete($gid, self::APPLICABLE_TYPE_GROUP);
+    }
+
+    protected function modifyMountsOnDelete(string $applicableId, int $applicableType): void {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select(['a.mount_id', $builder->func()->count('a.mount_id', 'count')])
+            ->from('external_applicable', 'a')
+            ->leftJoin('a', 'external_applicable', 'b', $builder->expr()->eq('a.mount_id', 'b.mount_id'))
+            ->where($builder->expr()->andX(
+                $builder->expr()->eq('b.type', $builder->createNamedParameter($applicableType, IQueryBuilder::PARAM_INT)),
+                $builder->expr()->eq('b.value', $builder->createNamedParameter($applicableId)),
+            ),
+            )
+            ->groupBy(['a.mount_id']);
+        $stmt = $query->executeQuery();
+        $result = $stmt->fetchAllAssociative();
+        $stmt->closeCursor();
+
+        foreach ($result as $row) {
+            if ((int)$row['count'] > 1) {
+                $this->removeApplicable($row['mount_id'], $applicableType, $applicableId);
+            } else {
+                $this->removeMount($row['mount_id']);
+            }
+        }
+    }
+
+    /**
+     * Get admin defined mounts
+     *
+     * @return array
+     */
+    public function getAdminMounts() {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select(['mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'type'])
+            ->from('external_mounts')
+            ->where($builder->expr()->eq('type', $builder->expr()->literal(self::MOUNT_TYPE_ADMIN, IQueryBuilder::PARAM_INT)));
+        return $this->getMountsFromQuery($query);
+    }
+
+    protected function getForQuery(IQueryBuilder $builder, $type, $value) {
+        $query = $builder->select(['m.mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'm.type'])
+            ->from('external_mounts', 'm')
+            ->innerJoin('m', 'external_applicable', 'a', $builder->expr()->eq('m.mount_id', 'a.mount_id'))
+            ->where($builder->expr()->eq('a.type', $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)));
+
+        if (is_null($value)) {
+            $query = $query->andWhere($builder->expr()->isNull('a.value'));
+        } else {
+            $query = $query->andWhere($builder->expr()->eq('a.value', $builder->createNamedParameter($value)));
+        }
+
+        return $query;
+    }
+
+    /**
+     * Get mounts by applicable
+     *
+     * @param int $type any of the self::APPLICABLE_TYPE_ constants
+     * @param string|null $value user_id, group_id or null for global mounts
+     * @return array
+     */
+    public function getMountsFor($type, $value) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $this->getForQuery($builder, $type, $value);
+
+        return $this->getMountsFromQuery($query);
+    }
+
+    /**
+     * Get admin defined mounts by applicable
+     *
+     * @param int $type any of the self::APPLICABLE_TYPE_ constants
+     * @param string|null $value user_id, group_id or null for global mounts
+     * @return array
+     */
+    public function getAdminMountsFor($type, $value) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $this->getForQuery($builder, $type, $value);
+        $query->andWhere($builder->expr()->eq('m.type', $builder->expr()->literal(self::MOUNT_TYPE_ADMIN, IQueryBuilder::PARAM_INT)));
+
+        return $this->getMountsFromQuery($query);
+    }
+
+    /**
+     * Get admin defined mounts for multiple applicable
+     *
+     * @param int $type any of the self::APPLICABLE_TYPE_ constants
+     * @param string[] $values user_ids or group_ids
+     * @return array
+     */
+    public function getAdminMountsForMultiple($type, array $values) {
+        $builder = $this->connection->getQueryBuilder();
+        $params = array_map(function ($value) use ($builder) {
+            return $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR);
+        }, $values);
+
+        $query = $builder->select(['m.mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'm.type'])
+            ->from('external_mounts', 'm')
+            ->innerJoin('m', 'external_applicable', 'a', $builder->expr()->eq('m.mount_id', 'a.mount_id'))
+            ->where($builder->expr()->eq('a.type', $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)))
+            ->andWhere($builder->expr()->in('a.value', $params));
+        $query->andWhere($builder->expr()->eq('m.type', $builder->expr()->literal(self::MOUNT_TYPE_ADMIN, IQueryBuilder::PARAM_INT)));
+
+        return $this->getMountsFromQuery($query);
+    }
+
+    /**
+     * Get user defined mounts by applicable
+     *
+     * @param int $type any of the self::APPLICABLE_TYPE_ constants
+     * @param string|null $value user_id, group_id or null for global mounts
+     * @return array
+     */
+    public function getUserMountsFor($type, $value) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $this->getForQuery($builder, $type, $value);
+        $query->andWhere($builder->expr()->eq('m.type', $builder->expr()->literal(self::MOUNT_TYPE_PERSONAL, IQueryBuilder::PARAM_INT)));
+
+        return $this->getMountsFromQuery($query);
+    }
+
+    /**
+     * Add a mount to the database
+     *
+     * @param string $mountPoint
+     * @param string $storageBackend
+     * @param string $authBackend
+     * @param int $priority
+     * @param int $type self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAL
+     * @return int the id of the new mount
+     */
+    public function addMount($mountPoint, $storageBackend, $authBackend, $priority, $type) {
+        if (!$priority) {
+            $priority = 100;
+        }
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->insert('external_mounts')
+            ->values([
+                'mount_point' => $builder->createNamedParameter($mountPoint, IQueryBuilder::PARAM_STR),
+                'storage_backend' => $builder->createNamedParameter($storageBackend, IQueryBuilder::PARAM_STR),
+                'auth_backend' => $builder->createNamedParameter($authBackend, IQueryBuilder::PARAM_STR),
+                'priority' => $builder->createNamedParameter($priority, IQueryBuilder::PARAM_INT),
+                'type' => $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT),
+            ]);
+        $query->executeStatement();
+        return $query->getLastInsertId();
+    }
+
+    /**
+     * Remove a mount from the database
+     *
+     * @param int $mountId
+     */
+    public function removeMount($mountId) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->delete('external_mounts')
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->delete('external_applicable')
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->delete('external_config')
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->delete('external_options')
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+    }
+
+    /**
+     * @param int $mountId
+     * @param string $newMountPoint
+     */
+    public function setMountPoint($mountId, $newMountPoint) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->update('external_mounts')
+            ->set('mount_point', $builder->createNamedParameter($newMountPoint))
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+
+        $query->executeStatement();
+    }
+
+    /**
+     * @param int $mountId
+     * @param string $newAuthBackend
+     */
+    public function setAuthBackend($mountId, $newAuthBackend) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->update('external_mounts')
+            ->set('auth_backend', $builder->createNamedParameter($newAuthBackend))
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+
+        $query->executeStatement();
+    }
+
+    /**
+     * @param int $mountId
+     * @param string $key
+     * @param string $value
+     */
+    public function setConfig($mountId, $key, $value) {
+        if ($key === 'password') {
+            $value = $this->encryptValue($value);
+        }
+
+        try {
+            $builder = $this->connection->getQueryBuilder();
+            $builder->insert('external_config')
+                ->setValue('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT))
+                ->setValue('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR))
+                ->setValue('value', $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR))
+                ->executeStatement();
+        } catch (Exception $e) {
+            if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                throw $e;
+            }
+            $builder = $this->connection->getQueryBuilder();
+            $query = $builder->update('external_config')
+                ->set('value', $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR))
+                ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
+                ->andWhere($builder->expr()->eq('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR)));
+            $query->executeStatement();
+        }
+    }
+
+    /**
+     * @param int $mountId
+     * @param string $key
+     * @param string $value
+     */
+    public function setOption($mountId, $key, $value) {
+        try {
+            $builder = $this->connection->getQueryBuilder();
+            $builder->insert('external_options')
+                ->setValue('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT))
+                ->setValue('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR))
+                ->setValue('value', $builder->createNamedParameter(json_encode($value), IQueryBuilder::PARAM_STR))
+                ->executeStatement();
+        } catch (Exception $e) {
+            if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                throw $e;
+            }
+            $builder = $this->connection->getQueryBuilder();
+            $query = $builder->update('external_options')
+                ->set('value', $builder->createNamedParameter(json_encode($value), IQueryBuilder::PARAM_STR))
+                ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
+                ->andWhere($builder->expr()->eq('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR)));
+            $query->executeStatement();
+        }
+    }
+
+    public function addApplicable($mountId, $type, $value) {
+        try {
+            $builder = $this->connection->getQueryBuilder();
+            $builder->insert('external_applicable')
+                ->setValue('mount_id', $builder->createNamedParameter($mountId))
+                ->setValue('type', $builder->createNamedParameter($type))
+                ->setValue('value', $builder->createNamedParameter($value))
+                ->executeStatement();
+        } catch (Exception $e) {
+            // applicable exists already
+            if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                throw $e;
+            }
+        }
+    }
+
+    public function removeApplicable($mountId, $type, $value) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->delete('external_applicable')
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
+            ->andWhere($builder->expr()->eq('type', $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)));
+
+        if (is_null($value)) {
+            $query = $query->andWhere($builder->expr()->isNull('value'));
+        } else {
+            $query = $query->andWhere($builder->expr()->eq('value', $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR)));
+        }
+
+        $query->executeStatement();
+    }
+
+    private function getMountsFromQuery(IQueryBuilder $query) {
+        $result = $query->executeQuery();
+        $mounts = $result->fetchAllAssociative();
+        $uniqueMounts = [];
+        foreach ($mounts as $mount) {
+            $id = $mount['mount_id'];
+            if (!isset($uniqueMounts[$id])) {
+                $uniqueMounts[$id] = $mount;
+            }
+        }
+        $uniqueMounts = array_values($uniqueMounts);
+
+        $mountIds = array_map(function ($mount) {
+            return $mount['mount_id'];
+        }, $uniqueMounts);
+        $mountIds = array_values(array_unique($mountIds));
+
+        $applicable = $this->getApplicableForMounts($mountIds);
+        $config = $this->getConfigForMounts($mountIds);
+        $options = $this->getOptionsForMounts($mountIds);
+
+        return array_map(function ($mount, $applicable, $config, $options) {
+            $mount['type'] = (int)$mount['type'];
+            $mount['priority'] = (int)$mount['priority'];
+            $mount['applicable'] = $applicable;
+            $mount['config'] = $config;
+            $mount['options'] = $options;
+            return $mount;
+        }, $uniqueMounts, $applicable, $config, $options);
+    }
+
+    /**
+     * Get mount options from a table grouped by mount id
+     *
+     * @param string $table
+     * @param string[] $fields
+     * @param int[] $mountIds
+     * @return array [$mountId => [['field1' => $value1, ...], ...], ...]
+     */
+    private function selectForMounts($table, array $fields, array $mountIds) {
+        if (count($mountIds) === 0) {
+            return [];
+        }
+        $builder = $this->connection->getQueryBuilder();
+        $fields[] = 'mount_id';
+        $placeHolders = array_map(function ($id) use ($builder) {
+            return $builder->createPositionalParameter($id, IQueryBuilder::PARAM_INT);
+        }, $mountIds);
+        $query = $builder->select($fields)
+            ->from($table)
+            ->where($builder->expr()->in('mount_id', $placeHolders));
+
+        $result = $query->executeQuery();
+        $rows = $result->fetchAllAssociative();
+        $result->closeCursor();
+
+        $result = [];
+        foreach ($mountIds as $mountId) {
+            $result[$mountId] = [];
+        }
+        foreach ($rows as $row) {
+            if (isset($row['type'])) {
+                $row['type'] = (int)$row['type'];
+            }
+            $result[$row['mount_id']][] = $row;
+        }
+        return $result;
+    }
+
+    /**
+     * @param int[] $mountIds
+     * @return array [$id => [['type' => $type, 'value' => $value], ...], ...]
+     */
+    public function getApplicableForMounts($mountIds) {
+        return $this->selectForMounts('external_applicable', ['type', 'value'], $mountIds);
+    }
+
+    /**
+     * @param int[] $mountIds
+     * @return array [$id => ['key1' => $value1, ...], ...]
+     */
+    public function getConfigForMounts($mountIds) {
+        $mountConfigs = $this->selectForMounts('external_config', ['key', 'value'], $mountIds);
+        return array_map([$this, 'createKeyValueMap'], $mountConfigs);
+    }
+
+    /**
+     * @param int[] $mountIds
+     * @return array [$id => ['key1' => $value1, ...], ...]
+     */
+    public function getOptionsForMounts($mountIds) {
+        $mountOptions = $this->selectForMounts('external_options', ['key', 'value'], $mountIds);
+        $optionsMap = array_map([$this, 'createKeyValueMap'], $mountOptions);
+        return array_map(function (array $options) {
+            return array_map(function ($option) {
+                return json_decode($option);
+            }, $options);
+        }, $optionsMap);
+    }
+
+    /**
+     * @param array $keyValuePairs [['key'=>$key, 'value=>$value], ...]
+     * @return array ['key1' => $value1, ...]
+     */
+    private function createKeyValueMap(array $keyValuePairs) {
+        $decryptedPairts = array_map(function ($pair) {
+            if ($pair['key'] === 'password') {
+                $pair['value'] = $this->decryptValue($pair['value']);
+            }
+            return $pair;
+        }, $keyValuePairs);
+        $keys = array_map(function ($pair) {
+            return $pair['key'];
+        }, $decryptedPairts);
+        $values = array_map(function ($pair) {
+            return $pair['value'];
+        }, $decryptedPairts);
+
+        return array_combine($keys, $values);
+    }
+
+    private function encryptValue($value) {
+        return $this->crypto->encrypt($value);
+    }
+
+    private function decryptValue($value) {
+        try {
+            return $this->crypto->decrypt($value);
+        } catch (\Exception $e) {
+            return $value;
+        }
+    }
+
+    /**
+     * Check if any mountpoint is configured that overwrite the home folder
+     */
+    public function hasHomeFolderOverwriteMount(): bool {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select('mount_id')
+            ->from('external_mounts')
+            ->where($builder->expr()->eq('mount_point', $builder->createNamedParameter('/')))
+            ->setMaxResults(1);
+        $result = $query->executeQuery();
+        return count($result->fetchAllAssociative()) > 0;
+    }
 }

apps/files_external/lib/Command/Notify.php

Indentation +225 added lines, -225 removed lines

@@ -25,229 +25,229 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Notify extends StorageAuthBase {
-	public function __construct(
-		private IDBConnection $connection,
-		private LoggerInterface $logger,
-		GlobalStoragesService $globalService,
-		IUserManager $userManager,
-	) {
-		parent::__construct($globalService, $userManager);
-	}
-
-	protected function configure(): void {
-		$this
-			->setName('files_external:notify')
-			->setDescription('Listen for active update notifications for a configured external mount')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'the mount id of the mount to listen to'
-			)->addOption(
-				'user',
-				'u',
-				InputOption::VALUE_REQUIRED,
-				'The username for the remote mount (required only for some mount configuration that don\'t store credentials)'
-			)->addOption(
-				'password',
-				'p',
-				InputOption::VALUE_REQUIRED,
-				'The password for the remote mount (required only for some mount configuration that don\'t store credentials)'
-			)->addOption(
-				'path',
-				'',
-				InputOption::VALUE_REQUIRED,
-				'The directory in the storage to listen for updates in',
-				'/'
-			)->addOption(
-				'no-self-check',
-				'',
-				InputOption::VALUE_NONE,
-				'Disable self check on startup'
-			)->addOption(
-				'dry-run',
-				'',
-				InputOption::VALUE_NONE,
-				'Don\'t make any changes, only log detected changes'
-			);
-		parent::configure();
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		[$mount, $storage] = $this->createStorage($input, $output);
-		if ($storage === null) {
-			return self::FAILURE;
-		}
-
-		if (!$storage instanceof INotifyStorage) {
-			$output->writeln('<error>Mount of type "' . $mount->getBackend()->getText() . '" does not support active update notifications</error>');
-			return self::FAILURE;
-		}
-
-		$dryRun = $input->getOption('dry-run');
-		if ($dryRun && $output->getVerbosity() < OutputInterface::VERBOSITY_VERBOSE) {
-			$output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE);
-		}
-
-		$path = trim($input->getOption('path'), '/');
-		$notifyHandler = $storage->notify($path);
-
-		if (!$input->getOption('no-self-check')) {
-			$this->selfTest($storage, $notifyHandler, $output);
-		}
-
-		$notifyHandler->listen(function (IChange $change) use ($mount, $output, $dryRun): void {
-			$this->logUpdate($change, $output);
-			if ($change instanceof IRenameChange) {
-				$this->markParentAsOutdated($mount->getId(), $change->getTargetPath(), $output, $dryRun);
-			}
-			$this->markParentAsOutdated($mount->getId(), $change->getPath(), $output, $dryRun);
-		});
-		return self::SUCCESS;
-	}
-
-	private function markParentAsOutdated($mountId, $path, OutputInterface $output, bool $dryRun): void {
-		$parent = ltrim(dirname($path), '/');
-		if ($parent === '.') {
-			$parent = '';
-		}
-
-		try {
-			$storages = $this->getStorageIds($mountId, $parent);
-		} catch (DriverException $ex) {
-			$this->logger->warning('Error while trying to find correct storage ids.', ['exception' => $ex]);
-			$this->connection = $this->reconnectToDatabase($this->connection, $output);
-			$output->writeln('<info>Needed to reconnect to the database</info>');
-			$storages = $this->getStorageIds($mountId, $path);
-		}
-		if (count($storages) === 0) {
-			$output->writeln("  no users found with access to '$parent', skipping", OutputInterface::VERBOSITY_VERBOSE);
-			return;
-		}
-
-		$users = array_map(function (array $storage) {
-			return $storage['user_id'];
-		}, $storages);
-
-		$output->writeln("  marking '$parent' as outdated for " . implode(', ', $users), OutputInterface::VERBOSITY_VERBOSE);
-
-		$storageIds = array_map(function (array $storage) {
-			return intval($storage['storage_id']);
-		}, $storages);
-		$storageIds = array_values(array_unique($storageIds));
-
-		if ($dryRun) {
-			$output->writeln('  dry-run: skipping database write');
-		} else {
-			$result = $this->updateParent($storageIds, $parent);
-			if ($result === 0) {
-				//TODO: Find existing parent further up the tree in the database and register that folder instead.
-				$this->logger->info('Failed updating parent for "' . $path . '" while trying to register change. It may not exist in the filecache.');
-			}
-		}
-	}
-
-	private function logUpdate(IChange $change, OutputInterface $output): void {
-		$text = match ($change->getType()) {
-			INotifyStorage::NOTIFY_ADDED => 'added',
-			INotifyStorage::NOTIFY_MODIFIED => 'modified',
-			INotifyStorage::NOTIFY_REMOVED => 'removed',
-			INotifyStorage::NOTIFY_RENAMED => 'renamed',
-			default => '',
-		};
-
-		if ($text === '') {
-			return;
-		}
-
-		$text .= ' ' . $change->getPath();
-		if ($change instanceof IRenameChange) {
-			$text .= ' to ' . $change->getTargetPath();
-		}
-
-		$output->writeln($text, OutputInterface::VERBOSITY_VERBOSE);
-	}
-
-	private function getStorageIds(int $mountId, string $path): array {
-		$pathHash = md5(trim(\OC_Util::normalizeUnicode($path), '/'));
-		$qb = $this->connection->getQueryBuilder();
-		return $qb
-			->select('storage_id', 'user_id')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f', $qb->expr()->eq('m.storage_id', 'f.storage'))
-			->where($qb->expr()->eq('mount_id', $qb->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
-			->andWhere($qb->expr()->eq('path_hash', $qb->createNamedParameter($pathHash, IQueryBuilder::PARAM_STR)))
-			->executeQuery()
-			->fetchAllAssociative();
-	}
-
-	private function updateParent(array $storageIds, string $parent): int {
-		$pathHash = md5(trim(\OC_Util::normalizeUnicode($parent), '/'));
-		$qb = $this->connection->getQueryBuilder();
-		return $qb
-			->update('filecache')
-			->set('size', $qb->createNamedParameter(-1, IQueryBuilder::PARAM_INT))
-			->where($qb->expr()->in('storage', $qb->createNamedParameter($storageIds, IQueryBuilder::PARAM_INT_ARRAY, ':storage_ids')))
-			->andWhere($qb->expr()->eq('path_hash', $qb->createNamedParameter($pathHash, IQueryBuilder::PARAM_STR)))
-			->executeStatement();
-	}
-
-	private function reconnectToDatabase(IDBConnection $connection, OutputInterface $output): IDBConnection {
-		try {
-			$connection->close();
-		} catch (\Exception $ex) {
-			$this->logger->warning('Error while disconnecting from DB', ['exception' => $ex]);
-			$output->writeln("<info>Error while disconnecting from database: {$ex->getMessage()}</info>");
-		}
-		$connected = false;
-		while (!$connected) {
-			try {
-				$connected = $connection->connect();
-			} catch (\Exception $ex) {
-				$this->logger->warning('Error while re-connecting to database', ['exception' => $ex]);
-				$output->writeln("<info>Error while re-connecting to database: {$ex->getMessage()}</info>");
-				sleep(60);
-			}
-		}
-		return $connection;
-	}
-
-
-	private function selfTest(IStorage $storage, INotifyHandler $notifyHandler, OutputInterface $output): void {
-		usleep(100 * 1000); //give time for the notify to start
-		if (!$storage->file_put_contents('/.nc_test_file.txt', 'test content')) {
-			$output->writeln('Failed to create test file for self-test');
-			return;
-		}
-		$storage->mkdir('/.nc_test_folder');
-		$storage->file_put_contents('/.nc_test_folder/subfile.txt', 'test content');
-
-		usleep(100 * 1000); //time for all changes to be processed
-		$changes = $notifyHandler->getChanges();
-
-		$storage->unlink('/.nc_test_file.txt');
-		$storage->unlink('/.nc_test_folder/subfile.txt');
-		$storage->rmdir('/.nc_test_folder');
-
-		usleep(100 * 1000); //time for all changes to be processed
-		$notifyHandler->getChanges(); // flush
-
-		$foundRootChange = false;
-		$foundSubfolderChange = false;
-
-		foreach ($changes as $change) {
-			if ($change->getPath() === '/.nc_test_file.txt' || $change->getPath() === '.nc_test_file.txt') {
-				$foundRootChange = true;
-			} elseif ($change->getPath() === '/.nc_test_folder/subfile.txt' || $change->getPath() === '.nc_test_folder/subfile.txt') {
-				$foundSubfolderChange = true;
-			}
-		}
-
-		if ($foundRootChange && $foundSubfolderChange) {
-			$output->writeln('<info>Self-test successful</info>', OutputInterface::VERBOSITY_VERBOSE);
-		} elseif ($foundRootChange) {
-			$output->writeln('<error>Error while running self-test, change is subfolder not detected</error>');
-		} else {
-			$output->writeln('<error>Error while running self-test, no changes detected</error>');
-		}
-	}
+    public function __construct(
+        private IDBConnection $connection,
+        private LoggerInterface $logger,
+        GlobalStoragesService $globalService,
+        IUserManager $userManager,
+    ) {
+        parent::__construct($globalService, $userManager);
+    }
+
+    protected function configure(): void {
+        $this
+            ->setName('files_external:notify')
+            ->setDescription('Listen for active update notifications for a configured external mount')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'the mount id of the mount to listen to'
+            )->addOption(
+                'user',
+                'u',
+                InputOption::VALUE_REQUIRED,
+                'The username for the remote mount (required only for some mount configuration that don\'t store credentials)'
+            )->addOption(
+                'password',
+                'p',
+                InputOption::VALUE_REQUIRED,
+                'The password for the remote mount (required only for some mount configuration that don\'t store credentials)'
+            )->addOption(
+                'path',
+                '',
+                InputOption::VALUE_REQUIRED,
+                'The directory in the storage to listen for updates in',
+                '/'
+            )->addOption(
+                'no-self-check',
+                '',
+                InputOption::VALUE_NONE,
+                'Disable self check on startup'
+            )->addOption(
+                'dry-run',
+                '',
+                InputOption::VALUE_NONE,
+                'Don\'t make any changes, only log detected changes'
+            );
+        parent::configure();
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        [$mount, $storage] = $this->createStorage($input, $output);
+        if ($storage === null) {
+            return self::FAILURE;
+        }
+
+        if (!$storage instanceof INotifyStorage) {
+            $output->writeln('<error>Mount of type "' . $mount->getBackend()->getText() . '" does not support active update notifications</error>');
+            return self::FAILURE;
+        }
+
+        $dryRun = $input->getOption('dry-run');
+        if ($dryRun && $output->getVerbosity() < OutputInterface::VERBOSITY_VERBOSE) {
+            $output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE);
+        }
+
+        $path = trim($input->getOption('path'), '/');
+        $notifyHandler = $storage->notify($path);
+
+        if (!$input->getOption('no-self-check')) {
+            $this->selfTest($storage, $notifyHandler, $output);
+        }
+
+        $notifyHandler->listen(function (IChange $change) use ($mount, $output, $dryRun): void {
+            $this->logUpdate($change, $output);
+            if ($change instanceof IRenameChange) {
+                $this->markParentAsOutdated($mount->getId(), $change->getTargetPath(), $output, $dryRun);
+            }
+            $this->markParentAsOutdated($mount->getId(), $change->getPath(), $output, $dryRun);
+        });
+        return self::SUCCESS;
+    }
+
+    private function markParentAsOutdated($mountId, $path, OutputInterface $output, bool $dryRun): void {
+        $parent = ltrim(dirname($path), '/');
+        if ($parent === '.') {
+            $parent = '';
+        }
+
+        try {
+            $storages = $this->getStorageIds($mountId, $parent);
+        } catch (DriverException $ex) {
+            $this->logger->warning('Error while trying to find correct storage ids.', ['exception' => $ex]);
+            $this->connection = $this->reconnectToDatabase($this->connection, $output);
+            $output->writeln('<info>Needed to reconnect to the database</info>');
+            $storages = $this->getStorageIds($mountId, $path);
+        }
+        if (count($storages) === 0) {
+            $output->writeln("  no users found with access to '$parent', skipping", OutputInterface::VERBOSITY_VERBOSE);
+            return;
+        }
+
+        $users = array_map(function (array $storage) {
+            return $storage['user_id'];
+        }, $storages);
+
+        $output->writeln("  marking '$parent' as outdated for " . implode(', ', $users), OutputInterface::VERBOSITY_VERBOSE);
+
+        $storageIds = array_map(function (array $storage) {
+            return intval($storage['storage_id']);
+        }, $storages);
+        $storageIds = array_values(array_unique($storageIds));
+
+        if ($dryRun) {
+            $output->writeln('  dry-run: skipping database write');
+        } else {
+            $result = $this->updateParent($storageIds, $parent);
+            if ($result === 0) {
+                //TODO: Find existing parent further up the tree in the database and register that folder instead.
+                $this->logger->info('Failed updating parent for "' . $path . '" while trying to register change. It may not exist in the filecache.');
+            }
+        }
+    }
+
+    private function logUpdate(IChange $change, OutputInterface $output): void {
+        $text = match ($change->getType()) {
+            INotifyStorage::NOTIFY_ADDED => 'added',
+            INotifyStorage::NOTIFY_MODIFIED => 'modified',
+            INotifyStorage::NOTIFY_REMOVED => 'removed',
+            INotifyStorage::NOTIFY_RENAMED => 'renamed',
+            default => '',
+        };
+
+        if ($text === '') {
+            return;
+        }
+
+        $text .= ' ' . $change->getPath();
+        if ($change instanceof IRenameChange) {
+            $text .= ' to ' . $change->getTargetPath();
+        }
+
+        $output->writeln($text, OutputInterface::VERBOSITY_VERBOSE);
+    }
+
+    private function getStorageIds(int $mountId, string $path): array {
+        $pathHash = md5(trim(\OC_Util::normalizeUnicode($path), '/'));
+        $qb = $this->connection->getQueryBuilder();
+        return $qb
+            ->select('storage_id', 'user_id')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f', $qb->expr()->eq('m.storage_id', 'f.storage'))
+            ->where($qb->expr()->eq('mount_id', $qb->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
+            ->andWhere($qb->expr()->eq('path_hash', $qb->createNamedParameter($pathHash, IQueryBuilder::PARAM_STR)))
+            ->executeQuery()
+            ->fetchAllAssociative();
+    }
+
+    private function updateParent(array $storageIds, string $parent): int {
+        $pathHash = md5(trim(\OC_Util::normalizeUnicode($parent), '/'));
+        $qb = $this->connection->getQueryBuilder();
+        return $qb
+            ->update('filecache')
+            ->set('size', $qb->createNamedParameter(-1, IQueryBuilder::PARAM_INT))
+            ->where($qb->expr()->in('storage', $qb->createNamedParameter($storageIds, IQueryBuilder::PARAM_INT_ARRAY, ':storage_ids')))
+            ->andWhere($qb->expr()->eq('path_hash', $qb->createNamedParameter($pathHash, IQueryBuilder::PARAM_STR)))
+            ->executeStatement();
+    }
+
+    private function reconnectToDatabase(IDBConnection $connection, OutputInterface $output): IDBConnection {
+        try {
+            $connection->close();
+        } catch (\Exception $ex) {
+            $this->logger->warning('Error while disconnecting from DB', ['exception' => $ex]);
+            $output->writeln("<info>Error while disconnecting from database: {$ex->getMessage()}</info>");
+        }
+        $connected = false;
+        while (!$connected) {
+            try {
+                $connected = $connection->connect();
+            } catch (\Exception $ex) {
+                $this->logger->warning('Error while re-connecting to database', ['exception' => $ex]);
+                $output->writeln("<info>Error while re-connecting to database: {$ex->getMessage()}</info>");
+                sleep(60);
+            }
+        }
+        return $connection;
+    }
+
+
+    private function selfTest(IStorage $storage, INotifyHandler $notifyHandler, OutputInterface $output): void {
+        usleep(100 * 1000); //give time for the notify to start
+        if (!$storage->file_put_contents('/.nc_test_file.txt', 'test content')) {
+            $output->writeln('Failed to create test file for self-test');
+            return;
+        }
+        $storage->mkdir('/.nc_test_folder');
+        $storage->file_put_contents('/.nc_test_folder/subfile.txt', 'test content');
+
+        usleep(100 * 1000); //time for all changes to be processed
+        $changes = $notifyHandler->getChanges();
+
+        $storage->unlink('/.nc_test_file.txt');
+        $storage->unlink('/.nc_test_folder/subfile.txt');
+        $storage->rmdir('/.nc_test_folder');
+
+        usleep(100 * 1000); //time for all changes to be processed
+        $notifyHandler->getChanges(); // flush
+
+        $foundRootChange = false;
+        $foundSubfolderChange = false;
+
+        foreach ($changes as $change) {
+            if ($change->getPath() === '/.nc_test_file.txt' || $change->getPath() === '.nc_test_file.txt') {
+                $foundRootChange = true;
+            } elseif ($change->getPath() === '/.nc_test_folder/subfile.txt' || $change->getPath() === '.nc_test_folder/subfile.txt') {
+                $foundSubfolderChange = true;
+            }
+        }
+
+        if ($foundRootChange && $foundSubfolderChange) {
+            $output->writeln('<info>Self-test successful</info>', OutputInterface::VERBOSITY_VERBOSE);
+        } elseif ($foundRootChange) {
+            $output->writeln('<error>Error while running self-test, change is subfolder not detected</error>');
+        } else {
+            $output->writeln('<error>Error while running self-test, no changes detected</error>');
+        }
+    }
 }

apps/files_external/lib/Migration/Version1015Date20211104103506.php

Indentation +62 added lines, -62 removed lines

@@ -20,71 +20,71 @@
 
 class Version1015Date20211104103506 extends SimpleMigrationStep {
 
-	public function __construct(
-		private IDBConnection $connection,
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private IDBConnection $connection,
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->update('storages')
-			->set('id', $qb->createParameter('newId'))
-			->where($qb->expr()->eq('id', $qb->createParameter('oldId')));
+    public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->update('storages')
+            ->set('id', $qb->createParameter('newId'))
+            ->where($qb->expr()->eq('id', $qb->createParameter('oldId')));
 
-		$mounts = $this->getS3Mounts();
-		if (!$mounts instanceof IResult) {
-			throw new \Exception('Could not fetch existing mounts for migration');
-		}
+        $mounts = $this->getS3Mounts();
+        if (!$mounts instanceof IResult) {
+            throw new \Exception('Could not fetch existing mounts for migration');
+        }
 
-		while ($mount = $mounts->fetchAssociative()) {
-			$config = $this->getStorageConfig((int)$mount['mount_id']);
-			$hostname = $config['hostname'];
-			$bucket = $config['bucket'];
-			$key = $config['key'];
-			$oldId = Storage::adjustStorageId('amazon::' . $bucket);
-			$newId = Storage::adjustStorageId('amazon::external::' . md5($hostname . ':' . $bucket . ':' . $key));
-			try {
-				$qb->setParameter('oldId', $oldId);
-				$qb->setParameter('newId', $newId);
-				$qb->executeStatement();
-				$this->logger->info('Migrated s3 storage id for mount with id ' . $mount['mount_id'] . ' to ' . $newId);
-			} catch (Exception $e) {
-				$this->logger->error('Failed to migrate external s3 storage id for mount with id ' . $mount['mount_id'], [
-					'exception' => $e
-				]);
-			}
-		}
-		return null;
-	}
+        while ($mount = $mounts->fetchAssociative()) {
+            $config = $this->getStorageConfig((int)$mount['mount_id']);
+            $hostname = $config['hostname'];
+            $bucket = $config['bucket'];
+            $key = $config['key'];
+            $oldId = Storage::adjustStorageId('amazon::' . $bucket);
+            $newId = Storage::adjustStorageId('amazon::external::' . md5($hostname . ':' . $bucket . ':' . $key));
+            try {
+                $qb->setParameter('oldId', $oldId);
+                $qb->setParameter('newId', $newId);
+                $qb->executeStatement();
+                $this->logger->info('Migrated s3 storage id for mount with id ' . $mount['mount_id'] . ' to ' . $newId);
+            } catch (Exception $e) {
+                $this->logger->error('Failed to migrate external s3 storage id for mount with id ' . $mount['mount_id'], [
+                    'exception' => $e
+                ]);
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * @throws Exception
-	 * @return IResult|int
-	 */
-	private function getS3Mounts() {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('m.mount_id')
-			->selectAlias('c.value', 'bucket')
-			->from('external_mounts', 'm')
-			->innerJoin('m', 'external_config', 'c', 'c.mount_id = m.mount_id')
-			->where($qb->expr()->eq('m.storage_backend', $qb->createPositionalParameter('amazons3')))
-			->andWhere($qb->expr()->eq('c.key', $qb->createPositionalParameter('bucket')));
-		return $qb->executeQuery();
-	}
+    /**
+     * @throws Exception
+     * @return IResult|int
+     */
+    private function getS3Mounts() {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('m.mount_id')
+            ->selectAlias('c.value', 'bucket')
+            ->from('external_mounts', 'm')
+            ->innerJoin('m', 'external_config', 'c', 'c.mount_id = m.mount_id')
+            ->where($qb->expr()->eq('m.storage_backend', $qb->createPositionalParameter('amazons3')))
+            ->andWhere($qb->expr()->eq('c.key', $qb->createPositionalParameter('bucket')));
+        return $qb->executeQuery();
+    }
 
-	/**
-	 * @throws Exception
-	 */
-	private function getStorageConfig(int $mountId): array {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('key', 'value')
-			->from('external_config')
-			->where($qb->expr()->eq('mount_id', $qb->createPositionalParameter($mountId)));
-		$config = [];
-		foreach ($qb->executeQuery()->fetchAllAssociative() as $row) {
-			$config[$row['key']] = $row['value'];
-		}
-		return $config;
-	}
+    /**
+     * @throws Exception
+     */
+    private function getStorageConfig(int $mountId): array {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('key', 'value')
+            ->from('external_config')
+            ->where($qb->expr()->eq('mount_id', $qb->createPositionalParameter($mountId)));
+        $config = [];
+        foreach ($qb->executeQuery()->fetchAllAssociative() as $row) {
+            $config[$row['key']] = $row['value'];
+        }
+        return $config;
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -38,19 +38,19 @@
 		}
 
 		while ($mount = $mounts->fetchAssociative()) {
-			$config = $this->getStorageConfig((int)$mount['mount_id']);
+			$config = $this->getStorageConfig((int) $mount['mount_id']);
 			$hostname = $config['hostname'];
 			$bucket = $config['bucket'];
 			$key = $config['key'];
-			$oldId = Storage::adjustStorageId('amazon::' . $bucket);
-			$newId = Storage::adjustStorageId('amazon::external::' . md5($hostname . ':' . $bucket . ':' . $key));
+			$oldId = Storage::adjustStorageId('amazon::'.$bucket);
+			$newId = Storage::adjustStorageId('amazon::external::'.md5($hostname.':'.$bucket.':'.$key));
 			try {
 				$qb->setParameter('oldId', $oldId);
 				$qb->setParameter('newId', $newId);
 				$qb->executeStatement();
-				$this->logger->info('Migrated s3 storage id for mount with id ' . $mount['mount_id'] . ' to ' . $newId);
+				$this->logger->info('Migrated s3 storage id for mount with id '.$mount['mount_id'].' to '.$newId);
 			} catch (Exception $e) {
-				$this->logger->error('Failed to migrate external s3 storage id for mount with id ' . $mount['mount_id'], [
+				$this->logger->error('Failed to migrate external s3 storage id for mount with id '.$mount['mount_id'], [
 					'exception' => $e
 				]);
 			}

apps/files/tests/BackgroundJob/DeleteOrphanedItemsJobTest.php

Indentation +224 added lines, -224 removed lines

@@ -23,228 +23,228 @@
  */
 #[\PHPUnit\Framework\Attributes\Group('DB')]
 class DeleteOrphanedItemsJobTest extends \Test\TestCase {
-	protected IDBConnection $connection;
-	protected LoggerInterface $logger;
-	protected ITimeFactory $timeFactory;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->connection = Server::get(IDBConnection::class);
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->logger = Server::get(LoggerInterface::class);
-	}
-
-	protected function cleanMapping(string $table): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete($table)->executeStatement();
-	}
-
-	protected function getMappings(string $table): array {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from($table);
-		$result = $query->executeQuery();
-		$mapping = $result->fetchAllAssociative();
-		$result->closeCursor();
-
-		return $mapping;
-	}
-
-	/**
-	 * Test clearing orphaned system tag mappings
-	 */
-	public function testClearSystemTagMappings(): void {
-		$this->cleanMapping('systemtag_object_mapping');
-
-		$query = $this->connection->getQueryBuilder();
-		$query->insert('filecache')
-			->values([
-				'storage' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
-				'path' => $query->createNamedParameter('apps/files/tests/deleteorphanedtagsjobtest.php'),
-				'path_hash' => $query->createNamedParameter(md5('apps/files/tests/deleteorphanedtagsjobtest.php')),
-			])->executeStatement();
-		$fileId = $query->getLastInsertId();
-
-		// Existing file
-		$query = $this->connection->getQueryBuilder();
-		$query->insert('systemtag_object_mapping')
-			->values([
-				'objectid' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
-				'objecttype' => $query->createNamedParameter('files'),
-				'systemtagid' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
-			])->executeStatement();
-
-		// Non-existing file
-		$query = $this->connection->getQueryBuilder();
-		$query->insert('systemtag_object_mapping')
-			->values([
-				'objectid' => $query->createNamedParameter($fileId + 1, IQueryBuilder::PARAM_INT),
-				'objecttype' => $query->createNamedParameter('files'),
-				'systemtagid' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
-			])->executeStatement();
-
-		$mapping = $this->getMappings('systemtag_object_mapping');
-		$this->assertCount(2, $mapping);
-
-		$job = new DeleteOrphanedItems($this->timeFactory, $this->connection, $this->logger);
-		self::invokePrivate($job, 'cleanSystemTags');
-
-		$mapping = $this->getMappings('systemtag_object_mapping');
-		$this->assertCount(1, $mapping);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->delete('filecache')
-			->where($query->expr()->eq('fileid', $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)))
-			->executeStatement();
-		$this->cleanMapping('systemtag_object_mapping');
-	}
-
-	/**
-	 * Test clearing orphaned system tag mappings
-	 */
-	public function testClearUserTagMappings(): void {
-		$this->cleanMapping('vcategory_to_object');
-
-		$query = $this->connection->getQueryBuilder();
-		$query->insert('filecache')
-			->values([
-				'storage' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
-				'path' => $query->createNamedParameter('apps/files/tests/deleteorphanedtagsjobtest.php'),
-				'path_hash' => $query->createNamedParameter(md5('apps/files/tests/deleteorphanedtagsjobtest.php')),
-			])->executeStatement();
-		$fileId = $query->getLastInsertId();
-
-		// Existing file
-		$query = $this->connection->getQueryBuilder();
-		$query->insert('vcategory_to_object')
-			->values([
-				'objid' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
-				'type' => $query->createNamedParameter('files'),
-				'categoryid' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
-			])->executeStatement();
-
-		// Non-existing file
-		$query = $this->connection->getQueryBuilder();
-		$query->insert('vcategory_to_object')
-			->values([
-				'objid' => $query->createNamedParameter($fileId + 1, IQueryBuilder::PARAM_INT),
-				'type' => $query->createNamedParameter('files'),
-				'categoryid' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
-			])->executeStatement();
-
-		$mapping = $this->getMappings('vcategory_to_object');
-		$this->assertCount(2, $mapping);
-
-		$job = new DeleteOrphanedItems($this->timeFactory, $this->connection, $this->logger);
-		self::invokePrivate($job, 'cleanUserTags');
-
-		$mapping = $this->getMappings('vcategory_to_object');
-		$this->assertCount(1, $mapping);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->delete('filecache')
-			->where($query->expr()->eq('fileid', $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)))
-			->executeStatement();
-		$this->cleanMapping('vcategory_to_object');
-	}
-
-	/**
-	 * Test clearing orphaned system tag mappings
-	 */
-	public function testClearComments(): void {
-		$this->cleanMapping('comments');
-
-		$query = $this->connection->getQueryBuilder();
-		$query->insert('filecache')
-			->values([
-				'storage' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
-				'path' => $query->createNamedParameter('apps/files/tests/deleteorphanedtagsjobtest.php'),
-				'path_hash' => $query->createNamedParameter(md5('apps/files/tests/deleteorphanedtagsjobtest.php')),
-			])->executeStatement();
-		$fileId = $query->getLastInsertId();
-
-		// Existing file
-		$query = $this->connection->getQueryBuilder();
-		$query->insert('comments')
-			->values([
-				'object_id' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
-				'object_type' => $query->createNamedParameter('files'),
-				'actor_id' => $query->createNamedParameter('Alice', IQueryBuilder::PARAM_INT),
-				'actor_type' => $query->createNamedParameter('users'),
-			])->executeStatement();
-
-		// Non-existing file
-		$query = $this->connection->getQueryBuilder();
-		$query->insert('comments')
-			->values([
-				'object_id' => $query->createNamedParameter($fileId + 1, IQueryBuilder::PARAM_INT),
-				'object_type' => $query->createNamedParameter('files'),
-				'actor_id' => $query->createNamedParameter('Alice', IQueryBuilder::PARAM_INT),
-				'actor_type' => $query->createNamedParameter('users'),
-			])->executeStatement();
-
-		$mapping = $this->getMappings('comments');
-		$this->assertCount(2, $mapping);
-
-		$job = new DeleteOrphanedItems($this->timeFactory, $this->connection, $this->logger);
-		self::invokePrivate($job, 'cleanComments');
-
-		$mapping = $this->getMappings('comments');
-		$this->assertCount(1, $mapping);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->delete('filecache')
-			->where($query->expr()->eq('fileid', $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)))
-			->executeStatement();
-		$this->cleanMapping('comments');
-	}
-
-	/**
-	 * Test clearing orphaned system tag mappings
-	 */
-	public function testClearCommentReadMarks(): void {
-		$this->cleanMapping('comments_read_markers');
-
-		$query = $this->connection->getQueryBuilder();
-		$query->insert('filecache')
-			->values([
-				'storage' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
-				'path' => $query->createNamedParameter('apps/files/tests/deleteorphanedtagsjobtest.php'),
-				'path_hash' => $query->createNamedParameter(md5('apps/files/tests/deleteorphanedtagsjobtest.php')),
-			])->executeStatement();
-		$fileId = $query->getLastInsertId();
-
-		// Existing file
-		$query = $this->connection->getQueryBuilder();
-		$query->insert('comments_read_markers')
-			->values([
-				'object_id' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
-				'object_type' => $query->createNamedParameter('files'),
-				'user_id' => $query->createNamedParameter('Alice', IQueryBuilder::PARAM_INT),
-			])->executeStatement();
-
-		// Non-existing file
-		$query = $this->connection->getQueryBuilder();
-		$query->insert('comments_read_markers')
-			->values([
-				'object_id' => $query->createNamedParameter($fileId + 1, IQueryBuilder::PARAM_INT),
-				'object_type' => $query->createNamedParameter('files'),
-				'user_id' => $query->createNamedParameter('Alice', IQueryBuilder::PARAM_INT),
-			])->executeStatement();
-
-		$mapping = $this->getMappings('comments_read_markers');
-		$this->assertCount(2, $mapping);
-
-		$job = new DeleteOrphanedItems($this->timeFactory, $this->connection, $this->logger);
-		self::invokePrivate($job, 'cleanCommentMarkers');
-
-		$mapping = $this->getMappings('comments_read_markers');
-		$this->assertCount(1, $mapping);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->delete('filecache')
-			->where($query->expr()->eq('fileid', $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)))
-			->executeStatement();
-		$this->cleanMapping('comments_read_markers');
-	}
+    protected IDBConnection $connection;
+    protected LoggerInterface $logger;
+    protected ITimeFactory $timeFactory;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->connection = Server::get(IDBConnection::class);
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+        $this->logger = Server::get(LoggerInterface::class);
+    }
+
+    protected function cleanMapping(string $table): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete($table)->executeStatement();
+    }
+
+    protected function getMappings(string $table): array {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from($table);
+        $result = $query->executeQuery();
+        $mapping = $result->fetchAllAssociative();
+        $result->closeCursor();
+
+        return $mapping;
+    }
+
+    /**
+     * Test clearing orphaned system tag mappings
+     */
+    public function testClearSystemTagMappings(): void {
+        $this->cleanMapping('systemtag_object_mapping');
+
+        $query = $this->connection->getQueryBuilder();
+        $query->insert('filecache')
+            ->values([
+                'storage' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
+                'path' => $query->createNamedParameter('apps/files/tests/deleteorphanedtagsjobtest.php'),
+                'path_hash' => $query->createNamedParameter(md5('apps/files/tests/deleteorphanedtagsjobtest.php')),
+            ])->executeStatement();
+        $fileId = $query->getLastInsertId();
+
+        // Existing file
+        $query = $this->connection->getQueryBuilder();
+        $query->insert('systemtag_object_mapping')
+            ->values([
+                'objectid' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
+                'objecttype' => $query->createNamedParameter('files'),
+                'systemtagid' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
+            ])->executeStatement();
+
+        // Non-existing file
+        $query = $this->connection->getQueryBuilder();
+        $query->insert('systemtag_object_mapping')
+            ->values([
+                'objectid' => $query->createNamedParameter($fileId + 1, IQueryBuilder::PARAM_INT),
+                'objecttype' => $query->createNamedParameter('files'),
+                'systemtagid' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
+            ])->executeStatement();
+
+        $mapping = $this->getMappings('systemtag_object_mapping');
+        $this->assertCount(2, $mapping);
+
+        $job = new DeleteOrphanedItems($this->timeFactory, $this->connection, $this->logger);
+        self::invokePrivate($job, 'cleanSystemTags');
+
+        $mapping = $this->getMappings('systemtag_object_mapping');
+        $this->assertCount(1, $mapping);
+
+        $query = $this->connection->getQueryBuilder();
+        $query->delete('filecache')
+            ->where($query->expr()->eq('fileid', $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)))
+            ->executeStatement();
+        $this->cleanMapping('systemtag_object_mapping');
+    }
+
+    /**
+     * Test clearing orphaned system tag mappings
+     */
+    public function testClearUserTagMappings(): void {
+        $this->cleanMapping('vcategory_to_object');
+
+        $query = $this->connection->getQueryBuilder();
+        $query->insert('filecache')
+            ->values([
+                'storage' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
+                'path' => $query->createNamedParameter('apps/files/tests/deleteorphanedtagsjobtest.php'),
+                'path_hash' => $query->createNamedParameter(md5('apps/files/tests/deleteorphanedtagsjobtest.php')),
+            ])->executeStatement();
+        $fileId = $query->getLastInsertId();
+
+        // Existing file
+        $query = $this->connection->getQueryBuilder();
+        $query->insert('vcategory_to_object')
+            ->values([
+                'objid' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
+                'type' => $query->createNamedParameter('files'),
+                'categoryid' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
+            ])->executeStatement();
+
+        // Non-existing file
+        $query = $this->connection->getQueryBuilder();
+        $query->insert('vcategory_to_object')
+            ->values([
+                'objid' => $query->createNamedParameter($fileId + 1, IQueryBuilder::PARAM_INT),
+                'type' => $query->createNamedParameter('files'),
+                'categoryid' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
+            ])->executeStatement();
+
+        $mapping = $this->getMappings('vcategory_to_object');
+        $this->assertCount(2, $mapping);
+
+        $job = new DeleteOrphanedItems($this->timeFactory, $this->connection, $this->logger);
+        self::invokePrivate($job, 'cleanUserTags');
+
+        $mapping = $this->getMappings('vcategory_to_object');
+        $this->assertCount(1, $mapping);
+
+        $query = $this->connection->getQueryBuilder();
+        $query->delete('filecache')
+            ->where($query->expr()->eq('fileid', $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)))
+            ->executeStatement();
+        $this->cleanMapping('vcategory_to_object');
+    }
+
+    /**
+     * Test clearing orphaned system tag mappings
+     */
+    public function testClearComments(): void {
+        $this->cleanMapping('comments');
+
+        $query = $this->connection->getQueryBuilder();
+        $query->insert('filecache')
+            ->values([
+                'storage' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
+                'path' => $query->createNamedParameter('apps/files/tests/deleteorphanedtagsjobtest.php'),
+                'path_hash' => $query->createNamedParameter(md5('apps/files/tests/deleteorphanedtagsjobtest.php')),
+            ])->executeStatement();
+        $fileId = $query->getLastInsertId();
+
+        // Existing file
+        $query = $this->connection->getQueryBuilder();
+        $query->insert('comments')
+            ->values([
+                'object_id' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
+                'object_type' => $query->createNamedParameter('files'),
+                'actor_id' => $query->createNamedParameter('Alice', IQueryBuilder::PARAM_INT),
+                'actor_type' => $query->createNamedParameter('users'),
+            ])->executeStatement();
+
+        // Non-existing file
+        $query = $this->connection->getQueryBuilder();
+        $query->insert('comments')
+            ->values([
+                'object_id' => $query->createNamedParameter($fileId + 1, IQueryBuilder::PARAM_INT),
+                'object_type' => $query->createNamedParameter('files'),
+                'actor_id' => $query->createNamedParameter('Alice', IQueryBuilder::PARAM_INT),
+                'actor_type' => $query->createNamedParameter('users'),
+            ])->executeStatement();
+
+        $mapping = $this->getMappings('comments');
+        $this->assertCount(2, $mapping);
+
+        $job = new DeleteOrphanedItems($this->timeFactory, $this->connection, $this->logger);
+        self::invokePrivate($job, 'cleanComments');
+
+        $mapping = $this->getMappings('comments');
+        $this->assertCount(1, $mapping);
+
+        $query = $this->connection->getQueryBuilder();
+        $query->delete('filecache')
+            ->where($query->expr()->eq('fileid', $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)))
+            ->executeStatement();
+        $this->cleanMapping('comments');
+    }
+
+    /**
+     * Test clearing orphaned system tag mappings
+     */
+    public function testClearCommentReadMarks(): void {
+        $this->cleanMapping('comments_read_markers');
+
+        $query = $this->connection->getQueryBuilder();
+        $query->insert('filecache')
+            ->values([
+                'storage' => $query->createNamedParameter(1337, IQueryBuilder::PARAM_INT),
+                'path' => $query->createNamedParameter('apps/files/tests/deleteorphanedtagsjobtest.php'),
+                'path_hash' => $query->createNamedParameter(md5('apps/files/tests/deleteorphanedtagsjobtest.php')),
+            ])->executeStatement();
+        $fileId = $query->getLastInsertId();
+
+        // Existing file
+        $query = $this->connection->getQueryBuilder();
+        $query->insert('comments_read_markers')
+            ->values([
+                'object_id' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
+                'object_type' => $query->createNamedParameter('files'),
+                'user_id' => $query->createNamedParameter('Alice', IQueryBuilder::PARAM_INT),
+            ])->executeStatement();
+
+        // Non-existing file
+        $query = $this->connection->getQueryBuilder();
+        $query->insert('comments_read_markers')
+            ->values([
+                'object_id' => $query->createNamedParameter($fileId + 1, IQueryBuilder::PARAM_INT),
+                'object_type' => $query->createNamedParameter('files'),
+                'user_id' => $query->createNamedParameter('Alice', IQueryBuilder::PARAM_INT),
+            ])->executeStatement();
+
+        $mapping = $this->getMappings('comments_read_markers');
+        $this->assertCount(2, $mapping);
+
+        $job = new DeleteOrphanedItems($this->timeFactory, $this->connection, $this->logger);
+        self::invokePrivate($job, 'cleanCommentMarkers');
+
+        $mapping = $this->getMappings('comments_read_markers');
+        $this->assertCount(1, $mapping);
+
+        $query = $this->connection->getQueryBuilder();
+        $query->delete('filecache')
+            ->where($query->expr()->eq('fileid', $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)))
+            ->executeStatement();
+        $this->cleanMapping('comments_read_markers');
+    }
 }

apps/files/tests/Command/DeleteOrphanedFilesTest.php

Indentation +81 added lines, -81 removed lines

@@ -28,111 +28,111 @@
 #[\PHPUnit\Framework\Attributes\Group('DB')]
 class DeleteOrphanedFilesTest extends TestCase {
 
-	private DeleteOrphanedFiles $command;
-	private IDBConnection $connection;
-	private string $user1;
+    private DeleteOrphanedFiles $command;
+    private IDBConnection $connection;
+    private string $user1;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->connection = Server::get(IDBConnection::class);
+        $this->connection = Server::get(IDBConnection::class);
 
-		$this->user1 = $this->getUniqueID('user1_');
+        $this->user1 = $this->getUniqueID('user1_');
 
-		$userManager = Server::get(IUserManager::class);
-		$userManager->createUser($this->user1, 'pass');
+        $userManager = Server::get(IUserManager::class);
+        $userManager->createUser($this->user1, 'pass');
 
-		$this->command = new DeleteOrphanedFiles($this->connection);
-	}
+        $this->command = new DeleteOrphanedFiles($this->connection);
+    }
 
-	protected function tearDown(): void {
-		$userManager = Server::get(IUserManager::class);
-		$user1 = $userManager->get($this->user1);
-		if ($user1) {
-			$user1->delete();
-		}
+    protected function tearDown(): void {
+        $userManager = Server::get(IUserManager::class);
+        $user1 = $userManager->get($this->user1);
+        if ($user1) {
+            $user1->delete();
+        }
 
-		$this->logout();
+        $this->logout();
 
-		parent::tearDown();
-	}
+        parent::tearDown();
+    }
 
-	protected function getFile(int $fileId): array {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('filecache')
-			->where($query->expr()->eq('fileid', $query->createNamedParameter($fileId)));
-		return $query->executeQuery()->fetchAllAssociative();
-	}
+    protected function getFile(int $fileId): array {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('filecache')
+            ->where($query->expr()->eq('fileid', $query->createNamedParameter($fileId)));
+        return $query->executeQuery()->fetchAllAssociative();
+    }
 
-	protected function getMounts(int $storageId): array {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('mounts')
-			->where($query->expr()->eq('storage_id', $query->createNamedParameter($storageId)));
-		return $query->executeQuery()->fetchAllAssociative();
-	}
+    protected function getMounts(int $storageId): array {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('mounts')
+            ->where($query->expr()->eq('storage_id', $query->createNamedParameter($storageId)));
+        return $query->executeQuery()->fetchAllAssociative();
+    }
 
-	/**
-	 * Test clearing orphaned files
-	 */
-	public function testClearFiles(): void {
-		$input = $this->createMock(InputInterface::class);
-		$output = $this->createMock(OutputInterface::class);
+    /**
+     * Test clearing orphaned files
+     */
+    public function testClearFiles(): void {
+        $input = $this->createMock(InputInterface::class);
+        $output = $this->createMock(OutputInterface::class);
 
-		$rootFolder = Server::get(IRootFolder::class);
+        $rootFolder = Server::get(IRootFolder::class);
 
-		// scan home storage so that mounts are properly setup
-		$rootFolder->getUserFolder($this->user1)->getStorage()->getScanner()->scan('');
+        // scan home storage so that mounts are properly setup
+        $rootFolder->getUserFolder($this->user1)->getStorage()->getScanner()->scan('');
 
-		$this->loginAsUser($this->user1);
+        $this->loginAsUser($this->user1);
 
-		$view = new View('/' . $this->user1 . '/');
-		$view->mkdir('files/test');
+        $view = new View('/' . $this->user1 . '/');
+        $view->mkdir('files/test');
 
-		$fileInfo = $view->getFileInfo('files/test');
+        $fileInfo = $view->getFileInfo('files/test');
 
-		$storageId = $fileInfo->getStorage()->getId();
-		$numericStorageId = $fileInfo->getStorage()->getStorageCache()->getNumericId();
+        $storageId = $fileInfo->getStorage()->getId();
+        $numericStorageId = $fileInfo->getStorage()->getStorageCache()->getNumericId();
 
-		$this->assertCount(1, $this->getFile($fileInfo->getId()), 'Asserts that file is available');
-		$this->assertCount(1, $this->getMounts($numericStorageId), 'Asserts that mount is available');
+        $this->assertCount(1, $this->getFile($fileInfo->getId()), 'Asserts that file is available');
+        $this->assertCount(1, $this->getMounts($numericStorageId), 'Asserts that mount is available');
 
-		$this->command->execute($input, $output);
+        $this->command->execute($input, $output);
 
-		$this->assertCount(1, $this->getFile($fileInfo->getId()), 'Asserts that file is still available');
-		$this->assertCount(1, $this->getMounts($numericStorageId), 'Asserts that mount is still available');
+        $this->assertCount(1, $this->getFile($fileInfo->getId()), 'Asserts that file is still available');
+        $this->assertCount(1, $this->getMounts($numericStorageId), 'Asserts that mount is still available');
 
 
-		$deletedRows = $this->connection->executeUpdate('DELETE FROM `*PREFIX*storages` WHERE `id` = ?', [$storageId]);
-		$this->assertNotNull($deletedRows, 'Asserts that storage got deleted');
-		$this->assertSame(1, $deletedRows, 'Asserts that storage got deleted');
+        $deletedRows = $this->connection->executeUpdate('DELETE FROM `*PREFIX*storages` WHERE `id` = ?', [$storageId]);
+        $this->assertNotNull($deletedRows, 'Asserts that storage got deleted');
+        $this->assertSame(1, $deletedRows, 'Asserts that storage got deleted');
 
-		// parent folder, `files`, ´test` and `welcome.txt` => 4 elements
-		$calls = [
-			'3 orphaned file cache entries deleted',
-			'0 orphaned file cache extended entries deleted',
-			'1 orphaned mount entries deleted',
-		];
-		$output
-			->expects($this->exactly(3))
-			->method('writeln')
-			->willReturnCallback(function (string $message) use (&$calls): void {
-				$expected = array_shift($calls);
-				$this->assertSame($expected, $message);
-			});
+        // parent folder, `files`, ´test` and `welcome.txt` => 4 elements
+        $calls = [
+            '3 orphaned file cache entries deleted',
+            '0 orphaned file cache extended entries deleted',
+            '1 orphaned mount entries deleted',
+        ];
+        $output
+            ->expects($this->exactly(3))
+            ->method('writeln')
+            ->willReturnCallback(function (string $message) use (&$calls): void {
+                $expected = array_shift($calls);
+                $this->assertSame($expected, $message);
+            });
 
-		$this->command->execute($input, $output);
+        $this->command->execute($input, $output);
 
-		$this->assertCount(0, $this->getFile($fileInfo->getId()), 'Asserts that file gets cleaned up');
-		$this->assertCount(0, $this->getMounts($numericStorageId), 'Asserts that mount gets cleaned up');
+        $this->assertCount(0, $this->getFile($fileInfo->getId()), 'Asserts that file gets cleaned up');
+        $this->assertCount(0, $this->getMounts($numericStorageId), 'Asserts that mount gets cleaned up');
 
-		// Rescan folder to add back to cache before deleting
-		$rootFolder->getUserFolder($this->user1)->getStorage()->getScanner()->scan('');
-		// since we deleted the storage it might throw a (valid) StorageNotAvailableException
-		try {
-			$view->unlink('files/test');
-		} catch (StorageNotAvailableException $e) {
-		}
-	}
+        // Rescan folder to add back to cache before deleting
+        $rootFolder->getUserFolder($this->user1)->getStorage()->getScanner()->scan('');
+        // since we deleted the storage it might throw a (valid) StorageNotAvailableException
+        try {
+            $view->unlink('files/test');
+        } catch (StorageNotAvailableException $e) {
+        }
+    }
 }