fix: improve handling of unavailable storages

Signed-off-by: Robin Appelman <[email protected]>

Author: icewind1991

apps/files_external/lib/Lib/StorageConfig.php

@@ -440,4 +440,19 @@ protected function formatStorageForUI(): void {
 	public function getMountPointForUser(IUser $user): string {
 		return '/' . $user->getUID() . '/files/' . trim($this->mountPoint, '/') . '/';
 	}
+
+	public function __clone() {
+		$clone = new StorageConfig($this->getId());
+		$clone->setBackend(clone $this->getBackend());
+		$clone->setAuthMechanism(clone $this->getAuthMechanism());
+		$clone->setBackendOptions($this->getBackendOptions());
+		$clone->setMountPoint($this->getMountPoint());
+		$clone->setStatus($this->getStatus(), $this->getStatusMessage());
+		$clone->setPriority($this->getPriority());
+		$clone->setApplicableUsers($this->getApplicableUsers());
+		$clone->setApplicableGroups($this->getApplicableGroups());
+		$clone->setMountOptions($this->getMountOptions());
+		$clone->setType($this->getType());
+		return $clone;
+	}
 }

apps/files_external/lib/Service/MountCacheService.php

@@ -9,6 +9,7 @@
 namespace OCA\Files_External\Service;
 
 use OC\Files\Cache\CacheEntry;
+use OC\Files\Storage\FailedStorage;
 use OC\User\LazyUser;
 use OCA\Files_External\Config\ConfigAdapter;
 use OCA\Files_External\Event\StorageCreatedEvent;
@@ -17,7 +18,6 @@
 use OCA\Files_External\Lib\StorageConfig;
 use OCP\Cache\CappedMemoryCache;
 use OCP\EventDispatcher\Event;
-use OCP\EventDispatcher\Event as T;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Files\Cache\ICacheEntry;
 use OCP\Files\Config\IUserMountCache;
@@ -132,16 +132,20 @@ public function registerUpdatedStorage(StorageConfig $oldStorage, StorageConfig
 	}
 
 	private function getCacheEntryForRoot(IUser $user, StorageConfig $storage): ICacheEntry {
-		$storage = $this->configAdapter->constructStorageForUser($user, $storage);
+		try {
+			$userStorage = $this->configAdapter->constructStorageForUser($user, clone $storage);
+		} catch (\Exception $e) {
+			$userStorage = new FailedStorage(['exception' => $e]);
+		}
 
-		if ($cachedEntry = $this->storageRootCache->get($storage->getId())) {
+		if ($cachedEntry = $this->storageRootCache->get($userStorage->getId())) {
 			return $cachedEntry;
 		}
 
-		$cache = $storage->getCache();
+		$cache = $userStorage->getCache();
 		$entry = $cache->get('');
-		if ($entry) {
-			$this->storageRootCache->set($storage->getId(), $entry);
+		if ($entry && $entry->getId() !== -1) {
+			$this->storageRootCache->set($userStorage->getId(), $entry);
 			return $entry;
 		}
 
@@ -163,10 +167,14 @@ private function getCacheEntryForRoot(IUser $user, StorageConfig $storage): ICac
 			'encrypted' => 0,
 			'checksum' => '',
 		];
-		$data['fileid'] = $cache->insert('', $data);
+		if ($cache->getNumericStorageId() !== -1) {
+			$data['fileid'] = $cache->insert('', $data);
+		} else {
+			$data['fileid'] = -1;
+		}
 
 		$entry = new CacheEntry($data);
-		$this->storageRootCache->set($storage->getId(), $entry);
+		$this->storageRootCache->set($userStorage->getId(), $entry);
 		return $entry;
 	}
 

lib/private/Files/Config/UserMountCache.php

@@ -542,6 +542,7 @@ public function addMount(IUser $user, string $mountPoint, ICacheEntry $rootCache
 				'root_id' => $query->createNamedParameter($rootCacheEntry->getId()),
 				'user_id' => $query->createNamedParameter($user->getUID()),
 				'mount_point' => $query->createNamedParameter($mountPoint),
+				'mount_point_hash' => $query->createNamedParameter(hash('xxh128', $mountPoint)),
 				'mount_id' => $query->createNamedParameter($mountId),
 				'mount_provider_class' => $query->createNamedParameter($mountProvider)
 			]);