diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2024-12-28 18:07:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-28 18:07:55 +0100 |
| commit | f19850815b3e348516f0893e33ae47cc7c0a1303 (patch) | |
| tree | 73474e31139303502ea221db8a91e2a10d57a3db | |
| parent | f9e6b1f81428f7ba786df781eb9a0389d8aee7c9 (diff) | |
| parent | 7bc8eb3007132ffd79070d229a5b5a4d623220fb (diff) | |
| download | nextcloud-server-f19850815b3e348516f0893e33ae47cc7c0a1303.tar.gz nextcloud-server-f19850815b3e348516f0893e33ae47cc7c0a1303.zip | |
Merge pull request #49887 from nextcloud/scan-home-ext-storae
fix: don't skip scanner users filesystem if they have a mountpoint at /<user>/files/
| -rw-r--r-- | build/psalm-baseline.xml | 8 | ||||
| -rw-r--r-- | lib/private/Files/Utils/Scanner.php | 9 |
2 files changed, 7 insertions, 10 deletions
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index 00add5ee78e..93c48a30283 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -2101,14 +2101,6 @@ <code><![CDATA[$mimetype]]></code> </ParamNameMismatch> </file> - <file src="lib/private/Files/Utils/Scanner.php"> - <LessSpecificReturnStatement> - <code><![CDATA[$mounts]]></code> - </LessSpecificReturnStatement> - <MoreSpecificReturnType> - <code><![CDATA[\OC\Files\Mount\MountPoint[]]]></code> - </MoreSpecificReturnType> - </file> <file src="lib/private/Files/View.php"> <InvalidScalarArgument> <code><![CDATA[$mtime]]></code> diff --git a/lib/private/Files/Utils/Scanner.php b/lib/private/Files/Utils/Scanner.php index 40201d10b99..4d94629443f 100644 --- a/lib/private/Files/Utils/Scanner.php +++ b/lib/private/Files/Utils/Scanner.php @@ -23,6 +23,7 @@ use OCP\Files\Events\FileScannedEvent; use OCP\Files\Events\FolderScannedEvent; use OCP\Files\Events\NodeAddedToCache; use OCP\Files\Events\NodeRemovedFromCache; +use OCP\Files\Mount\IMountPoint; use OCP\Files\NotFoundException; use OCP\Files\Storage\IStorage; use OCP\Files\StorageNotAvailableException; @@ -85,7 +86,7 @@ class Scanner extends PublicEmitter { * get all storages for $dir * * @param string $dir - * @return \OC\Files\Mount\MountPoint[] + * @return array<string, IMountPoint> */ protected function getMounts($dir) { //TODO: move to the node based fileapi once that's done @@ -96,8 +97,9 @@ class Scanner extends PublicEmitter { $mounts = $mountManager->findIn($dir); $mounts[] = $mountManager->find($dir); $mounts = array_reverse($mounts); //start with the mount of $dir + $mountPoints = array_map(fn ($mount) => $mount->getMountPoint(), $mounts); - return $mounts; + return array_combine($mountPoints, $mounts); } /** @@ -210,6 +212,9 @@ class Scanner extends PublicEmitter { $owner = $owner['name'] ?? $ownerUid; $permissions = decoct(fileperms($fullPath)); throw new ForbiddenException("User folder $fullPath is not writable, folders is owned by $owner and has mode $permissions"); + } elseif (isset($mounts[$mount->getMountPoint() . $path . '/'])) { + // /<user>/files is overwritten by a mountpoint, so this check is irrelevant + break; } else { // if the root exists in neither the cache nor the storage the user isn't setup yet break 2; |