Skip to content

fix: still setup for user when setting up root path with children #57910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
icewind1991 wants to merge 4 commits into
base: master
Choose a base branch
from
+45 −24
Open

fix: still setup for user when setting up root path with children #57910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d37782
fix: still setup for user when setting up root path with children
icewind1991 Jan 29, 2026
bcbfffe
fix: make sure all mounts are setup in getById
icewind1991 Jan 29, 2026
0462de9
test: adjust tests to new getById
icewind1991 Jan 29, 2026
502567d
fix: getById: don't setup for all users with access by default
icewind1991 Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/private/Files/Mount/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,11 @@ public function getSetupManager(): SetupManager {
}

/**
* Return all mounts in a path from a specific mount provider
* Return all mounts in a path from a specific mount provider, indexed by mount point
*
* @param string $path
* @param string[] $mountProviders
* @return IMountPoint[]
* @return array<string, IMountPoint>
*/
public function getMountsByMountProvider(string $path, array $mountProviders) {
$this->getSetupManager()->setupForProvider($path, $mountProviders);
Expand Down
25 changes: 14 additions & 11 deletions lib/private/Files/Node/Root.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
use OCP\Cache\CappedMemoryCache;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\Cache\ICacheEntry;
use OCP\Files\Config\ICachedMountInfo;
use OCP\Files\Config\IUserMountCache;
use OCP\Files\Events\Node\FilesystemTornDownEvent;
use OCP\Files\IRootFolder;
Expand Down Expand Up @@ -405,17 +406,18 @@ 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 {
$user = null;
}
$mountsContainingFile = $mountCache->getMountsForFileId($id, $user);
$mountsContainingFileInfos = $mountCache->getMountsForFileId($id, $user);

// 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);
$mountsContainingFile = $mountCache->getMountsForFileId($id, $user);
if (count($mountsContainingFileInfos) === 0) {
$setupManager->setupForPath($path, true);
$mountsContainingFileInfos = $mountCache->getMountsForFileId($id, $user);
}

// when a user has access through the same storage through multiple paths
Expand All @@ -427,20 +429,21 @@ public function getByIdInPath(int $id, string $path): array {

$mountRootIds = array_map(function ($mount) {
return $mount->getRootId();
}, $mountsContainingFile);
}, $mountsContainingFileInfos);
$mountRootPaths = array_map(function ($mount) {
return $mount->getRootInternalPath();
}, $mountsContainingFile);
}, $mountsContainingFileInfos);
$mountProviders = array_unique(array_map(function ($mount) {
return $mount->getMountProvider();
}, $mountsContainingFile));
}, $mountsContainingFileInfos));
$mountPoints = array_map(fn(ICachedMountInfo $mountInfo) => $mountInfo->getMountPoint(), $mountsContainingFileInfos);
$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($mounts, fn (IMountPoint $mount) => in_array($mount->getMountPoint(), $mountPoints));
if (count($mountsContainingFile) == 0) {
$mountsContainingFile = array_filter(array_map($this->mountManager->getMountFromMountInfo(...), $mountsContainingFileInfos));
}

if (count($mountsContainingFile) === 0) {
if ($user === $this->getAppDataDirectoryName()) {
Expand Down
6 changes: 3 additions & 3 deletions lib/private/Files/SetupManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -456,7 +456,7 @@ private function getUserForPath(string $path): ?IUser {

#[Override]
public function setupForPath(string $path, bool $includeChildren = false): void {
$user = $this->getUserForPath($path);
$user = $this->getUserForPath($path, $includeChildren);
if (!$user) {
$this->setupRoot();
return;
Expand Down
34 changes: 26 additions & 8 deletions tests/lib/Files/Node/FolderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
Loading