nextcloud / server

apps/user_ldap/lib/Migration/Version1130Date20211102154716.php

Spacing +1 added lines, -1 removed lines

@@ -214,7 +214,7 @@
 
 		while ($nextcloudId = array_shift($idList)) {
 			$update->setParameter('nextcloudId', $nextcloudId);
-			$update->setParameter('invalidatedUuid', 'invalidated_' . \bin2hex(\random_bytes(6)));
+			$update->setParameter('invalidatedUuid', 'invalidated_'.\bin2hex(\random_bytes(6)));
 			try {
 				$update->executeStatement();
 				$this->logger->warning(

Indentation +219 added lines, -219 removed lines

@@ -22,245 +22,245 @@
 
 class Version1130Date20211102154716 extends SimpleMigrationStep {
 
-	/** @var string[] */
-	private $hashColumnAddedToTables = [];
+    /** @var string[] */
+    private $hashColumnAddedToTables = [];
 
-	public function __construct(
-		private IDBConnection $dbc,
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private IDBConnection $dbc,
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	public function getName() {
-		return 'Adjust LDAP user and group ldap_dn column lengths and add ldap_dn_hash columns';
-	}
+    public function getName() {
+        return 'Adjust LDAP user and group ldap_dn column lengths and add ldap_dn_hash columns';
+    }
 
-	public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-		foreach (['ldap_user_mapping', 'ldap_group_mapping'] as $tableName) {
-			$this->processDuplicateUUIDs($tableName);
-		}
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+        foreach (['ldap_user_mapping', 'ldap_group_mapping'] as $tableName) {
+            $this->processDuplicateUUIDs($tableName);
+        }
 
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-		if ($schema->hasTable('ldap_group_mapping_backup')) {
-			// Previous upgrades of a broken release might have left an incomplete
-			// ldap_group_mapping_backup table. No need to recreate, but it
-			// should be empty.
-			// TRUNCATE is not available from Query Builder, but faster than DELETE FROM.
-			$sql = $this->dbc->getDatabasePlatform()->getTruncateTableSQL('`*PREFIX*ldap_group_mapping_backup`', false);
-			$this->dbc->executeStatement($sql);
-		}
-	}
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+        if ($schema->hasTable('ldap_group_mapping_backup')) {
+            // Previous upgrades of a broken release might have left an incomplete
+            // ldap_group_mapping_backup table. No need to recreate, but it
+            // should be empty.
+            // TRUNCATE is not available from Query Builder, but faster than DELETE FROM.
+            $sql = $this->dbc->getDatabasePlatform()->getTruncateTableSQL('`*PREFIX*ldap_group_mapping_backup`', false);
+            $this->dbc->executeStatement($sql);
+        }
+    }
 
-	/**
-	 * @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();
 
-		$changeSchema = false;
-		foreach (['ldap_user_mapping', 'ldap_group_mapping'] as $tableName) {
-			$table = $schema->getTable($tableName);
-			if (!$table->hasColumn('ldap_dn_hash')) {
-				$table->addColumn('ldap_dn_hash', Types::STRING, [
-					'notnull' => false,
-					'length' => 64,
-				]);
-				$changeSchema = true;
-				$this->hashColumnAddedToTables[] = $tableName;
-			}
-			$column = $table->getColumn('ldap_dn');
-			if ($tableName === 'ldap_user_mapping') {
-				if ($column->getLength() < 4000) {
-					$column->setLength(4000);
-					$changeSchema = true;
-				}
+        $changeSchema = false;
+        foreach (['ldap_user_mapping', 'ldap_group_mapping'] as $tableName) {
+            $table = $schema->getTable($tableName);
+            if (!$table->hasColumn('ldap_dn_hash')) {
+                $table->addColumn('ldap_dn_hash', Types::STRING, [
+                    'notnull' => false,
+                    'length' => 64,
+                ]);
+                $changeSchema = true;
+                $this->hashColumnAddedToTables[] = $tableName;
+            }
+            $column = $table->getColumn('ldap_dn');
+            if ($tableName === 'ldap_user_mapping') {
+                if ($column->getLength() < 4000) {
+                    $column->setLength(4000);
+                    $changeSchema = true;
+                }
 
-				if ($table->hasIndex('ldap_dn_users')) {
-					$table->dropIndex('ldap_dn_users');
-					$changeSchema = true;
-				}
-				if (!$table->hasIndex('ldap_user_dn_hashes')) {
-					$table->addUniqueIndex(['ldap_dn_hash'], 'ldap_user_dn_hashes');
-					$changeSchema = true;
-				}
-				if (!$table->hasIndex('ldap_user_directory_uuid')) {
-					$table->addUniqueIndex(['directory_uuid'], 'ldap_user_directory_uuid');
-					$changeSchema = true;
-				}
-			} elseif (!$schema->hasTable('ldap_group_mapping_backup')) {
-				// We need to copy the table twice to be able to change primary key, prepare the backup table
-				$table2 = $schema->createTable('ldap_group_mapping_backup');
-				$table2->addColumn('ldap_dn', Types::STRING, [
-					'notnull' => true,
-					'length' => 4000,
-					'default' => '',
-				]);
-				$table2->addColumn('owncloud_name', Types::STRING, [
-					'notnull' => true,
-					'length' => 64,
-					'default' => '',
-				]);
-				$table2->addColumn('directory_uuid', Types::STRING, [
-					'notnull' => true,
-					'length' => 255,
-					'default' => '',
-				]);
-				$table2->addColumn('ldap_dn_hash', Types::STRING, [
-					'notnull' => false,
-					'length' => 64,
-				]);
-				$table2->setPrimaryKey(['owncloud_name'], 'lgm_backup_primary');
-				$changeSchema = true;
-			}
-		}
+                if ($table->hasIndex('ldap_dn_users')) {
+                    $table->dropIndex('ldap_dn_users');
+                    $changeSchema = true;
+                }
+                if (!$table->hasIndex('ldap_user_dn_hashes')) {
+                    $table->addUniqueIndex(['ldap_dn_hash'], 'ldap_user_dn_hashes');
+                    $changeSchema = true;
+                }
+                if (!$table->hasIndex('ldap_user_directory_uuid')) {
+                    $table->addUniqueIndex(['directory_uuid'], 'ldap_user_directory_uuid');
+                    $changeSchema = true;
+                }
+            } elseif (!$schema->hasTable('ldap_group_mapping_backup')) {
+                // We need to copy the table twice to be able to change primary key, prepare the backup table
+                $table2 = $schema->createTable('ldap_group_mapping_backup');
+                $table2->addColumn('ldap_dn', Types::STRING, [
+                    'notnull' => true,
+                    'length' => 4000,
+                    'default' => '',
+                ]);
+                $table2->addColumn('owncloud_name', Types::STRING, [
+                    'notnull' => true,
+                    'length' => 64,
+                    'default' => '',
+                ]);
+                $table2->addColumn('directory_uuid', Types::STRING, [
+                    'notnull' => true,
+                    'length' => 255,
+                    'default' => '',
+                ]);
+                $table2->addColumn('ldap_dn_hash', Types::STRING, [
+                    'notnull' => false,
+                    'length' => 64,
+                ]);
+                $table2->setPrimaryKey(['owncloud_name'], 'lgm_backup_primary');
+                $changeSchema = true;
+            }
+        }
 
-		return $changeSchema ? $schema : null;
-	}
+        return $changeSchema ? $schema : null;
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 */
-	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
-		$this->handleDNHashes('ldap_group_mapping');
-		$this->handleDNHashes('ldap_user_mapping');
-	}
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     */
+    public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
+        $this->handleDNHashes('ldap_group_mapping');
+        $this->handleDNHashes('ldap_user_mapping');
+    }
 
-	protected function handleDNHashes(string $table): void {
-		$select = $this->getSelectQuery($table);
-		$update = $this->getUpdateQuery($table);
+    protected function handleDNHashes(string $table): void {
+        $select = $this->getSelectQuery($table);
+        $update = $this->getUpdateQuery($table);
 
-		$result = $select->executeQuery();
-		while ($row = $result->fetch()) {
-			$dnHash = hash('sha256', $row['ldap_dn'], false);
-			$update->setParameter('name', $row['owncloud_name']);
-			$update->setParameter('dn_hash', $dnHash);
-			try {
-				$update->executeStatement();
-			} catch (Exception $e) {
-				$this->logger->error('Failed to add hash "{dnHash}" ("{name}" of {table})',
-					[
-						'app' => 'user_ldap',
-						'name' => $row['owncloud_name'],
-						'dnHash' => $dnHash,
-						'table' => $table,
-						'exception' => $e,
-					]
-				);
-			}
-		}
-		$result->closeCursor();
-	}
+        $result = $select->executeQuery();
+        while ($row = $result->fetch()) {
+            $dnHash = hash('sha256', $row['ldap_dn'], false);
+            $update->setParameter('name', $row['owncloud_name']);
+            $update->setParameter('dn_hash', $dnHash);
+            try {
+                $update->executeStatement();
+            } catch (Exception $e) {
+                $this->logger->error('Failed to add hash "{dnHash}" ("{name}" of {table})',
+                    [
+                        'app' => 'user_ldap',
+                        'name' => $row['owncloud_name'],
+                        'dnHash' => $dnHash,
+                        'table' => $table,
+                        'exception' => $e,
+                    ]
+                );
+            }
+        }
+        $result->closeCursor();
+    }
 
-	protected function getSelectQuery(string $table): IQueryBuilder {
-		$qb = $this->dbc->getQueryBuilder();
-		$qb->select('owncloud_name', 'ldap_dn')
-			->from($table);
+    protected function getSelectQuery(string $table): IQueryBuilder {
+        $qb = $this->dbc->getQueryBuilder();
+        $qb->select('owncloud_name', 'ldap_dn')
+            ->from($table);
 
-		// when added we may run into risk that it's read from a DB node
-		// where the column is not present. Then the where clause is also
-		// not necessary since all rows qualify.
-		if (!in_array($table, $this->hashColumnAddedToTables, true)) {
-			$qb->where($qb->expr()->isNull('ldap_dn_hash'));
-		}
+        // when added we may run into risk that it's read from a DB node
+        // where the column is not present. Then the where clause is also
+        // not necessary since all rows qualify.
+        if (!in_array($table, $this->hashColumnAddedToTables, true)) {
+            $qb->where($qb->expr()->isNull('ldap_dn_hash'));
+        }
 
-		return $qb;
-	}
+        return $qb;
+    }
 
-	protected function getUpdateQuery(string $table): IQueryBuilder {
-		$qb = $this->dbc->getQueryBuilder();
-		$qb->update($table)
-			->set('ldap_dn_hash', $qb->createParameter('dn_hash'))
-			->where($qb->expr()->eq('owncloud_name', $qb->createParameter('name')));
-		return $qb;
-	}
+    protected function getUpdateQuery(string $table): IQueryBuilder {
+        $qb = $this->dbc->getQueryBuilder();
+        $qb->update($table)
+            ->set('ldap_dn_hash', $qb->createParameter('dn_hash'))
+            ->where($qb->expr()->eq('owncloud_name', $qb->createParameter('name')));
+        return $qb;
+    }
 
-	/**
-	 * @throws Exception
-	 */
-	protected function processDuplicateUUIDs(string $table): void {
-		$uuids = $this->getDuplicatedUuids($table);
-		$idsWithUuidToInvalidate = [];
-		foreach ($uuids as $uuid) {
-			array_push($idsWithUuidToInvalidate, ...$this->getNextcloudIdsByUuid($table, $uuid));
-		}
-		$this->invalidateUuids($table, $idsWithUuidToInvalidate);
-	}
+    /**
+     * @throws Exception
+     */
+    protected function processDuplicateUUIDs(string $table): void {
+        $uuids = $this->getDuplicatedUuids($table);
+        $idsWithUuidToInvalidate = [];
+        foreach ($uuids as $uuid) {
+            array_push($idsWithUuidToInvalidate, ...$this->getNextcloudIdsByUuid($table, $uuid));
+        }
+        $this->invalidateUuids($table, $idsWithUuidToInvalidate);
+    }
 
-	/**
-	 * @throws Exception
-	 */
-	protected function invalidateUuids(string $table, array $idList): void {
-		$update = $this->dbc->getQueryBuilder();
-		$update->update($table)
-			->set('directory_uuid', $update->createParameter('invalidatedUuid'))
-			->where($update->expr()->eq('owncloud_name', $update->createParameter('nextcloudId')));
+    /**
+     * @throws Exception
+     */
+    protected function invalidateUuids(string $table, array $idList): void {
+        $update = $this->dbc->getQueryBuilder();
+        $update->update($table)
+            ->set('directory_uuid', $update->createParameter('invalidatedUuid'))
+            ->where($update->expr()->eq('owncloud_name', $update->createParameter('nextcloudId')));
 
-		while ($nextcloudId = array_shift($idList)) {
-			$update->setParameter('nextcloudId', $nextcloudId);
-			$update->setParameter('invalidatedUuid', 'invalidated_' . \bin2hex(\random_bytes(6)));
-			try {
-				$update->executeStatement();
-				$this->logger->warning(
-					'LDAP user or group with ID {nid} has a duplicated UUID value which therefore was invalidated. You may double-check your LDAP configuration and trigger an update of the UUID.',
-					[
-						'app' => 'user_ldap',
-						'nid' => $nextcloudId,
-					]
-				);
-			} catch (Exception $e) {
-				// Catch possible, but unlikely duplications if new invalidated errors.
-				// There is the theoretical chance of an infinity loop is, when
-				// the constraint violation has a different background. I cannot
-				// think of one at the moment.
-				if ($e->getReason() !== Exception::REASON_CONSTRAINT_VIOLATION) {
-					throw $e;
-				}
-				$idList[] = $nextcloudId;
-			}
-		}
-	}
+        while ($nextcloudId = array_shift($idList)) {
+            $update->setParameter('nextcloudId', $nextcloudId);
+            $update->setParameter('invalidatedUuid', 'invalidated_' . \bin2hex(\random_bytes(6)));
+            try {
+                $update->executeStatement();
+                $this->logger->warning(
+                    'LDAP user or group with ID {nid} has a duplicated UUID value which therefore was invalidated. You may double-check your LDAP configuration and trigger an update of the UUID.',
+                    [
+                        'app' => 'user_ldap',
+                        'nid' => $nextcloudId,
+                    ]
+                );
+            } catch (Exception $e) {
+                // Catch possible, but unlikely duplications if new invalidated errors.
+                // There is the theoretical chance of an infinity loop is, when
+                // the constraint violation has a different background. I cannot
+                // think of one at the moment.
+                if ($e->getReason() !== Exception::REASON_CONSTRAINT_VIOLATION) {
+                    throw $e;
+                }
+                $idList[] = $nextcloudId;
+            }
+        }
+    }
 
-	/**
-	 * @throws \OCP\DB\Exception
-	 * @return array<string>
-	 */
-	protected function getNextcloudIdsByUuid(string $table, string $uuid): array {
-		$select = $this->dbc->getQueryBuilder();
-		$select->select('owncloud_name')
-			->from($table)
-			->where($select->expr()->eq('directory_uuid', $select->createNamedParameter($uuid)));
+    /**
+     * @throws \OCP\DB\Exception
+     * @return array<string>
+     */
+    protected function getNextcloudIdsByUuid(string $table, string $uuid): array {
+        $select = $this->dbc->getQueryBuilder();
+        $select->select('owncloud_name')
+            ->from($table)
+            ->where($select->expr()->eq('directory_uuid', $select->createNamedParameter($uuid)));
 
-		$result = $select->executeQuery();
-		$idList = [];
-		while (($id = $result->fetchOne()) !== false) {
-			$idList[] = $id;
-		}
-		$result->closeCursor();
-		return $idList;
-	}
+        $result = $select->executeQuery();
+        $idList = [];
+        while (($id = $result->fetchOne()) !== false) {
+            $idList[] = $id;
+        }
+        $result->closeCursor();
+        return $idList;
+    }
 
-	/**
-	 * @return Generator<string>
-	 * @throws \OCP\DB\Exception
-	 */
-	protected function getDuplicatedUuids(string $table): Generator {
-		$select = $this->dbc->getQueryBuilder();
-		$select->select('directory_uuid')
-			->from($table)
-			->groupBy('directory_uuid')
-			->having($select->expr()->gt($select->func()->count('owncloud_name'), $select->createNamedParameter(1)));
+    /**
+     * @return Generator<string>
+     * @throws \OCP\DB\Exception
+     */
+    protected function getDuplicatedUuids(string $table): Generator {
+        $select = $this->dbc->getQueryBuilder();
+        $select->select('directory_uuid')
+            ->from($table)
+            ->groupBy('directory_uuid')
+            ->having($select->expr()->gt($select->func()->count('owncloud_name'), $select->createNamedParameter(1)));
 
-		$result = $select->executeQuery();
-		while (($uuid = $result->fetchOne()) !== false) {
-			yield $uuid;
-		}
-		$result->closeCursor();
-	}
+        $result = $select->executeQuery();
+        while (($uuid = $result->fetchOne()) !== false) {
+            yield $uuid;
+        }
+        $result->closeCursor();
+    }
 }

