nextcloud / server

apps/workflowengine/lib/Migration/Version2200Date20210805101925.php

Indentation +17 added lines, -17 removed lines

@@ -32,23 +32,23 @@
 
 class Version2200Date20210805101925 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if ($schema->hasTable('flow_operations')) {
-			$table = $schema->getTable('flow_operations');
-			$table->changeColumn('name', [
-				'notnull' => false,
-			]);
-		}
+        if ($schema->hasTable('flow_operations')) {
+            $table = $schema->getTable('flow_operations');
+            $table->changeColumn('name', [
+                'notnull' => false,
+            ]);
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

apps/files_external/lib/Migration/Version1015Date20211104103506.php

Spacing +5 added lines, -5 removed lines

@@ -59,19 +59,19 @@
 		}
 
 		while ($mount = $mounts->fetch()) {
-			$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->execute();
-				$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
 				]);
 			}

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->fetch()) {
-			$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->execute();
-				$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->fetch()) {
+            $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->execute();
+                $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->execute();
-	}
+    /**
+     * @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->execute();
+    }
 
-	/**
-	 * @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->execute()->fetchAll() 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->execute()->fetchAll() as $row) {
+            $config[$row['key']] = $row['value'];
+        }
+        return $config;
+    }
 }

apps/dav/lib/Connector/Sabre/MtimeSanitizer.php

Indentation +14 added lines, -14 removed lines

@@ -23,20 +23,20 @@
 namespace OCA\DAV\Connector\Sabre;
 
 class MtimeSanitizer {
-	public static function sanitizeMtime(string $mtimeFromRequest): int {
-		// In PHP 5.X "is_numeric" returns true for strings in hexadecimal
-		// notation. This is no longer the case in PHP 7.X, so this check
-		// ensures that strings with hexadecimal notations fail too in PHP 5.X.
-		$isHexadecimal = preg_match('/^\s*0[xX]/', $mtimeFromRequest);
-		if ($isHexadecimal || !is_numeric($mtimeFromRequest)) {
-			throw new \InvalidArgumentException('X-OC-MTime header must be an integer (unix timestamp).');
-		}
+    public static function sanitizeMtime(string $mtimeFromRequest): int {
+        // In PHP 5.X "is_numeric" returns true for strings in hexadecimal
+        // notation. This is no longer the case in PHP 7.X, so this check
+        // ensures that strings with hexadecimal notations fail too in PHP 5.X.
+        $isHexadecimal = preg_match('/^\s*0[xX]/', $mtimeFromRequest);
+        if ($isHexadecimal || !is_numeric($mtimeFromRequest)) {
+            throw new \InvalidArgumentException('X-OC-MTime header must be an integer (unix timestamp).');
+        }
 
-		// Prevent writing invalid mtime (timezone-proof)
-		if ((int)$mtimeFromRequest <= 24 * 60 * 60) {
-			throw new \InvalidArgumentException('X-OC-MTime header must be a valid positive integer');
-		}
+        // Prevent writing invalid mtime (timezone-proof)
+        if ((int)$mtimeFromRequest <= 24 * 60 * 60) {
+            throw new \InvalidArgumentException('X-OC-MTime header must be a valid positive integer');
+        }
 
-		return (int)$mtimeFromRequest;
-	}
+        return (int)$mtimeFromRequest;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -33,10 +33,10 @@
 		}
 
 		// Prevent writing invalid mtime (timezone-proof)
-		if ((int)$mtimeFromRequest <= 24 * 60 * 60) {
+		if ((int) $mtimeFromRequest <= 24 * 60 * 60) {
 			throw new \InvalidArgumentException('X-OC-MTime header must be a valid positive integer');
 		}
 
-		return (int)$mtimeFromRequest;
+		return (int) $mtimeFromRequest;
 	}
 }

lib/private/Security/TrustedDomainHelper.php

Spacing +3 added lines, -3 removed lines

@@ -70,7 +70,7 @@ 
 		}
 
 		if (isset($parsedUrl['port']) && $parsedUrl['port']) {
-			return $this->isTrustedDomain($parsedUrl['host'] . ':' . $parsedUrl['port']);
+			return $this->isTrustedDomain($parsedUrl['host'].':'.$parsedUrl['port']);
 		}
 
 		return $this->isTrustedDomain($parsedUrl['host']);
@@ -106,9 +106,9 @@ 
 			if (gettype($trusted) !== 'string') {
 				break;
 			}
-			$regex = '/^' . implode('[-\.a-zA-Z0-9]*', array_map(function ($v) {
+			$regex = '/^'.implode('[-\.a-zA-Z0-9]*', array_map(function($v) {
 				return preg_quote($v, '/');
-			}, explode('*', $trusted))) . '$/i';
+			}, explode('*', $trusted))).'$/i';
 			if (preg_match($regex, $domain) || preg_match($regex, $domainWithPort)) {
 				return true;
 			}

Indentation +67 added lines, -67 removed lines

@@ -13,79 +13,79 @@
 use OCP\Security\ITrustedDomainHelper;
 
 class TrustedDomainHelper implements ITrustedDomainHelper {
-	public function __construct(
-		private IConfig $config,
-	) {
-	}
+    public function __construct(
+        private IConfig $config,
+    ) {
+    }
 
-	/**
-	 * Strips a potential port from a domain (in format domain:port)
-	 * @return string $host without appended port
-	 */
-	private function getDomainWithoutPort(string $host): string {
-		$pos = strrpos($host, ':');
-		if ($pos !== false) {
-			$port = substr($host, $pos + 1);
-			if (is_numeric($port)) {
-				$host = substr($host, 0, $pos);
-			}
-		}
-		return $host;
-	}
+    /**
+     * Strips a potential port from a domain (in format domain:port)
+     * @return string $host without appended port
+     */
+    private function getDomainWithoutPort(string $host): string {
+        $pos = strrpos($host, ':');
+        if ($pos !== false) {
+            $port = substr($host, $pos + 1);
+            if (is_numeric($port)) {
+                $host = substr($host, 0, $pos);
+            }
+        }
+        return $host;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function isTrustedUrl(string $url): bool {
-		$parsedUrl = parse_url($url);
-		if (empty($parsedUrl['host'])) {
-			return false;
-		}
+    /**
+     * {@inheritDoc}
+     */
+    public function isTrustedUrl(string $url): bool {
+        $parsedUrl = parse_url($url);
+        if (empty($parsedUrl['host'])) {
+            return false;
+        }
 
-		if (isset($parsedUrl['port']) && $parsedUrl['port']) {
-			return $this->isTrustedDomain($parsedUrl['host'] . ':' . $parsedUrl['port']);
-		}
+        if (isset($parsedUrl['port']) && $parsedUrl['port']) {
+            return $this->isTrustedDomain($parsedUrl['host'] . ':' . $parsedUrl['port']);
+        }
 
-		return $this->isTrustedDomain($parsedUrl['host']);
-	}
+        return $this->isTrustedDomain($parsedUrl['host']);
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function isTrustedDomain(string $domainWithPort): bool {
-		// overwritehost is always trusted
-		if ($this->config->getSystemValue('overwritehost') !== '') {
-			return true;
-		}
+    /**
+     * {@inheritDoc}
+     */
+    public function isTrustedDomain(string $domainWithPort): bool {
+        // overwritehost is always trusted
+        if ($this->config->getSystemValue('overwritehost') !== '') {
+            return true;
+        }
 
-		$domain = $this->getDomainWithoutPort($domainWithPort);
+        $domain = $this->getDomainWithoutPort($domainWithPort);
 
-		// Read trusted domains from config
-		$trustedList = $this->config->getSystemValue('trusted_domains', []);
-		if (!is_array($trustedList)) {
-			return false;
-		}
+        // Read trusted domains from config
+        $trustedList = $this->config->getSystemValue('trusted_domains', []);
+        if (!is_array($trustedList)) {
+            return false;
+        }
 
-		// Always allow access from localhost
-		if (preg_match(Request::REGEX_LOCALHOST, $domain) === 1) {
-			return true;
-		}
-		// Reject malformed domains in any case
-		if (str_starts_with($domain, '-') || str_contains($domain, '..')) {
-			return false;
-		}
-		// Match, allowing for * wildcards
-		foreach ($trustedList as $trusted) {
-			if (gettype($trusted) !== 'string') {
-				break;
-			}
-			$regex = '/^' . implode('[-\.a-zA-Z0-9]*', array_map(function ($v) {
-				return preg_quote($v, '/');
-			}, explode('*', $trusted))) . '$/i';
-			if (preg_match($regex, $domain) || preg_match($regex, $domainWithPort)) {
-				return true;
-			}
-		}
-		return false;
-	}
+        // Always allow access from localhost
+        if (preg_match(Request::REGEX_LOCALHOST, $domain) === 1) {
+            return true;
+        }
+        // Reject malformed domains in any case
+        if (str_starts_with($domain, '-') || str_contains($domain, '..')) {
+            return false;
+        }
+        // Match, allowing for * wildcards
+        foreach ($trustedList as $trusted) {
+            if (gettype($trusted) !== 'string') {
+                break;
+            }
+            $regex = '/^' . implode('[-\.a-zA-Z0-9]*', array_map(function ($v) {
+                return preg_quote($v, '/');
+            }, explode('*', $trusted))) . '$/i';
+            if (preg_match($regex, $domain) || preg_match($regex, $domainWithPort)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

apps/user_ldap/lib/Migration/Version1130Date20220110154719.php

Indentation +21 added lines, -21 removed lines

@@ -32,25 +32,25 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version1130Date20220110154719 extends SimpleMigrationStep {
-	public function getName() {
-		return 'Drop ldap_group_mapping_backup';
-	}
-
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		if ($schema->hasTable('ldap_group_mapping_backup')) {
-			$schema->dropTable('ldap_group_mapping_backup');
-			return $schema;
-		}
-
-		return null;
-	}
+    public function getName() {
+        return 'Drop ldap_group_mapping_backup';
+    }
+
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        if ($schema->hasTable('ldap_group_mapping_backup')) {
+            $schema->dropTable('ldap_group_mapping_backup');
+            return $schema;
+        }
+
+        return null;
+    }
 }

apps/testing/lib/Controller/LockingController.php

Spacing +9 added lines, -9 removed lines

@@ -94,7 +94,7 @@ 
 	 */
 	protected function getPath(string $user, string $path): string {
 		$node = $this->rootFolder->getUserFolder($user)->get($path);
-		return 'files/' . md5($node->getStorage()->getId() . '::' . trim($node->getInternalPath(), '/'));
+		return 'files/'.md5($node->getStorage()->getId().'::'.trim($node->getInternalPath(), '/'));
 	}
 
 	/**
@@ -125,7 +125,7 @@ 
 
 		try {
 			$lockingProvider->acquireLock($path, $type);
-			$this->config->setAppValue('testing', 'locking_' . $path, (string)$type);
+			$this->config->setAppValue('testing', 'locking_'.$path, (string) $type);
 			return new DataResponse();
 		} catch (LockedException $e) {
 			throw new OCSException('', Http::STATUS_LOCKED, $e);
@@ -148,7 +148,7 @@ 
 
 		try {
 			$lockingProvider->changeLock($path, $type);
-			$this->config->setAppValue('testing', 'locking_' . $path, (string)$type);
+			$this->config->setAppValue('testing', 'locking_'.$path, (string) $type);
 			return new DataResponse();
 		} catch (LockedException $e) {
 			throw new OCSException('', Http::STATUS_LOCKED, $e);
@@ -171,7 +171,7 @@ 
 
 		try {
 			$lockingProvider->releaseLock($path, $type);
-			$this->config->deleteAppValue('testing', 'locking_' . $path);
+			$this->config->deleteAppValue('testing', 'locking_'.$path);
 			return new DataResponse();
 		} catch (LockedException $e) {
 			throw new OCSException('', Http::STATUS_LOCKED, $e);
@@ -206,12 +206,12 @@ 
 			if (strpos($lock, 'locking_') === 0) {
 				$path = substr($lock, strlen('locking_'));
 
-				if ($type === ILockingProvider::LOCK_EXCLUSIVE && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_EXCLUSIVE) {
-					$lockingProvider->releaseLock($path, (int)$this->config->getAppValue('testing', $lock));
-				} elseif ($type === ILockingProvider::LOCK_SHARED && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_SHARED) {
-					$lockingProvider->releaseLock($path, (int)$this->config->getAppValue('testing', $lock));
+				if ($type === ILockingProvider::LOCK_EXCLUSIVE && (int) $this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_EXCLUSIVE) {
+					$lockingProvider->releaseLock($path, (int) $this->config->getAppValue('testing', $lock));
+				} elseif ($type === ILockingProvider::LOCK_SHARED && (int) $this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_SHARED) {
+					$lockingProvider->releaseLock($path, (int) $this->config->getAppValue('testing', $lock));
 				} else {
-					$lockingProvider->releaseLock($path, (int)$this->config->getAppValue('testing', $lock));
+					$lockingProvider->releaseLock($path, (int) $this->config->getAppValue('testing', $lock));
 				}
 			}
 		}

Indentation +160 added lines, -160 removed lines

@@ -23,164 +23,164 @@
 
 class LockingController extends OCSController {
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param ILockingProvider $lockingProvider
-	 * @param FakeDBLockingProvider $fakeDBLockingProvider
-	 * @param IDBConnection $connection
-	 * @param IConfig $config
-	 * @param IRootFolder $rootFolder
-	 */
-	public function __construct(
-		$appName,
-		IRequest $request,
-		protected ILockingProvider $lockingProvider,
-		protected FakeDBLockingProvider $fakeDBLockingProvider,
-		protected IDBConnection $connection,
-		protected IConfig $config,
-		protected IRootFolder $rootFolder,
-	) {
-		parent::__construct($appName, $request);
-	}
-
-	/**
-	 * @throws \RuntimeException
-	 */
-	protected function getLockingProvider(): ILockingProvider {
-		if ($this->lockingProvider instanceof DBLockingProvider) {
-			return $this->fakeDBLockingProvider;
-		}
-		throw new \RuntimeException('Lock provisioning is only possible using the DBLockingProvider');
-	}
-
-	/**
-	 * @throws NotFoundException
-	 */
-	protected function getPath(string $user, string $path): string {
-		$node = $this->rootFolder->getUserFolder($user)->get($path);
-		return 'files/' . md5($node->getStorage()->getId() . '::' . trim($node->getInternalPath(), '/'));
-	}
-
-	/**
-	 * @throws OCSException
-	 */
-	public function isLockingEnabled(): DataResponse {
-		try {
-			$this->getLockingProvider();
-			return new DataResponse();
-		} catch (\RuntimeException $e) {
-			throw new OCSException($e->getMessage(), Http::STATUS_NOT_IMPLEMENTED, $e);
-		}
-	}
-
-	/**
-	 * @throws OCSException
-	 */
-	public function acquireLock(int $type, string $user, string $path): DataResponse {
-		try {
-			$path = $this->getPath($user, $path);
-		} catch (NoUserException $e) {
-			throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
-		} catch (NotFoundException $e) {
-			throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
-		}
-
-		$lockingProvider = $this->getLockingProvider();
-
-		try {
-			$lockingProvider->acquireLock($path, $type);
-			$this->config->setAppValue('testing', 'locking_' . $path, (string)$type);
-			return new DataResponse();
-		} catch (LockedException $e) {
-			throw new OCSException('', Http::STATUS_LOCKED, $e);
-		}
-	}
-
-	/**
-	 * @throws OCSException
-	 */
-	public function changeLock(int $type, string $user, string $path): DataResponse {
-		try {
-			$path = $this->getPath($user, $path);
-		} catch (NoUserException $e) {
-			throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
-		} catch (NotFoundException $e) {
-			throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
-		}
-
-		$lockingProvider = $this->getLockingProvider();
-
-		try {
-			$lockingProvider->changeLock($path, $type);
-			$this->config->setAppValue('testing', 'locking_' . $path, (string)$type);
-			return new DataResponse();
-		} catch (LockedException $e) {
-			throw new OCSException('', Http::STATUS_LOCKED, $e);
-		}
-	}
-
-	/**
-	 * @throws OCSException
-	 */
-	public function releaseLock(int $type, string $user, string $path): DataResponse {
-		try {
-			$path = $this->getPath($user, $path);
-		} catch (NoUserException $e) {
-			throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
-		} catch (NotFoundException $e) {
-			throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
-		}
-
-		$lockingProvider = $this->getLockingProvider();
-
-		try {
-			$lockingProvider->releaseLock($path, $type);
-			$this->config->deleteAppValue('testing', 'locking_' . $path);
-			return new DataResponse();
-		} catch (LockedException $e) {
-			throw new OCSException('', Http::STATUS_LOCKED, $e);
-		}
-	}
-
-	/**
-	 * @throws OCSException
-	 */
-	public function isLocked(int $type, string $user, string $path): DataResponse {
-		try {
-			$path = $this->getPath($user, $path);
-		} catch (NoUserException $e) {
-			throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
-		} catch (NotFoundException $e) {
-			throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
-		}
-
-		$lockingProvider = $this->getLockingProvider();
-
-		if ($lockingProvider->isLocked($path, $type)) {
-			return new DataResponse();
-		}
-
-		throw new OCSException('', Http::STATUS_LOCKED);
-	}
-
-	public function releaseAll(?int $type = null): DataResponse {
-		$lockingProvider = $this->getLockingProvider();
-
-		foreach ($this->config->getAppKeys('testing') as $lock) {
-			if (strpos($lock, 'locking_') === 0) {
-				$path = substr($lock, strlen('locking_'));
-
-				if ($type === ILockingProvider::LOCK_EXCLUSIVE && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_EXCLUSIVE) {
-					$lockingProvider->releaseLock($path, (int)$this->config->getAppValue('testing', $lock));
-				} elseif ($type === ILockingProvider::LOCK_SHARED && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_SHARED) {
-					$lockingProvider->releaseLock($path, (int)$this->config->getAppValue('testing', $lock));
-				} else {
-					$lockingProvider->releaseLock($path, (int)$this->config->getAppValue('testing', $lock));
-				}
-			}
-		}
-
-		return new DataResponse();
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param ILockingProvider $lockingProvider
+     * @param FakeDBLockingProvider $fakeDBLockingProvider
+     * @param IDBConnection $connection
+     * @param IConfig $config
+     * @param IRootFolder $rootFolder
+     */
+    public function __construct(
+        $appName,
+        IRequest $request,
+        protected ILockingProvider $lockingProvider,
+        protected FakeDBLockingProvider $fakeDBLockingProvider,
+        protected IDBConnection $connection,
+        protected IConfig $config,
+        protected IRootFolder $rootFolder,
+    ) {
+        parent::__construct($appName, $request);
+    }
+
+    /**
+     * @throws \RuntimeException
+     */
+    protected function getLockingProvider(): ILockingProvider {
+        if ($this->lockingProvider instanceof DBLockingProvider) {
+            return $this->fakeDBLockingProvider;
+        }
+        throw new \RuntimeException('Lock provisioning is only possible using the DBLockingProvider');
+    }
+
+    /**
+     * @throws NotFoundException
+     */
+    protected function getPath(string $user, string $path): string {
+        $node = $this->rootFolder->getUserFolder($user)->get($path);
+        return 'files/' . md5($node->getStorage()->getId() . '::' . trim($node->getInternalPath(), '/'));
+    }
+
+    /**
+     * @throws OCSException
+     */
+    public function isLockingEnabled(): DataResponse {
+        try {
+            $this->getLockingProvider();
+            return new DataResponse();
+        } catch (\RuntimeException $e) {
+            throw new OCSException($e->getMessage(), Http::STATUS_NOT_IMPLEMENTED, $e);
+        }
+    }
+
+    /**
+     * @throws OCSException
+     */
+    public function acquireLock(int $type, string $user, string $path): DataResponse {
+        try {
+            $path = $this->getPath($user, $path);
+        } catch (NoUserException $e) {
+            throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
+        } catch (NotFoundException $e) {
+            throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
+        }
+
+        $lockingProvider = $this->getLockingProvider();
+
+        try {
+            $lockingProvider->acquireLock($path, $type);
+            $this->config->setAppValue('testing', 'locking_' . $path, (string)$type);
+            return new DataResponse();
+        } catch (LockedException $e) {
+            throw new OCSException('', Http::STATUS_LOCKED, $e);
+        }
+    }
+
+    /**
+     * @throws OCSException
+     */
+    public function changeLock(int $type, string $user, string $path): DataResponse {
+        try {
+            $path = $this->getPath($user, $path);
+        } catch (NoUserException $e) {
+            throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
+        } catch (NotFoundException $e) {
+            throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
+        }
+
+        $lockingProvider = $this->getLockingProvider();
+
+        try {
+            $lockingProvider->changeLock($path, $type);
+            $this->config->setAppValue('testing', 'locking_' . $path, (string)$type);
+            return new DataResponse();
+        } catch (LockedException $e) {
+            throw new OCSException('', Http::STATUS_LOCKED, $e);
+        }
+    }
+
+    /**
+     * @throws OCSException
+     */
+    public function releaseLock(int $type, string $user, string $path): DataResponse {
+        try {
+            $path = $this->getPath($user, $path);
+        } catch (NoUserException $e) {
+            throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
+        } catch (NotFoundException $e) {
+            throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
+        }
+
+        $lockingProvider = $this->getLockingProvider();
+
+        try {
+            $lockingProvider->releaseLock($path, $type);
+            $this->config->deleteAppValue('testing', 'locking_' . $path);
+            return new DataResponse();
+        } catch (LockedException $e) {
+            throw new OCSException('', Http::STATUS_LOCKED, $e);
+        }
+    }
+
+    /**
+     * @throws OCSException
+     */
+    public function isLocked(int $type, string $user, string $path): DataResponse {
+        try {
+            $path = $this->getPath($user, $path);
+        } catch (NoUserException $e) {
+            throw new OCSException('User not found', Http::STATUS_NOT_FOUND, $e);
+        } catch (NotFoundException $e) {
+            throw new OCSException('Path not found', Http::STATUS_NOT_FOUND, $e);
+        }
+
+        $lockingProvider = $this->getLockingProvider();
+
+        if ($lockingProvider->isLocked($path, $type)) {
+            return new DataResponse();
+        }
+
+        throw new OCSException('', Http::STATUS_LOCKED);
+    }
+
+    public function releaseAll(?int $type = null): DataResponse {
+        $lockingProvider = $this->getLockingProvider();
+
+        foreach ($this->config->getAppKeys('testing') as $lock) {
+            if (strpos($lock, 'locking_') === 0) {
+                $path = substr($lock, strlen('locking_'));
+
+                if ($type === ILockingProvider::LOCK_EXCLUSIVE && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_EXCLUSIVE) {
+                    $lockingProvider->releaseLock($path, (int)$this->config->getAppValue('testing', $lock));
+                } elseif ($type === ILockingProvider::LOCK_SHARED && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_SHARED) {
+                    $lockingProvider->releaseLock($path, (int)$this->config->getAppValue('testing', $lock));
+                } else {
+                    $lockingProvider->releaseLock($path, (int)$this->config->getAppValue('testing', $lock));
+                }
+            }
+        }
+
+        return new DataResponse();
+    }
 }

core/Migrations/Version24000Date20211213081604.php

Indentation +30 added lines, -30 removed lines

@@ -30,37 +30,37 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version24000Date20211213081604 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$hasTable = $schema->hasTable('ratelimit_entries');
+        $hasTable = $schema->hasTable('ratelimit_entries');
 
-		if (!$hasTable) {
-			$table = $schema->createTable('ratelimit_entries');
-			$table->addColumn('id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-			]);
-			$table->addColumn('hash', Types::STRING, [
-				'notnull' => true,
-				'length' => 128,
-			]);
-			$table->addColumn('delete_after', Types::DATETIME, [
-				'notnull' => true,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['hash'], 'ratelimit_hash');
-			$table->addIndex(['delete_after'], 'ratelimit_delete_after');
-			return $schema;
-		}
+        if (!$hasTable) {
+            $table = $schema->createTable('ratelimit_entries');
+            $table->addColumn('id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+            ]);
+            $table->addColumn('hash', Types::STRING, [
+                'notnull' => true,
+                'length' => 128,
+            ]);
+            $table->addColumn('delete_after', Types::DATETIME, [
+                'notnull' => true,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['hash'], 'ratelimit_hash');
+            $table->addIndex(['delete_after'], 'ratelimit_delete_after');
+            return $schema;
+        }
 
-		return null;
-	}
+        return null;
+    }
 }

core/Migrations/Version24000Date20211213081506.php

Indentation +16 added lines, -16 removed lines

@@ -29,22 +29,22 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version24000Date20211213081506 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$hasTable = $schema->hasTable('ratelimit_entries');
-		if ($hasTable) {
-			$schema->dropTable('ratelimit_entries');
-			return $schema;
-		}
+        $hasTable = $schema->hasTable('ratelimit_entries');
+        if ($hasTable) {
+            $schema->dropTable('ratelimit_entries');
+            return $schema;
+        }
 
-		return null;
-	}
+        return null;
+    }
 }

lib/private/Talk/ConversationOptions.php

Indentation +14 added lines, -14 removed lines

@@ -28,22 +28,22 @@
 use OCP\Talk\IConversationOptions;
 
 class ConversationOptions implements IConversationOptions {
-	private bool $isPublic;
+    private bool $isPublic;
 
-	private function __construct(bool $isPublic) {
-		$this->isPublic = $isPublic;
-	}
+    private function __construct(bool $isPublic) {
+        $this->isPublic = $isPublic;
+    }
 
-	public static function default(): self {
-		return new self(false);
-	}
+    public static function default(): self {
+        return new self(false);
+    }
 
-	public function setPublic(bool $isPublic = true): IConversationOptions {
-		$this->isPublic = $isPublic;
-		return $this;
-	}
+    public function setPublic(bool $isPublic = true): IConversationOptions {
+        $this->isPublic = $isPublic;
+        return $this;
+    }
 
-	public function isPublic(): bool {
-		return $this->isPublic;
-	}
+    public function isPublic(): bool {
+        return $this->isPublic;
+    }
 }