Fix initMountPoints to set usersSetup earlier

This is needed because in some cases like LDAP, the user manager itself
might trigger avatar updates which would internally also call
initMountPoints with the same user. This could cause the same user to
be setup twice, and in some sharing situations could cause recursive
deduplication of shares by adding "(2)" every time.

diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php
index d2662af527a69b256f4cf339aca364a19a7e0687..55cf38bbdc92c4d66d9148c5288d40f58726edc9 100644 (file)
--- a/lib/private/Files/Filesystem.php
+++ b/lib/private/Files/Filesystem.php
@@ -395,26 +395,36 @@ class Filesystem {
                        throw new \OC\User\NoUserException('Attempted to initialize mount points for null user and no user in session');
                }
 
+               if (isset(self::$usersSetup[$user])) {
+                       return;
+               }
+
+               self::$usersSetup[$user] = true;
+
                $userManager = \OC::$server->getUserManager();
                $userObject = $userManager->get($user);
 
                if (is_null($userObject)) {
                        \OCP\Util::writeLog('files', ' Backends provided no user object for ' . $user, \OCP\Util::ERROR);
+                       // reset flag, this will make it possible to rethrow the exception if called again
+                       unset(self::$usersSetup[$user]);
                        throw new \OC\User\NoUserException('Backends provided no user object for ' . $user);
                }
 
+               $realUid = $userObject->getUID();
                // workaround in case of different casings
-               if ($user !== $userObject->getUID()) {
+               if ($user !== $realUid) {
                        $stack = json_encode(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 50));
-                       \OCP\Util::writeLog('files', 'initMountPoints() called with wrong user casing. This could be a bug. Expected: "' . $userObject->getUID() . '" got "' . $user . '". Stack: ' . $stack, \OCP\Util::WARN);
-               }
-               $user = $userObject->getUID();
+                       \OCP\Util::writeLog('files', 'initMountPoints() called with wrong user casing. This could be a bug. Expected: "' . $realUid . '" got "' . $user . '". Stack: ' . $stack, \OCP\Util::WARN);
+                       $user = $realUid;
 
-               if (isset(self::$usersSetup[$user])) {
-                       return;
-               }
+                       // again with the correct casing
+                       if (isset(self::$usersSetup[$user])) {
+                               return;
+                       }
 
-               self::$usersSetup[$user] = true;
+                       self::$usersSetup[$user] = true;
+               }
 
                /** @var \OC\Files\Config\MountProviderCollection $mountConfigManager */
                $mountConfigManager = \OC::$server->getMountProviderCollection();