From 2f2a8fac61f5c09a07283d53945e7b6aa19fb905 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 29 Jan 2026 15:45:53 +0100 Subject: [PATCH 1/3] fix: still setup for user when setting up root path with children Signed-off-by: Robin Appelman --- lib/private/Files/SetupManager.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/private/Files/SetupManager.php b/lib/private/Files/SetupManager.php index ec17a1cac3ceb..06ec47d165489 100644 --- a/lib/private/Files/SetupManager.php +++ b/lib/private/Files/SetupManager.php @@ -434,8 +434,8 @@ public function setupRoot(): void { * @param string $path * @return IUser|null */ - private function getUserForPath(string $path): ?IUser { - if ($path === '' || $path === '/') { + private function getUserForPath(string $path, bool $includeChildren = false): ?IUser { + if (($path === '' || $path === '/') && !$includeChildren) { return null; } elseif (str_starts_with($path, '/__groupfolders')) { return null; @@ -459,7 +459,7 @@ private function getUserForPath(string $path): ?IUser { * children mounts. */ public function setupForPath(string $path, bool $includeChildren = false): void { - $user = $this->getUserForPath($path); + $user = $this->getUserForPath($path, $includeChildren); if (!$user) { $this->setupRoot(); return; From 02cf3d7c89581bf794458e2918c04214436826d2 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 29 Jan 2026 16:33:27 +0100 Subject: [PATCH 2/3] fix: make sure all mounts are setup in getById Signed-off-by: Robin Appelman --- lib/private/Files/Node/Root.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/private/Files/Node/Root.php b/lib/private/Files/Node/Root.php index 9b0a48fa296fd..c94eadcedb3f6 100644 --- a/lib/private/Files/Node/Root.php +++ b/lib/private/Files/Node/Root.php @@ -405,6 +405,7 @@ public function getFirstNodeByIdInPath(int $id, string $path): ?INode { */ public function getByIdInPath(int $id, string $path): array { $mountCache = $this->getUserMountCache(); + $setupManager = $this->mountManager->getSetupManager(); if ($path !== '' && strpos($path, '/', 1) > 0) { [, $user] = explode('/', $path); } else { @@ -414,7 +415,7 @@ public function getByIdInPath(int $id, string $path): array { // if the mount isn't in the cache yet, perform a setup first, then try again if (count($mountsContainingFile) === 0) { - $this->mountManager->getSetupManager()->setupForPath($path, true); + $setupManager->setupForPath($path, true); $mountsContainingFile = $mountCache->getMountsForFileId($id, $user); } @@ -436,11 +437,7 @@ public function getByIdInPath(int $id, string $path): array { }, $mountsContainingFile)); $mountRoots = array_combine($mountRootIds, $mountRootPaths); - $mounts = $this->mountManager->getMountsByMountProvider($path, $mountProviders); - - $mountsContainingFile = array_filter($mounts, function ($mount) use ($mountRoots) { - return isset($mountRoots[$mount->getStorageRootId()]); - }); + $mountsContainingFile = array_filter(array_map($this->mountManager->getMountFromMountInfo(...), $mountsContainingFile)); if (count($mountsContainingFile) === 0) { if ($user === $this->getAppDataDirectoryName()) { From 918db6f5ba4a589126ac41e3043aac1682aba427 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 29 Jan 2026 17:32:37 +0100 Subject: [PATCH 3/3] test: adjust tests to new getById Signed-off-by: Robin Appelman --- tests/lib/Files/Node/FolderTest.php | 34 ++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/tests/lib/Files/Node/FolderTest.php b/tests/lib/Files/Node/FolderTest.php index ad60cb535558c..19374fee6c128 100644 --- a/tests/lib/Files/Node/FolderTest.php +++ b/tests/lib/Files/Node/FolderTest.php @@ -29,6 +29,7 @@ use OC\Files\View; use OCP\Constants; use OCP\Files\Cache\ICacheEntry; +use OCP\Files\Config\ICachedMountInfo; use OCP\Files\InvalidPathException; use OCP\Files\IRootFolder; use OCP\Files\Mount\IMountPoint; @@ -538,8 +539,8 @@ public function testGetById(): void { ->with('/bar/foo') ->willReturn([]); - $manager->method('getMountsByMountProvider') - ->willReturn([$mount]); + $manager->method('getMountFromMountInfo') + ->willReturn($mount); $node = new Folder($root, $view, '/bar/foo'); $result = $node->getById(1); @@ -583,8 +584,8 @@ public function testGetByIdMountRoot(): void { ->with(1) ->willReturn($fileInfo); - $manager->method('getMountsByMountProvider') - ->willReturn([$mount]); + $manager->method('getMountFromMountInfo') + ->willReturn($mount); $node = new Folder($root, $view, '/bar'); $result = $node->getById(1); @@ -628,8 +629,8 @@ public function testGetByIdOutsideFolder(): void { ->with(1) ->willReturn($fileInfo); - $manager->method('getMountsByMountProvider') - ->willReturn([$mount]); + $manager->method('getMountFromMountInfo') + ->willReturn($mount); $node = new Folder($root, $view, '/bar/foo'); $result = $node->getById(1); @@ -668,14 +669,31 @@ public function testGetByIdMultipleStorages(): void { 1, '' ), + new CachedMountInfo( + $this->user, + 1, + 0, + '/bar/foo/asd/', + 'test', + 1, + '' + ), ]); $cache->method('get') ->with(1) ->willReturn($fileInfo); - $manager->method('getMountsByMountProvider') - ->willReturn([$mount1, $mount2]); + $manager->method('getMountFromMountInfo') + ->willReturnCallback(function (ICachedMountInfo $mountInfo) use ($mount1, $mount2) { + if ($mountInfo->getMountPoint() === $mount1->getMountPoint()) { + return $mount1; + } + if ($mountInfo->getMountPoint() === $mount2->getMountPoint()) { + return $mount2; + } + return null; + }); $node = new Folder($root, $view, '/bar/foo'); $result = $node->getById(1);