Merge pull request #37394 from nextcloud/backport/36810/stable26

[stable26] do onetime user setup before getting any mount from providers
nextcloud · Apr 6, 2023 · 76350d8 · 76350d8
2 parents 3fcb416 + 9d58c51
commit 76350d8
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/lib/private/Files/SetupManager.php b/lib/private/Files/SetupManager.php
@@ -235,11 +235,13 @@ public function setupForUser(IUser $user): void {
 	 * part of the user setup that is run only once per user
 	 */
 	private function oneTimeUserSetup(IUser $user) {
-		if (in_array($user->getUID(), $this->setupUsers, true)) {
+		if ($this->isSetupStarted($user)) {
 			return;
 		}
 		$this->setupUsers[] = $user->getUID();
 
+		$this->setupRoot();
+
 		$this->eventLogger->start('fs:setup:user:onetime', 'Onetime filesystem for user');
 
 		$this->setupBuiltinWrappers();
@@ -319,11 +321,7 @@ private function afterUserFullySetup(IUser $user, array $previouslySetupProvider
 	 * @throws \OC\ServerNotAvailableException
 	 */
 	private function setupForUserWith(IUser $user, callable $mountCallback): void {
-		$this->setupRoot();
-
-		if (!$this->isSetupStarted($user)) {
-			$this->oneTimeUserSetup($user);
-		}
+		$this->oneTimeUserSetup($user);
 
 		if ($this->lockdownManager->canAccessFilesystem()) {
 			$mountCallback();
@@ -422,9 +420,7 @@ public function setupForPath(string $path, bool $includeChildren = false): void
 			return;
 		}
 
-		if (!$this->isSetupStarted($user)) {
-			$this->oneTimeUserSetup($user);
-		}
+		$this->oneTimeUserSetup($user);
 
 		$this->eventLogger->start('fs:setup:user:path', "Setup $path filesystem for user");
 		$this->eventLogger->start('fs:setup:user:path:find', "Find mountpoint for $path");
@@ -513,6 +509,8 @@ public function setupForProvider(string $path, array $providers): void {
 
 		$this->eventLogger->start('fs:setup:user:providers', "Setup filesystem for " . implode(', ', $providers));
 
+		$this->oneTimeUserSetup($user);
+
 		// home providers are always used
 		$providers = array_filter($providers, function (string $provider) {
 			return !is_subclass_of($provider, IHomeMountProvider::class);