apps/dav/lib/Connector/Sabre/Exception/BadGateway.php

Indentation +8 added lines, -8 removed lines

@@ -29,12 +29,12 @@
  */
 class BadGateway extends \Sabre\DAV\Exception {
 
-	/**
-	 * Returns the HTTP status code for this exception
-	 *
-	 * @return int
-	 */
-	public function getHTTPCode() {
-		return 502;
-	}
+    /**
+     * Returns the HTTP status code for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+        return 502;
+    }
 }

lib/private/Files/Config/CachedMountFileInfo.php

Spacing +1 added lines, -1 removed lines

@@ -53,6 +53,6 @@
 	}
 
 	public function getPath(): string {
-		return $this->getMountPoint() . $this->getInternalPath();
+		return $this->getMountPoint().$this->getInternalPath();
 	}
 }

Indentation +24 added lines, -24 removed lines

@@ -9,31 +9,31 @@
 use OCP\IUser;
 
 class CachedMountFileInfo extends CachedMountInfo implements ICachedMountFileInfo {
-	private string $internalPath;
+    private string $internalPath;
 
-	public function __construct(
-		IUser $user,
-		int $storageId,
-		int $rootId,
-		string $mountPoint,
-		?int $mountId,
-		string $mountProvider,
-		string $rootInternalPath,
-		string $internalPath,
-	) {
-		parent::__construct($user, $storageId, $rootId, $mountPoint, $mountProvider, $mountId, $rootInternalPath);
-		$this->internalPath = $internalPath;
-	}
+    public function __construct(
+        IUser $user,
+        int $storageId,
+        int $rootId,
+        string $mountPoint,
+        ?int $mountId,
+        string $mountProvider,
+        string $rootInternalPath,
+        string $internalPath,
+    ) {
+        parent::__construct($user, $storageId, $rootId, $mountPoint, $mountProvider, $mountId, $rootInternalPath);
+        $this->internalPath = $internalPath;
+    }
 
-	public function getInternalPath(): string {
-		if ($this->getRootInternalPath()) {
-			return substr($this->internalPath, strlen($this->getRootInternalPath()) + 1);
-		} else {
-			return $this->internalPath;
-		}
-	}
+    public function getInternalPath(): string {
+        if ($this->getRootInternalPath()) {
+            return substr($this->internalPath, strlen($this->getRootInternalPath()) + 1);
+        } else {
+            return $this->internalPath;
+        }
+    }
 
-	public function getPath(): string {
-		return $this->getMountPoint() . $this->getInternalPath();
-	}
+    public function getPath(): string {
+        return $this->getMountPoint() . $this->getInternalPath();
+    }
 }

lib/private/Files/Mount/ObjectStorePreviewCacheMountProvider.php

Spacing +3 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
 			foreach ($directoryRange as $child) {
 				$mountPoints[] = new MountPoint(
 					AppdataPreviewObjectStoreStorage::class,
-					'/appdata_' . $instanceId . '/preview/' . $parent . '/' . $child,
+					'/appdata_'.$instanceId.'/preview/'.$parent.'/'.$child,
 					$this->getMultiBucketObjectStore($i),
 					$loader,
 					null,
@@ -82,13 +82,13 @@ 
 		$fakeRootStorage = new ObjectStoreStorage($rootStorageArguments);
 		$fakeRootStorageJail = new Jail([
 			'storage' => $fakeRootStorage,
-			'root' => '/appdata_' . $instanceId . '/preview',
+			'root' => '/appdata_'.$instanceId.'/preview',
 		]);
 
 		// add a fallback location to be able to fetch existing previews from the old bucket
 		$mountPoints[] = new MountPoint(
 			$fakeRootStorageJail,
-			'/appdata_' . $instanceId . '/preview/old-multibucket',
+			'/appdata_'.$instanceId.'/preview/old-multibucket',
 			null,
 			$loader,
 			null,

Indentation +100 added lines, -100 removed lines

@@ -37,119 +37,119 @@
  * Mount provider for object store app data folder for previews
  */
 class ObjectStorePreviewCacheMountProvider implements IRootMountProvider {
-	private LoggerInterface $logger;
-	/** @var IConfig */
-	private $config;
-
-	public function __construct(LoggerInterface $logger, IConfig $config) {
-		$this->logger = $logger;
-		$this->config = $config;
-	}
-
-	/**
-	 * @return MountPoint[]
-	 * @throws \Exception
-	 */
-	public function getRootMounts(IStorageFactory $loader): array {
-		if (!is_array($this->config->getSystemValue('objectstore_multibucket'))) {
-			return [];
-		}
-		if ($this->config->getSystemValue('objectstore.multibucket.preview-distribution', false) !== true) {
-			return [];
-		}
-
-		$instanceId = $this->config->getSystemValueString('instanceid', '');
-		$mountPoints = [];
-		$directoryRange = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'];
-		$i = 0;
-		foreach ($directoryRange as $parent) {
-			foreach ($directoryRange as $child) {
-				$mountPoints[] = new MountPoint(
-					AppdataPreviewObjectStoreStorage::class,
-					'/appdata_' . $instanceId . '/preview/' . $parent . '/' . $child,
-					$this->getMultiBucketObjectStore($i),
-					$loader,
-					null,
-					null,
-					self::class
-				);
-				$i++;
-			}
-		}
-
-		$rootStorageArguments = $this->getMultiBucketObjectStoreForRoot();
-		$fakeRootStorage = new ObjectStoreStorage($rootStorageArguments);
-		$fakeRootStorageJail = new Jail([
-			'storage' => $fakeRootStorage,
-			'root' => '/appdata_' . $instanceId . '/preview',
-		]);
-
-		// add a fallback location to be able to fetch existing previews from the old bucket
-		$mountPoints[] = new MountPoint(
-			$fakeRootStorageJail,
-			'/appdata_' . $instanceId . '/preview/old-multibucket',
-			null,
-			$loader,
-			null,
-			null,
-			self::class
-		);
-
-		return $mountPoints;
-	}
-
-	protected function getMultiBucketObjectStore(int $number): array {
-		$config = $this->config->getSystemValue('objectstore_multibucket');
-
-		// sanity checks
-		if (empty($config['class'])) {
-			$this->logger->error('No class given for objectstore', ['app' => 'files']);
-		}
-		if (!isset($config['arguments'])) {
-			$config['arguments'] = [];
-		}
-
-		/*
+    private LoggerInterface $logger;
+    /** @var IConfig */
+    private $config;
+
+    public function __construct(LoggerInterface $logger, IConfig $config) {
+        $this->logger = $logger;
+        $this->config = $config;
+    }
+
+    /**
+     * @return MountPoint[]
+     * @throws \Exception
+     */
+    public function getRootMounts(IStorageFactory $loader): array {
+        if (!is_array($this->config->getSystemValue('objectstore_multibucket'))) {
+            return [];
+        }
+        if ($this->config->getSystemValue('objectstore.multibucket.preview-distribution', false) !== true) {
+            return [];
+        }
+
+        $instanceId = $this->config->getSystemValueString('instanceid', '');
+        $mountPoints = [];
+        $directoryRange = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'];
+        $i = 0;
+        foreach ($directoryRange as $parent) {
+            foreach ($directoryRange as $child) {
+                $mountPoints[] = new MountPoint(
+                    AppdataPreviewObjectStoreStorage::class,
+                    '/appdata_' . $instanceId . '/preview/' . $parent . '/' . $child,
+                    $this->getMultiBucketObjectStore($i),
+                    $loader,
+                    null,
+                    null,
+                    self::class
+                );
+                $i++;
+            }
+        }
+
+        $rootStorageArguments = $this->getMultiBucketObjectStoreForRoot();
+        $fakeRootStorage = new ObjectStoreStorage($rootStorageArguments);
+        $fakeRootStorageJail = new Jail([
+            'storage' => $fakeRootStorage,
+            'root' => '/appdata_' . $instanceId . '/preview',
+        ]);
+
+        // add a fallback location to be able to fetch existing previews from the old bucket
+        $mountPoints[] = new MountPoint(
+            $fakeRootStorageJail,
+            '/appdata_' . $instanceId . '/preview/old-multibucket',
+            null,
+            $loader,
+            null,
+            null,
+            self::class
+        );
+
+        return $mountPoints;
+    }
+
+    protected function getMultiBucketObjectStore(int $number): array {
+        $config = $this->config->getSystemValue('objectstore_multibucket');
+
+        // sanity checks
+        if (empty($config['class'])) {
+            $this->logger->error('No class given for objectstore', ['app' => 'files']);
+        }
+        if (!isset($config['arguments'])) {
+            $config['arguments'] = [];
+        }
+
+        /*
 		 * Use any provided bucket argument as prefix
 		 * and add the mapping from parent/child => bucket
 		 */
-		if (!isset($config['arguments']['bucket'])) {
-			$config['arguments']['bucket'] = '';
-		}
+        if (!isset($config['arguments']['bucket'])) {
+            $config['arguments']['bucket'] = '';
+        }
 
-		$config['arguments']['bucket'] .= "-preview-$number";
+        $config['arguments']['bucket'] .= "-preview-$number";
 
-		// instantiate object store implementation
-		$config['arguments']['objectstore'] = new $config['class']($config['arguments']);
+        // instantiate object store implementation
+        $config['arguments']['objectstore'] = new $config['class']($config['arguments']);
 
-		$config['arguments']['internal-id'] = $number;
+        $config['arguments']['internal-id'] = $number;
 
-		return $config['arguments'];
-	}
+        return $config['arguments'];
+    }
 
-	protected function getMultiBucketObjectStoreForRoot(): array {
-		$config = $this->config->getSystemValue('objectstore_multibucket');
+    protected function getMultiBucketObjectStoreForRoot(): array {
+        $config = $this->config->getSystemValue('objectstore_multibucket');
 
-		// sanity checks
-		if (empty($config['class'])) {
-			$this->logger->error('No class given for objectstore', ['app' => 'files']);
-		}
-		if (!isset($config['arguments'])) {
-			$config['arguments'] = [];
-		}
+        // sanity checks
+        if (empty($config['class'])) {
+            $this->logger->error('No class given for objectstore', ['app' => 'files']);
+        }
+        if (!isset($config['arguments'])) {
+            $config['arguments'] = [];
+        }
 
-		/*
+        /*
 		 * Use any provided bucket argument as prefix
 		 * and add the mapping from parent/child => bucket
 		 */
-		if (!isset($config['arguments']['bucket'])) {
-			$config['arguments']['bucket'] = '';
-		}
-		$config['arguments']['bucket'] .= '0';
+        if (!isset($config['arguments']['bucket'])) {
+            $config['arguments']['bucket'] = '';
+        }
+        $config['arguments']['bucket'] .= '0';
 
-		// instantiate object store implementation
-		$config['arguments']['objectstore'] = new $config['class']($config['arguments']);
+        // instantiate object store implementation
+        $config['arguments']['objectstore'] = new $config['class']($config['arguments']);
 
-		return $config['arguments'];
-	}
+        return $config['arguments'];
+    }
 }

lib/private/Preview/OpenDocument.php

Indentation +16 added lines, -16 removed lines

@@ -29,22 +29,22 @@
 use OCP\IImage;
 
 class OpenDocument extends Bundled {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/application\/vnd.oasis.opendocument.*/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/application\/vnd.oasis.opendocument.*/';
+    }
 
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		$image = $this->extractThumbnail($file, 'Thumbnails/thumbnail.png');
-		if (($image !== null) && $image->valid()) {
-			return $image;
-		}
-		return null;
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+        $image = $this->extractThumbnail($file, 'Thumbnails/thumbnail.png');
+        if (($image !== null) && $image->valid()) {
+            return $image;
+        }
+        return null;
+    }
 }

