nextcloud / server

lib/private/Files/ObjectStore/PrimaryObjectStoreConfig.php

Indentation +215 added lines, -215 removed lines

@@ -17,222 +17,222 @@
  * @psalm-type ObjectStoreConfig array{class: class-string<IObjectStore>, arguments: array{multibucket: bool, ...}}
  */
 class PrimaryObjectStoreConfig {
-	public function __construct(
-		private readonly IConfig $config,
-		private readonly IAppManager $appManager,
-	) {
-	}
-
-	/**
-	 * @param ObjectStoreConfig $config
-	 */
-	public function buildObjectStore(array $config): IObjectStore {
-		return new $config['class']($config['arguments']);
-	}
-
-	/**
-	 * @return ?ObjectStoreConfig
-	 */
-	public function getObjectStoreConfigForRoot(): ?array {
-		if (!$this->hasObjectStore()) {
-			return null;
-		}
-
-		$config = $this->getObjectStoreConfiguration('root');
-
-		if ($config['arguments']['multibucket']) {
-			if (!isset($config['arguments']['bucket'])) {
-				$config['arguments']['bucket'] = '';
-			}
-
-			// put the root FS always in first bucket for multibucket configuration
-			$config['arguments']['bucket'] .= '0';
-		}
-		return $config;
-	}
-
-	/**
-	 * @return ?ObjectStoreConfig
-	 */
-	public function getObjectStoreConfigForUser(IUser $user): ?array {
-		if (!$this->hasObjectStore()) {
-			return null;
-		}
-
-		$store = $this->getObjectStoreForUser($user);
-		$config = $this->getObjectStoreConfiguration($store);
-
-		if ($config['arguments']['multibucket']) {
-			$config['arguments']['bucket'] = $this->getBucketForUser($user, $config);
-		}
-		return $config;
-	}
-
-	/**
-	 * @param string $name
-	 * @return ObjectStoreConfig
-	 */
-	public function getObjectStoreConfiguration(string $name): array {
-		$configs = $this->getObjectStoreConfigs();
-		$name = $this->resolveAlias($name);
-		if (!isset($configs[$name])) {
-			throw new \Exception("Object store configuration for '$name' not found");
-		}
-		if (is_string($configs[$name])) {
-			throw new \Exception("Object store configuration for '{$configs[$name]}' not found");
-		}
-		return $configs[$name];
-	}
-
-	public function resolveAlias(string $name): string {
-		$configs = $this->getObjectStoreConfigs();
-
-		while (isset($configs[$name]) && is_string($configs[$name])) {
-			$name = $configs[$name];
-		}
-		return $name;
-	}
-
-	public function hasObjectStore(): bool {
-		$objectStore = $this->config->getSystemValue('objectstore', null);
-		$objectStoreMultiBucket = $this->config->getSystemValue('objectstore_multibucket', null);
-		return $objectStore || $objectStoreMultiBucket;
-	}
-
-	public function hasMultipleObjectStorages(): bool {
-		$objectStore = $this->config->getSystemValue('objectstore', []);
-		return isset($objectStore['default']);
-	}
-
-	/**
-	 * @return ?array<string, ObjectStoreConfig|string>
-	 * @throws InvalidObjectStoreConfigurationException
-	 */
-	public function getObjectStoreConfigs(): ?array {
-		$objectStore = $this->config->getSystemValue('objectstore', null);
-		$objectStoreMultiBucket = $this->config->getSystemValue('objectstore_multibucket', null);
-
-		// new-style multibucket config uses the same 'objectstore' key but sets `'multibucket' => true`, transparently upgrade older style config
-		if ($objectStoreMultiBucket) {
-			$objectStoreMultiBucket['arguments']['multibucket'] = true;
-			$configs = [
-				'default' => 'server1',
-				'server1' => $this->validateObjectStoreConfig($objectStoreMultiBucket),
-				'root' => 'server1',
-			];
-		} elseif ($objectStore) {
-			if (!isset($objectStore['default'])) {
-				$objectStore = [
-					'default' => 'server1',
-					'root' => 'server1',
-					'server1' => $objectStore,
-				];
-			}
-			if (!isset($objectStore['root'])) {
-				$objectStore['root'] = 'default';
-			}
-
-			if (!is_string($objectStore['default'])) {
-				throw new InvalidObjectStoreConfigurationException('The \'default\' object storage configuration is required to be a reference to another configuration.');
-			}
-			$configs = array_map($this->validateObjectStoreConfig(...), $objectStore);
-		} else {
-			return null;
-		}
-
-		$usedBuckets = [];
-		foreach ($configs as $config) {
-			if (is_array($config)) {
-				$bucket = $config['arguments']['bucket'] ?? '';
-				if (in_array($bucket, $usedBuckets)) {
-					throw new InvalidObjectStoreConfigurationException('Each object store configuration must use distinct bucket names');
-				}
-				$usedBuckets[] = $bucket;
-			}
-		}
-
-		return $configs;
-	}
-
-	/**
-	 * @param array|string $config
-	 * @return string|ObjectStoreConfig
-	 */
-	private function validateObjectStoreConfig(array|string $config): array|string {
-		if (is_string($config)) {
-			return $config;
-		}
-		if (!isset($config['class'])) {
-			throw new InvalidObjectStoreConfigurationException('No class configured for object store');
-		}
-		if (!isset($config['arguments'])) {
-			$config['arguments'] = [];
-		}
-		$class = $config['class'];
-		$arguments = $config['arguments'];
-		if (!is_array($arguments)) {
-			throw new InvalidObjectStoreConfigurationException('Configured object store arguments are not an array');
-		}
-		if (!isset($arguments['multibucket'])) {
-			$arguments['multibucket'] = false;
-		}
-		if (!is_bool($arguments['multibucket'])) {
-			throw new InvalidObjectStoreConfigurationException('arguments.multibucket must be a boolean in object store configuration');
-		}
-
-		if (!is_string($class)) {
-			throw new InvalidObjectStoreConfigurationException('Configured class for object store is not a string');
-		}
-
-		if (str_starts_with($class, 'OCA\\') && substr_count($class, '\\') >= 2) {
-			[$appId] = explode('\\', $class);
-			$this->appManager->loadApp(strtolower($appId));
-		}
-
-		if (!is_a($class, IObjectStore::class, true)) {
-			throw new InvalidObjectStoreConfigurationException('Configured class for object store is not an object store');
-		}
-		return [
-			'class' => $class,
-			'arguments' => $arguments,
-		];
-	}
-
-	public function getBucketForUser(IUser $user, array $config): string {
-		$bucket = $this->getSetBucketForUser($user);
-
-		if ($bucket === null) {
-			/*
+    public function __construct(
+        private readonly IConfig $config,
+        private readonly IAppManager $appManager,
+    ) {
+    }
+
+    /**
+     * @param ObjectStoreConfig $config
+     */
+    public function buildObjectStore(array $config): IObjectStore {
+        return new $config['class']($config['arguments']);
+    }
+
+    /**
+     * @return ?ObjectStoreConfig
+     */
+    public function getObjectStoreConfigForRoot(): ?array {
+        if (!$this->hasObjectStore()) {
+            return null;
+        }
+
+        $config = $this->getObjectStoreConfiguration('root');
+
+        if ($config['arguments']['multibucket']) {
+            if (!isset($config['arguments']['bucket'])) {
+                $config['arguments']['bucket'] = '';
+            }
+
+            // put the root FS always in first bucket for multibucket configuration
+            $config['arguments']['bucket'] .= '0';
+        }
+        return $config;
+    }
+
+    /**
+     * @return ?ObjectStoreConfig
+     */
+    public function getObjectStoreConfigForUser(IUser $user): ?array {
+        if (!$this->hasObjectStore()) {
+            return null;
+        }
+
+        $store = $this->getObjectStoreForUser($user);
+        $config = $this->getObjectStoreConfiguration($store);
+
+        if ($config['arguments']['multibucket']) {
+            $config['arguments']['bucket'] = $this->getBucketForUser($user, $config);
+        }
+        return $config;
+    }
+
+    /**
+     * @param string $name
+     * @return ObjectStoreConfig
+     */
+    public function getObjectStoreConfiguration(string $name): array {
+        $configs = $this->getObjectStoreConfigs();
+        $name = $this->resolveAlias($name);
+        if (!isset($configs[$name])) {
+            throw new \Exception("Object store configuration for '$name' not found");
+        }
+        if (is_string($configs[$name])) {
+            throw new \Exception("Object store configuration for '{$configs[$name]}' not found");
+        }
+        return $configs[$name];
+    }
+
+    public function resolveAlias(string $name): string {
+        $configs = $this->getObjectStoreConfigs();
+
+        while (isset($configs[$name]) && is_string($configs[$name])) {
+            $name = $configs[$name];
+        }
+        return $name;
+    }
+
+    public function hasObjectStore(): bool {
+        $objectStore = $this->config->getSystemValue('objectstore', null);
+        $objectStoreMultiBucket = $this->config->getSystemValue('objectstore_multibucket', null);
+        return $objectStore || $objectStoreMultiBucket;
+    }
+
+    public function hasMultipleObjectStorages(): bool {
+        $objectStore = $this->config->getSystemValue('objectstore', []);
+        return isset($objectStore['default']);
+    }
+
+    /**
+     * @return ?array<string, ObjectStoreConfig|string>
+     * @throws InvalidObjectStoreConfigurationException
+     */
+    public function getObjectStoreConfigs(): ?array {
+        $objectStore = $this->config->getSystemValue('objectstore', null);
+        $objectStoreMultiBucket = $this->config->getSystemValue('objectstore_multibucket', null);
+
+        // new-style multibucket config uses the same 'objectstore' key but sets `'multibucket' => true`, transparently upgrade older style config
+        if ($objectStoreMultiBucket) {
+            $objectStoreMultiBucket['arguments']['multibucket'] = true;
+            $configs = [
+                'default' => 'server1',
+                'server1' => $this->validateObjectStoreConfig($objectStoreMultiBucket),
+                'root' => 'server1',
+            ];
+        } elseif ($objectStore) {
+            if (!isset($objectStore['default'])) {
+                $objectStore = [
+                    'default' => 'server1',
+                    'root' => 'server1',
+                    'server1' => $objectStore,
+                ];
+            }
+            if (!isset($objectStore['root'])) {
+                $objectStore['root'] = 'default';
+            }
+
+            if (!is_string($objectStore['default'])) {
+                throw new InvalidObjectStoreConfigurationException('The \'default\' object storage configuration is required to be a reference to another configuration.');
+            }
+            $configs = array_map($this->validateObjectStoreConfig(...), $objectStore);
+        } else {
+            return null;
+        }
+
+        $usedBuckets = [];
+        foreach ($configs as $config) {
+            if (is_array($config)) {
+                $bucket = $config['arguments']['bucket'] ?? '';
+                if (in_array($bucket, $usedBuckets)) {
+                    throw new InvalidObjectStoreConfigurationException('Each object store configuration must use distinct bucket names');
+                }
+                $usedBuckets[] = $bucket;
+            }
+        }
+
+        return $configs;
+    }
+
+    /**
+     * @param array|string $config
+     * @return string|ObjectStoreConfig
+     */
+    private function validateObjectStoreConfig(array|string $config): array|string {
+        if (is_string($config)) {
+            return $config;
+        }
+        if (!isset($config['class'])) {
+            throw new InvalidObjectStoreConfigurationException('No class configured for object store');
+        }
+        if (!isset($config['arguments'])) {
+            $config['arguments'] = [];
+        }
+        $class = $config['class'];
+        $arguments = $config['arguments'];
+        if (!is_array($arguments)) {
+            throw new InvalidObjectStoreConfigurationException('Configured object store arguments are not an array');
+        }
+        if (!isset($arguments['multibucket'])) {
+            $arguments['multibucket'] = false;
+        }
+        if (!is_bool($arguments['multibucket'])) {
+            throw new InvalidObjectStoreConfigurationException('arguments.multibucket must be a boolean in object store configuration');
+        }
+
+        if (!is_string($class)) {
+            throw new InvalidObjectStoreConfigurationException('Configured class for object store is not a string');
+        }
+
+        if (str_starts_with($class, 'OCA\\') && substr_count($class, '\\') >= 2) {
+            [$appId] = explode('\\', $class);
+            $this->appManager->loadApp(strtolower($appId));
+        }
+
+        if (!is_a($class, IObjectStore::class, true)) {
+            throw new InvalidObjectStoreConfigurationException('Configured class for object store is not an object store');
+        }
+        return [
+            'class' => $class,
+            'arguments' => $arguments,
+        ];
+    }
+
+    public function getBucketForUser(IUser $user, array $config): string {
+        $bucket = $this->getSetBucketForUser($user);
+
+        if ($bucket === null) {
+            /*
 			 * Use any provided bucket argument as prefix
 			 * and add the mapping from username => bucket
 			 */
-			if (!isset($config['arguments']['bucket'])) {
-				$config['arguments']['bucket'] = '';
-			}
-			$mapper = new Mapper($user, $config);
-			$numBuckets = $config['arguments']['num_buckets'] ?? 64;
-			$bucket = $config['arguments']['bucket'] . $mapper->getBucket($numBuckets);
-
-			$this->config->setUserValue($user->getUID(), 'homeobjectstore', 'bucket', $bucket);
-		}
-
-		return $bucket;
-	}
-
-	public function getSetBucketForUser(IUser $user): ?string {
-		return $this->config->getUserValue($user->getUID(), 'homeobjectstore', 'bucket', null);
-	}
-
-	public function getObjectStoreForUser(IUser $user): string {
-		if ($this->hasMultipleObjectStorages()) {
-			$value = $this->config->getUserValue($user->getUID(), 'homeobjectstore', 'objectstore', null);
-			if ($value === null) {
-				$value = $this->resolveAlias('default');
-				$this->config->setUserValue($user->getUID(), 'homeobjectstore', 'objectstore', $value);
-			}
-			return $value;
-		} else {
-			return 'default';
-		}
-	}
+            if (!isset($config['arguments']['bucket'])) {
+                $config['arguments']['bucket'] = '';
+            }
+            $mapper = new Mapper($user, $config);
+            $numBuckets = $config['arguments']['num_buckets'] ?? 64;
+            $bucket = $config['arguments']['bucket'] . $mapper->getBucket($numBuckets);
+
+            $this->config->setUserValue($user->getUID(), 'homeobjectstore', 'bucket', $bucket);
+        }
+
+        return $bucket;
+    }
+
+    public function getSetBucketForUser(IUser $user): ?string {
+        return $this->config->getUserValue($user->getUID(), 'homeobjectstore', 'bucket', null);
+    }
+
+    public function getObjectStoreForUser(IUser $user): string {
+        if ($this->hasMultipleObjectStorages()) {
+            $value = $this->config->getUserValue($user->getUID(), 'homeobjectstore', 'objectstore', null);
+            if ($value === null) {
+                $value = $this->resolveAlias('default');
+                $this->config->setUserValue($user->getUID(), 'homeobjectstore', 'objectstore', $value);
+            }
+            return $value;
+        } else {
+            return 'default';
+        }
+    }
 }

