pickup: fix wrong path-caching logic

Signed-off-by: Salvatore Martire <[email protected]>

Author: salmart-dev

lib/private/Files/Config/UserMountCache.php

@@ -672,7 +672,7 @@ private function getChildMounts(string $userId, string $path): array {
 			)->from('mounts', 'm')->where(
 				$builder->expr()->like(
 					'mount_point',
-					$builder->createNamedParameter($path . '%/')
+					$builder->createNamedParameter($path . '%')
 				)
 			)->andWhere(
 				$builder->expr()->neq(

lib/private/Files/SetupManager.php

@@ -31,7 +31,6 @@
 use OCP\Constants;
 use OCP\Diagnostics\IEventLogger;
 use OCP\EventDispatcher\IEventDispatcher;
-use OCP\Files\Cache\ICacheEntry;
 use OCP\Files\Config\ICachedMountInfo;
 use OCP\Files\Config\IHomeMountProvider;
 use OCP\Files\Config\IMountProvider;
@@ -57,6 +56,8 @@
 use OCP\Lockdown\ILockdownManager;
 use OCP\Share\Events\ShareCreatedEvent;
 use Psr\Log\LoggerInterface;
+use function array_key_exists;
+use function dirname;
 use function in_array;
 
 class SetupManager {
@@ -74,7 +75,7 @@ class SetupManager {
 	/**
 	 * An array of paths that have already been set up
 	 *
-	 * @var array<string, class-string<IMountProvider>[]>
+	 * @var array<string, bool>
 	 */
 	private array $setupMountProviderPaths = [];
 	private ICache $cache;
@@ -114,6 +115,28 @@ public function isSetupComplete(IUser $user): bool {
 		return in_array($user->getUID(), $this->setupUsersComplete, true);
 	}
 
+	/**
+	 * Checks if a path has been cached either directly or through a full setup
+	 * of one of its parents.
+	 */
+	private function isPathSetup(string $path, bool $withChildren): bool {
+		// if the exact path was already setup
+		$cacheKey = $path . ':' . $withChildren;
+		if (array_key_exists($cacheKey, $this->setupMountProviderPaths)) {
+			return true;
+		}
+
+		// or if any of the ancestors was fully setup
+		while (($path = dirname($path)) !== '/') {
+			$cacheKey = $path . ':1';
+			if (array_key_exists($cacheKey, $this->setupMountProviderPaths)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
 	private function setupBuiltinWrappers() {
 		if ($this->setupBuiltinWrappersDone) {
 			return;
@@ -401,7 +424,8 @@ public function setupForPath(string $path, bool $includeChildren = false): void
 			return;
 		}
 
-		if ($this->isSetupComplete($user) || isset($this->setupMountProviderPaths[$path])) {
+		// attempt detecting if the path has been already setup
+		if ($this->isSetupComplete($user) || $this->isPathSetup($path, $includeChildren)) {
 			return;
 		}
 
@@ -417,6 +441,11 @@ public function setupForPath(string $path, bool $includeChildren = false): void
 
 		$argsByProvider = [];
 		foreach ($mountInfos as $mountInfo) {
+			// attempt detecting if the path was setup, by using its mount point
+			if ($this->isPathSetup(rtrim($mountInfo->getMountPoint(), '/'), false)) {
+				continue;
+			}
+
 			$rootMetadata = $rootsMetadata[$mountInfo->getRootId()];
 			/** @var class-string<IMountProvider>|'' $mountProvider */
 			$mountProvider = $mountInfo->getMountProvider();
@@ -434,6 +463,9 @@ public function setupForPath(string $path, bool $includeChildren = false): void
 
 		$this->eventLogger->start('fs:setup:user:path:authoritative', "Setup $path filesystem for user");
 
+		// mark the mount point for $path as cached
+		$cacheKey = rtrim(array_first($mountInfos)->getMountPoint(), '/') . ':' . $includeChildren;
+		$this->setupMountProviderPaths[$cacheKey] = true;
 		$mounts = $this->getMountsFromProviders(
 			$user,
 			$path,
@@ -610,14 +642,10 @@ public function getMountsFromProviders(
 		/** @var class-string<IMountProvider> $providerClass */
 		foreach ($mountArgsByProvider as $providerClass => $providerArgs) {
 			if (in_array($providerClass, $this->setupUserMountProviders[$userUid])) {
-				continue; // skip already setup providers
+				continue; // skip already fully setup providers
 			}
 
 			if (is_a($providerClass, IPartialMountProvider::class, true)) {
-				if (isset($this->setupMountProviderPaths[$path])) {
-					continue; // skip already set up paths
-				}
-				$this->setupMountProviderPaths[$path] = true;
 				// mount provider capable of returning mount-points specific to
 				// this path
 				$mounts[] = $this->mountProviderCollection