lib/private/Preview/Krita.php

Indentation +20 added lines, -20 removed lines

@@ -26,26 +26,26 @@
 use OCP\IImage;
 
 class Krita extends Bundled {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/application\/x-krita/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/application\/x-krita/';
+    }
 
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		$image = $this->extractThumbnail($file, 'mergedimage.png');
-		if (($image !== null) && $image->valid()) {
-			return $image;
-		}
-		$image = $this->extractThumbnail($file, 'preview.png');
-		if (($image !== null) && $image->valid()) {
-			return $image;
-		}
-		return null;
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+        $image = $this->extractThumbnail($file, 'mergedimage.png');
+        if (($image !== null) && $image->valid()) {
+            return $image;
+        }
+        $image = $this->extractThumbnail($file, 'preview.png');
+        if (($image !== null) && $image->valid()) {
+            return $image;
+        }
+        return null;
+    }
 }

lib/public/Files/Config/ICachedMountFileInfo.php

Indentation +12 added lines, -12 removed lines

@@ -28,17 +28,17 @@
  * @since 13.0.0
  */
 interface ICachedMountFileInfo extends ICachedMountInfo {
-	/**
-	 * Return the path for the file within the cached mount
-	 *
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function getInternalPath(): string;
+    /**
+     * Return the path for the file within the cached mount
+     *
+     * @return string
+     * @since 13.0.0
+     */
+    public function getInternalPath(): string;
 
-	/**
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function getPath(): string;
+    /**
+     * @return string
+     * @since 13.0.0
+     */
+    public function getPath(): string;
 }