tests/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php

Indentation +272 added lines, -272 removed lines

@@ -17,276 +17,276 @@
 use Test\TestCase;
 
 class PrimaryObjectStoreConfigTest extends TestCase {
-	private array $systemConfig = [];
-	private array $userConfig = [];
-	private IConfig&MockObject $config;
-	private IAppManager&MockObject $appManager;
-	private PrimaryObjectStoreConfig $objectStoreConfig;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->systemConfig = [];
-		$this->config = $this->createMock(IConfig::class);
-		$this->appManager = $this->createMock(IAppManager::class);
-		$this->config->method('getSystemValue')
-			->willReturnCallback(function ($key, $default = '') {
-				if (isset($this->systemConfig[$key])) {
-					return $this->systemConfig[$key];
-				} else {
-					return $default;
-				}
-			});
-		$this->config->method('getUserValue')
-			->willReturnCallback(function ($userId, $appName, $key, $default = '') {
-				if (isset($this->userConfig[$userId][$appName][$key])) {
-					return $this->userConfig[$userId][$appName][$key];
-				} else {
-					return $default;
-				}
-			});
-		$this->config->method('setUserValue')
-			->willReturnCallback(function ($userId, $appName, $key, $value): void {
-				$this->userConfig[$userId][$appName][$key] = $value;
-			});
-
-		$this->objectStoreConfig = new PrimaryObjectStoreConfig($this->config, $this->appManager);
-	}
-
-	private function getUser(string $uid): IUser {
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')
-			->willReturn($uid);
-		return $user;
-	}
-
-	private function setConfig(string $key, $value) {
-		$this->systemConfig[$key] = $value;
-	}
-
-	public function testNewUserGetsDefault() {
-		$this->setConfig('objectstore', [
-			'default' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-				],
-			],
-		]);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
-		$this->assertEquals('server1', $result['arguments']['host']);
-
-		$this->assertEquals('server1', $this->config->getUserValue('test', 'homeobjectstore', 'objectstore', null));
-	}
-
-	public function testExistingUserKeepsStorage() {
-		// setup user with `server1` as storage
-		$this->testNewUserGetsDefault();
-
-		$this->setConfig('objectstore', [
-			'default' => 'server2',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'bucket' => '1',
-				],
-			],
-			'server2' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server2',
-					'bucket' => '2',
-				],
-			],
-		]);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
-		$this->assertEquals('server1', $result['arguments']['host']);
-
-		$this->assertEquals('server1', $this->config->getUserValue('test', 'homeobjectstore', 'objectstore', null));
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('other-user'));
-		$this->assertEquals('server2', $result['arguments']['host']);
-	}
-
-	public function testNestedAliases() {
-		$this->setConfig('objectstore', [
-			'default' => 'a1',
-			'a1' => 'a2',
-			'a2' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'bucket' => '1',
-				],
-			],
-		]);
-		$this->assertEquals('server1', $this->objectStoreConfig->resolveAlias('default'));
-	}
-
-	public function testMultibucketChangedConfig() {
-		$this->setConfig('objectstore', [
-			'default' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'multibucket' => true,
-					'num_buckets' => 8,
-					'bucket' => 'bucket1-'
-				],
-			],
-		]);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
-		$this->assertEquals('server1', $result['arguments']['host']);
-		$this->assertEquals('bucket1-7', $result['arguments']['bucket']);
-
-		$this->setConfig('objectstore', [
-			'default' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'multibucket' => true,
-					'num_buckets' => 64,
-					'bucket' => 'bucket1-'
-				],
-			],
-		]);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
-		$this->assertEquals('server1', $result['arguments']['host']);
-		$this->assertEquals('bucket1-7', $result['arguments']['bucket']);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test-foo'));
-		$this->assertEquals('server1', $result['arguments']['host']);
-		$this->assertEquals('bucket1-40', $result['arguments']['bucket']);
-
-		$this->setConfig('objectstore', [
-			'default' => 'server2',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'multibucket' => true,
-					'num_buckets' => 64,
-					'bucket' => 'bucket1-'
-				],
-			],
-			'server2' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server2',
-					'multibucket' => true,
-					'num_buckets' => 16,
-					'bucket' => 'bucket2-'
-				],
-			],
-		]);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
-		$this->assertEquals('server1', $result['arguments']['host']);
-		$this->assertEquals('bucket1-7', $result['arguments']['bucket']);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test-bar'));
-		$this->assertEquals('server2', $result['arguments']['host']);
-		$this->assertEquals('bucket2-4', $result['arguments']['bucket']);
-	}
-
-	public function testMultibucketOldConfig() {
-		$this->setConfig('objectstore_multibucket', [
-			'class' => StorageObjectStore::class,
-			'arguments' => [
-				'host' => 'server1',
-				'multibucket' => true,
-				'num_buckets' => 8,
-				'bucket' => 'bucket-'
-			],
-		]);
-		$configs = $this->objectStoreConfig->getObjectStoreConfigs();
-		$this->assertEquals([
-			'default' => 'server1',
-			'root' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'multibucket' => true,
-					'num_buckets' => 8,
-					'bucket' => 'bucket-'
-				],
-			],
-		], $configs);
-	}
-
-	public function testSingleObjectStore() {
-		$this->setConfig('objectstore', [
-			'class' => StorageObjectStore::class,
-			'arguments' => [
-				'host' => 'server1',
-			],
-		]);
-		$configs = $this->objectStoreConfig->getObjectStoreConfigs();
-		$this->assertEquals([
-			'default' => 'server1',
-			'root' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'multibucket' => false,
-				],
-			],
-		], $configs);
-	}
-
-	public function testRoot() {
-		$this->setConfig('objectstore', [
-			'default' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'bucket' => '1',
-				],
-			],
-			'server2' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server2',
-					'bucket' => '2',
-				],
-			],
-		]);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForRoot();
-		$this->assertEquals('server1', $result['arguments']['host']);
-
-		$this->setConfig('objectstore', [
-			'default' => 'server1',
-			'root' => 'server2',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'bucket' => '1',
-				],
-			],
-			'server2' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server2',
-					'bucket' => '2',
-				],
-			],
-		]);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForRoot();
-		$this->assertEquals('server2', $result['arguments']['host']);
-	}
+    private array $systemConfig = [];
+    private array $userConfig = [];
+    private IConfig&MockObject $config;
+    private IAppManager&MockObject $appManager;
+    private PrimaryObjectStoreConfig $objectStoreConfig;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->systemConfig = [];
+        $this->config = $this->createMock(IConfig::class);
+        $this->appManager = $this->createMock(IAppManager::class);
+        $this->config->method('getSystemValue')
+            ->willReturnCallback(function ($key, $default = '') {
+                if (isset($this->systemConfig[$key])) {
+                    return $this->systemConfig[$key];
+                } else {
+                    return $default;
+                }
+            });
+        $this->config->method('getUserValue')
+            ->willReturnCallback(function ($userId, $appName, $key, $default = '') {
+                if (isset($this->userConfig[$userId][$appName][$key])) {
+                    return $this->userConfig[$userId][$appName][$key];
+                } else {
+                    return $default;
+                }
+            });
+        $this->config->method('setUserValue')
+            ->willReturnCallback(function ($userId, $appName, $key, $value): void {
+                $this->userConfig[$userId][$appName][$key] = $value;
+            });
+
+        $this->objectStoreConfig = new PrimaryObjectStoreConfig($this->config, $this->appManager);
+    }
+
+    private function getUser(string $uid): IUser {
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')
+            ->willReturn($uid);
+        return $user;
+    }
+
+    private function setConfig(string $key, $value) {
+        $this->systemConfig[$key] = $value;
+    }
+
+    public function testNewUserGetsDefault() {
+        $this->setConfig('objectstore', [
+            'default' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                ],
+            ],
+        ]);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
+        $this->assertEquals('server1', $result['arguments']['host']);
+
+        $this->assertEquals('server1', $this->config->getUserValue('test', 'homeobjectstore', 'objectstore', null));
+    }
+
+    public function testExistingUserKeepsStorage() {
+        // setup user with `server1` as storage
+        $this->testNewUserGetsDefault();
+
+        $this->setConfig('objectstore', [
+            'default' => 'server2',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'bucket' => '1',
+                ],
+            ],
+            'server2' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server2',
+                    'bucket' => '2',
+                ],
+            ],
+        ]);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
+        $this->assertEquals('server1', $result['arguments']['host']);
+
+        $this->assertEquals('server1', $this->config->getUserValue('test', 'homeobjectstore', 'objectstore', null));
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('other-user'));
+        $this->assertEquals('server2', $result['arguments']['host']);
+    }
+
+    public function testNestedAliases() {
+        $this->setConfig('objectstore', [
+            'default' => 'a1',
+            'a1' => 'a2',
+            'a2' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'bucket' => '1',
+                ],
+            ],
+        ]);
+        $this->assertEquals('server1', $this->objectStoreConfig->resolveAlias('default'));
+    }
+
+    public function testMultibucketChangedConfig() {
+        $this->setConfig('objectstore', [
+            'default' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'multibucket' => true,
+                    'num_buckets' => 8,
+                    'bucket' => 'bucket1-'
+                ],
+            ],
+        ]);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
+        $this->assertEquals('server1', $result['arguments']['host']);
+        $this->assertEquals('bucket1-7', $result['arguments']['bucket']);
+
+        $this->setConfig('objectstore', [
+            'default' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'multibucket' => true,
+                    'num_buckets' => 64,
+                    'bucket' => 'bucket1-'
+                ],
+            ],
+        ]);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
+        $this->assertEquals('server1', $result['arguments']['host']);
+        $this->assertEquals('bucket1-7', $result['arguments']['bucket']);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test-foo'));
+        $this->assertEquals('server1', $result['arguments']['host']);
+        $this->assertEquals('bucket1-40', $result['arguments']['bucket']);
+
+        $this->setConfig('objectstore', [
+            'default' => 'server2',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'multibucket' => true,
+                    'num_buckets' => 64,
+                    'bucket' => 'bucket1-'
+                ],
+            ],
+            'server2' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server2',
+                    'multibucket' => true,
+                    'num_buckets' => 16,
+                    'bucket' => 'bucket2-'
+                ],
+            ],
+        ]);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
+        $this->assertEquals('server1', $result['arguments']['host']);
+        $this->assertEquals('bucket1-7', $result['arguments']['bucket']);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test-bar'));
+        $this->assertEquals('server2', $result['arguments']['host']);
+        $this->assertEquals('bucket2-4', $result['arguments']['bucket']);
+    }
+
+    public function testMultibucketOldConfig() {
+        $this->setConfig('objectstore_multibucket', [
+            'class' => StorageObjectStore::class,
+            'arguments' => [
+                'host' => 'server1',
+                'multibucket' => true,
+                'num_buckets' => 8,
+                'bucket' => 'bucket-'
+            ],
+        ]);
+        $configs = $this->objectStoreConfig->getObjectStoreConfigs();
+        $this->assertEquals([
+            'default' => 'server1',
+            'root' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'multibucket' => true,
+                    'num_buckets' => 8,
+                    'bucket' => 'bucket-'
+                ],
+            ],
+        ], $configs);
+    }
+
+    public function testSingleObjectStore() {
+        $this->setConfig('objectstore', [
+            'class' => StorageObjectStore::class,
+            'arguments' => [
+                'host' => 'server1',
+            ],
+        ]);
+        $configs = $this->objectStoreConfig->getObjectStoreConfigs();
+        $this->assertEquals([
+            'default' => 'server1',
+            'root' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'multibucket' => false,
+                ],
+            ],
+        ], $configs);
+    }
+
+    public function testRoot() {
+        $this->setConfig('objectstore', [
+            'default' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'bucket' => '1',
+                ],
+            ],
+            'server2' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server2',
+                    'bucket' => '2',
+                ],
+            ],
+        ]);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForRoot();
+        $this->assertEquals('server1', $result['arguments']['host']);
+
+        $this->setConfig('objectstore', [
+            'default' => 'server1',
+            'root' => 'server2',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'bucket' => '1',
+                ],
+            ],
+            'server2' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server2',
+                    'bucket' => '2',
+                ],
+            ],
+        ]);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForRoot();
+        $this->assertEquals('server2', $result['arguments']['host']);
+    }
 }