Merge pull request #24195 from owncloud/stable9-fs-initmountpoint-nulluser

[stable9] Throw NoUserException when attempting to init mount point for null user

lib/private/files/filesystem.php

@@ -372,6 +372,9 @@ class Filesystem {
 		if ($user == '') {
 			$user = \OC_User::getUser();
 		}
+		if ($user === null || $user === false || $user === '') {
+			throw new \OC\User\NoUserException('Attempted to initialize mount points for null user and no user in session');
+		}
 		if (isset(self::$usersSetup[$user])) {
 			return;
 		}

tests/lib/files/filesystem.php

@@ -319,6 +319,28 @@ class Filesystem extends \Test\TestCase {
 		\OC\Files\Filesystem::initMountPoints($userId);
 	}
 
+	/**
+	 * @expectedException \OC\User\NoUserException
+	 */
+	public function testNullUserThrows() {
+		\OC\Files\Filesystem::initMountPoints(null);
+	}
+
+	public function testNullUserThrowsTwice() {
+		$thrown = 0;
+		try {
+			\OC\Files\Filesystem::initMountPoints(null);
+		} catch (NoUserException $e) {
+			$thrown++;
+		}
+		try {
+			\OC\Files\Filesystem::initMountPoints(null);
+		} catch (NoUserException $e) {
+			$thrown++;
+		}
+		$this->assertEquals(2, $thrown);
+	}
+
 	/**
 	 * Tests that the home storage is used for the user's mount point
 	 */