only setup part of the filesystem for appdata requests

Signed-off-by: Robin Appelman <robin@icewind.nl>

Author: icewind1991

lib/private/Files/Filesystem.php

@@ -240,9 +240,7 @@ public static function getLoader() {
 	 * @return \OC\Files\Mount\Manager
 	 */
 	public static function getMountManager($user = '') {
-		if (!self::$mounts) {
-			\OC_Util::setupFS($user);
-		}
+		self::initMountManager();
 		return self::$mounts;
 	}
 
@@ -292,10 +290,7 @@ public static function getMountPoints($path) {
 	 * @return \OC\Files\Storage\Storage|null
 	 */
 	public static function getStorage($mountPoint) {
-		if (!self::$mounts) {
-			\OC_Util::setupFS();
-		}
-		$mount = self::$mounts->find($mountPoint);
+		$mount = self::getMountManager()->find($mountPoint);
 		return $mount->getStorage();
 	}
 
@@ -304,21 +299,15 @@ public static function getStorage($mountPoint) {
 	 * @return Mount\MountPoint[]
 	 */
 	public static function getMountByStorageId($id) {
-		if (!self::$mounts) {
-			\OC_Util::setupFS();
-		}
-		return self::$mounts->findByStorageId($id);
+		return self::getMountManager()->findByStorageId($id);
 	}
 
 	/**
 	 * @param int $id
 	 * @return Mount\MountPoint[]
 	 */
 	public static function getMountByNumericId($id) {
-		if (!self::$mounts) {
-			\OC_Util::setupFS();
-		}
-		return self::$mounts->findByNumericId($id);
+		return self::getMountManager()->findByNumericId($id);
 	}
 
 	/**

lib/private/Files/Mount/Manager.php

@@ -81,14 +81,23 @@ public function moveMount(string $mountPoint, string $target) {
 		$this->inPathCache->clear();
 	}
 
+	private function setupForFind(string $path) {
+		if (strpos($path, '/appdata_' . \OC_Util::getInstanceId()) === 0) {
+			// for appdata, we only setup the root bits, not the user bits
+			\OC_Util::setupRootFS();
+		} else {
+			\OC_Util::setupFS();
+		}
+	}
+
 	/**
 	 * Find the mount for $path
 	 *
 	 * @param string $path
 	 * @return MountPoint|null
 	 */
 	public function find(string $path) {
-		\OC_Util::setupFS();
+		$this->setupForFind($path);
 		$path = Filesystem::normalizePath($path);
 
 		if (isset($this->pathCache[$path])) {
@@ -121,7 +130,7 @@ public function find(string $path) {
 	 * @return MountPoint[]
 	 */
 	public function findIn(string $path): array {
-		\OC_Util::setupFS();
+		$this->setupForFind($path);
 		$path = $this->formatPath($path);
 
 		if (isset($this->inPathCache[$path])) {

lib/private/legacy/OC_Util.php

@@ -81,6 +81,7 @@ class OC_Util {
 	public static $styles = [];
 	public static $headers = [];
 	private static $rootMounted = false;
+	private static $rootFsSetup = false;
 	private static $fsSetup = false;
 
 	/** @var array Local cache of version.php */
@@ -186,30 +187,18 @@ private static function initObjectStoreMultibucketRootFS($config) {
 	 * @suppress PhanDeprecatedFunction
 	 * @suppress PhanAccessMethodInternal
 	 */
-	public static function setupFS($user = '') {
+	public static function setupRootFS(string $user = '') {
 		//setting up the filesystem twice can only lead to trouble
-		if (self::$fsSetup) {
+		if (self::$rootFsSetup) {
 			return false;
 		}
 
-		\OC::$server->getEventLogger()->start('setup_fs', 'Setup filesystem');
-
-		// If we are not forced to load a specific user we load the one that is logged in
-		if ($user === null) {
-			$user = '';
-		} elseif ($user == "" && \OC::$server->getUserSession()->isLoggedIn()) {
-			$user = OC_User::getUser();
-		}
+		\OC::$server->getEventLogger()->start('setup_root_fs', 'Setup root filesystem');
 
 		// load all filesystem apps before, so no setup-hook gets lost
 		OC_App::loadApps(['filesystem']);
 
-		// the filesystem will finish when $user is not empty,
-		// mark fs setup here to avoid doing the setup from loading
-		// OC_Filesystem
-		if ($user != '') {
-			self::$fsSetup = true;
-		}
+		self::$rootFsSetup = true;
 
 		\OC\Files\Filesystem::initMountManager();
 
@@ -277,10 +266,10 @@ public static function setupFS($user = '') {
 				return new \OC\Files\Storage\Wrapper\PermissionsMask([
 					'storage' => $storage,
 					'mask' => \OCP\Constants::PERMISSION_ALL & ~(
-						\OCP\Constants::PERMISSION_UPDATE |
-						\OCP\Constants::PERMISSION_CREATE |
-						\OCP\Constants::PERMISSION_DELETE
-					),
+							\OCP\Constants::PERMISSION_UPDATE |
+							\OCP\Constants::PERMISSION_CREATE |
+							\OCP\Constants::PERMISSION_DELETE
+						),
 				]);
 			}
 			return $storage;
@@ -313,11 +302,40 @@ public static function setupFS($user = '') {
 			$mountManager->addMount($rootMountProvider);
 		}
 
+		\OC::$server->getEventLogger()->end('setup_root_fs');
+	}
+
+	/**
+	 * Can be set up
+	 *
+	 * @param string $user
+	 * @return boolean
+	 * @description configure the initial filesystem based on the configuration
+	 * @suppress PhanDeprecatedFunction
+	 * @suppress PhanAccessMethodInternal
+	 */
+	public static function setupFS($user = '') {
+		// If we are not forced to load a specific user we load the one that is logged in
+		if ($user === null) {
+			$user = '';
+		} elseif ($user == "" && \OC::$server->getUserSession()->isLoggedIn()) {
+			$user = OC_User::getUser();
+		}
+
+		if (self::$fsSetup) {
+			return false;
+		}
+		self::setupRootFS($user);
+
+		\OC::$server->getEventLogger()->start('setup_fs', 'Setup filesystem');
+
 		if ($user != '' && !\OC::$server->getUserManager()->userExists($user)) {
 			\OC::$server->getEventLogger()->end('setup_fs');
 			return false;
 		}
 
+		self::$fsSetup = true;
+
 		//if we aren't logged in, there is no use to set up the filesystem
 		if ($user != "") {
 			$userDir = '/' . $user . '/files';

lib/public/Files/Config/IScopedMountProvider.php

@@ -0,0 +1,38 @@
+<?php declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2022 Robin Appelman <robin@icewind.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCP\Files\Config;
+
+use OCP\IUser;
+
+/**
+ * Denotes a roots that all mounts from this provider belong to
+ *
+ * @since 24.0.0
+ */
+interface IScopedMountProvider extends IMountProvider {
+	/**
+	 * Get the common roots for all  mounts from this provider
+	 *
+	 * @return string[]
+	 */
+	public function getRoots(IUser $user): array;
+}