lib/private/Group/MetaData.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 	 * @param string $userSearch the pattern users are search for
 	 */
 	public function get(string $groupSearch = '', string $userSearch = ''): array {
-		$key = $groupSearch . '::' . $userSearch;
+		$key = $groupSearch.'::'.$userSearch;
 		if (isset($this->metaData[$key])) {
 			return $this->metaData[$key];
 		}

Indentation +151 added lines, -151 removed lines

@@ -13,155 +13,155 @@
 use OCP\IUserSession;
 
 class MetaData {
-	public const SORT_NONE = 0;
-	public const SORT_USERCOUNT = 1; // May have performance issues on LDAP backends
-	public const SORT_GROUPNAME = 2;
-
-	/** @var array */
-	protected $metaData = [];
-	/** @var int */
-	protected $sorting = self::SORT_NONE;
-
-	/**
-	 * @param string $user the uid of the current user
-	 * @param bool $isAdmin whether the current users is an admin
-	 */
-	public function __construct(
-		private string $user,
-		private bool $isAdmin,
-		private bool $isDelegatedAdmin,
-		private IGroupManager $groupManager,
-		private IUserSession $userSession,
-	) {
-	}
-
-	/**
-	 * returns an array with meta data about all available groups
-	 * the array is structured as follows:
-	 * [0] array containing meta data about admin groups
-	 * [1] array containing meta data about unprivileged groups
-	 * @param string $groupSearch only effective when instance was created with
-	 *                            isAdmin being true
-	 * @param string $userSearch the pattern users are search for
-	 */
-	public function get(string $groupSearch = '', string $userSearch = ''): array {
-		$key = $groupSearch . '::' . $userSearch;
-		if (isset($this->metaData[$key])) {
-			return $this->metaData[$key];
-		}
-
-		$adminGroups = [];
-		$groups = [];
-		$sortGroupsIndex = 0;
-		$sortGroupsKeys = [];
-		$sortAdminGroupsIndex = 0;
-		$sortAdminGroupsKeys = [];
-
-		foreach ($this->getGroups($groupSearch) as $group) {
-			$groupMetaData = $this->generateGroupMetaData($group, $userSearch);
-			if (strtolower($group->getGID()) !== 'admin') {
-				$this->addEntry(
-					$groups,
-					$sortGroupsKeys,
-					$sortGroupsIndex,
-					$groupMetaData);
-			} else {
-				//admin group is hard coded to 'admin' for now. In future,
-				//backends may define admin groups too. Then the if statement
-				//has to be adjusted accordingly.
-				$this->addEntry(
-					$adminGroups,
-					$sortAdminGroupsKeys,
-					$sortAdminGroupsIndex,
-					$groupMetaData);
-			}
-		}
-
-		//whether sorting is necessary is will be checked in sort()
-		$this->sort($groups, $sortGroupsKeys);
-		$this->sort($adminGroups, $sortAdminGroupsKeys);
-
-		$this->metaData[$key] = [$adminGroups, $groups];
-		return $this->metaData[$key];
-	}
-
-	/**
-	 * sets the sort mode, see SORT_* constants for supported modes
-	 */
-	public function setSorting(int $sortMode): void {
-		switch ($sortMode) {
-			case self::SORT_USERCOUNT:
-			case self::SORT_GROUPNAME:
-				$this->sorting = $sortMode;
-				break;
-
-			default:
-				$this->sorting = self::SORT_NONE;
-		}
-	}
-
-	/**
-	 * adds an group entry to the resulting array
-	 * @param array $entries the resulting array, by reference
-	 * @param array $sortKeys the sort key array, by reference
-	 * @param int $sortIndex the sort key index, by reference
-	 * @param array $data the group's meta data as returned by generateGroupMetaData()
-	 */
-	private function addEntry(array &$entries, array &$sortKeys, int &$sortIndex, array $data): void {
-		$entries[] = $data;
-		if ($this->sorting === self::SORT_USERCOUNT) {
-			$sortKeys[$sortIndex] = $data['usercount'];
-			$sortIndex++;
-		} elseif ($this->sorting === self::SORT_GROUPNAME) {
-			$sortKeys[$sortIndex] = $data['name'];
-			$sortIndex++;
-		}
-	}
-
-	/**
-	 * creates an array containing the group meta data
-	 * @return array with the keys 'id', 'name', 'usercount' and 'disabled'
-	 */
-	private function generateGroupMetaData(IGroup $group, string $userSearch): array {
-		return [
-			'id' => $group->getGID(),
-			'name' => $group->getDisplayName(),
-			'usercount' => $this->sorting === self::SORT_USERCOUNT ? $group->count($userSearch) : 0,
-			'disabled' => $group->countDisabled(),
-			'canAdd' => $group->canAddUser(),
-			'canRemove' => $group->canRemoveUser(),
-		];
-	}
-
-	/**
-	 * sorts the result array, if applicable
-	 * @param array $entries the result array, by reference
-	 * @param array $sortKeys the array containing the sort keys
-	 */
-	private function sort(array &$entries, array $sortKeys): void {
-		if ($this->sorting === self::SORT_USERCOUNT) {
-			array_multisort($sortKeys, SORT_DESC, $entries);
-		} elseif ($this->sorting === self::SORT_GROUPNAME) {
-			array_multisort($sortKeys, SORT_ASC, $entries);
-		}
-	}
-
-	/**
-	 * returns the available groups
-	 * @return IGroup[]
-	 */
-	public function getGroups(string $search = ''): array {
-		if ($this->isAdmin || $this->isDelegatedAdmin) {
-			return $this->groupManager->search($search);
-		} else {
-			$userObject = $this->userSession->getUser();
-			if ($userObject !== null && $this->groupManager instanceof GroupManager) {
-				$groups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($userObject);
-			} else {
-				$groups = [];
-			}
-
-			return $groups;
-		}
-	}
+    public const SORT_NONE = 0;
+    public const SORT_USERCOUNT = 1; // May have performance issues on LDAP backends
+    public const SORT_GROUPNAME = 2;
+
+    /** @var array */
+    protected $metaData = [];
+    /** @var int */
+    protected $sorting = self::SORT_NONE;
+
+    /**
+     * @param string $user the uid of the current user
+     * @param bool $isAdmin whether the current users is an admin
+     */
+    public function __construct(
+        private string $user,
+        private bool $isAdmin,
+        private bool $isDelegatedAdmin,
+        private IGroupManager $groupManager,
+        private IUserSession $userSession,
+    ) {
+    }
+
+    /**
+     * returns an array with meta data about all available groups
+     * the array is structured as follows:
+     * [0] array containing meta data about admin groups
+     * [1] array containing meta data about unprivileged groups
+     * @param string $groupSearch only effective when instance was created with
+     *                            isAdmin being true
+     * @param string $userSearch the pattern users are search for
+     */
+    public function get(string $groupSearch = '', string $userSearch = ''): array {
+        $key = $groupSearch . '::' . $userSearch;
+        if (isset($this->metaData[$key])) {
+            return $this->metaData[$key];
+        }
+
+        $adminGroups = [];
+        $groups = [];
+        $sortGroupsIndex = 0;
+        $sortGroupsKeys = [];
+        $sortAdminGroupsIndex = 0;
+        $sortAdminGroupsKeys = [];
+
+        foreach ($this->getGroups($groupSearch) as $group) {
+            $groupMetaData = $this->generateGroupMetaData($group, $userSearch);
+            if (strtolower($group->getGID()) !== 'admin') {
+                $this->addEntry(
+                    $groups,
+                    $sortGroupsKeys,
+                    $sortGroupsIndex,
+                    $groupMetaData);
+            } else {
+                //admin group is hard coded to 'admin' for now. In future,
+                //backends may define admin groups too. Then the if statement
+                //has to be adjusted accordingly.
+                $this->addEntry(
+                    $adminGroups,
+                    $sortAdminGroupsKeys,
+                    $sortAdminGroupsIndex,
+                    $groupMetaData);
+            }
+        }
+
+        //whether sorting is necessary is will be checked in sort()
+        $this->sort($groups, $sortGroupsKeys);
+        $this->sort($adminGroups, $sortAdminGroupsKeys);
+
+        $this->metaData[$key] = [$adminGroups, $groups];
+        return $this->metaData[$key];
+    }
+
+    /**
+     * sets the sort mode, see SORT_* constants for supported modes
+     */
+    public function setSorting(int $sortMode): void {
+        switch ($sortMode) {
+            case self::SORT_USERCOUNT:
+            case self::SORT_GROUPNAME:
+                $this->sorting = $sortMode;
+                break;
+
+            default:
+                $this->sorting = self::SORT_NONE;
+        }
+    }
+
+    /**
+     * adds an group entry to the resulting array
+     * @param array $entries the resulting array, by reference
+     * @param array $sortKeys the sort key array, by reference
+     * @param int $sortIndex the sort key index, by reference
+     * @param array $data the group's meta data as returned by generateGroupMetaData()
+     */
+    private function addEntry(array &$entries, array &$sortKeys, int &$sortIndex, array $data): void {
+        $entries[] = $data;
+        if ($this->sorting === self::SORT_USERCOUNT) {
+            $sortKeys[$sortIndex] = $data['usercount'];
+            $sortIndex++;
+        } elseif ($this->sorting === self::SORT_GROUPNAME) {
+            $sortKeys[$sortIndex] = $data['name'];
+            $sortIndex++;
+        }
+    }
+
+    /**
+     * creates an array containing the group meta data
+     * @return array with the keys 'id', 'name', 'usercount' and 'disabled'
+     */
+    private function generateGroupMetaData(IGroup $group, string $userSearch): array {
+        return [
+            'id' => $group->getGID(),
+            'name' => $group->getDisplayName(),
+            'usercount' => $this->sorting === self::SORT_USERCOUNT ? $group->count($userSearch) : 0,
+            'disabled' => $group->countDisabled(),
+            'canAdd' => $group->canAddUser(),
+            'canRemove' => $group->canRemoveUser(),
+        ];
+    }
+
+    /**
+     * sorts the result array, if applicable
+     * @param array $entries the result array, by reference
+     * @param array $sortKeys the array containing the sort keys
+     */
+    private function sort(array &$entries, array $sortKeys): void {
+        if ($this->sorting === self::SORT_USERCOUNT) {
+            array_multisort($sortKeys, SORT_DESC, $entries);
+        } elseif ($this->sorting === self::SORT_GROUPNAME) {
+            array_multisort($sortKeys, SORT_ASC, $entries);
+        }
+    }
+
+    /**
+     * returns the available groups
+     * @return IGroup[]
+     */
+    public function getGroups(string $search = ''): array {
+        if ($this->isAdmin || $this->isDelegatedAdmin) {
+            return $this->groupManager->search($search);
+        } else {
+            $userObject = $this->userSession->getUser();
+            if ($userObject !== null && $this->groupManager instanceof GroupManager) {
+                $groups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($userObject);
+            } else {
+                $groups = [];
+            }
+
+            return $groups;
+        }
+    }
 }

apps/admin_audit/lib/AuditLogger.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 		$logFile = $config->getSystemValueString('logfile_audit', '');
 
 		if ($auditType === 'file' && !$logFile) {
-			$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
+			$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/audit.log';
 			// Legacy way was appconfig, now it's paralleled with the normal log config
 			$logFile = $config->getAppValue('admin_audit', 'logfile', $default);
 		}

Indentation +52 added lines, -52 removed lines

@@ -18,56 +18,56 @@
  */
 class AuditLogger implements IAuditLogger {
 
-	private LoggerInterface $parentLogger;
-
-	public function __construct(ILogFactory $logFactory, IConfig $config) {
-		$auditType = $config->getSystemValueString('log_type_audit', 'file');
-		$defaultTag = $config->getSystemValueString('syslog_tag', 'Nextcloud');
-		$auditTag = $config->getSystemValueString('syslog_tag_audit', $defaultTag);
-		$logFile = $config->getSystemValueString('logfile_audit', '');
-
-		if ($auditType === 'file' && !$logFile) {
-			$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
-			// Legacy way was appconfig, now it's paralleled with the normal log config
-			$logFile = $config->getAppValue('admin_audit', 'logfile', $default);
-		}
-
-		$this->parentLogger = $logFactory->getCustomPsrLogger($logFile, $auditType, $auditTag);
-	}
-
-	public function emergency($message, array $context = []): void {
-		$this->parentLogger->emergency($message, $context);
-	}
-
-	public function alert($message, array $context = []): void {
-		$this->parentLogger->alert($message, $context);
-	}
-
-	public function critical($message, array $context = []): void {
-		$this->parentLogger->critical($message, $context);
-	}
-
-	public function error($message, array $context = []): void {
-		$this->parentLogger->error($message, $context);
-	}
-
-	public function warning($message, array $context = []): void {
-		$this->parentLogger->warning($message, $context);
-	}
-
-	public function notice($message, array $context = []): void {
-		$this->parentLogger->notice($message, $context);
-	}
-
-	public function info($message, array $context = []): void {
-		$this->parentLogger->info($message, $context);
-	}
-
-	public function debug($message, array $context = []): void {
-		$this->parentLogger->debug($message, $context);
-	}
-
-	public function log($level, $message, array $context = []): void {
-		$this->parentLogger->log($level, $message, $context);
-	}
+    private LoggerInterface $parentLogger;
+
+    public function __construct(ILogFactory $logFactory, IConfig $config) {
+        $auditType = $config->getSystemValueString('log_type_audit', 'file');
+        $defaultTag = $config->getSystemValueString('syslog_tag', 'Nextcloud');
+        $auditTag = $config->getSystemValueString('syslog_tag_audit', $defaultTag);
+        $logFile = $config->getSystemValueString('logfile_audit', '');
+
+        if ($auditType === 'file' && !$logFile) {
+            $default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
+            // Legacy way was appconfig, now it's paralleled with the normal log config
+            $logFile = $config->getAppValue('admin_audit', 'logfile', $default);
+        }
+
+        $this->parentLogger = $logFactory->getCustomPsrLogger($logFile, $auditType, $auditTag);
+    }
+
+    public function emergency($message, array $context = []): void {
+        $this->parentLogger->emergency($message, $context);
+    }
+
+    public function alert($message, array $context = []): void {
+        $this->parentLogger->alert($message, $context);
+    }
+
+    public function critical($message, array $context = []): void {
+        $this->parentLogger->critical($message, $context);
+    }
+
+    public function error($message, array $context = []): void {
+        $this->parentLogger->error($message, $context);
+    }
+
+    public function warning($message, array $context = []): void {
+        $this->parentLogger->warning($message, $context);
+    }
+
+    public function notice($message, array $context = []): void {
+        $this->parentLogger->notice($message, $context);
+    }
+
+    public function info($message, array $context = []): void {
+        $this->parentLogger->info($message, $context);
+    }
+
+    public function debug($message, array $context = []): void {
+        $this->parentLogger->debug($message, $context);
+    }
+
+    public function log($level, $message, array $context = []): void {
+        $this->parentLogger->log($level, $message, $context);
+    }
 }