allow configuring multiple objectstore configurations

Signed-off-by: Robin Appelman <robin@icewind.nl>
nextcloud · Dec 1, 2022 · 6557231 · 6557231
1 parent 7c8a53d
commit 6557231
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 12 deletions.
diff --git a/lib/private/Files/Mount/ObjectHomeMountProvider.php b/lib/private/Files/Mount/ObjectHomeMountProvider.php
@@ -53,7 +53,7 @@ public function getHomeMountForUser(IUser $user, IStorageFactory $loader): ?IMou
 		if ($objectStore === null) {
 			return null;
 		}
-		$arguments = array_merge($this->objectStoreConfig->getObjectStoreArguments(), [
+		$arguments = array_merge($this->objectStoreConfig->getObjectStoreArgumentsForUser($user), [
 			'objectstore' => $objectStore,
 			'user' => $user,
 		]);

diff --git a/lib/private/Files/Mount/RootMountProvider.php b/lib/private/Files/Mount/RootMountProvider.php
@@ -57,7 +57,7 @@ private function getLocalRootMount(IStorageFactory $loader): MountPoint {
 	}
 
 	private function getObjectStoreRootMount(IStorageFactory $loader, IObjectStore $objectStore): MountPoint {
-		$arguments = array_merge($this->objectStoreConfig->getObjectStoreArguments(), [
+		$arguments = array_merge($this->objectStoreConfig->getObjectStoreArgumentsForRoot(), [
 			'objectstore' => $objectStore,
 		]);
 

diff --git a/lib/private/Files/ObjectStore/PrimaryObjectStoreConfig.php b/lib/private/Files/ObjectStore/PrimaryObjectStoreConfig.php
@@ -38,7 +38,7 @@ public function __construct(IConfig $config, LoggerInterface $logger) {
 	}
 
 	public function getObjectStoreForRoot(): ?IObjectStore {
-		$config = $this->getObjectStoreConfig();
+		$config = $this->getObjectStoreConfigForRoot();
 		if (!$config) {
 			return null;
 		}
@@ -56,43 +56,79 @@ public function getObjectStoreForRoot(): ?IObjectStore {
 	}
 
 	public function getObjectStoreForUser(IUser $user): ?IObjectStore {
-		$config = $this->getObjectStoreConfig();
+		$config = $this->getObjectStoreConfigForUser($user);
 		if (!$config) {
 			return null;
 		}
 
-		if ($config['multibucket']) {
+		if ($config['arguments']['multibucket']) {
 			$config['arguments']['bucket'] = $this->getBucketForUser($user, $config);
 		}
 
 		// instantiate object store implementation
 		return new $config['class']($config['arguments']);
 	}
 
-	public function getObjectStoreArguments(): array {
-		$config = $this->getObjectStoreConfig();
+	public function getObjectStoreArgumentsForRoot(): array {
+		$config = $this->getObjectStoreConfigForRoot();
 		if ($config === null) {
 			return [];
 		}
 		return $config['arguments'] ?? [];
 	}
 
+	public function getObjectStoreArgumentsForUser(IUser $user): array {
+		$config = $this->getObjectStoreConfigForUser($user);
+		if ($config === null) {
+			return [];
+		}
+		return $config['arguments'] ?? [];
+	}
+
+	private function getObjectStoreConfigForRoot(): ?array {
+		$configs = $this->getObjectStoreConfig();
+
+		return $configs['root'] ?? $configs['default'];
+	}
+
+	private function getObjectStoreConfigForUser(IUser $user): ?array {
+		$configs = $this->getObjectStoreConfig();
+		$store = $this->config->getUserValue($user->getUID(), 'homeobjectstore', 'objectstore', null);
+
+		if ($store) {
+			return $configs[$store];
+		} else {
+			return $configs['default'];
+		}
+	}
+
 	private function getObjectStoreConfig(): ?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['multibucket'] = true;
-			$objectStore = $objectStoreMultiBucket;
+			$objectStore = [
+				'default' => $objectStoreMultiBucket,
+			];
 		}
 		if ($objectStore === null) {
-			return null;
+			return ['default' => null];
+		}
+
+		if (!isset($objectStore['default'])) {
+			$objectStore['default'] = $objectStore;
 		}
-		if (!isset($objectStore['multibucket'])) {
-			$objectStore['multibucket'] = false;
+
+		foreach ($objectStore as &$config) {
+			if (!isset($config['multibucket'])) {
+				$config['multibucket'] = false;
+			}
+
+			$this->validateObjectStoreConfig($config);
 		}
-		$this->validateObjectStoreConfig($objectStore);
+
 		return $objectStore;
 	}