sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #54205 from nextcloud/backport/54182/stable30 

[stable30] fix: don't update cached mountpoints if the request doesn't have filesystem access
pull/54284/head
Git'Fellow 2025-08-06 14:18:02 +07:00 committed by GitHub
parent 3ae3932cbf 8519f5adb0
commit 94a5e1440e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/private/Files/SetupManager.php
Unescape Escape View File

@ -287,7 +287,7 @@ class SetupManager {
$mounts = array_filter($mounts, function (IMountPoint $mount) use ($previouslySetupProviders) {
return !in_array($mount->getMountProvider(), $previouslySetupProviders);
});
$this->userMountCache->registerMounts($user, $mounts, $newProviders);
$this->registerMounts($user, $mounts, $newProviders);
$cacheDuration = $this->config->getSystemValueInt('fs_mount_cache_duration', 5 * 60);
if ($cacheDuration > 0) {
@ -452,7 +452,7 @@ class SetupManager {
}
if (count($mounts)) {
$this->userMountCache->registerMounts($user, $mounts, $currentProviders);
$this->registerMounts($user, $mounts, $currentProviders);
$this->setupForUserWith($user, function () use ($mounts) {
array_walk($mounts, [$this->mountManager, 'addMount']);
});
@ -523,7 +523,7 @@ class SetupManager {
$mounts = $this->mountProviderCollection->getUserMountsForProviderClasses($user, $providers);
}
$this->userMountCache->registerMounts($user, $mounts, $providers);
$this->registerMounts($user, $mounts, $providers);
$this->setupForUserWith($user, function () use ($mounts) {
array_walk($mounts, [$this->mountManager, 'addMount']);
});
@ -595,4 +595,10 @@ class SetupManager {
});
}
}
private function registerMounts(IUser $user, array $mounts, ?array $mountProviderClasses = null): void {
if ($this->lockdownManager->canAccessFilesystem()) {
$this->userMountCache->registerMounts($user, $mounts, $mountProviderClasses);
}
}
}