upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 08:44:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #58000 from nextcloud/setup-root-path-children-less-setup-33

Browse source 
[stable33] getById: don't setup for all users with access by default
This commit is contained in:
Andy Scherzinger 2026-02-03 20:43:56 +01:00 committed by GitHub
commit baff429c1c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build/psalm-baseline.xml
View file

@ -3781,17 +3781,12 @@
<code><![CDATA[$this->mountManager->findByNumericId($numericId)]]></code>
<code><![CDATA[$this->mountManager->findByStorageId($storageId)]]></code>
<code><![CDATA[$this->mountManager->findIn($mountPoint)]]></code>
<code><![CDATA[$this->user]]></code>
</LessSpecificReturnStatement>
<MoreSpecificReturnType>
<code><![CDATA[MountPoint[]]]></code>
<code><![CDATA[\OC\Files\Mount\MountPoint[]]]></code>
<code><![CDATA[\OC\Files\Mount\MountPoint[]]]></code>
<code><![CDATA[\OC\User\User]]></code>
</MoreSpecificReturnType>
<NullableReturnStatement>
<code><![CDATA[$this->user]]></code>
</NullableReturnStatement>
<UndefinedMethod>
<code><![CDATA[remove]]></code>
</UndefinedMethod>

4
lib/private/Files/Mount/Manager.php
View file

@ -230,11 +230,11 @@ class Manager implements IMountManager {
}
/**
* 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);

36
lib/private/Files/Node/Root.php
View file

@ -5,6 +5,7 @@
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OC\Files\Node;
use OC\Files\FileInfo;
@ -19,6 +20,8 @@ use OCA\Files\ConfigLexicon;
use OCP\Cache\CappedMemoryCache;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\Cache\ICacheEntry;
use OCP\Files\Config\ICachedMountFileInfo;
use OCP\Files\Config\ICachedMountInfo;
use OCP\Files\Config\IUserMountCache;
use OCP\Files\Events\Node\FilesystemTornDownEvent;
use OCP\Files\IRootFolder;
@ -82,10 +85,8 @@ class Root extends Folder implements IRootFolder {
/**
* Get the user for which the filesystem is setup
*
* @return \OC\User\User
*/
public function getUser() {
public function getUser(): ?IUser {
return $this->user;
}
@ -411,12 +412,12 @@ class Root extends Folder implements IRootFolder {
} else {
$user = null;
}
$mountsContainingFile = $mountCache->getMountsForFileId($id, $user);
$mountInfosContainingFiles = $mountCache->getMountsForFileId($id, $user);
// if the mount isn't in the cache yet, perform a setup first, then try again
if (count($mountsContainingFile) === 0) {
if (count($mountInfosContainingFiles) === 0) {
$setupManager->setupForPath($path, true);
$mountsContainingFile = $mountCache->getMountsForFileId($id, $user);
$mountInfosContainingFiles = $mountCache->getMountsForFileId($id, $user);
}
// when a user has access through the same storage through multiple paths
@ -428,16 +429,31 @@ class Root extends Folder implements IRootFolder {
$mountRootIds = array_map(function ($mount) {
return $mount->getRootId();
}, $mountsContainingFile);
}, $mountInfosContainingFiles);
$mountRootPaths = array_map(function ($mount) {
return $mount->getRootInternalPath();
}, $mountsContainingFile);
}, $mountInfosContainingFiles);
$mountProviders = array_unique(array_map(function ($mount) {
return $mount->getMountProvider();
}, $mountsContainingFile));
}, $mountInfosContainingFiles));
$mountPoints = array_map(fn (ICachedMountInfo $mountInfo) => $mountInfo->getMountPoint(), $mountInfosContainingFiles);
$mountRoots = array_combine($mountRootIds, $mountRootPaths);
$mountsContainingFile = array_filter(array_map($this->mountManager->getMountFromMountInfo(...), $mountsContainingFile));
$mounts = $this->mountManager->getMountsByMountProvider($path, $mountProviders);
$mountsContainingFile = array_filter($mounts, fn (IMountPoint $mount) => in_array($mount->getMountPoint(), $mountPoints));
if (count($mountsContainingFile) == 0 && count($mountInfosContainingFiles) > 0) {
if (!$user) {
$user = $this->getUser()?->getUID();
}
if (!$user) {
/** @var ICachedMountFileInfo $firstMount */
$firstMount = current($mountInfosContainingFiles);
$user = $firstMount->getUser()->getUID();
}
$mountInfosContainingFiles = array_filter($mountInfosContainingFiles, fn (ICachedMountInfo $mountInfo) => $mountInfo->getUser()->getUID() === $user);
$mountsContainingFile = array_filter(array_map($this->mountManager->getMountFromMountInfo(...), $mountInfosContainingFiles));
}
if (count($mountsContainingFile) === 0) {
if ($user === $this->getAppDataDirectoryName()) {

8
tests/lib/Files/Node/FolderTest.php
View file

@ -541,6 +541,8 @@ class FolderTest extends NodeTestCase {
$manager->method('getMountFromMountInfo')
->willReturn($mount);
$manager->method('getMountsByMountProvider')
->willReturn([$mount]);
$node = new Folder($root, $view, '/bar/foo');
$result = $node->getById(1);
@ -586,6 +588,8 @@ class FolderTest extends NodeTestCase {
$manager->method('getMountFromMountInfo')
->willReturn($mount);
$manager->method('getMountsByMountProvider')
->willReturn([$mount]);
$node = new Folder($root, $view, '/bar');
$result = $node->getById(1);
@ -631,6 +635,8 @@ class FolderTest extends NodeTestCase {
$manager->method('getMountFromMountInfo')
->willReturn($mount);
$manager->method('getMountsByMountProvider')
->willReturn([$mount]);
$node = new Folder($root, $view, '/bar/foo');
$result = $node->getById(1);
@ -694,6 +700,8 @@ class FolderTest extends NodeTestCase {
}
return null;
});
$manager->method('getMountsByMountProvider')
->willReturn([$mount1, $mount2]);
$node = new Folder($root, $view, '/bar/foo');
$result = $node->getById(1);