nextcloud / server

lib/private/Server.php

Indentation +1373 added lines, -1373 removed lines

@@ -248,1418 +248,1418 @@
  * TODO: hookup all manager classes
  */
 class Server extends ServerContainer implements IServerContainer {
-	/** @var string */
-	private $webRoot;
-
-	/**
-	 * @param string $webRoot
-	 * @param \OC\Config $config
-	 */
-	public function __construct($webRoot, \OC\Config $config) {
-		parent::__construct();
-		$this->webRoot = $webRoot;
-
-		// To find out if we are running from CLI or not
-		$this->registerParameter('isCLI', \OC::$CLI);
-		$this->registerParameter('serverRoot', \OC::$SERVERROOT);
-
-		$this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
-			return $c;
-		});
-		$this->registerDeprecatedAlias(\OCP\IServerContainer::class, ContainerInterface::class);
-
-		$this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class);
-
-		$this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class);
-
-		$this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class);
-
-		$this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
-
-		$this->registerAlias(\OCP\ContextChat\IContentManager::class, \OC\ContextChat\ContentManager::class);
-
-		$this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class);
-		$this->registerAlias(ITemplateManager::class, TemplateManager::class);
-		$this->registerAlias(\OCP\Template\ITemplateManager::class, \OC\Template\TemplateManager::class);
-
-		$this->registerAlias(IActionFactory::class, ActionFactory::class);
-
-		$this->registerService(View::class, function (Server $c) {
-			return new View();
-		}, false);
-
-		$this->registerService(IPreview::class, function (ContainerInterface $c) {
-			return new PreviewManager(
-				$c->get(\OCP\IConfig::class),
-				$c->get(IRootFolder::class),
-				new \OC\Preview\Storage\Root(
-					$c->get(IRootFolder::class),
-					$c->get(SystemConfig::class)
-				),
-				$c->get(IEventDispatcher::class),
-				$c->get(GeneratorHelper::class),
-				$c->get(ISession::class)->get('user_id'),
-				$c->get(Coordinator::class),
-				$c->get(IServerContainer::class),
-				$c->get(IBinaryFinder::class),
-				$c->get(IMagickSupport::class)
-			);
-		});
-		$this->registerAlias(IMimeIconProvider::class, MimeIconProvider::class);
-
-		$this->registerService(\OC\Preview\Watcher::class, function (ContainerInterface $c) {
-			return new \OC\Preview\Watcher(
-				new \OC\Preview\Storage\Root(
-					$c->get(IRootFolder::class),
-					$c->get(SystemConfig::class)
-				)
-			);
-		});
-
-		$this->registerService(IProfiler::class, function (Server $c) {
-			return new Profiler($c->get(SystemConfig::class));
-		});
-
-		$this->registerService(Encryption\Manager::class, function (Server $c): Encryption\Manager {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-			return new Encryption\Manager(
-				$c->get(\OCP\IConfig::class),
-				$c->get(LoggerInterface::class),
-				$c->getL10N('core'),
-				new View(),
-				$util,
-				new ArrayCache()
-			);
-		});
-		$this->registerAlias(\OCP\Encryption\IManager::class, Encryption\Manager::class);
-
-		$this->registerService(IFile::class, function (ContainerInterface $c) {
-			$util = new Encryption\Util(
-				new View(),
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-			return new Encryption\File(
-				$util,
-				$c->get(IRootFolder::class),
-				$c->get(\OCP\Share\IManager::class)
-			);
-		});
-
-		$this->registerService(IStorage::class, function (ContainerInterface $c) {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-
-			return new Encryption\Keys\Storage(
-				$view,
-				$util,
-				$c->get(ICrypto::class),
-				$c->get(\OCP\IConfig::class)
-			);
-		});
-
-		$this->registerAlias(\OCP\ITagManager::class, TagManager::class);
-
-		$this->registerService('SystemTagManagerFactory', function (ContainerInterface $c) {
-			/** @var \OCP\IConfig $config */
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
-			return new $factoryClass($this);
-		});
-		$this->registerService(ISystemTagManager::class, function (ContainerInterface $c) {
-			return $c->get('SystemTagManagerFactory')->getManager();
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
-
-		$this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) {
-			return $c->get('SystemTagManagerFactory')->getObjectMapper();
-		});
-		$this->registerAlias(IFileAccess::class, FileAccess::class);
-		$this->registerService('RootFolder', function (ContainerInterface $c) {
-			$manager = \OC\Files\Filesystem::getMountManager();
-			$view = new View();
-			/** @var IUserSession $userSession */
-			$userSession = $c->get(IUserSession::class);
-			$root = new Root(
-				$manager,
-				$view,
-				$userSession->getUser(),
-				$c->get(IUserMountCache::class),
-				$this->get(LoggerInterface::class),
-				$this->get(IUserManager::class),
-				$this->get(IEventDispatcher::class),
-				$this->get(ICacheFactory::class),
-				$this->get(IAppConfig::class),
-			);
-
-			$previewConnector = new \OC\Preview\WatcherConnector(
-				$root,
-				$c->get(SystemConfig::class),
-				$this->get(IEventDispatcher::class)
-			);
-			$previewConnector->connectWatcher();
-
-			return $root;
-		});
-		$this->registerService(HookConnector::class, function (ContainerInterface $c) {
-			return new HookConnector(
-				$c->get(IRootFolder::class),
-				new View(),
-				$c->get(IEventDispatcher::class),
-				$c->get(LoggerInterface::class)
-			);
-		});
-
-		$this->registerService(IRootFolder::class, function (ContainerInterface $c) {
-			return new LazyRoot(function () use ($c) {
-				return $c->get('RootFolder');
-			});
-		});
-
-		$this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
-
-		$this->registerService(DisplayNameCache::class, function (ContainerInterface $c) {
-			return $c->get(\OC\User\Manager::class)->getDisplayNameCache();
-		});
-
-		$this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) {
-			$groupManager = new \OC\Group\Manager(
-				$this->get(IUserManager::class),
-				$this->get(IEventDispatcher::class),
-				$this->get(LoggerInterface::class),
-				$this->get(ICacheFactory::class),
-				$this->get(IRemoteAddress::class),
-			);
-			return $groupManager;
-		});
-
-		$this->registerService(Store::class, function (ContainerInterface $c) {
-			$session = $c->get(ISession::class);
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$tokenProvider = $c->get(IProvider::class);
-			} else {
-				$tokenProvider = null;
-			}
-			$logger = $c->get(LoggerInterface::class);
-			$crypto = $c->get(ICrypto::class);
-			return new Store($session, $logger, $crypto, $tokenProvider);
-		});
-		$this->registerAlias(IStore::class, Store::class);
-		$this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
-		$this->registerAlias(OCPIProvider::class, Authentication\Token\Manager::class);
-
-		$this->registerService(\OC\User\Session::class, function (Server $c) {
-			$manager = $c->get(IUserManager::class);
-			$session = new \OC\Session\Memory();
-			$timeFactory = new TimeFactory();
-			// Token providers might require a working database. This code
-			// might however be called when Nextcloud is not yet setup.
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$provider = $c->get(IProvider::class);
-			} else {
-				$provider = null;
-			}
-
-			$userSession = new \OC\User\Session(
-				$manager,
-				$session,
-				$timeFactory,
-				$provider,
-				$c->get(\OCP\IConfig::class),
-				$c->get(ISecureRandom::class),
-				$c->get('LockdownManager'),
-				$c->get(LoggerInterface::class),
-				$c->get(IEventDispatcher::class),
-			);
-			/** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
-				\OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]);
-			});
-			/** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_createUser', ['uid' => $user->getUID(), 'password' => $password]);
-			});
-			/** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preDelete', function ($user) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]);
-			});
-			/** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postDelete', function ($user) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
-			});
-			$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'pre_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
-			});
-			$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
-			});
-			$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
-				\OC_Hook::emit('OC_User', 'pre_login', ['run' => true, 'uid' => $uid, 'password' => $password]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password));
-			});
-			$userSession->listen('\OC\User', 'postLogin', function ($user, $loginName, $password, $isTokenLogin) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin));
-			});
-			$userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid));
-			});
-			$userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password));
-			});
-			$userSession->listen('\OC\User', 'logout', function ($user) {
-				\OC_Hook::emit('OC_User', 'logout', []);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user));
-			});
-			$userSession->listen('\OC\User', 'postLogout', function ($user) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedOutEvent($user));
-			});
-			$userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'changeUser', ['run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue]);
-			});
-			return $userSession;
-		});
-		$this->registerAlias(\OCP\IUserSession::class, \OC\User\Session::class);
-
-		$this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class);
-
-		$this->registerAlias(INavigationManager::class, \OC\NavigationManager::class);
-
-		$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
-
-		$this->registerService(\OC\SystemConfig::class, function ($c) use ($config) {
-			return new \OC\SystemConfig($config);
-		});
-
-		$this->registerAlias(IAppConfig::class, \OC\AppConfig::class);
-		$this->registerAlias(IUserConfig::class, \OC\Config\UserConfig::class);
-		$this->registerAlias(IAppManager::class, AppManager::class);
-
-		$this->registerService(IFactory::class, function (Server $c) {
-			return new \OC\L10N\Factory(
-				$c->get(\OCP\IConfig::class),
-				$c->getRequest(),
-				$c->get(IUserSession::class),
-				$c->get(ICacheFactory::class),
-				\OC::$SERVERROOT,
-				$c->get(IAppManager::class),
-			);
-		});
-
-		$this->registerAlias(IURLGenerator::class, URLGenerator::class);
-
-		$this->registerAlias(ICache::class, Cache\File::class);
-		$this->registerService(Factory::class, function (Server $c) {
-			$profiler = $c->get(IProfiler::class);
-			$logger = $c->get(LoggerInterface::class);
-			$serverVersion = $c->get(ServerVersion::class);
-			/** @var SystemConfig $config */
-			$config = $c->get(SystemConfig::class);
-			if (!$config->getValue('installed', false) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				return new \OC\Memcache\Factory(
-					$logger,
-					$profiler,
-					$serverVersion,
-					ArrayCache::class,
-					ArrayCache::class,
-					ArrayCache::class
-				);
-			}
-
-			return new \OC\Memcache\Factory(
-				$logger,
-				$profiler,
-				$serverVersion,
-				/** @psalm-taint-escape callable */
-				$config->getValue('memcache.local', null),
-				/** @psalm-taint-escape callable */
-				$config->getValue('memcache.distributed', null),
-				/** @psalm-taint-escape callable */
-				$config->getValue('memcache.locking', null),
-				/** @psalm-taint-escape callable */
-				$config->getValue('redis_log_file')
-			);
-		});
-		$this->registerAlias(ICacheFactory::class, Factory::class);
-
-		$this->registerService('RedisFactory', function (Server $c) {
-			$systemConfig = $c->get(SystemConfig::class);
-			return new RedisFactory($systemConfig, $c->get(IEventLogger::class));
-		});
-
-		$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
-			$l10n = $this->get(IFactory::class)->get('lib');
-			return new \OC\Activity\Manager(
-				$c->getRequest(),
-				$c->get(IUserSession::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(IValidator::class),
-				$c->get(IRichTextFormatter::class),
-				$l10n,
-				$c->get(ITimeFactory::class),
-			);
-		});
-
-		$this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
-			return new \OC\Activity\EventMerger(
-				$c->getL10N('lib')
-			);
-		});
-		$this->registerAlias(IValidator::class, Validator::class);
-
-		$this->registerService(AvatarManager::class, function (Server $c) {
-			return new AvatarManager(
-				$c->get(IUserSession::class),
-				$c->get(\OC\User\Manager::class),
-				$c->getAppDataDir('avatar'),
-				$c->getL10N('lib'),
-				$c->get(LoggerInterface::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(IAccountManager::class),
-				$c->get(KnownUserService::class)
-			);
-		});
-
-		$this->registerAlias(IAvatarManager::class, AvatarManager::class);
-
-		$this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
-		$this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
-		$this->registerAlias(\OCP\Support\Subscription\IAssertion::class, \OC\Support\Subscription\Assertion::class);
-
-		/** Only used by the PsrLoggerAdapter should not be used by apps */
-		$this->registerService(\OC\Log::class, function (Server $c) {
-			$logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file');
-			$factory = new LogFactory($c, $this->get(SystemConfig::class));
-			$logger = $factory->get($logType);
-			$registry = $c->get(\OCP\Support\CrashReport\IRegistry::class);
-
-			return new Log($logger, $this->get(SystemConfig::class), crashReporters: $registry);
-		});
-		// PSR-3 logger
-		$this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
-
-		$this->registerService(ILogFactory::class, function (Server $c) {
-			return new LogFactory($c, $this->get(SystemConfig::class));
-		});
-
-		$this->registerAlias(IJobList::class, \OC\BackgroundJob\JobList::class);
-
-		$this->registerService(Router::class, function (Server $c) {
-			$cacheFactory = $c->get(ICacheFactory::class);
-			if ($cacheFactory->isLocalCacheAvailable()) {
-				$router = $c->resolve(CachingRouter::class);
-			} else {
-				$router = $c->resolve(Router::class);
-			}
-			return $router;
-		});
-		$this->registerAlias(IRouter::class, Router::class);
-
-		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
-			$config = $c->get(\OCP\IConfig::class);
-			if (ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
-				$backend = new \OC\Security\RateLimiting\Backend\MemoryCacheBackend(
-					$c->get(AllConfig::class),
-					$this->get(ICacheFactory::class),
-					new \OC\AppFramework\Utility\TimeFactory()
-				);
-			} else {
-				$backend = new \OC\Security\RateLimiting\Backend\DatabaseBackend(
-					$c->get(AllConfig::class),
-					$c->get(IDBConnection::class),
-					new \OC\AppFramework\Utility\TimeFactory()
-				);
-			}
-
-			return $backend;
-		});
-
-		$this->registerAlias(\OCP\Security\ISecureRandom::class, SecureRandom::class);
-		$this->registerAlias(\OCP\Security\IRemoteHostValidator::class, \OC\Security\RemoteHostValidator::class);
-		$this->registerAlias(IVerificationToken::class, VerificationToken::class);
-
-		$this->registerAlias(ICrypto::class, Crypto::class);
-
-		$this->registerAlias(IHasher::class, Hasher::class);
-
-		$this->registerAlias(ICredentialsManager::class, CredentialsManager::class);
-
-		$this->registerAlias(IDBConnection::class, ConnectionAdapter::class);
-		$this->registerService(Connection::class, function (Server $c) {
-			$systemConfig = $c->get(SystemConfig::class);
-			$factory = new \OC\DB\ConnectionFactory($systemConfig, $c->get(ICacheFactory::class));
-			$type = $systemConfig->getValue('dbtype', 'sqlite');
-			if (!$factory->isValidType($type)) {
-				throw new \OC\DatabaseException('Invalid database type');
-			}
-			$connection = $factory->getConnection($type, []);
-			return $connection;
-		});
-
-		$this->registerAlias(ICertificateManager::class, CertificateManager::class);
-		$this->registerAlias(IClientService::class, ClientService::class);
-		$this->registerService(NegativeDnsCache::class, function (ContainerInterface $c) {
-			return new NegativeDnsCache(
-				$c->get(ICacheFactory::class),
-			);
-		});
-		$this->registerDeprecatedAlias('HttpClientService', IClientService::class);
-		$this->registerService(IEventLogger::class, function (ContainerInterface $c) {
-			return new EventLogger($c->get(SystemConfig::class), $c->get(LoggerInterface::class), $c->get(Log::class));
-		});
-
-		$this->registerService(IQueryLogger::class, function (ContainerInterface $c) {
-			$queryLogger = new QueryLogger();
-			if ($c->get(SystemConfig::class)->getValue('debug', false)) {
-				// In debug mode, module is being activated by default
-				$queryLogger->activate();
-			}
-			return $queryLogger;
-		});
-
-		$this->registerAlias(ITempManager::class, TempManager::class);
-		$this->registerAlias(IDateTimeZone::class, DateTimeZone::class);
-
-		$this->registerService(IDateTimeFormatter::class, function (Server $c) {
-			$language = $c->get(\OCP\IConfig::class)->getUserValue($c->get(ISession::class)->get('user_id'), 'core', 'lang', null);
-
-			return new DateTimeFormatter(
-				$c->get(IDateTimeZone::class)->getTimeZone(),
-				$c->getL10N('lib', $language)
-			);
-		});
-
-		$this->registerService(IUserMountCache::class, function (ContainerInterface $c) {
-			$mountCache = $c->get(UserMountCache::class);
-			$listener = new UserMountCacheListener($mountCache);
-			$listener->listen($c->get(IUserManager::class));
-			return $mountCache;
-		});
-
-		$this->registerService(IMountProviderCollection::class, function (ContainerInterface $c) {
-			$loader = $c->get(IStorageFactory::class);
-			$mountCache = $c->get(IUserMountCache::class);
-			$eventLogger = $c->get(IEventLogger::class);
-			$manager = new MountProviderCollection($loader, $mountCache, $eventLogger);
-
-			// builtin providers
-
-			$config = $c->get(\OCP\IConfig::class);
-			$logger = $c->get(LoggerInterface::class);
-			$objectStoreConfig = $c->get(PrimaryObjectStoreConfig::class);
-			$manager->registerProvider(new CacheMountProvider($config));
-			$manager->registerHomeProvider(new LocalHomeMountProvider());
-			$manager->registerHomeProvider(new ObjectHomeMountProvider($objectStoreConfig));
-			$manager->registerRootProvider(new RootMountProvider($objectStoreConfig, $config));
-			$manager->registerRootProvider(new ObjectStorePreviewCacheMountProvider($logger, $config));
-
-			return $manager;
-		});
-
-		$this->registerService(IBus::class, function (ContainerInterface $c) {
-			$busClass = $c->get(\OCP\IConfig::class)->getSystemValueString('commandbus');
-			if ($busClass) {
-				[$app, $class] = explode('::', $busClass, 2);
-				if ($c->get(IAppManager::class)->isEnabledForUser($app)) {
-					$c->get(IAppManager::class)->loadApp($app);
-					return $c->get($class);
-				} else {
-					throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
-				}
-			} else {
-				$jobList = $c->get(IJobList::class);
-				return new CronBus($jobList);
-			}
-		});
-		$this->registerDeprecatedAlias('AsyncCommandBus', IBus::class);
-		$this->registerAlias(ITrustedDomainHelper::class, TrustedDomainHelper::class);
-		$this->registerAlias(IThrottler::class, Throttler::class);
-
-		$this->registerService(\OC\Security\Bruteforce\Backend\IBackend::class, function ($c) {
-			$config = $c->get(\OCP\IConfig::class);
-			if (!$config->getSystemValueBool('auth.bruteforce.protection.force.database', false)
-				&& ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
-				$backend = $c->get(\OC\Security\Bruteforce\Backend\MemoryCacheBackend::class);
-			} else {
-				$backend = $c->get(\OC\Security\Bruteforce\Backend\DatabaseBackend::class);
-			}
-
-			return $backend;
-		});
-
-		$this->registerDeprecatedAlias('IntegrityCodeChecker', Checker::class);
-		$this->registerService(Checker::class, function (ContainerInterface $c) {
-			// IConfig requires a working database. This code
-			// might however be called when Nextcloud is not yet setup.
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$config = $c->get(\OCP\IConfig::class);
-				$appConfig = $c->get(\OCP\IAppConfig::class);
-			} else {
-				$config = null;
-				$appConfig = null;
-			}
-
-			return new Checker(
-				$c->get(ServerVersion::class),
-				$c->get(EnvironmentHelper::class),
-				new FileAccessHelper(),
-				$config,
-				$appConfig,
-				$c->get(ICacheFactory::class),
-				$c->get(IAppManager::class),
-				$c->get(IMimeTypeDetector::class)
-			);
-		});
-		$this->registerService(Request::class, function (ContainerInterface $c) {
-			if (isset($this['urlParams'])) {
-				$urlParams = $this['urlParams'];
-			} else {
-				$urlParams = [];
-			}
-
-			if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
-				&& in_array('fakeinput', stream_get_wrappers())
-			) {
-				$stream = 'fakeinput://data';
-			} else {
-				$stream = 'php://input';
-			}
-
-			return new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: '',
-					'urlParams' => $urlParams,
-				],
-				$this->get(IRequestId::class),
-				$this->get(\OCP\IConfig::class),
-				$this->get(CsrfTokenManager::class),
-				$stream
-			);
-		});
-		$this->registerAlias(\OCP\IRequest::class, Request::class);
-
-		$this->registerService(IRequestId::class, function (ContainerInterface $c): IRequestId {
-			return new RequestId(
-				$_SERVER['UNIQUE_ID'] ?? '',
-				$this->get(ISecureRandom::class)
-			);
-		});
-
-		/** @since 32.0.0 */
-		$this->registerAlias(IEmailValidator::class, EmailValidator::class);
-
-		$this->registerService(IMailer::class, function (Server $c) {
-			return new Mailer(
-				$c->get(\OCP\IConfig::class),
-				$c->get(LoggerInterface::class),
-				$c->get(Defaults::class),
-				$c->get(IURLGenerator::class),
-				$c->getL10N('lib'),
-				$c->get(IEventDispatcher::class),
-				$c->get(IFactory::class),
-				$c->get(IEmailValidator::class),
-			);
-		});
-
-		/** @since 30.0.0 */
-		$this->registerAlias(\OCP\Mail\Provider\IManager::class, \OC\Mail\Provider\Manager::class);
-
-		$this->registerService(ILDAPProviderFactory::class, function (ContainerInterface $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
-			if (is_null($factoryClass) || !class_exists($factoryClass)) {
-				return new NullLDAPProviderFactory($this);
-			}
-			/** @var \OCP\LDAP\ILDAPProviderFactory $factory */
-			return new $factoryClass($this);
-		});
-		$this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
-			$factory = $c->get(ILDAPProviderFactory::class);
-			return $factory->getLDAPProvider();
-		});
-		$this->registerService(ILockingProvider::class, function (ContainerInterface $c) {
-			$ini = $c->get(IniGetWrapper::class);
-			$config = $c->get(\OCP\IConfig::class);
-			$ttl = $config->getSystemValueInt('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
-			if ($config->getSystemValueBool('filelocking.enabled', true) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				/** @var \OC\Memcache\Factory $memcacheFactory */
-				$memcacheFactory = $c->get(ICacheFactory::class);
-				$memcache = $memcacheFactory->createLocking('lock');
-				if (!($memcache instanceof \OC\Memcache\NullCache)) {
-					$timeFactory = $c->get(ITimeFactory::class);
-					return new MemcacheLockingProvider($memcache, $timeFactory, $ttl);
-				}
-				return new DBLockingProvider(
-					$c->get(IDBConnection::class),
-					new TimeFactory(),
-					$ttl,
-					!\OC::$CLI
-				);
-			}
-			return new NoopLockingProvider();
-		});
-
-		$this->registerService(ILockManager::class, function (Server $c): LockManager {
-			return new LockManager();
-		});
-
-		$this->registerAlias(ILockdownManager::class, 'LockdownManager');
-		$this->registerService(SetupManager::class, function ($c) {
-			// create the setupmanager through the mount manager to resolve the cyclic dependency
-			return $c->get(\OC\Files\Mount\Manager::class)->getSetupManager();
-		});
-		$this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class);
-
-		$this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) {
-			return new \OC\Files\Type\Detection(
-				$c->get(IURLGenerator::class),
-				$c->get(LoggerInterface::class),
-				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
-			);
-		});
-
-		$this->registerAlias(IMimeTypeLoader::class, Loader::class);
-		$this->registerService(BundleFetcher::class, function () {
-			return new BundleFetcher($this->getL10N('lib'));
-		});
-		$this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
-
-		$this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
-			$manager = new CapabilitiesManager($c->get(LoggerInterface::class));
-			$manager->registerCapability(function () use ($c) {
-				return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
-			});
-			$manager->registerCapability(function () use ($c) {
-				return $c->get(\OC\Security\Bruteforce\Capabilities::class);
-			});
-			return $manager;
-		});
-
-		$this->registerService(ICommentsManager::class, function (Server $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
-			/** @var \OCP\Comments\ICommentsManagerFactory $factory */
-			$factory = new $factoryClass($this);
-			$manager = $factory->getManager();
-
-			$manager->registerDisplayNameResolver('user', function ($id) use ($c) {
-				$manager = $c->get(IUserManager::class);
-				$userDisplayName = $manager->getDisplayName($id);
-				if ($userDisplayName === null) {
-					$l = $c->get(IFactory::class)->get('core');
-					return $l->t('Unknown account');
-				}
-				return $userDisplayName;
-			});
-
-			return $manager;
-		});
-
-		$this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
-		$this->registerService('ThemingDefaults', function (Server $c) {
-			try {
-				$classExists = class_exists('OCA\Theming\ThemingDefaults');
-			} catch (\OCP\AutoloadNotAllowedException $e) {
-				// App disabled or in maintenance mode
-				$classExists = false;
-			}
-
-			if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isEnabledForAnyone('theming') && $c->get(TrustedDomainHelper::class)->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
-				$backgroundService = new BackgroundService(
-					$c->get(IRootFolder::class),
-					$c->getAppDataDir('theming'),
-					$c->get(IAppConfig::class),
-					$c->get(\OCP\IConfig::class),
-					$c->get(ISession::class)->get('user_id'),
-				);
-				$imageManager = new ImageManager(
-					$c->get(\OCP\IConfig::class),
-					$c->getAppDataDir('theming'),
-					$c->get(IURLGenerator::class),
-					$c->get(ICacheFactory::class),
-					$c->get(LoggerInterface::class),
-					$c->get(ITempManager::class),
-					$backgroundService,
-				);
-				return new ThemingDefaults(
-					$c->get(\OCP\IConfig::class),
-					$c->get(\OCP\IAppConfig::class),
-					$c->getL10N('theming'),
-					$c->get(IUserSession::class),
-					$c->get(IURLGenerator::class),
-					$c->get(ICacheFactory::class),
-					new Util($c->get(ServerVersion::class), $c->get(\OCP\IConfig::class), $this->get(IAppManager::class), $c->getAppDataDir('theming'), $imageManager),
-					$imageManager,
-					$c->get(IAppManager::class),
-					$c->get(INavigationManager::class),
-					$backgroundService,
-				);
-			}
-			return new \OC_Defaults();
-		});
-		$this->registerService(JSCombiner::class, function (Server $c) {
-			return new JSCombiner(
-				$c->getAppDataDir('js'),
-				$c->get(IURLGenerator::class),
-				$this->get(ICacheFactory::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(LoggerInterface::class)
-			);
-		});
-		$this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
-
-		$this->registerService('CryptoWrapper', function (ContainerInterface $c) {
-			// FIXME: Instantiated here due to cyclic dependency
-			$request = new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: null,
-				],
-				$c->get(IRequestId::class),
-				$c->get(\OCP\IConfig::class)
-			);
-
-			return new CryptoWrapper(
-				$c->get(ICrypto::class),
-				$c->get(ISecureRandom::class),
-				$request
-			);
-		});
-		$this->registerService(SessionStorage::class, function (ContainerInterface $c) {
-			return new SessionStorage($c->get(ISession::class));
-		});
-		$this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
-
-		$this->registerService(IProviderFactory::class, function (ContainerInterface $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
-			/** @var \OCP\Share\IProviderFactory $factory */
-			return $c->get($factoryClass);
-		});
-
-		$this->registerAlias(\OCP\Share\IManager::class, \OC\Share20\Manager::class);
-
-		$this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
-			$instance = new Collaboration\Collaborators\Search($c);
-
-			// register default plugins
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE_GROUP', 'class' => RemoteGroupPlugin::class]);
-
-			return $instance;
-		});
-		$this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class);
-
-		$this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
-
-		$this->registerAlias(\OCP\Collaboration\Resources\IProviderManager::class, \OC\Collaboration\Resources\ProviderManager::class);
-		$this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
-
-		$this->registerAlias(IReferenceManager::class, ReferenceManager::class);
-		$this->registerAlias(ITeamManager::class, TeamManager::class);
-
-		$this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class);
-		$this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class);
-		$this->registerService(\OC\Files\AppData\Factory::class, function (ContainerInterface $c) {
-			return new \OC\Files\AppData\Factory(
-				$c->get(IRootFolder::class),
-				$c->get(SystemConfig::class)
-			);
-		});
-
-		$this->registerService('LockdownManager', function (ContainerInterface $c) {
-			return new LockdownManager(function () use ($c) {
-				return $c->get(ISession::class);
-			});
-		});
-
-		$this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
-			return new DiscoveryService(
-				$c->get(ICacheFactory::class),
-				$c->get(IClientService::class)
-			);
-		});
-		$this->registerAlias(IOCMDiscoveryService::class, OCMDiscoveryService::class);
-
-		$this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
-			return new CloudIdManager(
-				$c->get(ICacheFactory::class),
-				$c->get(IEventDispatcher::class),
-				$c->get(\OCP\Contacts\IManager::class),
-				$c->get(IURLGenerator::class),
-				$c->get(IUserManager::class),
-			);
-		});
+    /** @var string */
+    private $webRoot;
+
+    /**
+     * @param string $webRoot
+     * @param \OC\Config $config
+     */
+    public function __construct($webRoot, \OC\Config $config) {
+        parent::__construct();
+        $this->webRoot = $webRoot;
+
+        // To find out if we are running from CLI or not
+        $this->registerParameter('isCLI', \OC::$CLI);
+        $this->registerParameter('serverRoot', \OC::$SERVERROOT);
+
+        $this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
+            return $c;
+        });
+        $this->registerDeprecatedAlias(\OCP\IServerContainer::class, ContainerInterface::class);
+
+        $this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class);
+
+        $this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
+
+        $this->registerAlias(\OCP\ContextChat\IContentManager::class, \OC\ContextChat\ContentManager::class);
+
+        $this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class);
+        $this->registerAlias(ITemplateManager::class, TemplateManager::class);
+        $this->registerAlias(\OCP\Template\ITemplateManager::class, \OC\Template\TemplateManager::class);
+
+        $this->registerAlias(IActionFactory::class, ActionFactory::class);
+
+        $this->registerService(View::class, function (Server $c) {
+            return new View();
+        }, false);
+
+        $this->registerService(IPreview::class, function (ContainerInterface $c) {
+            return new PreviewManager(
+                $c->get(\OCP\IConfig::class),
+                $c->get(IRootFolder::class),
+                new \OC\Preview\Storage\Root(
+                    $c->get(IRootFolder::class),
+                    $c->get(SystemConfig::class)
+                ),
+                $c->get(IEventDispatcher::class),
+                $c->get(GeneratorHelper::class),
+                $c->get(ISession::class)->get('user_id'),
+                $c->get(Coordinator::class),
+                $c->get(IServerContainer::class),
+                $c->get(IBinaryFinder::class),
+                $c->get(IMagickSupport::class)
+            );
+        });
+        $this->registerAlias(IMimeIconProvider::class, MimeIconProvider::class);
+
+        $this->registerService(\OC\Preview\Watcher::class, function (ContainerInterface $c) {
+            return new \OC\Preview\Watcher(
+                new \OC\Preview\Storage\Root(
+                    $c->get(IRootFolder::class),
+                    $c->get(SystemConfig::class)
+                )
+            );
+        });
+
+        $this->registerService(IProfiler::class, function (Server $c) {
+            return new Profiler($c->get(SystemConfig::class));
+        });
+
+        $this->registerService(Encryption\Manager::class, function (Server $c): Encryption\Manager {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+            return new Encryption\Manager(
+                $c->get(\OCP\IConfig::class),
+                $c->get(LoggerInterface::class),
+                $c->getL10N('core'),
+                new View(),
+                $util,
+                new ArrayCache()
+            );
+        });
+        $this->registerAlias(\OCP\Encryption\IManager::class, Encryption\Manager::class);
+
+        $this->registerService(IFile::class, function (ContainerInterface $c) {
+            $util = new Encryption\Util(
+                new View(),
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+            return new Encryption\File(
+                $util,
+                $c->get(IRootFolder::class),
+                $c->get(\OCP\Share\IManager::class)
+            );
+        });
+
+        $this->registerService(IStorage::class, function (ContainerInterface $c) {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+
+            return new Encryption\Keys\Storage(
+                $view,
+                $util,
+                $c->get(ICrypto::class),
+                $c->get(\OCP\IConfig::class)
+            );
+        });
+
+        $this->registerAlias(\OCP\ITagManager::class, TagManager::class);
+
+        $this->registerService('SystemTagManagerFactory', function (ContainerInterface $c) {
+            /** @var \OCP\IConfig $config */
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
+            return new $factoryClass($this);
+        });
+        $this->registerService(ISystemTagManager::class, function (ContainerInterface $c) {
+            return $c->get('SystemTagManagerFactory')->getManager();
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
+
+        $this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) {
+            return $c->get('SystemTagManagerFactory')->getObjectMapper();
+        });
+        $this->registerAlias(IFileAccess::class, FileAccess::class);
+        $this->registerService('RootFolder', function (ContainerInterface $c) {
+            $manager = \OC\Files\Filesystem::getMountManager();
+            $view = new View();
+            /** @var IUserSession $userSession */
+            $userSession = $c->get(IUserSession::class);
+            $root = new Root(
+                $manager,
+                $view,
+                $userSession->getUser(),
+                $c->get(IUserMountCache::class),
+                $this->get(LoggerInterface::class),
+                $this->get(IUserManager::class),
+                $this->get(IEventDispatcher::class),
+                $this->get(ICacheFactory::class),
+                $this->get(IAppConfig::class),
+            );
+
+            $previewConnector = new \OC\Preview\WatcherConnector(
+                $root,
+                $c->get(SystemConfig::class),
+                $this->get(IEventDispatcher::class)
+            );
+            $previewConnector->connectWatcher();
+
+            return $root;
+        });
+        $this->registerService(HookConnector::class, function (ContainerInterface $c) {
+            return new HookConnector(
+                $c->get(IRootFolder::class),
+                new View(),
+                $c->get(IEventDispatcher::class),
+                $c->get(LoggerInterface::class)
+            );
+        });
+
+        $this->registerService(IRootFolder::class, function (ContainerInterface $c) {
+            return new LazyRoot(function () use ($c) {
+                return $c->get('RootFolder');
+            });
+        });
+
+        $this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
+
+        $this->registerService(DisplayNameCache::class, function (ContainerInterface $c) {
+            return $c->get(\OC\User\Manager::class)->getDisplayNameCache();
+        });
+
+        $this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) {
+            $groupManager = new \OC\Group\Manager(
+                $this->get(IUserManager::class),
+                $this->get(IEventDispatcher::class),
+                $this->get(LoggerInterface::class),
+                $this->get(ICacheFactory::class),
+                $this->get(IRemoteAddress::class),
+            );
+            return $groupManager;
+        });
+
+        $this->registerService(Store::class, function (ContainerInterface $c) {
+            $session = $c->get(ISession::class);
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $tokenProvider = $c->get(IProvider::class);
+            } else {
+                $tokenProvider = null;
+            }
+            $logger = $c->get(LoggerInterface::class);
+            $crypto = $c->get(ICrypto::class);
+            return new Store($session, $logger, $crypto, $tokenProvider);
+        });
+        $this->registerAlias(IStore::class, Store::class);
+        $this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
+        $this->registerAlias(OCPIProvider::class, Authentication\Token\Manager::class);
+
+        $this->registerService(\OC\User\Session::class, function (Server $c) {
+            $manager = $c->get(IUserManager::class);
+            $session = new \OC\Session\Memory();
+            $timeFactory = new TimeFactory();
+            // Token providers might require a working database. This code
+            // might however be called when Nextcloud is not yet setup.
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $provider = $c->get(IProvider::class);
+            } else {
+                $provider = null;
+            }
+
+            $userSession = new \OC\User\Session(
+                $manager,
+                $session,
+                $timeFactory,
+                $provider,
+                $c->get(\OCP\IConfig::class),
+                $c->get(ISecureRandom::class),
+                $c->get('LockdownManager'),
+                $c->get(LoggerInterface::class),
+                $c->get(IEventDispatcher::class),
+            );
+            /** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+                \OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]);
+            });
+            /** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_createUser', ['uid' => $user->getUID(), 'password' => $password]);
+            });
+            /** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'preDelete', function ($user) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]);
+            });
+            /** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'postDelete', function ($user) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
+            });
+            $userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'pre_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
+            });
+            $userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
+            });
+            $userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
+                \OC_Hook::emit('OC_User', 'pre_login', ['run' => true, 'uid' => $uid, 'password' => $password]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password));
+            });
+            $userSession->listen('\OC\User', 'postLogin', function ($user, $loginName, $password, $isTokenLogin) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin));
+            });
+            $userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid));
+            });
+            $userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password));
+            });
+            $userSession->listen('\OC\User', 'logout', function ($user) {
+                \OC_Hook::emit('OC_User', 'logout', []);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user));
+            });
+            $userSession->listen('\OC\User', 'postLogout', function ($user) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedOutEvent($user));
+            });
+            $userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'changeUser', ['run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue]);
+            });
+            return $userSession;
+        });
+        $this->registerAlias(\OCP\IUserSession::class, \OC\User\Session::class);
+
+        $this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class);
+
+        $this->registerAlias(INavigationManager::class, \OC\NavigationManager::class);
+
+        $this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
+
+        $this->registerService(\OC\SystemConfig::class, function ($c) use ($config) {
+            return new \OC\SystemConfig($config);
+        });
+
+        $this->registerAlias(IAppConfig::class, \OC\AppConfig::class);
+        $this->registerAlias(IUserConfig::class, \OC\Config\UserConfig::class);
+        $this->registerAlias(IAppManager::class, AppManager::class);
+
+        $this->registerService(IFactory::class, function (Server $c) {
+            return new \OC\L10N\Factory(
+                $c->get(\OCP\IConfig::class),
+                $c->getRequest(),
+                $c->get(IUserSession::class),
+                $c->get(ICacheFactory::class),
+                \OC::$SERVERROOT,
+                $c->get(IAppManager::class),
+            );
+        });
+
+        $this->registerAlias(IURLGenerator::class, URLGenerator::class);
+
+        $this->registerAlias(ICache::class, Cache\File::class);
+        $this->registerService(Factory::class, function (Server $c) {
+            $profiler = $c->get(IProfiler::class);
+            $logger = $c->get(LoggerInterface::class);
+            $serverVersion = $c->get(ServerVersion::class);
+            /** @var SystemConfig $config */
+            $config = $c->get(SystemConfig::class);
+            if (!$config->getValue('installed', false) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                return new \OC\Memcache\Factory(
+                    $logger,
+                    $profiler,
+                    $serverVersion,
+                    ArrayCache::class,
+                    ArrayCache::class,
+                    ArrayCache::class
+                );
+            }
+
+            return new \OC\Memcache\Factory(
+                $logger,
+                $profiler,
+                $serverVersion,
+                /** @psalm-taint-escape callable */
+                $config->getValue('memcache.local', null),
+                /** @psalm-taint-escape callable */
+                $config->getValue('memcache.distributed', null),
+                /** @psalm-taint-escape callable */
+                $config->getValue('memcache.locking', null),
+                /** @psalm-taint-escape callable */
+                $config->getValue('redis_log_file')
+            );
+        });
+        $this->registerAlias(ICacheFactory::class, Factory::class);
+
+        $this->registerService('RedisFactory', function (Server $c) {
+            $systemConfig = $c->get(SystemConfig::class);
+            return new RedisFactory($systemConfig, $c->get(IEventLogger::class));
+        });
+
+        $this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
+            $l10n = $this->get(IFactory::class)->get('lib');
+            return new \OC\Activity\Manager(
+                $c->getRequest(),
+                $c->get(IUserSession::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(IValidator::class),
+                $c->get(IRichTextFormatter::class),
+                $l10n,
+                $c->get(ITimeFactory::class),
+            );
+        });
+
+        $this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
+            return new \OC\Activity\EventMerger(
+                $c->getL10N('lib')
+            );
+        });
+        $this->registerAlias(IValidator::class, Validator::class);
+
+        $this->registerService(AvatarManager::class, function (Server $c) {
+            return new AvatarManager(
+                $c->get(IUserSession::class),
+                $c->get(\OC\User\Manager::class),
+                $c->getAppDataDir('avatar'),
+                $c->getL10N('lib'),
+                $c->get(LoggerInterface::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(IAccountManager::class),
+                $c->get(KnownUserService::class)
+            );
+        });
+
+        $this->registerAlias(IAvatarManager::class, AvatarManager::class);
+
+        $this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
+        $this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
+        $this->registerAlias(\OCP\Support\Subscription\IAssertion::class, \OC\Support\Subscription\Assertion::class);
+
+        /** Only used by the PsrLoggerAdapter should not be used by apps */
+        $this->registerService(\OC\Log::class, function (Server $c) {
+            $logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file');
+            $factory = new LogFactory($c, $this->get(SystemConfig::class));
+            $logger = $factory->get($logType);
+            $registry = $c->get(\OCP\Support\CrashReport\IRegistry::class);
+
+            return new Log($logger, $this->get(SystemConfig::class), crashReporters: $registry);
+        });
+        // PSR-3 logger
+        $this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
+
+        $this->registerService(ILogFactory::class, function (Server $c) {
+            return new LogFactory($c, $this->get(SystemConfig::class));
+        });
+
+        $this->registerAlias(IJobList::class, \OC\BackgroundJob\JobList::class);
+
+        $this->registerService(Router::class, function (Server $c) {
+            $cacheFactory = $c->get(ICacheFactory::class);
+            if ($cacheFactory->isLocalCacheAvailable()) {
+                $router = $c->resolve(CachingRouter::class);
+            } else {
+                $router = $c->resolve(Router::class);
+            }
+            return $router;
+        });
+        $this->registerAlias(IRouter::class, Router::class);
+
+        $this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
+            $config = $c->get(\OCP\IConfig::class);
+            if (ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
+                $backend = new \OC\Security\RateLimiting\Backend\MemoryCacheBackend(
+                    $c->get(AllConfig::class),
+                    $this->get(ICacheFactory::class),
+                    new \OC\AppFramework\Utility\TimeFactory()
+                );
+            } else {
+                $backend = new \OC\Security\RateLimiting\Backend\DatabaseBackend(
+                    $c->get(AllConfig::class),
+                    $c->get(IDBConnection::class),
+                    new \OC\AppFramework\Utility\TimeFactory()
+                );
+            }
+
+            return $backend;
+        });
+
+        $this->registerAlias(\OCP\Security\ISecureRandom::class, SecureRandom::class);
+        $this->registerAlias(\OCP\Security\IRemoteHostValidator::class, \OC\Security\RemoteHostValidator::class);
+        $this->registerAlias(IVerificationToken::class, VerificationToken::class);
+
+        $this->registerAlias(ICrypto::class, Crypto::class);
+
+        $this->registerAlias(IHasher::class, Hasher::class);
+
+        $this->registerAlias(ICredentialsManager::class, CredentialsManager::class);
+
+        $this->registerAlias(IDBConnection::class, ConnectionAdapter::class);
+        $this->registerService(Connection::class, function (Server $c) {
+            $systemConfig = $c->get(SystemConfig::class);
+            $factory = new \OC\DB\ConnectionFactory($systemConfig, $c->get(ICacheFactory::class));
+            $type = $systemConfig->getValue('dbtype', 'sqlite');
+            if (!$factory->isValidType($type)) {
+                throw new \OC\DatabaseException('Invalid database type');
+            }
+            $connection = $factory->getConnection($type, []);
+            return $connection;
+        });
+
+        $this->registerAlias(ICertificateManager::class, CertificateManager::class);
+        $this->registerAlias(IClientService::class, ClientService::class);
+        $this->registerService(NegativeDnsCache::class, function (ContainerInterface $c) {
+            return new NegativeDnsCache(
+                $c->get(ICacheFactory::class),
+            );
+        });
+        $this->registerDeprecatedAlias('HttpClientService', IClientService::class);
+        $this->registerService(IEventLogger::class, function (ContainerInterface $c) {
+            return new EventLogger($c->get(SystemConfig::class), $c->get(LoggerInterface::class), $c->get(Log::class));
+        });
+
+        $this->registerService(IQueryLogger::class, function (ContainerInterface $c) {
+            $queryLogger = new QueryLogger();
+            if ($c->get(SystemConfig::class)->getValue('debug', false)) {
+                // In debug mode, module is being activated by default
+                $queryLogger->activate();
+            }
+            return $queryLogger;
+        });
+
+        $this->registerAlias(ITempManager::class, TempManager::class);
+        $this->registerAlias(IDateTimeZone::class, DateTimeZone::class);
+
+        $this->registerService(IDateTimeFormatter::class, function (Server $c) {
+            $language = $c->get(\OCP\IConfig::class)->getUserValue($c->get(ISession::class)->get('user_id'), 'core', 'lang', null);
+
+            return new DateTimeFormatter(
+                $c->get(IDateTimeZone::class)->getTimeZone(),
+                $c->getL10N('lib', $language)
+            );
+        });
+
+        $this->registerService(IUserMountCache::class, function (ContainerInterface $c) {
+            $mountCache = $c->get(UserMountCache::class);
+            $listener = new UserMountCacheListener($mountCache);
+            $listener->listen($c->get(IUserManager::class));
+            return $mountCache;
+        });
+
+        $this->registerService(IMountProviderCollection::class, function (ContainerInterface $c) {
+            $loader = $c->get(IStorageFactory::class);
+            $mountCache = $c->get(IUserMountCache::class);
+            $eventLogger = $c->get(IEventLogger::class);
+            $manager = new MountProviderCollection($loader, $mountCache, $eventLogger);
+
+            // builtin providers
+
+            $config = $c->get(\OCP\IConfig::class);
+            $logger = $c->get(LoggerInterface::class);
+            $objectStoreConfig = $c->get(PrimaryObjectStoreConfig::class);
+            $manager->registerProvider(new CacheMountProvider($config));
+            $manager->registerHomeProvider(new LocalHomeMountProvider());
+            $manager->registerHomeProvider(new ObjectHomeMountProvider($objectStoreConfig));
+            $manager->registerRootProvider(new RootMountProvider($objectStoreConfig, $config));
+            $manager->registerRootProvider(new ObjectStorePreviewCacheMountProvider($logger, $config));
+
+            return $manager;
+        });
+
+        $this->registerService(IBus::class, function (ContainerInterface $c) {
+            $busClass = $c->get(\OCP\IConfig::class)->getSystemValueString('commandbus');
+            if ($busClass) {
+                [$app, $class] = explode('::', $busClass, 2);
+                if ($c->get(IAppManager::class)->isEnabledForUser($app)) {
+                    $c->get(IAppManager::class)->loadApp($app);
+                    return $c->get($class);
+                } else {
+                    throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
+                }
+            } else {
+                $jobList = $c->get(IJobList::class);
+                return new CronBus($jobList);
+            }
+        });
+        $this->registerDeprecatedAlias('AsyncCommandBus', IBus::class);
+        $this->registerAlias(ITrustedDomainHelper::class, TrustedDomainHelper::class);
+        $this->registerAlias(IThrottler::class, Throttler::class);
+
+        $this->registerService(\OC\Security\Bruteforce\Backend\IBackend::class, function ($c) {
+            $config = $c->get(\OCP\IConfig::class);
+            if (!$config->getSystemValueBool('auth.bruteforce.protection.force.database', false)
+                && ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
+                $backend = $c->get(\OC\Security\Bruteforce\Backend\MemoryCacheBackend::class);
+            } else {
+                $backend = $c->get(\OC\Security\Bruteforce\Backend\DatabaseBackend::class);
+            }
+
+            return $backend;
+        });
+
+        $this->registerDeprecatedAlias('IntegrityCodeChecker', Checker::class);
+        $this->registerService(Checker::class, function (ContainerInterface $c) {
+            // IConfig requires a working database. This code
+            // might however be called when Nextcloud is not yet setup.
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $config = $c->get(\OCP\IConfig::class);
+                $appConfig = $c->get(\OCP\IAppConfig::class);
+            } else {
+                $config = null;
+                $appConfig = null;
+            }
+
+            return new Checker(
+                $c->get(ServerVersion::class),
+                $c->get(EnvironmentHelper::class),
+                new FileAccessHelper(),
+                $config,
+                $appConfig,
+                $c->get(ICacheFactory::class),
+                $c->get(IAppManager::class),
+                $c->get(IMimeTypeDetector::class)
+            );
+        });
+        $this->registerService(Request::class, function (ContainerInterface $c) {
+            if (isset($this['urlParams'])) {
+                $urlParams = $this['urlParams'];
+            } else {
+                $urlParams = [];
+            }
+
+            if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
+                && in_array('fakeinput', stream_get_wrappers())
+            ) {
+                $stream = 'fakeinput://data';
+            } else {
+                $stream = 'php://input';
+            }
+
+            return new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : '',
+                    'urlParams' => $urlParams,
+                ],
+                $this->get(IRequestId::class),
+                $this->get(\OCP\IConfig::class),
+                $this->get(CsrfTokenManager::class),
+                $stream
+            );
+        });
+        $this->registerAlias(\OCP\IRequest::class, Request::class);
+
+        $this->registerService(IRequestId::class, function (ContainerInterface $c): IRequestId {
+            return new RequestId(
+                $_SERVER['UNIQUE_ID'] ?? '',
+                $this->get(ISecureRandom::class)
+            );
+        });
+
+        /** @since 32.0.0 */
+        $this->registerAlias(IEmailValidator::class, EmailValidator::class);
+
+        $this->registerService(IMailer::class, function (Server $c) {
+            return new Mailer(
+                $c->get(\OCP\IConfig::class),
+                $c->get(LoggerInterface::class),
+                $c->get(Defaults::class),
+                $c->get(IURLGenerator::class),
+                $c->getL10N('lib'),
+                $c->get(IEventDispatcher::class),
+                $c->get(IFactory::class),
+                $c->get(IEmailValidator::class),
+            );
+        });
+
+        /** @since 30.0.0 */
+        $this->registerAlias(\OCP\Mail\Provider\IManager::class, \OC\Mail\Provider\Manager::class);
+
+        $this->registerService(ILDAPProviderFactory::class, function (ContainerInterface $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('ldapProviderFactory', null);
+            if (is_null($factoryClass) || !class_exists($factoryClass)) {
+                return new NullLDAPProviderFactory($this);
+            }
+            /** @var \OCP\LDAP\ILDAPProviderFactory $factory */
+            return new $factoryClass($this);
+        });
+        $this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
+            $factory = $c->get(ILDAPProviderFactory::class);
+            return $factory->getLDAPProvider();
+        });
+        $this->registerService(ILockingProvider::class, function (ContainerInterface $c) {
+            $ini = $c->get(IniGetWrapper::class);
+            $config = $c->get(\OCP\IConfig::class);
+            $ttl = $config->getSystemValueInt('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
+            if ($config->getSystemValueBool('filelocking.enabled', true) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                /** @var \OC\Memcache\Factory $memcacheFactory */
+                $memcacheFactory = $c->get(ICacheFactory::class);
+                $memcache = $memcacheFactory->createLocking('lock');
+                if (!($memcache instanceof \OC\Memcache\NullCache)) {
+                    $timeFactory = $c->get(ITimeFactory::class);
+                    return new MemcacheLockingProvider($memcache, $timeFactory, $ttl);
+                }
+                return new DBLockingProvider(
+                    $c->get(IDBConnection::class),
+                    new TimeFactory(),
+                    $ttl,
+                    !\OC::$CLI
+                );
+            }
+            return new NoopLockingProvider();
+        });
+
+        $this->registerService(ILockManager::class, function (Server $c): LockManager {
+            return new LockManager();
+        });
+
+        $this->registerAlias(ILockdownManager::class, 'LockdownManager');
+        $this->registerService(SetupManager::class, function ($c) {
+            // create the setupmanager through the mount manager to resolve the cyclic dependency
+            return $c->get(\OC\Files\Mount\Manager::class)->getSetupManager();
+        });
+        $this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class);
+
+        $this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) {
+            return new \OC\Files\Type\Detection(
+                $c->get(IURLGenerator::class),
+                $c->get(LoggerInterface::class),
+                \OC::$configDir,
+                \OC::$SERVERROOT . '/resources/config/'
+            );
+        });
+
+        $this->registerAlias(IMimeTypeLoader::class, Loader::class);
+        $this->registerService(BundleFetcher::class, function () {
+            return new BundleFetcher($this->getL10N('lib'));
+        });
+        $this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
+
+        $this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
+            $manager = new CapabilitiesManager($c->get(LoggerInterface::class));
+            $manager->registerCapability(function () use ($c) {
+                return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
+            });
+            $manager->registerCapability(function () use ($c) {
+                return $c->get(\OC\Security\Bruteforce\Capabilities::class);
+            });
+            return $manager;
+        });
+
+        $this->registerService(ICommentsManager::class, function (Server $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
+            /** @var \OCP\Comments\ICommentsManagerFactory $factory */
+            $factory = new $factoryClass($this);
+            $manager = $factory->getManager();
+
+            $manager->registerDisplayNameResolver('user', function ($id) use ($c) {
+                $manager = $c->get(IUserManager::class);
+                $userDisplayName = $manager->getDisplayName($id);
+                if ($userDisplayName === null) {
+                    $l = $c->get(IFactory::class)->get('core');
+                    return $l->t('Unknown account');
+                }
+                return $userDisplayName;
+            });
+
+            return $manager;
+        });
+
+        $this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
+        $this->registerService('ThemingDefaults', function (Server $c) {
+            try {
+                $classExists = class_exists('OCA\Theming\ThemingDefaults');
+            } catch (\OCP\AutoloadNotAllowedException $e) {
+                // App disabled or in maintenance mode
+                $classExists = false;
+            }
+
+            if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isEnabledForAnyone('theming') && $c->get(TrustedDomainHelper::class)->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
+                $backgroundService = new BackgroundService(
+                    $c->get(IRootFolder::class),
+                    $c->getAppDataDir('theming'),
+                    $c->get(IAppConfig::class),
+                    $c->get(\OCP\IConfig::class),
+                    $c->get(ISession::class)->get('user_id'),
+                );
+                $imageManager = new ImageManager(
+                    $c->get(\OCP\IConfig::class),
+                    $c->getAppDataDir('theming'),
+                    $c->get(IURLGenerator::class),
+                    $c->get(ICacheFactory::class),
+                    $c->get(LoggerInterface::class),
+                    $c->get(ITempManager::class),
+                    $backgroundService,
+                );
+                return new ThemingDefaults(
+                    $c->get(\OCP\IConfig::class),
+                    $c->get(\OCP\IAppConfig::class),
+                    $c->getL10N('theming'),
+                    $c->get(IUserSession::class),
+                    $c->get(IURLGenerator::class),
+                    $c->get(ICacheFactory::class),
+                    new Util($c->get(ServerVersion::class), $c->get(\OCP\IConfig::class), $this->get(IAppManager::class), $c->getAppDataDir('theming'), $imageManager),
+                    $imageManager,
+                    $c->get(IAppManager::class),
+                    $c->get(INavigationManager::class),
+                    $backgroundService,
+                );
+            }
+            return new \OC_Defaults();
+        });
+        $this->registerService(JSCombiner::class, function (Server $c) {
+            return new JSCombiner(
+                $c->getAppDataDir('js'),
+                $c->get(IURLGenerator::class),
+                $this->get(ICacheFactory::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(LoggerInterface::class)
+            );
+        });
+        $this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
+
+        $this->registerService('CryptoWrapper', function (ContainerInterface $c) {
+            // FIXME: Instantiated here due to cyclic dependency
+            $request = new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : null,
+                ],
+                $c->get(IRequestId::class),
+                $c->get(\OCP\IConfig::class)
+            );
+
+            return new CryptoWrapper(
+                $c->get(ICrypto::class),
+                $c->get(ISecureRandom::class),
+                $request
+            );
+        });
+        $this->registerService(SessionStorage::class, function (ContainerInterface $c) {
+            return new SessionStorage($c->get(ISession::class));
+        });
+        $this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
+
+        $this->registerService(IProviderFactory::class, function (ContainerInterface $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
+            /** @var \OCP\Share\IProviderFactory $factory */
+            return $c->get($factoryClass);
+        });
+
+        $this->registerAlias(\OCP\Share\IManager::class, \OC\Share20\Manager::class);
+
+        $this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
+            $instance = new Collaboration\Collaborators\Search($c);
+
+            // register default plugins
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE_GROUP', 'class' => RemoteGroupPlugin::class]);
+
+            return $instance;
+        });
+        $this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class);
+
+        $this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
+
+        $this->registerAlias(\OCP\Collaboration\Resources\IProviderManager::class, \OC\Collaboration\Resources\ProviderManager::class);
+        $this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
+
+        $this->registerAlias(IReferenceManager::class, ReferenceManager::class);
+        $this->registerAlias(ITeamManager::class, TeamManager::class);
+
+        $this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class);
+        $this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class);
+        $this->registerService(\OC\Files\AppData\Factory::class, function (ContainerInterface $c) {
+            return new \OC\Files\AppData\Factory(
+                $c->get(IRootFolder::class),
+                $c->get(SystemConfig::class)
+            );
+        });
+
+        $this->registerService('LockdownManager', function (ContainerInterface $c) {
+            return new LockdownManager(function () use ($c) {
+                return $c->get(ISession::class);
+            });
+        });
+
+        $this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
+            return new DiscoveryService(
+                $c->get(ICacheFactory::class),
+                $c->get(IClientService::class)
+            );
+        });
+        $this->registerAlias(IOCMDiscoveryService::class, OCMDiscoveryService::class);
+
+        $this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
+            return new CloudIdManager(
+                $c->get(ICacheFactory::class),
+                $c->get(IEventDispatcher::class),
+                $c->get(\OCP\Contacts\IManager::class),
+                $c->get(IURLGenerator::class),
+                $c->get(IUserManager::class),
+            );
+        });
 
-		$this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
-		$this->registerAlias(ICloudFederationProviderManager::class, CloudFederationProviderManager::class);
-		$this->registerService(ICloudFederationFactory::class, function (Server $c) {
-			return new CloudFederationFactory();
-		});
+        $this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
+        $this->registerAlias(ICloudFederationProviderManager::class, CloudFederationProviderManager::class);
+        $this->registerService(ICloudFederationFactory::class, function (Server $c) {
+            return new CloudFederationFactory();
+        });
 
-		$this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
+        $this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
 
-		$this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
-		$this->registerAlias(\Psr\Clock\ClockInterface::class, \OCP\AppFramework\Utility\ITimeFactory::class);
+        $this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
+        $this->registerAlias(\Psr\Clock\ClockInterface::class, \OCP\AppFramework\Utility\ITimeFactory::class);
 
-		$this->registerService(Defaults::class, function (Server $c) {
-			return new Defaults(
-				$c->get('ThemingDefaults')
-			);
-		});
+        $this->registerService(Defaults::class, function (Server $c) {
+            return new Defaults(
+                $c->get('ThemingDefaults')
+            );
+        });
 
-		$this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
-			return $c->get(\OCP\IUserSession::class)->getSession();
-		}, false);
+        $this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
+            return $c->get(\OCP\IUserSession::class)->getSession();
+        }, false);
 
-		$this->registerService(IShareHelper::class, function (ContainerInterface $c) {
-			return new ShareHelper(
-				$c->get(\OCP\Share\IManager::class)
-			);
-		});
+        $this->registerService(IShareHelper::class, function (ContainerInterface $c) {
+            return new ShareHelper(
+                $c->get(\OCP\Share\IManager::class)
+            );
+        });
 
-		$this->registerService(IApiFactory::class, function (ContainerInterface $c) {
-			return new ApiFactory($c->get(IClientService::class));
-		});
+        $this->registerService(IApiFactory::class, function (ContainerInterface $c) {
+            return new ApiFactory($c->get(IClientService::class));
+        });
 
-		$this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
-			$memcacheFactory = $c->get(ICacheFactory::class);
-			return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
-		});
+        $this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
+            $memcacheFactory = $c->get(ICacheFactory::class);
+            return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
+        });
 
-		$this->registerAlias(IContactsStore::class, ContactsStore::class);
-		$this->registerAlias(IAccountManager::class, AccountManager::class);
+        $this->registerAlias(IContactsStore::class, ContactsStore::class);
+        $this->registerAlias(IAccountManager::class, AccountManager::class);
 
-		$this->registerAlias(IStorageFactory::class, StorageFactory::class);
+        $this->registerAlias(IStorageFactory::class, StorageFactory::class);
 
-		$this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class);
+        $this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class);
 
-		$this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
-		$this->registerAlias(IFilesMetadataManager::class, FilesMetadataManager::class);
+        $this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
+        $this->registerAlias(IFilesMetadataManager::class, FilesMetadataManager::class);
 
-		$this->registerAlias(ISubAdmin::class, SubAdmin::class);
+        $this->registerAlias(ISubAdmin::class, SubAdmin::class);
 
-		$this->registerAlias(IInitialStateService::class, InitialStateService::class);
+        $this->registerAlias(IInitialStateService::class, InitialStateService::class);
 
-		$this->registerAlias(\OCP\IEmojiHelper::class, \OC\EmojiHelper::class);
+        $this->registerAlias(\OCP\IEmojiHelper::class, \OC\EmojiHelper::class);
 
-		$this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class);
+        $this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class);
 
-		$this->registerAlias(IBroker::class, Broker::class);
+        $this->registerAlias(IBroker::class, Broker::class);
 
-		$this->registerAlias(\OCP\Files\AppData\IAppDataFactory::class, \OC\Files\AppData\Factory::class);
+        $this->registerAlias(\OCP\Files\AppData\IAppDataFactory::class, \OC\Files\AppData\Factory::class);
 
-		$this->registerAlias(\OCP\Files\IFilenameValidator::class, \OC\Files\FilenameValidator::class);
+        $this->registerAlias(\OCP\Files\IFilenameValidator::class, \OC\Files\FilenameValidator::class);
 
-		$this->registerAlias(IBinaryFinder::class, BinaryFinder::class);
+        $this->registerAlias(IBinaryFinder::class, BinaryFinder::class);
 
-		$this->registerAlias(\OCP\Share\IPublicShareTemplateFactory::class, \OC\Share20\PublicShareTemplateFactory::class);
+        $this->registerAlias(\OCP\Share\IPublicShareTemplateFactory::class, \OC\Share20\PublicShareTemplateFactory::class);
 
-		$this->registerAlias(ITranslationManager::class, TranslationManager::class);
+        $this->registerAlias(ITranslationManager::class, TranslationManager::class);
 
-		$this->registerAlias(IConversionManager::class, ConversionManager::class);
+        $this->registerAlias(IConversionManager::class, ConversionManager::class);
 
-		$this->registerAlias(ISpeechToTextManager::class, SpeechToTextManager::class);
+        $this->registerAlias(ISpeechToTextManager::class, SpeechToTextManager::class);
 
-		$this->registerAlias(IEventSourceFactory::class, EventSourceFactory::class);
+        $this->registerAlias(IEventSourceFactory::class, EventSourceFactory::class);
 
-		$this->registerAlias(\OCP\TextProcessing\IManager::class, \OC\TextProcessing\Manager::class);
+        $this->registerAlias(\OCP\TextProcessing\IManager::class, \OC\TextProcessing\Manager::class);
 
-		$this->registerAlias(\OCP\TextToImage\IManager::class, \OC\TextToImage\Manager::class);
+        $this->registerAlias(\OCP\TextToImage\IManager::class, \OC\TextToImage\Manager::class);
 
-		$this->registerAlias(ILimiter::class, Limiter::class);
+        $this->registerAlias(ILimiter::class, Limiter::class);
 
-		$this->registerAlias(IPhoneNumberUtil::class, PhoneNumberUtil::class);
+        $this->registerAlias(IPhoneNumberUtil::class, PhoneNumberUtil::class);
 
-		// there is no reason for having OCMProvider as a Service
-		$this->registerDeprecatedAlias(ICapabilityAwareOCMProvider::class, OCMProvider::class);
-		$this->registerDeprecatedAlias(IOCMProvider::class, OCMProvider::class);
+        // there is no reason for having OCMProvider as a Service
+        $this->registerDeprecatedAlias(ICapabilityAwareOCMProvider::class, OCMProvider::class);
+        $this->registerDeprecatedAlias(IOCMProvider::class, OCMProvider::class);
 
-		$this->registerAlias(ISetupCheckManager::class, SetupCheckManager::class);
+        $this->registerAlias(ISetupCheckManager::class, SetupCheckManager::class);
 
-		$this->registerAlias(IProfileManager::class, ProfileManager::class);
+        $this->registerAlias(IProfileManager::class, ProfileManager::class);
 
-		$this->registerAlias(IAvailabilityCoordinator::class, AvailabilityCoordinator::class);
+        $this->registerAlias(IAvailabilityCoordinator::class, AvailabilityCoordinator::class);
 
-		$this->registerAlias(IDeclarativeManager::class, DeclarativeManager::class);
+        $this->registerAlias(IDeclarativeManager::class, DeclarativeManager::class);
 
-		$this->registerAlias(\OCP\TaskProcessing\IManager::class, \OC\TaskProcessing\Manager::class);
+        $this->registerAlias(\OCP\TaskProcessing\IManager::class, \OC\TaskProcessing\Manager::class);
 
-		$this->registerAlias(IRemoteAddress::class, RemoteAddress::class);
+        $this->registerAlias(IRemoteAddress::class, RemoteAddress::class);
 
-		$this->registerAlias(\OCP\Security\Ip\IFactory::class, \OC\Security\Ip\Factory::class);
+        $this->registerAlias(\OCP\Security\Ip\IFactory::class, \OC\Security\Ip\Factory::class);
 
-		$this->registerAlias(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class);
+        $this->registerAlias(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class);
 
-		$this->registerAlias(ISignatureManager::class, SignatureManager::class);
+        $this->registerAlias(ISignatureManager::class, SignatureManager::class);
 
-		$this->connectDispatcher();
-	}
+        $this->connectDispatcher();
+    }
 
-	public function boot() {
-		/** @var HookConnector $hookConnector */
-		$hookConnector = $this->get(HookConnector::class);
-		$hookConnector->viewToNode();
-	}
-
-	private function connectDispatcher(): void {
-		/** @var IEventDispatcher $eventDispatcher */
-		$eventDispatcher = $this->get(IEventDispatcher::class);
-		$eventDispatcher->addServiceListener(LoginFailed::class, LoginFailedListener::class);
-		$eventDispatcher->addServiceListener(PostLoginEvent::class, UserLoggedInListener::class);
-		$eventDispatcher->addServiceListener(UserChangedEvent::class, UserChangedListener::class);
-		$eventDispatcher->addServiceListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
-
-		FilesMetadataManager::loadListeners($eventDispatcher);
-		GenerateBlurhashMetadata::loadListeners($eventDispatcher);
-	}
-
-	/**
-	 * @return \OCP\Contacts\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getContactsManager() {
-		return $this->get(\OCP\Contacts\IManager::class);
-	}
-
-	/**
-	 * @return \OC\Encryption\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getEncryptionManager() {
-		return $this->get(\OCP\Encryption\IManager::class);
-	}
-
-	/**
-	 * @return \OC\Encryption\File
-	 * @deprecated 20.0.0
-	 */
-	public function getEncryptionFilesHelper() {
-		return $this->get(IFile::class);
-	}
-
-	/**
-	 * The current request object holding all information about the request
-	 * currently being processed is returned from this method.
-	 * In case the current execution was not initiated by a web request null is returned
-	 *
-	 * @return \OCP\IRequest
-	 * @deprecated 20.0.0
-	 */
-	public function getRequest() {
-		return $this->get(IRequest::class);
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 *
-	 * @return IRootFolder
-	 * @deprecated 20.0.0
-	 */
-	public function getRootFolder() {
-		return $this->get(IRootFolder::class);
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 * This is the lazy variant so this gets only initialized once it
-	 * is actually used.
-	 *
-	 * @return IRootFolder
-	 * @deprecated 20.0.0
-	 */
-	public function getLazyRootFolder() {
-		return $this->get(IRootFolder::class);
-	}
-
-	/**
-	 * Returns a view to ownCloud's files folder
-	 *
-	 * @param string $userId user ID
-	 * @return \OCP\Files\Folder|null
-	 * @deprecated 20.0.0
-	 */
-	public function getUserFolder($userId = null) {
-		if ($userId === null) {
-			$user = $this->get(IUserSession::class)->getUser();
-			if (!$user) {
-				return null;
-			}
-			$userId = $user->getUID();
-		}
-		$root = $this->get(IRootFolder::class);
-		return $root->getUserFolder($userId);
-	}
-
-	/**
-	 * @return \OC\User\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getUserManager() {
-		return $this->get(IUserManager::class);
-	}
-
-	/**
-	 * @return \OC\Group\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getGroupManager() {
-		return $this->get(IGroupManager::class);
-	}
-
-	/**
-	 * @return \OC\User\Session
-	 * @deprecated 20.0.0
-	 */
-	public function getUserSession() {
-		return $this->get(IUserSession::class);
-	}
-
-	/**
-	 * @return \OCP\ISession
-	 * @deprecated 20.0.0
-	 */
-	public function getSession() {
-		return $this->get(Session::class)->getSession();
-	}
-
-	/**
-	 * @param \OCP\ISession $session
-	 * @return void
-	 */
-	public function setSession(\OCP\ISession $session) {
-		$this->get(SessionStorage::class)->setSession($session);
-		$this->get(Session::class)->setSession($session);
-		$this->get(Store::class)->setSession($session);
-	}
-
-	/**
-	 * @return \OCP\IConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getConfig() {
-		return $this->get(AllConfig::class);
-	}
-
-	/**
-	 * @return \OC\SystemConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getSystemConfig() {
-		return $this->get(SystemConfig::class);
-	}
-
-	/**
-	 * @return IFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getL10NFactory() {
-		return $this->get(IFactory::class);
-	}
-
-	/**
-	 * get an L10N instance
-	 *
-	 * @param string $app appid
-	 * @param string $lang
-	 * @return IL10N
-	 * @deprecated 20.0.0 use DI of {@see IL10N} or {@see IFactory} instead, or {@see \OCP\Util::getL10N()} as a last resort
-	 */
-	public function getL10N($app, $lang = null) {
-		return $this->get(IFactory::class)->get($app, $lang);
-	}
-
-	/**
-	 * @return IURLGenerator
-	 * @deprecated 20.0.0
-	 */
-	public function getURLGenerator() {
-		return $this->get(IURLGenerator::class);
-	}
-
-	/**
-	 * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
-	 * getMemCacheFactory() instead.
-	 *
-	 * @return ICache
-	 * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
-	 */
-	public function getCache() {
-		return $this->get(ICache::class);
-	}
-
-	/**
-	 * Returns an \OCP\CacheFactory instance
-	 *
-	 * @return \OCP\ICacheFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getMemCacheFactory() {
-		return $this->get(ICacheFactory::class);
-	}
-
-	/**
-	 * Returns the current session
-	 *
-	 * @return \OCP\IDBConnection
-	 * @deprecated 20.0.0
-	 */
-	public function getDatabaseConnection() {
-		return $this->get(IDBConnection::class);
-	}
-
-	/**
-	 * Returns the activity manager
-	 *
-	 * @return \OCP\Activity\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getActivityManager() {
-		return $this->get(\OCP\Activity\IManager::class);
-	}
-
-	/**
-	 * Returns an job list for controlling background jobs
-	 *
-	 * @return IJobList
-	 * @deprecated 20.0.0
-	 */
-	public function getJobList() {
-		return $this->get(IJobList::class);
-	}
-
-	/**
-	 * Returns a SecureRandom instance
-	 *
-	 * @return \OCP\Security\ISecureRandom
-	 * @deprecated 20.0.0
-	 */
-	public function getSecureRandom() {
-		return $this->get(ISecureRandom::class);
-	}
-
-	/**
-	 * Returns a Crypto instance
-	 *
-	 * @return ICrypto
-	 * @deprecated 20.0.0
-	 */
-	public function getCrypto() {
-		return $this->get(ICrypto::class);
-	}
-
-	/**
-	 * Returns a Hasher instance
-	 *
-	 * @return IHasher
-	 * @deprecated 20.0.0
-	 */
-	public function getHasher() {
-		return $this->get(IHasher::class);
-	}
-
-	/**
-	 * Get the certificate manager
-	 *
-	 * @return \OCP\ICertificateManager
-	 */
-	public function getCertificateManager() {
-		return $this->get(ICertificateManager::class);
-	}
-
-	/**
-	 * Get the manager for temporary files and folders
-	 *
-	 * @return \OCP\ITempManager
-	 * @deprecated 20.0.0
-	 */
-	public function getTempManager() {
-		return $this->get(ITempManager::class);
-	}
-
-	/**
-	 * Get the app manager
-	 *
-	 * @return \OCP\App\IAppManager
-	 * @deprecated 20.0.0
-	 */
-	public function getAppManager() {
-		return $this->get(IAppManager::class);
-	}
-
-	/**
-	 * Creates a new mailer
-	 *
-	 * @return IMailer
-	 * @deprecated 20.0.0
-	 */
-	public function getMailer() {
-		return $this->get(IMailer::class);
-	}
-
-	/**
-	 * Get the webroot
-	 *
-	 * @return string
-	 * @deprecated 20.0.0
-	 */
-	public function getWebRoot() {
-		return $this->webRoot;
-	}
-
-	/**
-	 * Get the locking provider
-	 *
-	 * @return ILockingProvider
-	 * @since 8.1.0
-	 * @deprecated 20.0.0
-	 */
-	public function getLockingProvider() {
-		return $this->get(ILockingProvider::class);
-	}
-
-	/**
-	 * Get the MimeTypeDetector
-	 *
-	 * @return IMimeTypeDetector
-	 * @deprecated 20.0.0
-	 */
-	public function getMimeTypeDetector() {
-		return $this->get(IMimeTypeDetector::class);
-	}
-
-	/**
-	 * Get the MimeTypeLoader
-	 *
-	 * @return IMimeTypeLoader
-	 * @deprecated 20.0.0
-	 */
-	public function getMimeTypeLoader() {
-		return $this->get(IMimeTypeLoader::class);
-	}
-
-	/**
-	 * Get the Notification Manager
-	 *
-	 * @return \OCP\Notification\IManager
-	 * @since 8.2.0
-	 * @deprecated 20.0.0
-	 */
-	public function getNotificationManager() {
-		return $this->get(\OCP\Notification\IManager::class);
-	}
-
-	/**
-	 * @return \OCA\Theming\ThemingDefaults
-	 * @deprecated 20.0.0
-	 */
-	public function getThemingDefaults() {
-		return $this->get('ThemingDefaults');
-	}
-
-	/**
-	 * @return \OC\IntegrityCheck\Checker
-	 * @deprecated 20.0.0
-	 */
-	public function getIntegrityCodeChecker() {
-		return $this->get('IntegrityCodeChecker');
-	}
-
-	/**
-	 * @return CsrfTokenManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCsrfTokenManager() {
-		return $this->get(CsrfTokenManager::class);
-	}
-
-	/**
-	 * @return ContentSecurityPolicyNonceManager
-	 * @deprecated 20.0.0
-	 */
-	public function getContentSecurityPolicyNonceManager() {
-		return $this->get(ContentSecurityPolicyNonceManager::class);
-	}
-
-	/**
-	 * @return \OCP\Settings\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getSettingsManager() {
-		return $this->get(\OC\Settings\Manager::class);
-	}
-
-	/**
-	 * @return \OCP\Files\IAppData
-	 * @deprecated 20.0.0 Use get(\OCP\Files\AppData\IAppDataFactory::class)->get($app) instead
-	 */
-	public function getAppDataDir($app) {
-		$factory = $this->get(\OC\Files\AppData\Factory::class);
-		return $factory->get($app);
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudIdManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCloudIdManager() {
-		return $this->get(ICloudIdManager::class);
-	}
+    public function boot() {
+        /** @var HookConnector $hookConnector */
+        $hookConnector = $this->get(HookConnector::class);
+        $hookConnector->viewToNode();
+    }
+
+    private function connectDispatcher(): void {
+        /** @var IEventDispatcher $eventDispatcher */
+        $eventDispatcher = $this->get(IEventDispatcher::class);
+        $eventDispatcher->addServiceListener(LoginFailed::class, LoginFailedListener::class);
+        $eventDispatcher->addServiceListener(PostLoginEvent::class, UserLoggedInListener::class);
+        $eventDispatcher->addServiceListener(UserChangedEvent::class, UserChangedListener::class);
+        $eventDispatcher->addServiceListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
+
+        FilesMetadataManager::loadListeners($eventDispatcher);
+        GenerateBlurhashMetadata::loadListeners($eventDispatcher);
+    }
+
+    /**
+     * @return \OCP\Contacts\IManager
+     * @deprecated 20.0.0
+     */
+    public function getContactsManager() {
+        return $this->get(\OCP\Contacts\IManager::class);
+    }
+
+    /**
+     * @return \OC\Encryption\Manager
+     * @deprecated 20.0.0
+     */
+    public function getEncryptionManager() {
+        return $this->get(\OCP\Encryption\IManager::class);
+    }
+
+    /**
+     * @return \OC\Encryption\File
+     * @deprecated 20.0.0
+     */
+    public function getEncryptionFilesHelper() {
+        return $this->get(IFile::class);
+    }
+
+    /**
+     * The current request object holding all information about the request
+     * currently being processed is returned from this method.
+     * In case the current execution was not initiated by a web request null is returned
+     *
+     * @return \OCP\IRequest
+     * @deprecated 20.0.0
+     */
+    public function getRequest() {
+        return $this->get(IRequest::class);
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     *
+     * @return IRootFolder
+     * @deprecated 20.0.0
+     */
+    public function getRootFolder() {
+        return $this->get(IRootFolder::class);
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     * This is the lazy variant so this gets only initialized once it
+     * is actually used.
+     *
+     * @return IRootFolder
+     * @deprecated 20.0.0
+     */
+    public function getLazyRootFolder() {
+        return $this->get(IRootFolder::class);
+    }
+
+    /**
+     * Returns a view to ownCloud's files folder
+     *
+     * @param string $userId user ID
+     * @return \OCP\Files\Folder|null
+     * @deprecated 20.0.0
+     */
+    public function getUserFolder($userId = null) {
+        if ($userId === null) {
+            $user = $this->get(IUserSession::class)->getUser();
+            if (!$user) {
+                return null;
+            }
+            $userId = $user->getUID();
+        }
+        $root = $this->get(IRootFolder::class);
+        return $root->getUserFolder($userId);
+    }
+
+    /**
+     * @return \OC\User\Manager
+     * @deprecated 20.0.0
+     */
+    public function getUserManager() {
+        return $this->get(IUserManager::class);
+    }
+
+    /**
+     * @return \OC\Group\Manager
+     * @deprecated 20.0.0
+     */
+    public function getGroupManager() {
+        return $this->get(IGroupManager::class);
+    }
+
+    /**
+     * @return \OC\User\Session
+     * @deprecated 20.0.0
+     */
+    public function getUserSession() {
+        return $this->get(IUserSession::class);
+    }
+
+    /**
+     * @return \OCP\ISession
+     * @deprecated 20.0.0
+     */
+    public function getSession() {
+        return $this->get(Session::class)->getSession();
+    }
+
+    /**
+     * @param \OCP\ISession $session
+     * @return void
+     */
+    public function setSession(\OCP\ISession $session) {
+        $this->get(SessionStorage::class)->setSession($session);
+        $this->get(Session::class)->setSession($session);
+        $this->get(Store::class)->setSession($session);
+    }
+
+    /**
+     * @return \OCP\IConfig
+     * @deprecated 20.0.0
+     */
+    public function getConfig() {
+        return $this->get(AllConfig::class);
+    }
+
+    /**
+     * @return \OC\SystemConfig
+     * @deprecated 20.0.0
+     */
+    public function getSystemConfig() {
+        return $this->get(SystemConfig::class);
+    }
+
+    /**
+     * @return IFactory
+     * @deprecated 20.0.0
+     */
+    public function getL10NFactory() {
+        return $this->get(IFactory::class);
+    }
+
+    /**
+     * get an L10N instance
+     *
+     * @param string $app appid
+     * @param string $lang
+     * @return IL10N
+     * @deprecated 20.0.0 use DI of {@see IL10N} or {@see IFactory} instead, or {@see \OCP\Util::getL10N()} as a last resort
+     */
+    public function getL10N($app, $lang = null) {
+        return $this->get(IFactory::class)->get($app, $lang);
+    }
+
+    /**
+     * @return IURLGenerator
+     * @deprecated 20.0.0
+     */
+    public function getURLGenerator() {
+        return $this->get(IURLGenerator::class);
+    }
+
+    /**
+     * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
+     * getMemCacheFactory() instead.
+     *
+     * @return ICache
+     * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
+     */
+    public function getCache() {
+        return $this->get(ICache::class);
+    }
+
+    /**
+     * Returns an \OCP\CacheFactory instance
+     *
+     * @return \OCP\ICacheFactory
+     * @deprecated 20.0.0
+     */
+    public function getMemCacheFactory() {
+        return $this->get(ICacheFactory::class);
+    }
+
+    /**
+     * Returns the current session
+     *
+     * @return \OCP\IDBConnection
+     * @deprecated 20.0.0
+     */
+    public function getDatabaseConnection() {
+        return $this->get(IDBConnection::class);
+    }
+
+    /**
+     * Returns the activity manager
+     *
+     * @return \OCP\Activity\IManager
+     * @deprecated 20.0.0
+     */
+    public function getActivityManager() {
+        return $this->get(\OCP\Activity\IManager::class);
+    }
+
+    /**
+     * Returns an job list for controlling background jobs
+     *
+     * @return IJobList
+     * @deprecated 20.0.0
+     */
+    public function getJobList() {
+        return $this->get(IJobList::class);
+    }
+
+    /**
+     * Returns a SecureRandom instance
+     *
+     * @return \OCP\Security\ISecureRandom
+     * @deprecated 20.0.0
+     */
+    public function getSecureRandom() {
+        return $this->get(ISecureRandom::class);
+    }
+
+    /**
+     * Returns a Crypto instance
+     *
+     * @return ICrypto
+     * @deprecated 20.0.0
+     */
+    public function getCrypto() {
+        return $this->get(ICrypto::class);
+    }
+
+    /**
+     * Returns a Hasher instance
+     *
+     * @return IHasher
+     * @deprecated 20.0.0
+     */
+    public function getHasher() {
+        return $this->get(IHasher::class);
+    }
+
+    /**
+     * Get the certificate manager
+     *
+     * @return \OCP\ICertificateManager
+     */
+    public function getCertificateManager() {
+        return $this->get(ICertificateManager::class);
+    }
+
+    /**
+     * Get the manager for temporary files and folders
+     *
+     * @return \OCP\ITempManager
+     * @deprecated 20.0.0
+     */
+    public function getTempManager() {
+        return $this->get(ITempManager::class);
+    }
+
+    /**
+     * Get the app manager
+     *
+     * @return \OCP\App\IAppManager
+     * @deprecated 20.0.0
+     */
+    public function getAppManager() {
+        return $this->get(IAppManager::class);
+    }
+
+    /**
+     * Creates a new mailer
+     *
+     * @return IMailer
+     * @deprecated 20.0.0
+     */
+    public function getMailer() {
+        return $this->get(IMailer::class);
+    }
+
+    /**
+     * Get the webroot
+     *
+     * @return string
+     * @deprecated 20.0.0
+     */
+    public function getWebRoot() {
+        return $this->webRoot;
+    }
+
+    /**
+     * Get the locking provider
+     *
+     * @return ILockingProvider
+     * @since 8.1.0
+     * @deprecated 20.0.0
+     */
+    public function getLockingProvider() {
+        return $this->get(ILockingProvider::class);
+    }
+
+    /**
+     * Get the MimeTypeDetector
+     *
+     * @return IMimeTypeDetector
+     * @deprecated 20.0.0
+     */
+    public function getMimeTypeDetector() {
+        return $this->get(IMimeTypeDetector::class);
+    }
+
+    /**
+     * Get the MimeTypeLoader
+     *
+     * @return IMimeTypeLoader
+     * @deprecated 20.0.0
+     */
+    public function getMimeTypeLoader() {
+        return $this->get(IMimeTypeLoader::class);
+    }
+
+    /**
+     * Get the Notification Manager
+     *
+     * @return \OCP\Notification\IManager
+     * @since 8.2.0
+     * @deprecated 20.0.0
+     */
+    public function getNotificationManager() {
+        return $this->get(\OCP\Notification\IManager::class);
+    }
+
+    /**
+     * @return \OCA\Theming\ThemingDefaults
+     * @deprecated 20.0.0
+     */
+    public function getThemingDefaults() {
+        return $this->get('ThemingDefaults');
+    }
+
+    /**
+     * @return \OC\IntegrityCheck\Checker
+     * @deprecated 20.0.0
+     */
+    public function getIntegrityCodeChecker() {
+        return $this->get('IntegrityCodeChecker');
+    }
+
+    /**
+     * @return CsrfTokenManager
+     * @deprecated 20.0.0
+     */
+    public function getCsrfTokenManager() {
+        return $this->get(CsrfTokenManager::class);
+    }
+
+    /**
+     * @return ContentSecurityPolicyNonceManager
+     * @deprecated 20.0.0
+     */
+    public function getContentSecurityPolicyNonceManager() {
+        return $this->get(ContentSecurityPolicyNonceManager::class);
+    }
+
+    /**
+     * @return \OCP\Settings\IManager
+     * @deprecated 20.0.0
+     */
+    public function getSettingsManager() {
+        return $this->get(\OC\Settings\Manager::class);
+    }
+
+    /**
+     * @return \OCP\Files\IAppData
+     * @deprecated 20.0.0 Use get(\OCP\Files\AppData\IAppDataFactory::class)->get($app) instead
+     */
+    public function getAppDataDir($app) {
+        $factory = $this->get(\OC\Files\AppData\Factory::class);
+        return $factory->get($app);
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudIdManager
+     * @deprecated 20.0.0
+     */
+    public function getCloudIdManager() {
+        return $this->get(ICloudIdManager::class);
+    }
 }

lib/private/Files/Node/Root.php

Indentation +467 added lines, -467 removed lines

@@ -54,471 +54,471 @@
  * @package OC\Files\Node
  */
 class Root extends Folder implements IRootFolder {
-	private PublicEmitter $emitter;
-	private CappedMemoryCache $userFolderCache;
-	private ICache $pathByIdCache;
-	private bool $useDefaultHomeFoldersPermissions = true;
-
-	public function __construct(
-		private Manager $mountManager,
-		View $view,
-		private ?IUser $user,
-		private IUserMountCache $userMountCache,
-		private LoggerInterface $logger,
-		private IUserManager $userManager,
-		IEventDispatcher $eventDispatcher,
-		ICacheFactory $cacheFactory,
-		IAppConfig $appConfig,
-	) {
-		parent::__construct($this, $view, '');
-		$this->emitter = new PublicEmitter();
-		$this->userFolderCache = new CappedMemoryCache();
-		$eventDispatcher->addListener(FilesystemTornDownEvent::class, function () {
-			$this->userFolderCache = new CappedMemoryCache();
-		});
-		$this->pathByIdCache = $cacheFactory->createLocal('path-by-id');
-		$this->useDefaultHomeFoldersPermissions = count($appConfig->getValueArray(Application::APP_ID, ConfigLexicon::OVERWRITES_HOME_FOLDERS)) === 0;
-	}
-
-	/**
-	 * Get the user for which the filesystem is setup
-	 *
-	 * @return \OC\User\User
-	 */
-	public function getUser() {
-		return $this->user;
-	}
-
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param callable $callback
-	 */
-	public function listen($scope, $method, callable $callback) {
-		$this->emitter->listen($scope, $method, $callback);
-	}
-
-	/**
-	 * @param string $scope optional
-	 * @param string $method optional
-	 * @param callable $callback optional
-	 */
-	public function removeListener($scope = null, $method = null, ?callable $callback = null) {
-		$this->emitter->removeListener($scope, $method, $callback);
-	}
-
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param Node[] $arguments
-	 */
-	public function emit($scope, $method, $arguments = []) {
-		$this->emitter->emit($scope, $method, $arguments);
-	}
-
-	/**
-	 * @param \OC\Files\Storage\Storage $storage
-	 * @param string $mountPoint
-	 * @param array $arguments
-	 */
-	public function mount($storage, $mountPoint, $arguments = []) {
-		$mount = new MountPoint($storage, $mountPoint, $arguments);
-		$this->mountManager->addMount($mount);
-	}
-
-	public function getMount(string $mountPoint): IMountPoint {
-		return $this->mountManager->find($mountPoint);
-	}
-
-	/**
-	 * @param string $mountPoint
-	 * @return \OC\Files\Mount\MountPoint[]
-	 */
-	public function getMountsIn(string $mountPoint): array {
-		return $this->mountManager->findIn($mountPoint);
-	}
-
-	/**
-	 * @param string $storageId
-	 * @return \OC\Files\Mount\MountPoint[]
-	 */
-	public function getMountByStorageId($storageId) {
-		return $this->mountManager->findByStorageId($storageId);
-	}
-
-	/**
-	 * @param int $numericId
-	 * @return MountPoint[]
-	 */
-	public function getMountByNumericStorageId($numericId) {
-		return $this->mountManager->findByNumericId($numericId);
-	}
-
-	/**
-	 * @param \OC\Files\Mount\MountPoint $mount
-	 */
-	public function unMount($mount) {
-		$this->mountManager->remove($mount);
-	}
-
-	public function get($path) {
-		$path = $this->normalizePath($path);
-		if ($this->isValidPath($path)) {
-			$fullPath = $this->getFullPath($path);
-			$fileInfo = $this->view->getFileInfo($fullPath, false);
-			if ($fileInfo) {
-				return $this->createNode($fullPath, $fileInfo, false);
-			} else {
-				throw new NotFoundException($path);
-			}
-		} else {
-			throw new NotPermittedException();
-		}
-	}
-
-	//most operations can't be done on the root
-
-	/**
-	 * @param string $targetPath
-	 * @return Node
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function rename($targetPath) {
-		throw new NotPermittedException();
-	}
-
-	public function delete() {
-		throw new NotPermittedException();
-	}
-
-	/**
-	 * @param string $targetPath
-	 * @return Node
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function copy($targetPath) {
-		throw new NotPermittedException();
-	}
-
-	/**
-	 * @param int $mtime
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function touch($mtime = null) {
-		throw new NotPermittedException();
-	}
-
-	/**
-	 * @return \OC\Files\Storage\Storage
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function getStorage() {
-		throw new NotFoundException();
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getPath() {
-		return '/';
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getInternalPath() {
-		return '';
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getId() {
-		return 0;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function stat() {
-		return [];
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getMTime() {
-		return 0;
-	}
-
-	/**
-	 * @param bool $includeMounts
-	 * @return int|float
-	 */
-	public function getSize($includeMounts = true): int|float {
-		return 0;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getEtag() {
-		return '';
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getPermissions() {
-		return \OCP\Constants::PERMISSION_CREATE;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isReadable() {
-		return false;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isUpdateable() {
-		return false;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isDeletable() {
-		return false;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isShareable() {
-		return false;
-	}
-
-	/**
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function getParent(): INode|IRootFolder {
-		throw new NotFoundException();
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return '';
-	}
-
-	/**
-	 * Returns a view to user's files folder
-	 *
-	 * @param string $userId user ID
-	 * @return \OCP\Files\Folder
-	 * @throws NoUserException
-	 * @throws NotPermittedException
-	 */
-	public function getUserFolder($userId) {
-		$userObject = $this->userManager->get($userId);
-
-		if (is_null($userObject)) {
-			$e = new NoUserException('Backends provided no user object');
-			$this->logger->error(
-				sprintf(
-					'Backends provided no user object for %s',
-					$userId
-				),
-				[
-					'app' => 'files',
-					'exception' => $e,
-				]
-			);
-			throw $e;
-		}
-
-		$userId = $userObject->getUID();
-
-		if (!$this->userFolderCache->hasKey($userId)) {
-			if ($this->mountManager->getSetupManager()->isSetupComplete($userObject)) {
-				try {
-					$folder = $this->get('/' . $userId . '/files');
-					if (!$folder instanceof \OCP\Files\Folder) {
-						throw new \Exception("Account folder for \"$userId\" exists as a file");
-					}
-				} catch (NotFoundException $e) {
-					if (!$this->nodeExists('/' . $userId)) {
-						$this->newFolder('/' . $userId);
-					}
-					$folder = $this->newFolder('/' . $userId . '/files');
-				}
-			} else {
-				$folder = new LazyUserFolder($this, $userObject, $this->mountManager, $this->useDefaultHomeFoldersPermissions);
-			}
-
-			$this->userFolderCache->set($userId, $folder);
-		}
-
-		return $this->userFolderCache->get($userId);
-	}
-
-	public function getUserMountCache() {
-		return $this->userMountCache;
-	}
-
-	public function getFirstNodeByIdInPath(int $id, string $path): ?INode {
-		// scope the cache by user, so we don't return nodes for different users
-		if ($this->user) {
-			$cachedPath = $this->pathByIdCache->get($this->user->getUID() . '::' . $id);
-			if ($cachedPath && str_starts_with($cachedPath, $path)) {
-				// getting the node by path is significantly cheaper than finding it by id
-				try {
-					$node = $this->get($cachedPath);
-					// by validating that the cached path still has the requested fileid we can work around the need to invalidate the cached path
-					// if the cached path is invalid or a different file now we fall back to the uncached logic
-					if ($node && $node->getId() === $id) {
-						return $node;
-					}
-				} catch (NotFoundException|NotPermittedException) {
-					// The file may be moved but the old path still in cache
-				}
-			}
-		}
-		$node = current($this->getByIdInPath($id, $path));
-		if (!$node) {
-			return null;
-		}
-
-		if ($this->user) {
-			$this->pathByIdCache->set($this->user->getUID() . '::' . $id, $node->getPath());
-		}
-		return $node;
-	}
-
-	/**
-	 * @param int $id
-	 * @return Node[]
-	 */
-	public function getByIdInPath(int $id, string $path): array {
-		$mountCache = $this->getUserMountCache();
-		if ($path !== '' && strpos($path, '/', 1) > 0) {
-			[, $user] = explode('/', $path);
-		} else {
-			$user = null;
-		}
-		$mountsContainingFile = $mountCache->getMountsForFileId($id, $user);
-
-		// if the mount isn't in the cache yet, perform a setup first, then try again
-		if (count($mountsContainingFile) === 0) {
-			$this->mountManager->getSetupManager()->setupForPath($path, true);
-			$mountsContainingFile = $mountCache->getMountsForFileId($id, $user);
-		}
-
-		// when a user has access through the same storage through multiple paths
-		// (such as an external storage that is both mounted for a user and shared to the user)
-		// the mount cache will only hold a single entry for the storage
-		// this can lead to issues as the different ways the user has access to a storage can have different permissions
-		//
-		// so instead of using the cached entries directly, we instead filter the current mounts by the rootid of the cache entry
-
-		$mountRootIds = array_map(function ($mount) {
-			return $mount->getRootId();
-		}, $mountsContainingFile);
-		$mountRootPaths = array_map(function ($mount) {
-			return $mount->getRootInternalPath();
-		}, $mountsContainingFile);
-		$mountProviders = array_unique(array_map(function ($mount) {
-			return $mount->getMountProvider();
-		}, $mountsContainingFile));
-		$mountRoots = array_combine($mountRootIds, $mountRootPaths);
-
-		$mounts = $this->mountManager->getMountsByMountProvider($path, $mountProviders);
-
-		$mountsContainingFile = array_filter($mounts, function ($mount) use ($mountRoots) {
-			return isset($mountRoots[$mount->getStorageRootId()]);
-		});
-
-		if (count($mountsContainingFile) === 0) {
-			if ($user === $this->getAppDataDirectoryName()) {
-				$folder = $this->get($path);
-				if ($folder instanceof Folder) {
-					return $folder->getByIdInRootMount($id);
-				} else {
-					throw new \Exception('getByIdInPath with non folder');
-				}
-			}
-			return [];
-		}
-
-		$nodes = array_map(function (IMountPoint $mount) use ($id, $mountRoots) {
-			$rootInternalPath = $mountRoots[$mount->getStorageRootId()];
-			$cacheEntry = $mount->getStorage()->getCache()->get($id);
-			if (!$cacheEntry) {
-				return null;
-			}
-
-			// cache jails will hide the "true" internal path
-			$internalPath = ltrim($rootInternalPath . '/' . $cacheEntry->getPath(), '/');
-			$pathRelativeToMount = substr($internalPath, strlen($rootInternalPath));
-			$pathRelativeToMount = ltrim($pathRelativeToMount, '/');
-			$absolutePath = rtrim($mount->getMountPoint() . $pathRelativeToMount, '/');
-			$storage = $mount->getStorage();
-			if ($storage === null) {
-				return null;
-			}
-			$ownerId = $storage->getOwner($pathRelativeToMount);
-			if ($ownerId !== false) {
-				$owner = Server::get(IUserManager::class)->get($ownerId);
-			} else {
-				$owner = null;
-			}
-			return $this->createNode($absolutePath, new FileInfo(
-				$absolutePath,
-				$storage,
-				$cacheEntry->getPath(),
-				$cacheEntry,
-				$mount,
-				$owner,
-			));
-		}, $mountsContainingFile);
-
-		$nodes = array_filter($nodes);
-
-		$folders = array_filter($nodes, function (Node $node) use ($path) {
-			return PathHelper::getRelativePath($path, $node->getPath()) !== null;
-		});
-		usort($folders, function ($a, $b) {
-			return $b->getPath() <=> $a->getPath();
-		});
-		return $folders;
-	}
-
-	public function getNodeFromCacheEntryAndMount(ICacheEntry $cacheEntry, IMountPoint $mountPoint): INode {
-		$path = $cacheEntry->getPath();
-		$fullPath = $mountPoint->getMountPoint() . $path;
-		// todo: LazyNode?
-		$info = new FileInfo($fullPath, $mountPoint->getStorage(), $path, $cacheEntry, $mountPoint);
-		$parentPath = dirname($fullPath);
-		$parent = new LazyFolder($this, function () use ($parentPath) {
-			$parent = $this->get($parentPath);
-			if ($parent instanceof \OCP\Files\Folder) {
-				return $parent;
-			} else {
-				throw new \Exception("parent $parentPath is not a folder");
-			}
-		}, [
-			'path' => $parentPath,
-		]);
-		$isDir = $info->getType() === FileInfo::TYPE_FOLDER;
-		$view = new View('');
-		if ($isDir) {
-			return new Folder($this, $view, $fullPath, $info, $parent);
-		} else {
-			return new File($this, $view, $fullPath, $info, $parent);
-		}
-	}
+    private PublicEmitter $emitter;
+    private CappedMemoryCache $userFolderCache;
+    private ICache $pathByIdCache;
+    private bool $useDefaultHomeFoldersPermissions = true;
+
+    public function __construct(
+        private Manager $mountManager,
+        View $view,
+        private ?IUser $user,
+        private IUserMountCache $userMountCache,
+        private LoggerInterface $logger,
+        private IUserManager $userManager,
+        IEventDispatcher $eventDispatcher,
+        ICacheFactory $cacheFactory,
+        IAppConfig $appConfig,
+    ) {
+        parent::__construct($this, $view, '');
+        $this->emitter = new PublicEmitter();
+        $this->userFolderCache = new CappedMemoryCache();
+        $eventDispatcher->addListener(FilesystemTornDownEvent::class, function () {
+            $this->userFolderCache = new CappedMemoryCache();
+        });
+        $this->pathByIdCache = $cacheFactory->createLocal('path-by-id');
+        $this->useDefaultHomeFoldersPermissions = count($appConfig->getValueArray(Application::APP_ID, ConfigLexicon::OVERWRITES_HOME_FOLDERS)) === 0;
+    }
+
+    /**
+     * Get the user for which the filesystem is setup
+     *
+     * @return \OC\User\User
+     */
+    public function getUser() {
+        return $this->user;
+    }
+
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param callable $callback
+     */
+    public function listen($scope, $method, callable $callback) {
+        $this->emitter->listen($scope, $method, $callback);
+    }
+
+    /**
+     * @param string $scope optional
+     * @param string $method optional
+     * @param callable $callback optional
+     */
+    public function removeListener($scope = null, $method = null, ?callable $callback = null) {
+        $this->emitter->removeListener($scope, $method, $callback);
+    }
+
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param Node[] $arguments
+     */
+    public function emit($scope, $method, $arguments = []) {
+        $this->emitter->emit($scope, $method, $arguments);
+    }
+
+    /**
+     * @param \OC\Files\Storage\Storage $storage
+     * @param string $mountPoint
+     * @param array $arguments
+     */
+    public function mount($storage, $mountPoint, $arguments = []) {
+        $mount = new MountPoint($storage, $mountPoint, $arguments);
+        $this->mountManager->addMount($mount);
+    }
+
+    public function getMount(string $mountPoint): IMountPoint {
+        return $this->mountManager->find($mountPoint);
+    }
+
+    /**
+     * @param string $mountPoint
+     * @return \OC\Files\Mount\MountPoint[]
+     */
+    public function getMountsIn(string $mountPoint): array {
+        return $this->mountManager->findIn($mountPoint);
+    }
+
+    /**
+     * @param string $storageId
+     * @return \OC\Files\Mount\MountPoint[]
+     */
+    public function getMountByStorageId($storageId) {
+        return $this->mountManager->findByStorageId($storageId);
+    }
+
+    /**
+     * @param int $numericId
+     * @return MountPoint[]
+     */
+    public function getMountByNumericStorageId($numericId) {
+        return $this->mountManager->findByNumericId($numericId);
+    }
+
+    /**
+     * @param \OC\Files\Mount\MountPoint $mount
+     */
+    public function unMount($mount) {
+        $this->mountManager->remove($mount);
+    }
+
+    public function get($path) {
+        $path = $this->normalizePath($path);
+        if ($this->isValidPath($path)) {
+            $fullPath = $this->getFullPath($path);
+            $fileInfo = $this->view->getFileInfo($fullPath, false);
+            if ($fileInfo) {
+                return $this->createNode($fullPath, $fileInfo, false);
+            } else {
+                throw new NotFoundException($path);
+            }
+        } else {
+            throw new NotPermittedException();
+        }
+    }
+
+    //most operations can't be done on the root
+
+    /**
+     * @param string $targetPath
+     * @return Node
+     * @throws \OCP\Files\NotPermittedException
+     */
+    public function rename($targetPath) {
+        throw new NotPermittedException();
+    }
+
+    public function delete() {
+        throw new NotPermittedException();
+    }
+
+    /**
+     * @param string $targetPath
+     * @return Node
+     * @throws \OCP\Files\NotPermittedException
+     */
+    public function copy($targetPath) {
+        throw new NotPermittedException();
+    }
+
+    /**
+     * @param int $mtime
+     * @throws \OCP\Files\NotPermittedException
+     */
+    public function touch($mtime = null) {
+        throw new NotPermittedException();
+    }
+
+    /**
+     * @return \OC\Files\Storage\Storage
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function getStorage() {
+        throw new NotFoundException();
+    }
+
+    /**
+     * @return string
+     */
+    public function getPath() {
+        return '/';
+    }
+
+    /**
+     * @return string
+     */
+    public function getInternalPath() {
+        return '';
+    }
+
+    /**
+     * @return int
+     */
+    public function getId() {
+        return 0;
+    }
+
+    /**
+     * @return array
+     */
+    public function stat() {
+        return [];
+    }
+
+    /**
+     * @return int
+     */
+    public function getMTime() {
+        return 0;
+    }
+
+    /**
+     * @param bool $includeMounts
+     * @return int|float
+     */
+    public function getSize($includeMounts = true): int|float {
+        return 0;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEtag() {
+        return '';
+    }
+
+    /**
+     * @return int
+     */
+    public function getPermissions() {
+        return \OCP\Constants::PERMISSION_CREATE;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isReadable() {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isUpdateable() {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isDeletable() {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isShareable() {
+        return false;
+    }
+
+    /**
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function getParent(): INode|IRootFolder {
+        throw new NotFoundException();
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return '';
+    }
+
+    /**
+     * Returns a view to user's files folder
+     *
+     * @param string $userId user ID
+     * @return \OCP\Files\Folder
+     * @throws NoUserException
+     * @throws NotPermittedException
+     */
+    public function getUserFolder($userId) {
+        $userObject = $this->userManager->get($userId);
+
+        if (is_null($userObject)) {
+            $e = new NoUserException('Backends provided no user object');
+            $this->logger->error(
+                sprintf(
+                    'Backends provided no user object for %s',
+                    $userId
+                ),
+                [
+                    'app' => 'files',
+                    'exception' => $e,
+                ]
+            );
+            throw $e;
+        }
+
+        $userId = $userObject->getUID();
+
+        if (!$this->userFolderCache->hasKey($userId)) {
+            if ($this->mountManager->getSetupManager()->isSetupComplete($userObject)) {
+                try {
+                    $folder = $this->get('/' . $userId . '/files');
+                    if (!$folder instanceof \OCP\Files\Folder) {
+                        throw new \Exception("Account folder for \"$userId\" exists as a file");
+                    }
+                } catch (NotFoundException $e) {
+                    if (!$this->nodeExists('/' . $userId)) {
+                        $this->newFolder('/' . $userId);
+                    }
+                    $folder = $this->newFolder('/' . $userId . '/files');
+                }
+            } else {
+                $folder = new LazyUserFolder($this, $userObject, $this->mountManager, $this->useDefaultHomeFoldersPermissions);
+            }
+
+            $this->userFolderCache->set($userId, $folder);
+        }
+
+        return $this->userFolderCache->get($userId);
+    }
+
+    public function getUserMountCache() {
+        return $this->userMountCache;
+    }
+
+    public function getFirstNodeByIdInPath(int $id, string $path): ?INode {
+        // scope the cache by user, so we don't return nodes for different users
+        if ($this->user) {
+            $cachedPath = $this->pathByIdCache->get($this->user->getUID() . '::' . $id);
+            if ($cachedPath && str_starts_with($cachedPath, $path)) {
+                // getting the node by path is significantly cheaper than finding it by id
+                try {
+                    $node = $this->get($cachedPath);
+                    // by validating that the cached path still has the requested fileid we can work around the need to invalidate the cached path
+                    // if the cached path is invalid or a different file now we fall back to the uncached logic
+                    if ($node && $node->getId() === $id) {
+                        return $node;
+                    }
+                } catch (NotFoundException|NotPermittedException) {
+                    // The file may be moved but the old path still in cache
+                }
+            }
+        }
+        $node = current($this->getByIdInPath($id, $path));
+        if (!$node) {
+            return null;
+        }
+
+        if ($this->user) {
+            $this->pathByIdCache->set($this->user->getUID() . '::' . $id, $node->getPath());
+        }
+        return $node;
+    }
+
+    /**
+     * @param int $id
+     * @return Node[]
+     */
+    public function getByIdInPath(int $id, string $path): array {
+        $mountCache = $this->getUserMountCache();
+        if ($path !== '' && strpos($path, '/', 1) > 0) {
+            [, $user] = explode('/', $path);
+        } else {
+            $user = null;
+        }
+        $mountsContainingFile = $mountCache->getMountsForFileId($id, $user);
+
+        // if the mount isn't in the cache yet, perform a setup first, then try again
+        if (count($mountsContainingFile) === 0) {
+            $this->mountManager->getSetupManager()->setupForPath($path, true);
+            $mountsContainingFile = $mountCache->getMountsForFileId($id, $user);
+        }
+
+        // when a user has access through the same storage through multiple paths
+        // (such as an external storage that is both mounted for a user and shared to the user)
+        // the mount cache will only hold a single entry for the storage
+        // this can lead to issues as the different ways the user has access to a storage can have different permissions
+        //
+        // so instead of using the cached entries directly, we instead filter the current mounts by the rootid of the cache entry
+
+        $mountRootIds = array_map(function ($mount) {
+            return $mount->getRootId();
+        }, $mountsContainingFile);
+        $mountRootPaths = array_map(function ($mount) {
+            return $mount->getRootInternalPath();
+        }, $mountsContainingFile);
+        $mountProviders = array_unique(array_map(function ($mount) {
+            return $mount->getMountProvider();
+        }, $mountsContainingFile));
+        $mountRoots = array_combine($mountRootIds, $mountRootPaths);
+
+        $mounts = $this->mountManager->getMountsByMountProvider($path, $mountProviders);
+
+        $mountsContainingFile = array_filter($mounts, function ($mount) use ($mountRoots) {
+            return isset($mountRoots[$mount->getStorageRootId()]);
+        });
+
+        if (count($mountsContainingFile) === 0) {
+            if ($user === $this->getAppDataDirectoryName()) {
+                $folder = $this->get($path);
+                if ($folder instanceof Folder) {
+                    return $folder->getByIdInRootMount($id);
+                } else {
+                    throw new \Exception('getByIdInPath with non folder');
+                }
+            }
+            return [];
+        }
+
+        $nodes = array_map(function (IMountPoint $mount) use ($id, $mountRoots) {
+            $rootInternalPath = $mountRoots[$mount->getStorageRootId()];
+            $cacheEntry = $mount->getStorage()->getCache()->get($id);
+            if (!$cacheEntry) {
+                return null;
+            }
+
+            // cache jails will hide the "true" internal path
+            $internalPath = ltrim($rootInternalPath . '/' . $cacheEntry->getPath(), '/');
+            $pathRelativeToMount = substr($internalPath, strlen($rootInternalPath));
+            $pathRelativeToMount = ltrim($pathRelativeToMount, '/');
+            $absolutePath = rtrim($mount->getMountPoint() . $pathRelativeToMount, '/');
+            $storage = $mount->getStorage();
+            if ($storage === null) {
+                return null;
+            }
+            $ownerId = $storage->getOwner($pathRelativeToMount);
+            if ($ownerId !== false) {
+                $owner = Server::get(IUserManager::class)->get($ownerId);
+            } else {
+                $owner = null;
+            }
+            return $this->createNode($absolutePath, new FileInfo(
+                $absolutePath,
+                $storage,
+                $cacheEntry->getPath(),
+                $cacheEntry,
+                $mount,
+                $owner,
+            ));
+        }, $mountsContainingFile);
+
+        $nodes = array_filter($nodes);
+
+        $folders = array_filter($nodes, function (Node $node) use ($path) {
+            return PathHelper::getRelativePath($path, $node->getPath()) !== null;
+        });
+        usort($folders, function ($a, $b) {
+            return $b->getPath() <=> $a->getPath();
+        });
+        return $folders;
+    }
+
+    public function getNodeFromCacheEntryAndMount(ICacheEntry $cacheEntry, IMountPoint $mountPoint): INode {
+        $path = $cacheEntry->getPath();
+        $fullPath = $mountPoint->getMountPoint() . $path;
+        // todo: LazyNode?
+        $info = new FileInfo($fullPath, $mountPoint->getStorage(), $path, $cacheEntry, $mountPoint);
+        $parentPath = dirname($fullPath);
+        $parent = new LazyFolder($this, function () use ($parentPath) {
+            $parent = $this->get($parentPath);
+            if ($parent instanceof \OCP\Files\Folder) {
+                return $parent;
+            } else {
+                throw new \Exception("parent $parentPath is not a folder");
+            }
+        }, [
+            'path' => $parentPath,
+        ]);
+        $isDir = $info->getType() === FileInfo::TYPE_FOLDER;
+        $view = new View('');
+        if ($isDir) {
+            return new Folder($this, $view, $fullPath, $info, $parent);
+        } else {
+            return new File($this, $view, $fullPath, $info, $parent);
+        }
+    }
 }

Spacing +21 added lines, -21 removed lines

@@ -73,7 +73,7 @@ 
 		parent::__construct($this, $view, '');
 		$this->emitter = new PublicEmitter();
 		$this->userFolderCache = new CappedMemoryCache();
-		$eventDispatcher->addListener(FilesystemTornDownEvent::class, function () {
+		$eventDispatcher->addListener(FilesystemTornDownEvent::class, function() {
 			$this->userFolderCache = new CappedMemoryCache();
 		});
 		$this->pathByIdCache = $cacheFactory->createLocal('path-by-id');
@@ -255,7 +255,7 @@ 
 	 * @param bool $includeMounts
 	 * @return int|float
 	 */
-	public function getSize($includeMounts = true): int|float {
+	public function getSize($includeMounts = true): int | float {
 		return 0;
 	}
 
@@ -304,7 +304,7 @@ 
 	/**
 	 * @throws \OCP\Files\NotFoundException
 	 */
-	public function getParent(): INode|IRootFolder {
+	public function getParent(): INode | IRootFolder {
 		throw new NotFoundException();
 	}
 
@@ -346,15 +346,15 @@ 
 		if (!$this->userFolderCache->hasKey($userId)) {
 			if ($this->mountManager->getSetupManager()->isSetupComplete($userObject)) {
 				try {
-					$folder = $this->get('/' . $userId . '/files');
+					$folder = $this->get('/'.$userId.'/files');
 					if (!$folder instanceof \OCP\Files\Folder) {
 						throw new \Exception("Account folder for \"$userId\" exists as a file");
 					}
 				} catch (NotFoundException $e) {
-					if (!$this->nodeExists('/' . $userId)) {
-						$this->newFolder('/' . $userId);
+					if (!$this->nodeExists('/'.$userId)) {
+						$this->newFolder('/'.$userId);
 					}
-					$folder = $this->newFolder('/' . $userId . '/files');
+					$folder = $this->newFolder('/'.$userId.'/files');
 				}
 			} else {
 				$folder = new LazyUserFolder($this, $userObject, $this->mountManager, $this->useDefaultHomeFoldersPermissions);
@@ -373,7 +373,7 @@ 
 	public function getFirstNodeByIdInPath(int $id, string $path): ?INode {
 		// scope the cache by user, so we don't return nodes for different users
 		if ($this->user) {
-			$cachedPath = $this->pathByIdCache->get($this->user->getUID() . '::' . $id);
+			$cachedPath = $this->pathByIdCache->get($this->user->getUID().'::'.$id);
 			if ($cachedPath && str_starts_with($cachedPath, $path)) {
 				// getting the node by path is significantly cheaper than finding it by id
 				try {
@@ -383,7 +383,7 @@ 
 					if ($node && $node->getId() === $id) {
 						return $node;
 					}
-				} catch (NotFoundException|NotPermittedException) {
+				} catch (NotFoundException | NotPermittedException) {
 					// The file may be moved but the old path still in cache
 				}
 			}
@@ -394,7 +394,7 @@ 
 		}
 
 		if ($this->user) {
-			$this->pathByIdCache->set($this->user->getUID() . '::' . $id, $node->getPath());
+			$this->pathByIdCache->set($this->user->getUID().'::'.$id, $node->getPath());
 		}
 		return $node;
 	}
@@ -425,20 +425,20 @@ 
 		//
 		// so instead of using the cached entries directly, we instead filter the current mounts by the rootid of the cache entry
 
-		$mountRootIds = array_map(function ($mount) {
+		$mountRootIds = array_map(function($mount) {
 			return $mount->getRootId();
 		}, $mountsContainingFile);
-		$mountRootPaths = array_map(function ($mount) {
+		$mountRootPaths = array_map(function($mount) {
 			return $mount->getRootInternalPath();
 		}, $mountsContainingFile);
-		$mountProviders = array_unique(array_map(function ($mount) {
+		$mountProviders = array_unique(array_map(function($mount) {
 			return $mount->getMountProvider();
 		}, $mountsContainingFile));
 		$mountRoots = array_combine($mountRootIds, $mountRootPaths);
 
 		$mounts = $this->mountManager->getMountsByMountProvider($path, $mountProviders);
 
-		$mountsContainingFile = array_filter($mounts, function ($mount) use ($mountRoots) {
+		$mountsContainingFile = array_filter($mounts, function($mount) use ($mountRoots) {
 			return isset($mountRoots[$mount->getStorageRootId()]);
 		});
 
@@ -454,7 +454,7 @@ 
 			return [];
 		}
 
-		$nodes = array_map(function (IMountPoint $mount) use ($id, $mountRoots) {
+		$nodes = array_map(function(IMountPoint $mount) use ($id, $mountRoots) {
 			$rootInternalPath = $mountRoots[$mount->getStorageRootId()];
 			$cacheEntry = $mount->getStorage()->getCache()->get($id);
 			if (!$cacheEntry) {
@@ -462,10 +462,10 @@ 
 			}
 
 			// cache jails will hide the "true" internal path
-			$internalPath = ltrim($rootInternalPath . '/' . $cacheEntry->getPath(), '/');
+			$internalPath = ltrim($rootInternalPath.'/'.$cacheEntry->getPath(), '/');
 			$pathRelativeToMount = substr($internalPath, strlen($rootInternalPath));
 			$pathRelativeToMount = ltrim($pathRelativeToMount, '/');
-			$absolutePath = rtrim($mount->getMountPoint() . $pathRelativeToMount, '/');
+			$absolutePath = rtrim($mount->getMountPoint().$pathRelativeToMount, '/');
 			$storage = $mount->getStorage();
 			if ($storage === null) {
 				return null;
@@ -488,10 +488,10 @@ 
 
 		$nodes = array_filter($nodes);
 
-		$folders = array_filter($nodes, function (Node $node) use ($path) {
+		$folders = array_filter($nodes, function(Node $node) use ($path) {
 			return PathHelper::getRelativePath($path, $node->getPath()) !== null;
 		});
-		usort($folders, function ($a, $b) {
+		usort($folders, function($a, $b) {
 			return $b->getPath() <=> $a->getPath();
 		});
 		return $folders;
@@ -499,11 +499,11 @@ 
 
 	public function getNodeFromCacheEntryAndMount(ICacheEntry $cacheEntry, IMountPoint $mountPoint): INode {
 		$path = $cacheEntry->getPath();
-		$fullPath = $mountPoint->getMountPoint() . $path;
+		$fullPath = $mountPoint->getMountPoint().$path;
 		// todo: LazyNode?
 		$info = new FileInfo($fullPath, $mountPoint->getStorage(), $path, $cacheEntry, $mountPoint);
 		$parentPath = dirname($fullPath);
-		$parent = new LazyFolder($this, function () use ($parentPath) {
+		$parent = new LazyFolder($this, function() use ($parentPath) {
 			$parent = $this->get($parentPath);
 			if ($parent instanceof \OCP\Files\Folder) {
 				return $parent;

lib/private/Files/Node/LazyUserFolder.php

Indentation +52 added lines, -52 removed lines

@@ -19,60 +19,60 @@
 use Psr\Log\LoggerInterface;
 
 class LazyUserFolder extends LazyFolder {
-	private string $path;
+    private string $path;
 
-	public function __construct(
-		IRootFolder $rootFolder,
-		private IUser $user,
-		private IMountManager $mountManager,
-		bool $useDefaultHomeFoldersPermissions = true,
-	) {
-		$this->path = '/' . $user->getUID() . '/files';
-		$data = [
-			'path' => $this->path,
-			'type' => FileInfo::TYPE_FOLDER,
-			'mimetype' => FileInfo::MIMETYPE_FOLDER,
-		];
+    public function __construct(
+        IRootFolder $rootFolder,
+        private IUser $user,
+        private IMountManager $mountManager,
+        bool $useDefaultHomeFoldersPermissions = true,
+    ) {
+        $this->path = '/' . $user->getUID() . '/files';
+        $data = [
+            'path' => $this->path,
+            'type' => FileInfo::TYPE_FOLDER,
+            'mimetype' => FileInfo::MIMETYPE_FOLDER,
+        ];
 
-		// By default, we assume the permissions for the users' home folders.
-		// If a mount point is mounted on a user's home folder, the permissions cannot be assumed.
-		if ($useDefaultHomeFoldersPermissions) {
-			// Sharing user root folder is not allowed
-			$data['permissions'] = Constants::PERMISSION_ALL ^ Constants::PERMISSION_SHARE;
-		}
+        // By default, we assume the permissions for the users' home folders.
+        // If a mount point is mounted on a user's home folder, the permissions cannot be assumed.
+        if ($useDefaultHomeFoldersPermissions) {
+            // Sharing user root folder is not allowed
+            $data['permissions'] = Constants::PERMISSION_ALL ^ Constants::PERMISSION_SHARE;
+        }
 
-		parent::__construct(
-			$rootFolder,
-			function () use ($user): Folder {
-				try {
-					$node = $this->getRootFolder()->get($this->path);
-					if ($node instanceof File) {
-						$e = new \RuntimeException();
-						\OCP\Server::get(LoggerInterface::class)->error('User root storage is not a folder: ' . $this->path, [
-							'exception' => $e,
-						]);
-						throw $e;
-					}
-					return $node;
-				} catch (NotFoundException $e) {
-					if (!$this->getRootFolder()->nodeExists('/' . $user->getUID())) {
-						$this->getRootFolder()->newFolder('/' . $user->getUID());
-					}
-					return $this->getRootFolder()->newFolder($this->path);
-				}
-			},
-			$data,
-		);
-	}
+        parent::__construct(
+            $rootFolder,
+            function () use ($user): Folder {
+                try {
+                    $node = $this->getRootFolder()->get($this->path);
+                    if ($node instanceof File) {
+                        $e = new \RuntimeException();
+                        \OCP\Server::get(LoggerInterface::class)->error('User root storage is not a folder: ' . $this->path, [
+                            'exception' => $e,
+                        ]);
+                        throw $e;
+                    }
+                    return $node;
+                } catch (NotFoundException $e) {
+                    if (!$this->getRootFolder()->nodeExists('/' . $user->getUID())) {
+                        $this->getRootFolder()->newFolder('/' . $user->getUID());
+                    }
+                    return $this->getRootFolder()->newFolder($this->path);
+                }
+            },
+            $data,
+        );
+    }
 
-	public function getMountPoint() {
-		if ($this->folder !== null) {
-			return $this->folder->getMountPoint();
-		}
-		$mountPoint = $this->mountManager->find('/' . $this->user->getUID());
-		if (is_null($mountPoint)) {
-			throw new \Exception('No mountpoint for user folder');
-		}
-		return $mountPoint;
-	}
+    public function getMountPoint() {
+        if ($this->folder !== null) {
+            return $this->folder->getMountPoint();
+        }
+        $mountPoint = $this->mountManager->find('/' . $this->user->getUID());
+        if (is_null($mountPoint)) {
+            throw new \Exception('No mountpoint for user folder');
+        }
+        return $mountPoint;
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -27,7 +27,7 @@ 
 		private IMountManager $mountManager,
 		bool $useDefaultHomeFoldersPermissions = true,
 	) {
-		$this->path = '/' . $user->getUID() . '/files';
+		$this->path = '/'.$user->getUID().'/files';
 		$data = [
 			'path' => $this->path,
 			'type' => FileInfo::TYPE_FOLDER,
@@ -43,20 +43,20 @@ 
 
 		parent::__construct(
 			$rootFolder,
-			function () use ($user): Folder {
+			function() use ($user): Folder {
 				try {
 					$node = $this->getRootFolder()->get($this->path);
 					if ($node instanceof File) {
 						$e = new \RuntimeException();
-						\OCP\Server::get(LoggerInterface::class)->error('User root storage is not a folder: ' . $this->path, [
+						\OCP\Server::get(LoggerInterface::class)->error('User root storage is not a folder: '.$this->path, [
 							'exception' => $e,
 						]);
 						throw $e;
 					}
 					return $node;
 				} catch (NotFoundException $e) {
-					if (!$this->getRootFolder()->nodeExists('/' . $user->getUID())) {
-						$this->getRootFolder()->newFolder('/' . $user->getUID());
+					if (!$this->getRootFolder()->nodeExists('/'.$user->getUID())) {
+						$this->getRootFolder()->newFolder('/'.$user->getUID());
 					}
 					return $this->getRootFolder()->newFolder($this->path);
 				}
@@ -69,7 +69,7 @@ 
 		if ($this->folder !== null) {
 			return $this->folder->getMountPoint();
 		}
-		$mountPoint = $this->mountManager->find('/' . $this->user->getUID());
+		$mountPoint = $this->mountManager->find('/'.$this->user->getUID());
 		if (is_null($mountPoint)) {
 			throw new \Exception('No mountpoint for user folder');
 		}

apps/files_external/lib/Migration/Version1025Date20250228162604.php

Indentation +11 added lines, -11 removed lines

@@ -20,16 +20,16 @@
  * Check for any external storage overwriting the home folder
  */
 class Version1025Date20250228162604 extends SimpleMigrationStep {
-	public function __construct(
-		private GlobalStoragesService $globalStoragesServices,
-		private IAppConfig $appConfig,
-	) {
-	}
+    public function __construct(
+        private GlobalStoragesService $globalStoragesServices,
+        private IAppConfig $appConfig,
+    ) {
+    }
 
-	/**
-	 * @param Closure(): ISchemaWrapper $schemaClosure
-	 */
-	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
-		$this->globalStoragesServices->updateOverwriteHomeFolders();
-	}
+    /**
+     * @param Closure(): ISchemaWrapper $schemaClosure
+     */
+    public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+        $this->globalStoragesServices->updateOverwriteHomeFolders();
+    }
 }

apps/files_external/lib/Service/StoragesService.php

Indentation +468 added lines, -468 removed lines

@@ -33,472 +33,472 @@
  */
 abstract class StoragesService {
 
-	/**
-	 * @param BackendService $backendService
-	 * @param DBConfigService $dbConfig
-	 * @param IUserMountCache $userMountCache
-	 * @param IEventDispatcher $eventDispatcher
-	 */
-	public function __construct(
-		protected BackendService $backendService,
-		protected DBConfigService $dbConfig,
-		protected IUserMountCache $userMountCache,
-		protected IEventDispatcher $eventDispatcher,
-		protected IAppConfig $appConfig,
-	) {
-	}
-
-	protected function readDBConfig() {
-		return $this->dbConfig->getAdminMounts();
-	}
-
-	protected function getStorageConfigFromDBMount(array $mount) {
-		$applicableUsers = array_filter($mount['applicable'], function ($applicable) {
-			return $applicable['type'] === DBConfigService::APPLICABLE_TYPE_USER;
-		});
-		$applicableUsers = array_map(function ($applicable) {
-			return $applicable['value'];
-		}, $applicableUsers);
-
-		$applicableGroups = array_filter($mount['applicable'], function ($applicable) {
-			return $applicable['type'] === DBConfigService::APPLICABLE_TYPE_GROUP;
-		});
-		$applicableGroups = array_map(function ($applicable) {
-			return $applicable['value'];
-		}, $applicableGroups);
-
-		try {
-			$config = $this->createStorage(
-				$mount['mount_point'],
-				$mount['storage_backend'],
-				$mount['auth_backend'],
-				$mount['config'],
-				$mount['options'],
-				array_values($applicableUsers),
-				array_values($applicableGroups),
-				$mount['priority']
-			);
-			$config->setType($mount['type']);
-			$config->setId((int)$mount['mount_id']);
-			return $config;
-		} catch (\UnexpectedValueException $e) {
-			// don't die if a storage backend doesn't exist
-			Server::get(LoggerInterface::class)->error('Could not load storage.', [
-				'app' => 'files_external',
-				'exception' => $e,
-			]);
-			return null;
-		} catch (\InvalidArgumentException $e) {
-			Server::get(LoggerInterface::class)->error('Could not load storage.', [
-				'app' => 'files_external',
-				'exception' => $e,
-			]);
-			return null;
-		}
-	}
-
-	/**
-	 * Read the external storage config
-	 *
-	 * @return array map of storage id to storage config
-	 */
-	protected function readConfig() {
-		$mounts = $this->readDBConfig();
-		$configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts);
-		$configs = array_filter($configs, function ($config) {
-			return $config instanceof StorageConfig;
-		});
-
-		$keys = array_map(function (StorageConfig $config) {
-			return $config->getId();
-		}, $configs);
-
-		return array_combine($keys, $configs);
-	}
-
-	/**
-	 * Get a storage with status
-	 *
-	 * @param int $id storage id
-	 *
-	 * @return StorageConfig
-	 * @throws NotFoundException if the storage with the given id was not found
-	 */
-	public function getStorage(int $id) {
-		$mount = $this->dbConfig->getMountById($id);
-
-		if (!is_array($mount)) {
-			throw new NotFoundException('Storage with ID "' . $id . '" not found');
-		}
-
-		$config = $this->getStorageConfigFromDBMount($mount);
-		if ($this->isApplicable($config)) {
-			return $config;
-		} else {
-			throw new NotFoundException('Storage with ID "' . $id . '" not found');
-		}
-	}
-
-	/**
-	 * Check whether this storage service should provide access to a storage
-	 *
-	 * @param StorageConfig $config
-	 * @return bool
-	 */
-	abstract protected function isApplicable(StorageConfig $config);
-
-	/**
-	 * Gets all storages, valid or not
-	 *
-	 * @return StorageConfig[] array of storage configs
-	 */
-	public function getAllStorages() {
-		return $this->readConfig();
-	}
-
-	/**
-	 * Gets all valid storages
-	 *
-	 * @return StorageConfig[]
-	 */
-	public function getStorages() {
-		return array_filter($this->getAllStorages(), [$this, 'validateStorage']);
-	}
-
-	/**
-	 * Validate storage
-	 * FIXME: De-duplicate with StoragesController::validate()
-	 *
-	 * @param StorageConfig $storage
-	 * @return bool
-	 */
-	protected function validateStorage(StorageConfig $storage) {
-		/** @var Backend */
-		$backend = $storage->getBackend();
-		/** @var AuthMechanism */
-		$authMechanism = $storage->getAuthMechanism();
-
-		if (!$backend->isVisibleFor($this->getVisibilityType())) {
-			// not permitted to use backend
-			return false;
-		}
-		if (!$authMechanism->isVisibleFor($this->getVisibilityType())) {
-			// not permitted to use auth mechanism
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Get the visibility type for this controller, used in validation
-	 *
-	 * @return int BackendService::VISIBILITY_* constants
-	 */
-	abstract public function getVisibilityType();
-
-	/**
-	 * @return integer
-	 */
-	protected function getType() {
-		return DBConfigService::MOUNT_TYPE_ADMIN;
-	}
-
-	/**
-	 * Add new storage to the configuration
-	 *
-	 * @param StorageConfig $newStorage storage attributes
-	 *
-	 * @return StorageConfig storage config, with added id
-	 */
-	public function addStorage(StorageConfig $newStorage) {
-		$allStorages = $this->readConfig();
-
-		$configId = $this->dbConfig->addMount(
-			$newStorage->getMountPoint(),
-			$newStorage->getBackend()->getIdentifier(),
-			$newStorage->getAuthMechanism()->getIdentifier(),
-			$newStorage->getPriority(),
-			$this->getType()
-		);
-
-		$newStorage->setId($configId);
-
-		foreach ($newStorage->getApplicableUsers() as $user) {
-			$this->dbConfig->addApplicable($configId, DBConfigService::APPLICABLE_TYPE_USER, $user);
-		}
-		foreach ($newStorage->getApplicableGroups() as $group) {
-			$this->dbConfig->addApplicable($configId, DBConfigService::APPLICABLE_TYPE_GROUP, $group);
-		}
-		foreach ($newStorage->getBackendOptions() as $key => $value) {
-			$this->dbConfig->setConfig($configId, $key, $value);
-		}
-		foreach ($newStorage->getMountOptions() as $key => $value) {
-			$this->dbConfig->setOption($configId, $key, $value);
-		}
-
-		if (count($newStorage->getApplicableUsers()) === 0 && count($newStorage->getApplicableGroups()) === 0) {
-			$this->dbConfig->addApplicable($configId, DBConfigService::APPLICABLE_TYPE_GLOBAL, null);
-		}
-
-		// add new storage
-		$allStorages[$configId] = $newStorage;
-
-		$this->triggerHooks($newStorage, Filesystem::signal_create_mount);
-
-		$newStorage->setStatus(StorageNotAvailableException::STATUS_SUCCESS);
-
-		$this->updateOverwriteHomeFolders();
-
-		return $newStorage;
-	}
-
-	/**
-	 * Create a storage from its parameters
-	 *
-	 * @param string $mountPoint storage mount point
-	 * @param string $backendIdentifier backend identifier
-	 * @param string $authMechanismIdentifier authentication mechanism identifier
-	 * @param array $backendOptions backend-specific options
-	 * @param array|null $mountOptions mount-specific options
-	 * @param array|null $applicableUsers users for which to mount the storage
-	 * @param array|null $applicableGroups groups for which to mount the storage
-	 * @param int|null $priority priority
-	 *
-	 * @return StorageConfig
-	 */
-	public function createStorage(
-		$mountPoint,
-		$backendIdentifier,
-		$authMechanismIdentifier,
-		$backendOptions,
-		$mountOptions = null,
-		$applicableUsers = null,
-		$applicableGroups = null,
-		$priority = null,
-	) {
-		$backend = $this->backendService->getBackend($backendIdentifier);
-		if (!$backend) {
-			$backend = new InvalidBackend($backendIdentifier);
-		}
-		$authMechanism = $this->backendService->getAuthMechanism($authMechanismIdentifier);
-		if (!$authMechanism) {
-			$authMechanism = new InvalidAuth($authMechanismIdentifier);
-		}
-		$newStorage = new StorageConfig();
-		$newStorage->setMountPoint($mountPoint);
-		$newStorage->setBackend($backend);
-		$newStorage->setAuthMechanism($authMechanism);
-		$newStorage->setBackendOptions($backendOptions);
-		if (isset($mountOptions)) {
-			$newStorage->setMountOptions($mountOptions);
-		}
-		if (isset($applicableUsers)) {
-			$newStorage->setApplicableUsers($applicableUsers);
-		}
-		if (isset($applicableGroups)) {
-			$newStorage->setApplicableGroups($applicableGroups);
-		}
-		if (isset($priority)) {
-			$newStorage->setPriority($priority);
-		}
-
-		return $newStorage;
-	}
-
-	/**
-	 * Triggers the given hook signal for all the applicables given
-	 *
-	 * @param string $signal signal
-	 * @param string $mountPoint hook mount point param
-	 * @param string $mountType hook mount type param
-	 * @param array $applicableArray array of applicable users/groups for which to trigger the hook
-	 */
-	protected function triggerApplicableHooks($signal, $mountPoint, $mountType, $applicableArray): void {
-		$this->eventDispatcher->dispatchTyped(new InvalidateMountCacheEvent(null));
-		foreach ($applicableArray as $applicable) {
-			Util::emitHook(
-				Filesystem::CLASSNAME,
-				$signal,
-				[
-					Filesystem::signal_param_path => $mountPoint,
-					Filesystem::signal_param_mount_type => $mountType,
-					Filesystem::signal_param_users => $applicable,
-				]
-			);
-		}
-	}
-
-	/**
-	 * Triggers $signal for all applicable users of the given
-	 * storage
-	 *
-	 * @param StorageConfig $storage storage data
-	 * @param string $signal signal to trigger
-	 */
-	abstract protected function triggerHooks(StorageConfig $storage, $signal);
-
-	/**
-	 * Triggers signal_create_mount or signal_delete_mount to
-	 * accommodate for additions/deletions in applicableUsers
-	 * and applicableGroups fields.
-	 *
-	 * @param StorageConfig $oldStorage old storage data
-	 * @param StorageConfig $newStorage new storage data
-	 */
-	abstract protected function triggerChangeHooks(StorageConfig $oldStorage, StorageConfig $newStorage);
-
-	/**
-	 * Update storage to the configuration
-	 *
-	 * @param StorageConfig $updatedStorage storage attributes
-	 *
-	 * @return StorageConfig storage config
-	 * @throws NotFoundException if the given storage does not exist in the config
-	 */
-	public function updateStorage(StorageConfig $updatedStorage) {
-		$id = $updatedStorage->getId();
-
-		$existingMount = $this->dbConfig->getMountById($id);
-
-		if (!is_array($existingMount)) {
-			throw new NotFoundException('Storage with ID "' . $id . '" not found while updating storage');
-		}
-
-		$oldStorage = $this->getStorageConfigFromDBMount($existingMount);
-
-		if ($oldStorage->getBackend() instanceof InvalidBackend) {
-			throw new NotFoundException('Storage with id "' . $id . '" cannot be edited due to missing backend');
-		}
-
-		$removedUsers = array_diff($oldStorage->getApplicableUsers(), $updatedStorage->getApplicableUsers());
-		$removedGroups = array_diff($oldStorage->getApplicableGroups(), $updatedStorage->getApplicableGroups());
-		$addedUsers = array_diff($updatedStorage->getApplicableUsers(), $oldStorage->getApplicableUsers());
-		$addedGroups = array_diff($updatedStorage->getApplicableGroups(), $oldStorage->getApplicableGroups());
-
-		$oldUserCount = count($oldStorage->getApplicableUsers());
-		$oldGroupCount = count($oldStorage->getApplicableGroups());
-		$newUserCount = count($updatedStorage->getApplicableUsers());
-		$newGroupCount = count($updatedStorage->getApplicableGroups());
-		$wasGlobal = ($oldUserCount + $oldGroupCount) === 0;
-		$isGlobal = ($newUserCount + $newGroupCount) === 0;
-
-		foreach ($removedUsers as $user) {
-			$this->dbConfig->removeApplicable($id, DBConfigService::APPLICABLE_TYPE_USER, $user);
-		}
-		foreach ($removedGroups as $group) {
-			$this->dbConfig->removeApplicable($id, DBConfigService::APPLICABLE_TYPE_GROUP, $group);
-		}
-		foreach ($addedUsers as $user) {
-			$this->dbConfig->addApplicable($id, DBConfigService::APPLICABLE_TYPE_USER, $user);
-		}
-		foreach ($addedGroups as $group) {
-			$this->dbConfig->addApplicable($id, DBConfigService::APPLICABLE_TYPE_GROUP, $group);
-		}
-
-		if ($wasGlobal && !$isGlobal) {
-			$this->dbConfig->removeApplicable($id, DBConfigService::APPLICABLE_TYPE_GLOBAL, null);
-		} elseif (!$wasGlobal && $isGlobal) {
-			$this->dbConfig->addApplicable($id, DBConfigService::APPLICABLE_TYPE_GLOBAL, null);
-		}
-
-		$changedConfig = array_diff_assoc($updatedStorage->getBackendOptions(), $oldStorage->getBackendOptions());
-		$changedOptions = array_diff_assoc($updatedStorage->getMountOptions(), $oldStorage->getMountOptions());
-
-		foreach ($changedConfig as $key => $value) {
-			if ($value !== DefinitionParameter::UNMODIFIED_PLACEHOLDER) {
-				$this->dbConfig->setConfig($id, $key, $value);
-			}
-		}
-		foreach ($changedOptions as $key => $value) {
-			$this->dbConfig->setOption($id, $key, $value);
-		}
-
-		if ($updatedStorage->getMountPoint() !== $oldStorage->getMountPoint()) {
-			$this->dbConfig->setMountPoint($id, $updatedStorage->getMountPoint());
-		}
-
-		if ($updatedStorage->getAuthMechanism()->getIdentifier() !== $oldStorage->getAuthMechanism()->getIdentifier()) {
-			$this->dbConfig->setAuthBackend($id, $updatedStorage->getAuthMechanism()->getIdentifier());
-		}
-
-		$this->triggerChangeHooks($oldStorage, $updatedStorage);
-
-		if (($wasGlobal && !$isGlobal) || count($removedGroups) > 0) { // to expensive to properly handle these on the fly
-			$this->userMountCache->remoteStorageMounts($this->getStorageId($updatedStorage));
-		} else {
-			$storageId = $this->getStorageId($updatedStorage);
-			foreach ($removedUsers as $userId) {
-				$this->userMountCache->removeUserStorageMount($storageId, $userId);
-			}
-		}
-
-		$this->updateOverwriteHomeFolders();
-
-		return $this->getStorage($id);
-	}
-
-	/**
-	 * Delete the storage with the given id.
-	 *
-	 * @param int $id storage id
-	 *
-	 * @throws NotFoundException if no storage was found with the given id
-	 */
-	public function removeStorage(int $id) {
-		$existingMount = $this->dbConfig->getMountById($id);
-
-		if (!is_array($existingMount)) {
-			throw new NotFoundException('Storage with ID "' . $id . '" not found');
-		}
-
-		$this->dbConfig->removeMount($id);
-
-		$deletedStorage = $this->getStorageConfigFromDBMount($existingMount);
-		$this->triggerHooks($deletedStorage, Filesystem::signal_delete_mount);
-
-		// delete oc_storages entries and oc_filecache
-		Storage::cleanByMountId($id);
-
-		$this->updateOverwriteHomeFolders();
-	}
-
-	/**
-	 * Construct the storage implementation
-	 *
-	 * @param StorageConfig $storageConfig
-	 * @return int
-	 */
-	private function getStorageId(StorageConfig $storageConfig) {
-		try {
-			$class = $storageConfig->getBackend()->getStorageClass();
-			/** @var \OC\Files\Storage\Storage $storage */
-			$storage = new $class($storageConfig->getBackendOptions());
-
-			// auth mechanism should fire first
-			$storage = $storageConfig->getBackend()->wrapStorage($storage);
-			$storage = $storageConfig->getAuthMechanism()->wrapStorage($storage);
-
-			/** @var \OC\Files\Storage\Storage $storage */
-			return $storage->getStorageCache()->getNumericId();
-		} catch (\Exception $e) {
-			return -1;
-		}
-	}
-
-	public function updateOverwriteHomeFolders(): void {
-		$appIdsList = $this->appConfig->getValueArray(FilesApplication::APP_ID, ConfigLexicon::OVERWRITES_HOME_FOLDERS);
-
-		if ($this->dbConfig->hasHomeFolderOverwriteMount()) {
-			if (!in_array(Application::APP_ID, $appIdsList)) {
-				$appIdsList[] = Application::APP_ID;
-				$this->appConfig->setValueArray(FilesApplication::APP_ID, ConfigLexicon::OVERWRITES_HOME_FOLDERS, $appIdsList);
-			}
-		} else {
-			if (in_array(Application::APP_ID, $appIdsList)) {
-				$appIdsList = array_values(array_filter($appIdsList, fn ($v) => $v !== Application::APP_ID));
-				$this->appConfig->setValueArray(FilesApplication::APP_ID, ConfigLexicon::OVERWRITES_HOME_FOLDERS, $appIdsList);
-			}
-		}
-	}
+    /**
+     * @param BackendService $backendService
+     * @param DBConfigService $dbConfig
+     * @param IUserMountCache $userMountCache
+     * @param IEventDispatcher $eventDispatcher
+     */
+    public function __construct(
+        protected BackendService $backendService,
+        protected DBConfigService $dbConfig,
+        protected IUserMountCache $userMountCache,
+        protected IEventDispatcher $eventDispatcher,
+        protected IAppConfig $appConfig,
+    ) {
+    }
+
+    protected function readDBConfig() {
+        return $this->dbConfig->getAdminMounts();
+    }
+
+    protected function getStorageConfigFromDBMount(array $mount) {
+        $applicableUsers = array_filter($mount['applicable'], function ($applicable) {
+            return $applicable['type'] === DBConfigService::APPLICABLE_TYPE_USER;
+        });
+        $applicableUsers = array_map(function ($applicable) {
+            return $applicable['value'];
+        }, $applicableUsers);
+
+        $applicableGroups = array_filter($mount['applicable'], function ($applicable) {
+            return $applicable['type'] === DBConfigService::APPLICABLE_TYPE_GROUP;
+        });
+        $applicableGroups = array_map(function ($applicable) {
+            return $applicable['value'];
+        }, $applicableGroups);
+
+        try {
+            $config = $this->createStorage(
+                $mount['mount_point'],
+                $mount['storage_backend'],
+                $mount['auth_backend'],
+                $mount['config'],
+                $mount['options'],
+                array_values($applicableUsers),
+                array_values($applicableGroups),
+                $mount['priority']
+            );
+            $config->setType($mount['type']);
+            $config->setId((int)$mount['mount_id']);
+            return $config;
+        } catch (\UnexpectedValueException $e) {
+            // don't die if a storage backend doesn't exist
+            Server::get(LoggerInterface::class)->error('Could not load storage.', [
+                'app' => 'files_external',
+                'exception' => $e,
+            ]);
+            return null;
+        } catch (\InvalidArgumentException $e) {
+            Server::get(LoggerInterface::class)->error('Could not load storage.', [
+                'app' => 'files_external',
+                'exception' => $e,
+            ]);
+            return null;
+        }
+    }
+
+    /**
+     * Read the external storage config
+     *
+     * @return array map of storage id to storage config
+     */
+    protected function readConfig() {
+        $mounts = $this->readDBConfig();
+        $configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts);
+        $configs = array_filter($configs, function ($config) {
+            return $config instanceof StorageConfig;
+        });
+
+        $keys = array_map(function (StorageConfig $config) {
+            return $config->getId();
+        }, $configs);
+
+        return array_combine($keys, $configs);
+    }
+
+    /**
+     * Get a storage with status
+     *
+     * @param int $id storage id
+     *
+     * @return StorageConfig
+     * @throws NotFoundException if the storage with the given id was not found
+     */
+    public function getStorage(int $id) {
+        $mount = $this->dbConfig->getMountById($id);
+
+        if (!is_array($mount)) {
+            throw new NotFoundException('Storage with ID "' . $id . '" not found');
+        }
+
+        $config = $this->getStorageConfigFromDBMount($mount);
+        if ($this->isApplicable($config)) {
+            return $config;
+        } else {
+            throw new NotFoundException('Storage with ID "' . $id . '" not found');
+        }
+    }
+
+    /**
+     * Check whether this storage service should provide access to a storage
+     *
+     * @param StorageConfig $config
+     * @return bool
+     */
+    abstract protected function isApplicable(StorageConfig $config);
+
+    /**
+     * Gets all storages, valid or not
+     *
+     * @return StorageConfig[] array of storage configs
+     */
+    public function getAllStorages() {
+        return $this->readConfig();
+    }
+
+    /**
+     * Gets all valid storages
+     *
+     * @return StorageConfig[]
+     */
+    public function getStorages() {
+        return array_filter($this->getAllStorages(), [$this, 'validateStorage']);
+    }
+
+    /**
+     * Validate storage
+     * FIXME: De-duplicate with StoragesController::validate()
+     *
+     * @param StorageConfig $storage
+     * @return bool
+     */
+    protected function validateStorage(StorageConfig $storage) {
+        /** @var Backend */
+        $backend = $storage->getBackend();
+        /** @var AuthMechanism */
+        $authMechanism = $storage->getAuthMechanism();
+
+        if (!$backend->isVisibleFor($this->getVisibilityType())) {
+            // not permitted to use backend
+            return false;
+        }
+        if (!$authMechanism->isVisibleFor($this->getVisibilityType())) {
+            // not permitted to use auth mechanism
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Get the visibility type for this controller, used in validation
+     *
+     * @return int BackendService::VISIBILITY_* constants
+     */
+    abstract public function getVisibilityType();
+
+    /**
+     * @return integer
+     */
+    protected function getType() {
+        return DBConfigService::MOUNT_TYPE_ADMIN;
+    }
+
+    /**
+     * Add new storage to the configuration
+     *
+     * @param StorageConfig $newStorage storage attributes
+     *
+     * @return StorageConfig storage config, with added id
+     */
+    public function addStorage(StorageConfig $newStorage) {
+        $allStorages = $this->readConfig();
+
+        $configId = $this->dbConfig->addMount(
+            $newStorage->getMountPoint(),
+            $newStorage->getBackend()->getIdentifier(),
+            $newStorage->getAuthMechanism()->getIdentifier(),
+            $newStorage->getPriority(),
+            $this->getType()
+        );
+
+        $newStorage->setId($configId);
+
+        foreach ($newStorage->getApplicableUsers() as $user) {
+            $this->dbConfig->addApplicable($configId, DBConfigService::APPLICABLE_TYPE_USER, $user);
+        }
+        foreach ($newStorage->getApplicableGroups() as $group) {
+            $this->dbConfig->addApplicable($configId, DBConfigService::APPLICABLE_TYPE_GROUP, $group);
+        }
+        foreach ($newStorage->getBackendOptions() as $key => $value) {
+            $this->dbConfig->setConfig($configId, $key, $value);
+        }
+        foreach ($newStorage->getMountOptions() as $key => $value) {
+            $this->dbConfig->setOption($configId, $key, $value);
+        }
+
+        if (count($newStorage->getApplicableUsers()) === 0 && count($newStorage->getApplicableGroups()) === 0) {
+            $this->dbConfig->addApplicable($configId, DBConfigService::APPLICABLE_TYPE_GLOBAL, null);
+        }
+
+        // add new storage
+        $allStorages[$configId] = $newStorage;
+
+        $this->triggerHooks($newStorage, Filesystem::signal_create_mount);
+
+        $newStorage->setStatus(StorageNotAvailableException::STATUS_SUCCESS);
+
+        $this->updateOverwriteHomeFolders();
+
+        return $newStorage;
+    }
+
+    /**
+     * Create a storage from its parameters
+     *
+     * @param string $mountPoint storage mount point
+     * @param string $backendIdentifier backend identifier
+     * @param string $authMechanismIdentifier authentication mechanism identifier
+     * @param array $backendOptions backend-specific options
+     * @param array|null $mountOptions mount-specific options
+     * @param array|null $applicableUsers users for which to mount the storage
+     * @param array|null $applicableGroups groups for which to mount the storage
+     * @param int|null $priority priority
+     *
+     * @return StorageConfig
+     */
+    public function createStorage(
+        $mountPoint,
+        $backendIdentifier,
+        $authMechanismIdentifier,
+        $backendOptions,
+        $mountOptions = null,
+        $applicableUsers = null,
+        $applicableGroups = null,
+        $priority = null,
+    ) {
+        $backend = $this->backendService->getBackend($backendIdentifier);
+        if (!$backend) {
+            $backend = new InvalidBackend($backendIdentifier);
+        }
+        $authMechanism = $this->backendService->getAuthMechanism($authMechanismIdentifier);
+        if (!$authMechanism) {
+            $authMechanism = new InvalidAuth($authMechanismIdentifier);
+        }
+        $newStorage = new StorageConfig();
+        $newStorage->setMountPoint($mountPoint);
+        $newStorage->setBackend($backend);
+        $newStorage->setAuthMechanism($authMechanism);
+        $newStorage->setBackendOptions($backendOptions);
+        if (isset($mountOptions)) {
+            $newStorage->setMountOptions($mountOptions);
+        }
+        if (isset($applicableUsers)) {
+            $newStorage->setApplicableUsers($applicableUsers);
+        }
+        if (isset($applicableGroups)) {
+            $newStorage->setApplicableGroups($applicableGroups);
+        }
+        if (isset($priority)) {
+            $newStorage->setPriority($priority);
+        }
+
+        return $newStorage;
+    }
+
+    /**
+     * Triggers the given hook signal for all the applicables given
+     *
+     * @param string $signal signal
+     * @param string $mountPoint hook mount point param
+     * @param string $mountType hook mount type param
+     * @param array $applicableArray array of applicable users/groups for which to trigger the hook
+     */
+    protected function triggerApplicableHooks($signal, $mountPoint, $mountType, $applicableArray): void {
+        $this->eventDispatcher->dispatchTyped(new InvalidateMountCacheEvent(null));
+        foreach ($applicableArray as $applicable) {
+            Util::emitHook(
+                Filesystem::CLASSNAME,
+                $signal,
+                [
+                    Filesystem::signal_param_path => $mountPoint,
+                    Filesystem::signal_param_mount_type => $mountType,
+                    Filesystem::signal_param_users => $applicable,
+                ]
+            );
+        }
+    }
+
+    /**
+     * Triggers $signal for all applicable users of the given
+     * storage
+     *
+     * @param StorageConfig $storage storage data
+     * @param string $signal signal to trigger
+     */
+    abstract protected function triggerHooks(StorageConfig $storage, $signal);
+
+    /**
+     * Triggers signal_create_mount or signal_delete_mount to
+     * accommodate for additions/deletions in applicableUsers
+     * and applicableGroups fields.
+     *
+     * @param StorageConfig $oldStorage old storage data
+     * @param StorageConfig $newStorage new storage data
+     */
+    abstract protected function triggerChangeHooks(StorageConfig $oldStorage, StorageConfig $newStorage);
+
+    /**
+     * Update storage to the configuration
+     *
+     * @param StorageConfig $updatedStorage storage attributes
+     *
+     * @return StorageConfig storage config
+     * @throws NotFoundException if the given storage does not exist in the config
+     */
+    public function updateStorage(StorageConfig $updatedStorage) {
+        $id = $updatedStorage->getId();
+
+        $existingMount = $this->dbConfig->getMountById($id);
+
+        if (!is_array($existingMount)) {
+            throw new NotFoundException('Storage with ID "' . $id . '" not found while updating storage');
+        }
+
+        $oldStorage = $this->getStorageConfigFromDBMount($existingMount);
+
+        if ($oldStorage->getBackend() instanceof InvalidBackend) {
+            throw new NotFoundException('Storage with id "' . $id . '" cannot be edited due to missing backend');
+        }
+
+        $removedUsers = array_diff($oldStorage->getApplicableUsers(), $updatedStorage->getApplicableUsers());
+        $removedGroups = array_diff($oldStorage->getApplicableGroups(), $updatedStorage->getApplicableGroups());
+        $addedUsers = array_diff($updatedStorage->getApplicableUsers(), $oldStorage->getApplicableUsers());
+        $addedGroups = array_diff($updatedStorage->getApplicableGroups(), $oldStorage->getApplicableGroups());
+
+        $oldUserCount = count($oldStorage->getApplicableUsers());
+        $oldGroupCount = count($oldStorage->getApplicableGroups());
+        $newUserCount = count($updatedStorage->getApplicableUsers());
+        $newGroupCount = count($updatedStorage->getApplicableGroups());
+        $wasGlobal = ($oldUserCount + $oldGroupCount) === 0;
+        $isGlobal = ($newUserCount + $newGroupCount) === 0;
+
+        foreach ($removedUsers as $user) {
+            $this->dbConfig->removeApplicable($id, DBConfigService::APPLICABLE_TYPE_USER, $user);
+        }
+        foreach ($removedGroups as $group) {
+            $this->dbConfig->removeApplicable($id, DBConfigService::APPLICABLE_TYPE_GROUP, $group);
+        }
+        foreach ($addedUsers as $user) {
+            $this->dbConfig->addApplicable($id, DBConfigService::APPLICABLE_TYPE_USER, $user);
+        }
+        foreach ($addedGroups as $group) {
+            $this->dbConfig->addApplicable($id, DBConfigService::APPLICABLE_TYPE_GROUP, $group);
+        }
+
+        if ($wasGlobal && !$isGlobal) {
+            $this->dbConfig->removeApplicable($id, DBConfigService::APPLICABLE_TYPE_GLOBAL, null);
+        } elseif (!$wasGlobal && $isGlobal) {
+            $this->dbConfig->addApplicable($id, DBConfigService::APPLICABLE_TYPE_GLOBAL, null);
+        }
+
+        $changedConfig = array_diff_assoc($updatedStorage->getBackendOptions(), $oldStorage->getBackendOptions());
+        $changedOptions = array_diff_assoc($updatedStorage->getMountOptions(), $oldStorage->getMountOptions());
+
+        foreach ($changedConfig as $key => $value) {
+            if ($value !== DefinitionParameter::UNMODIFIED_PLACEHOLDER) {
+                $this->dbConfig->setConfig($id, $key, $value);
+            }
+        }
+        foreach ($changedOptions as $key => $value) {
+            $this->dbConfig->setOption($id, $key, $value);
+        }
+
+        if ($updatedStorage->getMountPoint() !== $oldStorage->getMountPoint()) {
+            $this->dbConfig->setMountPoint($id, $updatedStorage->getMountPoint());
+        }
+
+        if ($updatedStorage->getAuthMechanism()->getIdentifier() !== $oldStorage->getAuthMechanism()->getIdentifier()) {
+            $this->dbConfig->setAuthBackend($id, $updatedStorage->getAuthMechanism()->getIdentifier());
+        }
+
+        $this->triggerChangeHooks($oldStorage, $updatedStorage);
+
+        if (($wasGlobal && !$isGlobal) || count($removedGroups) > 0) { // to expensive to properly handle these on the fly
+            $this->userMountCache->remoteStorageMounts($this->getStorageId($updatedStorage));
+        } else {
+            $storageId = $this->getStorageId($updatedStorage);
+            foreach ($removedUsers as $userId) {
+                $this->userMountCache->removeUserStorageMount($storageId, $userId);
+            }
+        }
+
+        $this->updateOverwriteHomeFolders();
+
+        return $this->getStorage($id);
+    }
+
+    /**
+     * Delete the storage with the given id.
+     *
+     * @param int $id storage id
+     *
+     * @throws NotFoundException if no storage was found with the given id
+     */
+    public function removeStorage(int $id) {
+        $existingMount = $this->dbConfig->getMountById($id);
+
+        if (!is_array($existingMount)) {
+            throw new NotFoundException('Storage with ID "' . $id . '" not found');
+        }
+
+        $this->dbConfig->removeMount($id);
+
+        $deletedStorage = $this->getStorageConfigFromDBMount($existingMount);
+        $this->triggerHooks($deletedStorage, Filesystem::signal_delete_mount);
+
+        // delete oc_storages entries and oc_filecache
+        Storage::cleanByMountId($id);
+
+        $this->updateOverwriteHomeFolders();
+    }
+
+    /**
+     * Construct the storage implementation
+     *
+     * @param StorageConfig $storageConfig
+     * @return int
+     */
+    private function getStorageId(StorageConfig $storageConfig) {
+        try {
+            $class = $storageConfig->getBackend()->getStorageClass();
+            /** @var \OC\Files\Storage\Storage $storage */
+            $storage = new $class($storageConfig->getBackendOptions());
+
+            // auth mechanism should fire first
+            $storage = $storageConfig->getBackend()->wrapStorage($storage);
+            $storage = $storageConfig->getAuthMechanism()->wrapStorage($storage);
+
+            /** @var \OC\Files\Storage\Storage $storage */
+            return $storage->getStorageCache()->getNumericId();
+        } catch (\Exception $e) {
+            return -1;
+        }
+    }
+
+    public function updateOverwriteHomeFolders(): void {
+        $appIdsList = $this->appConfig->getValueArray(FilesApplication::APP_ID, ConfigLexicon::OVERWRITES_HOME_FOLDERS);
+
+        if ($this->dbConfig->hasHomeFolderOverwriteMount()) {
+            if (!in_array(Application::APP_ID, $appIdsList)) {
+                $appIdsList[] = Application::APP_ID;
+                $this->appConfig->setValueArray(FilesApplication::APP_ID, ConfigLexicon::OVERWRITES_HOME_FOLDERS, $appIdsList);
+            }
+        } else {
+            if (in_array(Application::APP_ID, $appIdsList)) {
+                $appIdsList = array_values(array_filter($appIdsList, fn ($v) => $v !== Application::APP_ID));
+                $this->appConfig->setValueArray(FilesApplication::APP_ID, ConfigLexicon::OVERWRITES_HOME_FOLDERS, $appIdsList);
+            }
+        }
+    }
 }

apps/files_external/lib/Service/UserStoragesService.php

Indentation +94 added lines, -94 removed lines

@@ -21,110 +21,110 @@
  * (aka personal storages)
  */
 class UserStoragesService extends StoragesService {
-	use UserTrait;
+    use UserTrait;
 
-	/**
-	 * Create a user storages service
-	 */
-	public function __construct(
-		BackendService $backendService,
-		DBConfigService $dbConfig,
-		IUserSession $userSession,
-		IUserMountCache $userMountCache,
-		IEventDispatcher $eventDispatcher,
-		IAppConfig $appConfig,
-	) {
-		$this->userSession = $userSession;
-		parent::__construct($backendService, $dbConfig, $userMountCache, $eventDispatcher, $appConfig);
-	}
+    /**
+     * Create a user storages service
+     */
+    public function __construct(
+        BackendService $backendService,
+        DBConfigService $dbConfig,
+        IUserSession $userSession,
+        IUserMountCache $userMountCache,
+        IEventDispatcher $eventDispatcher,
+        IAppConfig $appConfig,
+    ) {
+        $this->userSession = $userSession;
+        parent::__construct($backendService, $dbConfig, $userMountCache, $eventDispatcher, $appConfig);
+    }
 
-	protected function readDBConfig() {
-		return $this->dbConfig->getUserMountsFor(DBConfigService::APPLICABLE_TYPE_USER, $this->getUser()->getUID());
-	}
+    protected function readDBConfig() {
+        return $this->dbConfig->getUserMountsFor(DBConfigService::APPLICABLE_TYPE_USER, $this->getUser()->getUID());
+    }
 
-	/**
-	 * Triggers $signal for all applicable users of the given
-	 * storage
-	 *
-	 * @param StorageConfig $storage storage data
-	 * @param string $signal signal to trigger
-	 */
-	protected function triggerHooks(StorageConfig $storage, $signal) {
-		$user = $this->getUser()->getUID();
+    /**
+     * Triggers $signal for all applicable users of the given
+     * storage
+     *
+     * @param StorageConfig $storage storage data
+     * @param string $signal signal to trigger
+     */
+    protected function triggerHooks(StorageConfig $storage, $signal) {
+        $user = $this->getUser()->getUID();
 
-		// trigger hook for the current user
-		$this->triggerApplicableHooks(
-			$signal,
-			$storage->getMountPoint(),
-			MountConfig::MOUNT_TYPE_USER,
-			[$user]
-		);
-	}
+        // trigger hook for the current user
+        $this->triggerApplicableHooks(
+            $signal,
+            $storage->getMountPoint(),
+            MountConfig::MOUNT_TYPE_USER,
+            [$user]
+        );
+    }
 
-	/**
-	 * Triggers signal_create_mount or signal_delete_mount to
-	 * accommodate for additions/deletions in applicableUsers
-	 * and applicableGroups fields.
-	 *
-	 * @param StorageConfig $oldStorage old storage data
-	 * @param StorageConfig $newStorage new storage data
-	 */
-	protected function triggerChangeHooks(StorageConfig $oldStorage, StorageConfig $newStorage) {
-		// if mount point changed, it's like a deletion + creation
-		if ($oldStorage->getMountPoint() !== $newStorage->getMountPoint()) {
-			$this->triggerHooks($oldStorage, Filesystem::signal_delete_mount);
-			$this->triggerHooks($newStorage, Filesystem::signal_create_mount);
-		}
-	}
+    /**
+     * Triggers signal_create_mount or signal_delete_mount to
+     * accommodate for additions/deletions in applicableUsers
+     * and applicableGroups fields.
+     *
+     * @param StorageConfig $oldStorage old storage data
+     * @param StorageConfig $newStorage new storage data
+     */
+    protected function triggerChangeHooks(StorageConfig $oldStorage, StorageConfig $newStorage) {
+        // if mount point changed, it's like a deletion + creation
+        if ($oldStorage->getMountPoint() !== $newStorage->getMountPoint()) {
+            $this->triggerHooks($oldStorage, Filesystem::signal_delete_mount);
+            $this->triggerHooks($newStorage, Filesystem::signal_create_mount);
+        }
+    }
 
-	protected function getType() {
-		return DBConfigService::MOUNT_TYPE_PERSONAL;
-	}
+    protected function getType() {
+        return DBConfigService::MOUNT_TYPE_PERSONAL;
+    }
 
-	/**
-	 * Add new storage to the configuration
-	 *
-	 * @param StorageConfig $newStorage storage attributes
-	 *
-	 * @return StorageConfig storage config, with added id
-	 */
-	public function addStorage(StorageConfig $newStorage) {
-		$newStorage->setApplicableUsers([$this->getUser()->getUID()]);
-		return parent::addStorage($newStorage);
-	}
+    /**
+     * Add new storage to the configuration
+     *
+     * @param StorageConfig $newStorage storage attributes
+     *
+     * @return StorageConfig storage config, with added id
+     */
+    public function addStorage(StorageConfig $newStorage) {
+        $newStorage->setApplicableUsers([$this->getUser()->getUID()]);
+        return parent::addStorage($newStorage);
+    }
 
-	/**
-	 * Update storage to the configuration
-	 *
-	 * @param StorageConfig $updatedStorage storage attributes
-	 *
-	 * @return StorageConfig storage config
-	 * @throws NotFoundException if the given storage does not exist in the config
-	 */
-	public function updateStorage(StorageConfig $updatedStorage) {
-		// verify ownership through $this->isApplicable() and otherwise throws an exception
-		$this->getStorage($updatedStorage->getId());
+    /**
+     * Update storage to the configuration
+     *
+     * @param StorageConfig $updatedStorage storage attributes
+     *
+     * @return StorageConfig storage config
+     * @throws NotFoundException if the given storage does not exist in the config
+     */
+    public function updateStorage(StorageConfig $updatedStorage) {
+        // verify ownership through $this->isApplicable() and otherwise throws an exception
+        $this->getStorage($updatedStorage->getId());
 
-		$updatedStorage->setApplicableUsers([$this->getUser()->getUID()]);
-		return parent::updateStorage($updatedStorage);
-	}
+        $updatedStorage->setApplicableUsers([$this->getUser()->getUID()]);
+        return parent::updateStorage($updatedStorage);
+    }
 
-	/**
-	 * Get the visibility type for this controller, used in validation
-	 *
-	 * @return int BackendService::VISIBILITY_* constants
-	 */
-	public function getVisibilityType() {
-		return BackendService::VISIBILITY_PERSONAL;
-	}
+    /**
+     * Get the visibility type for this controller, used in validation
+     *
+     * @return int BackendService::VISIBILITY_* constants
+     */
+    public function getVisibilityType() {
+        return BackendService::VISIBILITY_PERSONAL;
+    }
 
-	protected function isApplicable(StorageConfig $config) {
-		return ($config->getApplicableUsers() === [$this->getUser()->getUID()]) && $config->getType() === StorageConfig::MOUNT_TYPE_PERSONAL;
-	}
+    protected function isApplicable(StorageConfig $config) {
+        return ($config->getApplicableUsers() === [$this->getUser()->getUID()]) && $config->getType() === StorageConfig::MOUNT_TYPE_PERSONAL;
+    }
 
-	public function removeStorage($id) {
-		// verify ownership through $this->isApplicable() and otherwise throws an exception
-		$this->getStorage($id);
-		parent::removeStorage($id);
-	}
+    public function removeStorage($id) {
+        // verify ownership through $this->isApplicable() and otherwise throws an exception
+        $this->getStorage($id);
+        parent::removeStorage($id);
+    }
 }

apps/files_external/lib/Service/UserGlobalStoragesService.php

Indentation +158 added lines, -158 removed lines

@@ -20,162 +20,162 @@
  * Read-only access available, attempting to write will throw DomainException
  */
 class UserGlobalStoragesService extends GlobalStoragesService {
-	use UserTrait;
-
-	public function __construct(
-		BackendService $backendService,
-		DBConfigService $dbConfig,
-		IUserSession $userSession,
-		protected IGroupManager $groupManager,
-		IUserMountCache $userMountCache,
-		IEventDispatcher $eventDispatcher,
-		IAppConfig $appConfig,
-	) {
-		parent::__construct($backendService, $dbConfig, $userMountCache, $eventDispatcher, $appConfig);
-		$this->userSession = $userSession;
-	}
-
-	/**
-	 * Replace config hash ID with real IDs, for migrating legacy storages
-	 *
-	 * @param StorageConfig[] $storages Storages with real IDs
-	 * @param StorageConfig[] $storagesWithConfigHash Storages with config hash IDs
-	 */
-	protected function setRealStorageIds(array &$storages, array $storagesWithConfigHash) {
-		// as a read-only view, storage IDs don't need to be real
-		foreach ($storagesWithConfigHash as $storage) {
-			$storages[$storage->getId()] = $storage;
-		}
-	}
-
-	protected function readDBConfig() {
-		$userMounts = $this->dbConfig->getAdminMountsFor(DBConfigService::APPLICABLE_TYPE_USER, $this->getUser()->getUID());
-		$globalMounts = $this->dbConfig->getAdminMountsFor(DBConfigService::APPLICABLE_TYPE_GLOBAL, null);
-		$groups = $this->groupManager->getUserGroupIds($this->getUser());
-		if (count($groups) !== 0) {
-			$groupMounts = $this->dbConfig->getAdminMountsForMultiple(DBConfigService::APPLICABLE_TYPE_GROUP, $groups);
-		} else {
-			$groupMounts = [];
-		}
-		return array_merge($userMounts, $groupMounts, $globalMounts);
-	}
-
-	public function addStorage(StorageConfig $newStorage) {
-		throw new \DomainException('UserGlobalStoragesService writing disallowed');
-	}
-
-	public function updateStorage(StorageConfig $updatedStorage) {
-		throw new \DomainException('UserGlobalStoragesService writing disallowed');
-	}
-
-	/**
-	 * @param integer $id
-	 */
-	public function removeStorage($id) {
-		throw new \DomainException('UserGlobalStoragesService writing disallowed');
-	}
-
-	/**
-	 * Get unique storages, in case two are defined with the same mountpoint
-	 * Higher priority storages take precedence
-	 *
-	 * @return StorageConfig[]
-	 */
-	public function getUniqueStorages() {
-		$storages = $this->getStorages();
-
-		$storagesByMountpoint = [];
-		foreach ($storages as $storage) {
-			$storagesByMountpoint[$storage->getMountPoint()][] = $storage;
-		}
-
-		$result = [];
-		foreach ($storagesByMountpoint as $storageList) {
-			$storage = array_reduce($storageList, function ($carry, $item) {
-				if (isset($carry)) {
-					$carryPriorityType = $this->getPriorityType($carry);
-					$itemPriorityType = $this->getPriorityType($item);
-					if ($carryPriorityType > $itemPriorityType) {
-						return $carry;
-					} elseif ($carryPriorityType === $itemPriorityType) {
-						if ($carry->getPriority() > $item->getPriority()) {
-							return $carry;
-						}
-					}
-				}
-				return $item;
-			});
-			$result[$storage->getID()] = $storage;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Get a priority 'type', where a bigger number means higher priority
-	 * user applicable > group applicable > 'all'
-	 *
-	 * @param StorageConfig $storage
-	 * @return int
-	 */
-	protected function getPriorityType(StorageConfig $storage) {
-		$applicableUsers = $storage->getApplicableUsers();
-		$applicableGroups = $storage->getApplicableGroups();
-
-		if ($applicableUsers && $applicableUsers[0] !== 'all') {
-			return 2;
-		}
-		if ($applicableGroups) {
-			return 1;
-		}
-		return 0;
-	}
-
-	protected function isApplicable(StorageConfig $config) {
-		$applicableUsers = $config->getApplicableUsers();
-		$applicableGroups = $config->getApplicableGroups();
-
-		if (count($applicableUsers) === 0 && count($applicableGroups) === 0) {
-			return true;
-		}
-		if (in_array($this->getUser()->getUID(), $applicableUsers, true)) {
-			return true;
-		}
-		$groupIds = $this->groupManager->getUserGroupIds($this->getUser());
-		foreach ($groupIds as $groupId) {
-			if (in_array($groupId, $applicableGroups, true)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-
-	/**
-	 * Gets all storages for the user, admin, personal, global, etc
-	 *
-	 * @param IUser|null $user user to get the storages for, if not set the currently logged in user will be used
-	 * @return StorageConfig[] array of storage configs
-	 */
-	public function getAllStoragesForUser(?IUser $user = null) {
-		if (is_null($user)) {
-			$user = $this->getUser();
-		}
-		if (is_null($user)) {
-			return [];
-		}
-		$groupIds = $this->groupManager->getUserGroupIds($user);
-		$mounts = $this->dbConfig->getMountsForUser($user->getUID(), $groupIds);
-		$configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts);
-		$configs = array_filter($configs, function ($config) {
-			return $config instanceof StorageConfig;
-		});
-
-		$keys = array_map(function (StorageConfig $config) {
-			return $config->getId();
-		}, $configs);
-
-		$storages = array_combine($keys, $configs);
-		return array_filter($storages, [$this, 'validateStorage']);
-	}
+    use UserTrait;
+
+    public function __construct(
+        BackendService $backendService,
+        DBConfigService $dbConfig,
+        IUserSession $userSession,
+        protected IGroupManager $groupManager,
+        IUserMountCache $userMountCache,
+        IEventDispatcher $eventDispatcher,
+        IAppConfig $appConfig,
+    ) {
+        parent::__construct($backendService, $dbConfig, $userMountCache, $eventDispatcher, $appConfig);
+        $this->userSession = $userSession;
+    }
+
+    /**
+     * Replace config hash ID with real IDs, for migrating legacy storages
+     *
+     * @param StorageConfig[] $storages Storages with real IDs
+     * @param StorageConfig[] $storagesWithConfigHash Storages with config hash IDs
+     */
+    protected function setRealStorageIds(array &$storages, array $storagesWithConfigHash) {
+        // as a read-only view, storage IDs don't need to be real
+        foreach ($storagesWithConfigHash as $storage) {
+            $storages[$storage->getId()] = $storage;
+        }
+    }
+
+    protected function readDBConfig() {
+        $userMounts = $this->dbConfig->getAdminMountsFor(DBConfigService::APPLICABLE_TYPE_USER, $this->getUser()->getUID());
+        $globalMounts = $this->dbConfig->getAdminMountsFor(DBConfigService::APPLICABLE_TYPE_GLOBAL, null);
+        $groups = $this->groupManager->getUserGroupIds($this->getUser());
+        if (count($groups) !== 0) {
+            $groupMounts = $this->dbConfig->getAdminMountsForMultiple(DBConfigService::APPLICABLE_TYPE_GROUP, $groups);
+        } else {
+            $groupMounts = [];
+        }
+        return array_merge($userMounts, $groupMounts, $globalMounts);
+    }
+
+    public function addStorage(StorageConfig $newStorage) {
+        throw new \DomainException('UserGlobalStoragesService writing disallowed');
+    }
+
+    public function updateStorage(StorageConfig $updatedStorage) {
+        throw new \DomainException('UserGlobalStoragesService writing disallowed');
+    }
+
+    /**
+     * @param integer $id
+     */
+    public function removeStorage($id) {
+        throw new \DomainException('UserGlobalStoragesService writing disallowed');
+    }
+
+    /**
+     * Get unique storages, in case two are defined with the same mountpoint
+     * Higher priority storages take precedence
+     *
+     * @return StorageConfig[]
+     */
+    public function getUniqueStorages() {
+        $storages = $this->getStorages();
+
+        $storagesByMountpoint = [];
+        foreach ($storages as $storage) {
+            $storagesByMountpoint[$storage->getMountPoint()][] = $storage;
+        }
+
+        $result = [];
+        foreach ($storagesByMountpoint as $storageList) {
+            $storage = array_reduce($storageList, function ($carry, $item) {
+                if (isset($carry)) {
+                    $carryPriorityType = $this->getPriorityType($carry);
+                    $itemPriorityType = $this->getPriorityType($item);
+                    if ($carryPriorityType > $itemPriorityType) {
+                        return $carry;
+                    } elseif ($carryPriorityType === $itemPriorityType) {
+                        if ($carry->getPriority() > $item->getPriority()) {
+                            return $carry;
+                        }
+                    }
+                }
+                return $item;
+            });
+            $result[$storage->getID()] = $storage;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get a priority 'type', where a bigger number means higher priority
+     * user applicable > group applicable > 'all'
+     *
+     * @param StorageConfig $storage
+     * @return int
+     */
+    protected function getPriorityType(StorageConfig $storage) {
+        $applicableUsers = $storage->getApplicableUsers();
+        $applicableGroups = $storage->getApplicableGroups();
+
+        if ($applicableUsers && $applicableUsers[0] !== 'all') {
+            return 2;
+        }
+        if ($applicableGroups) {
+            return 1;
+        }
+        return 0;
+    }
+
+    protected function isApplicable(StorageConfig $config) {
+        $applicableUsers = $config->getApplicableUsers();
+        $applicableGroups = $config->getApplicableGroups();
+
+        if (count($applicableUsers) === 0 && count($applicableGroups) === 0) {
+            return true;
+        }
+        if (in_array($this->getUser()->getUID(), $applicableUsers, true)) {
+            return true;
+        }
+        $groupIds = $this->groupManager->getUserGroupIds($this->getUser());
+        foreach ($groupIds as $groupId) {
+            if (in_array($groupId, $applicableGroups, true)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    /**
+     * Gets all storages for the user, admin, personal, global, etc
+     *
+     * @param IUser|null $user user to get the storages for, if not set the currently logged in user will be used
+     * @return StorageConfig[] array of storage configs
+     */
+    public function getAllStoragesForUser(?IUser $user = null) {
+        if (is_null($user)) {
+            $user = $this->getUser();
+        }
+        if (is_null($user)) {
+            return [];
+        }
+        $groupIds = $this->groupManager->getUserGroupIds($user);
+        $mounts = $this->dbConfig->getMountsForUser($user->getUID(), $groupIds);
+        $configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts);
+        $configs = array_filter($configs, function ($config) {
+            return $config instanceof StorageConfig;
+        });
+
+        $keys = array_map(function (StorageConfig $config) {
+            return $config->getId();
+        }, $configs);
+
+        $storages = array_combine($keys, $configs);
+        return array_filter($storages, [$this, 'validateStorage']);
+    }
 }

apps/files_external/lib/Service/DBConfigService.php

Indentation +504 added lines, -504 removed lines

@@ -17,508 +17,508 @@
  * Stores the mount config in the database
  */
 class DBConfigService {
-	public const MOUNT_TYPE_ADMIN = 1;
-	public const MOUNT_TYPE_PERSONAL = 2;
-	/** @deprecated use MOUNT_TYPE_PERSONAL (full uppercase) instead */
-	public const MOUNT_TYPE_PERSONAl = 2;
-
-	public const APPLICABLE_TYPE_GLOBAL = 1;
-	public const APPLICABLE_TYPE_GROUP = 2;
-	public const APPLICABLE_TYPE_USER = 3;
-
-	public function __construct(
-		private IDBConnection $connection,
-		private ICrypto $crypto,
-	) {
-	}
-
-	public function getMountById(int $mountId): ?array {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select(['mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'type'])
-			->from('external_mounts', 'm')
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-		$mounts = $this->getMountsFromQuery($query);
-		if (count($mounts) > 0) {
-			return $mounts[0];
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Get all configured mounts
-	 *
-	 * @return array
-	 */
-	public function getAllMounts() {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select(['mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'type'])
-			->from('external_mounts');
-		return $this->getMountsFromQuery($query);
-	}
-
-	public function getMountsForUser($userId, $groupIds) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select(['m.mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'm.type'])
-			->from('external_mounts', 'm')
-			->innerJoin('m', 'external_applicable', 'a', $builder->expr()->eq('m.mount_id', 'a.mount_id'))
-			->where($builder->expr()->orX(
-				$builder->expr()->andX( // global mounts
-					$builder->expr()->eq('a.type', $builder->createNamedParameter(self::APPLICABLE_TYPE_GLOBAL, IQueryBuilder::PARAM_INT)),
-					$builder->expr()->isNull('a.value'),
-				),
-				$builder->expr()->andX( // mounts for user
-					$builder->expr()->eq('a.type', $builder->createNamedParameter(self::APPLICABLE_TYPE_USER, IQueryBuilder::PARAM_INT)),
-					$builder->expr()->eq('a.value', $builder->createNamedParameter($userId)),
-				),
-				$builder->expr()->andX( // mounts for group
-					$builder->expr()->eq('a.type', $builder->createNamedParameter(self::APPLICABLE_TYPE_GROUP, IQueryBuilder::PARAM_INT)),
-					$builder->expr()->in('a.value', $builder->createNamedParameter($groupIds, IQueryBuilder::PARAM_STR_ARRAY)),
-				),
-			));
-
-		return $this->getMountsFromQuery($query);
-	}
-
-	public function modifyMountsOnUserDelete(string $uid): void {
-		$this->modifyMountsOnDelete($uid, self::APPLICABLE_TYPE_USER);
-	}
-
-	public function modifyMountsOnGroupDelete(string $gid): void {
-		$this->modifyMountsOnDelete($gid, self::APPLICABLE_TYPE_GROUP);
-	}
-
-	protected function modifyMountsOnDelete(string $applicableId, int $applicableType): void {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select(['a.mount_id', $builder->func()->count('a.mount_id', 'count')])
-			->from('external_applicable', 'a')
-			->leftJoin('a', 'external_applicable', 'b', $builder->expr()->eq('a.mount_id', 'b.mount_id'))
-			->where($builder->expr()->andX(
-				$builder->expr()->eq('b.type', $builder->createNamedParameter($applicableType, IQueryBuilder::PARAM_INT)),
-				$builder->expr()->eq('b.value', $builder->createNamedParameter($applicableId)),
-			),
-			)
-			->groupBy(['a.mount_id']);
-		$stmt = $query->executeQuery();
-		$result = $stmt->fetchAll();
-		$stmt->closeCursor();
-
-		foreach ($result as $row) {
-			if ((int)$row['count'] > 1) {
-				$this->removeApplicable($row['mount_id'], $applicableType, $applicableId);
-			} else {
-				$this->removeMount($row['mount_id']);
-			}
-		}
-	}
-
-	/**
-	 * Get admin defined mounts
-	 *
-	 * @return array
-	 */
-	public function getAdminMounts() {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select(['mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'type'])
-			->from('external_mounts')
-			->where($builder->expr()->eq('type', $builder->expr()->literal(self::MOUNT_TYPE_ADMIN, IQueryBuilder::PARAM_INT)));
-		return $this->getMountsFromQuery($query);
-	}
-
-	protected function getForQuery(IQueryBuilder $builder, $type, $value) {
-		$query = $builder->select(['m.mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'm.type'])
-			->from('external_mounts', 'm')
-			->innerJoin('m', 'external_applicable', 'a', $builder->expr()->eq('m.mount_id', 'a.mount_id'))
-			->where($builder->expr()->eq('a.type', $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)));
-
-		if (is_null($value)) {
-			$query = $query->andWhere($builder->expr()->isNull('a.value'));
-		} else {
-			$query = $query->andWhere($builder->expr()->eq('a.value', $builder->createNamedParameter($value)));
-		}
-
-		return $query;
-	}
-
-	/**
-	 * Get mounts by applicable
-	 *
-	 * @param int $type any of the self::APPLICABLE_TYPE_ constants
-	 * @param string|null $value user_id, group_id or null for global mounts
-	 * @return array
-	 */
-	public function getMountsFor($type, $value) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $this->getForQuery($builder, $type, $value);
-
-		return $this->getMountsFromQuery($query);
-	}
-
-	/**
-	 * Get admin defined mounts by applicable
-	 *
-	 * @param int $type any of the self::APPLICABLE_TYPE_ constants
-	 * @param string|null $value user_id, group_id or null for global mounts
-	 * @return array
-	 */
-	public function getAdminMountsFor($type, $value) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $this->getForQuery($builder, $type, $value);
-		$query->andWhere($builder->expr()->eq('m.type', $builder->expr()->literal(self::MOUNT_TYPE_ADMIN, IQueryBuilder::PARAM_INT)));
-
-		return $this->getMountsFromQuery($query);
-	}
-
-	/**
-	 * Get admin defined mounts for multiple applicable
-	 *
-	 * @param int $type any of the self::APPLICABLE_TYPE_ constants
-	 * @param string[] $values user_ids or group_ids
-	 * @return array
-	 */
-	public function getAdminMountsForMultiple($type, array $values) {
-		$builder = $this->connection->getQueryBuilder();
-		$params = array_map(function ($value) use ($builder) {
-			return $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR);
-		}, $values);
-
-		$query = $builder->select(['m.mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'm.type'])
-			->from('external_mounts', 'm')
-			->innerJoin('m', 'external_applicable', 'a', $builder->expr()->eq('m.mount_id', 'a.mount_id'))
-			->where($builder->expr()->eq('a.type', $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)))
-			->andWhere($builder->expr()->in('a.value', $params));
-		$query->andWhere($builder->expr()->eq('m.type', $builder->expr()->literal(self::MOUNT_TYPE_ADMIN, IQueryBuilder::PARAM_INT)));
-
-		return $this->getMountsFromQuery($query);
-	}
-
-	/**
-	 * Get user defined mounts by applicable
-	 *
-	 * @param int $type any of the self::APPLICABLE_TYPE_ constants
-	 * @param string|null $value user_id, group_id or null for global mounts
-	 * @return array
-	 */
-	public function getUserMountsFor($type, $value) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $this->getForQuery($builder, $type, $value);
-		$query->andWhere($builder->expr()->eq('m.type', $builder->expr()->literal(self::MOUNT_TYPE_PERSONAL, IQueryBuilder::PARAM_INT)));
-
-		return $this->getMountsFromQuery($query);
-	}
-
-	/**
-	 * Add a mount to the database
-	 *
-	 * @param string $mountPoint
-	 * @param string $storageBackend
-	 * @param string $authBackend
-	 * @param int $priority
-	 * @param int $type self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAL
-	 * @return int the id of the new mount
-	 */
-	public function addMount($mountPoint, $storageBackend, $authBackend, $priority, $type) {
-		if (!$priority) {
-			$priority = 100;
-		}
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->insert('external_mounts')
-			->values([
-				'mount_point' => $builder->createNamedParameter($mountPoint, IQueryBuilder::PARAM_STR),
-				'storage_backend' => $builder->createNamedParameter($storageBackend, IQueryBuilder::PARAM_STR),
-				'auth_backend' => $builder->createNamedParameter($authBackend, IQueryBuilder::PARAM_STR),
-				'priority' => $builder->createNamedParameter($priority, IQueryBuilder::PARAM_INT),
-				'type' => $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT),
-			]);
-		$query->executeStatement();
-		return $query->getLastInsertId();
-	}
-
-	/**
-	 * Remove a mount from the database
-	 *
-	 * @param int $mountId
-	 */
-	public function removeMount($mountId) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->delete('external_mounts')
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->delete('external_applicable')
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->delete('external_config')
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->delete('external_options')
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-	}
-
-	/**
-	 * @param int $mountId
-	 * @param string $newMountPoint
-	 */
-	public function setMountPoint($mountId, $newMountPoint) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->update('external_mounts')
-			->set('mount_point', $builder->createNamedParameter($newMountPoint))
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-
-		$query->executeStatement();
-	}
-
-	/**
-	 * @param int $mountId
-	 * @param string $newAuthBackend
-	 */
-	public function setAuthBackend($mountId, $newAuthBackend) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->update('external_mounts')
-			->set('auth_backend', $builder->createNamedParameter($newAuthBackend))
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-
-		$query->executeStatement();
-	}
-
-	/**
-	 * @param int $mountId
-	 * @param string $key
-	 * @param string $value
-	 */
-	public function setConfig($mountId, $key, $value) {
-		if ($key === 'password') {
-			$value = $this->encryptValue($value);
-		}
-
-		try {
-			$builder = $this->connection->getQueryBuilder();
-			$builder->insert('external_config')
-				->setValue('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT))
-				->setValue('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR))
-				->setValue('value', $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR))
-				->executeStatement();
-		} catch (Exception $e) {
-			if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-				throw $e;
-			}
-			$builder = $this->connection->getQueryBuilder();
-			$query = $builder->update('external_config')
-				->set('value', $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR))
-				->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
-				->andWhere($builder->expr()->eq('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR)));
-			$query->executeStatement();
-		}
-	}
-
-	/**
-	 * @param int $mountId
-	 * @param string $key
-	 * @param string $value
-	 */
-	public function setOption($mountId, $key, $value) {
-		try {
-			$builder = $this->connection->getQueryBuilder();
-			$builder->insert('external_options')
-				->setValue('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT))
-				->setValue('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR))
-				->setValue('value', $builder->createNamedParameter(json_encode($value), IQueryBuilder::PARAM_STR))
-				->executeStatement();
-		} catch (Exception $e) {
-			if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-				throw $e;
-			}
-			$builder = $this->connection->getQueryBuilder();
-			$query = $builder->update('external_options')
-				->set('value', $builder->createNamedParameter(json_encode($value), IQueryBuilder::PARAM_STR))
-				->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
-				->andWhere($builder->expr()->eq('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR)));
-			$query->executeStatement();
-		}
-	}
-
-	public function addApplicable($mountId, $type, $value) {
-		try {
-			$builder = $this->connection->getQueryBuilder();
-			$builder->insert('external_applicable')
-				->setValue('mount_id', $builder->createNamedParameter($mountId))
-				->setValue('type', $builder->createNamedParameter($type))
-				->setValue('value', $builder->createNamedParameter($value))
-				->executeStatement();
-		} catch (Exception $e) {
-			// applicable exists already
-			if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-				throw $e;
-			}
-		}
-	}
-
-	public function removeApplicable($mountId, $type, $value) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->delete('external_applicable')
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
-			->andWhere($builder->expr()->eq('type', $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)));
-
-		if (is_null($value)) {
-			$query = $query->andWhere($builder->expr()->isNull('value'));
-		} else {
-			$query = $query->andWhere($builder->expr()->eq('value', $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR)));
-		}
-
-		$query->executeStatement();
-	}
-
-	private function getMountsFromQuery(IQueryBuilder $query) {
-		$result = $query->executeQuery();
-		$mounts = $result->fetchAll();
-		$uniqueMounts = [];
-		foreach ($mounts as $mount) {
-			$id = $mount['mount_id'];
-			if (!isset($uniqueMounts[$id])) {
-				$uniqueMounts[$id] = $mount;
-			}
-		}
-		$uniqueMounts = array_values($uniqueMounts);
-
-		$mountIds = array_map(function ($mount) {
-			return $mount['mount_id'];
-		}, $uniqueMounts);
-		$mountIds = array_values(array_unique($mountIds));
-
-		$applicable = $this->getApplicableForMounts($mountIds);
-		$config = $this->getConfigForMounts($mountIds);
-		$options = $this->getOptionsForMounts($mountIds);
-
-		return array_map(function ($mount, $applicable, $config, $options) {
-			$mount['type'] = (int)$mount['type'];
-			$mount['priority'] = (int)$mount['priority'];
-			$mount['applicable'] = $applicable;
-			$mount['config'] = $config;
-			$mount['options'] = $options;
-			return $mount;
-		}, $uniqueMounts, $applicable, $config, $options);
-	}
-
-	/**
-	 * Get mount options from a table grouped by mount id
-	 *
-	 * @param string $table
-	 * @param string[] $fields
-	 * @param int[] $mountIds
-	 * @return array [$mountId => [['field1' => $value1, ...], ...], ...]
-	 */
-	private function selectForMounts($table, array $fields, array $mountIds) {
-		if (count($mountIds) === 0) {
-			return [];
-		}
-		$builder = $this->connection->getQueryBuilder();
-		$fields[] = 'mount_id';
-		$placeHolders = array_map(function ($id) use ($builder) {
-			return $builder->createPositionalParameter($id, IQueryBuilder::PARAM_INT);
-		}, $mountIds);
-		$query = $builder->select($fields)
-			->from($table)
-			->where($builder->expr()->in('mount_id', $placeHolders));
-
-		$result = $query->executeQuery();
-		$rows = $result->fetchAll();
-		$result->closeCursor();
-
-		$result = [];
-		foreach ($mountIds as $mountId) {
-			$result[$mountId] = [];
-		}
-		foreach ($rows as $row) {
-			if (isset($row['type'])) {
-				$row['type'] = (int)$row['type'];
-			}
-			$result[$row['mount_id']][] = $row;
-		}
-		return $result;
-	}
-
-	/**
-	 * @param int[] $mountIds
-	 * @return array [$id => [['type' => $type, 'value' => $value], ...], ...]
-	 */
-	public function getApplicableForMounts($mountIds) {
-		return $this->selectForMounts('external_applicable', ['type', 'value'], $mountIds);
-	}
-
-	/**
-	 * @param int[] $mountIds
-	 * @return array [$id => ['key1' => $value1, ...], ...]
-	 */
-	public function getConfigForMounts($mountIds) {
-		$mountConfigs = $this->selectForMounts('external_config', ['key', 'value'], $mountIds);
-		return array_map([$this, 'createKeyValueMap'], $mountConfigs);
-	}
-
-	/**
-	 * @param int[] $mountIds
-	 * @return array [$id => ['key1' => $value1, ...], ...]
-	 */
-	public function getOptionsForMounts($mountIds) {
-		$mountOptions = $this->selectForMounts('external_options', ['key', 'value'], $mountIds);
-		$optionsMap = array_map([$this, 'createKeyValueMap'], $mountOptions);
-		return array_map(function (array $options) {
-			return array_map(function ($option) {
-				return json_decode($option);
-			}, $options);
-		}, $optionsMap);
-	}
-
-	/**
-	 * @param array $keyValuePairs [['key'=>$key, 'value=>$value], ...]
-	 * @return array ['key1' => $value1, ...]
-	 */
-	private function createKeyValueMap(array $keyValuePairs) {
-		$decryptedPairts = array_map(function ($pair) {
-			if ($pair['key'] === 'password') {
-				$pair['value'] = $this->decryptValue($pair['value']);
-			}
-			return $pair;
-		}, $keyValuePairs);
-		$keys = array_map(function ($pair) {
-			return $pair['key'];
-		}, $decryptedPairts);
-		$values = array_map(function ($pair) {
-			return $pair['value'];
-		}, $decryptedPairts);
-
-		return array_combine($keys, $values);
-	}
-
-	private function encryptValue($value) {
-		return $this->crypto->encrypt($value);
-	}
-
-	private function decryptValue($value) {
-		try {
-			return $this->crypto->decrypt($value);
-		} catch (\Exception $e) {
-			return $value;
-		}
-	}
-
-	/**
-	 * Check if any mountpoint is configured that overwrite the home folder
-	 */
-	public function hasHomeFolderOverwriteMount(): bool {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select('mount_id')
-			->from('external_mounts')
-			->where($builder->expr()->eq('mount_point', $builder->createNamedParameter('/')))
-			->setMaxResults(1);
-		$result = $query->executeQuery();
-		return count($result->fetchAll()) > 0;
-	}
+    public const MOUNT_TYPE_ADMIN = 1;
+    public const MOUNT_TYPE_PERSONAL = 2;
+    /** @deprecated use MOUNT_TYPE_PERSONAL (full uppercase) instead */
+    public const MOUNT_TYPE_PERSONAl = 2;
+
+    public const APPLICABLE_TYPE_GLOBAL = 1;
+    public const APPLICABLE_TYPE_GROUP = 2;
+    public const APPLICABLE_TYPE_USER = 3;
+
+    public function __construct(
+        private IDBConnection $connection,
+        private ICrypto $crypto,
+    ) {
+    }
+
+    public function getMountById(int $mountId): ?array {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select(['mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'type'])
+            ->from('external_mounts', 'm')
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+        $mounts = $this->getMountsFromQuery($query);
+        if (count($mounts) > 0) {
+            return $mounts[0];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Get all configured mounts
+     *
+     * @return array
+     */
+    public function getAllMounts() {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select(['mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'type'])
+            ->from('external_mounts');
+        return $this->getMountsFromQuery($query);
+    }
+
+    public function getMountsForUser($userId, $groupIds) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select(['m.mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'm.type'])
+            ->from('external_mounts', 'm')
+            ->innerJoin('m', 'external_applicable', 'a', $builder->expr()->eq('m.mount_id', 'a.mount_id'))
+            ->where($builder->expr()->orX(
+                $builder->expr()->andX( // global mounts
+                    $builder->expr()->eq('a.type', $builder->createNamedParameter(self::APPLICABLE_TYPE_GLOBAL, IQueryBuilder::PARAM_INT)),
+                    $builder->expr()->isNull('a.value'),
+                ),
+                $builder->expr()->andX( // mounts for user
+                    $builder->expr()->eq('a.type', $builder->createNamedParameter(self::APPLICABLE_TYPE_USER, IQueryBuilder::PARAM_INT)),
+                    $builder->expr()->eq('a.value', $builder->createNamedParameter($userId)),
+                ),
+                $builder->expr()->andX( // mounts for group
+                    $builder->expr()->eq('a.type', $builder->createNamedParameter(self::APPLICABLE_TYPE_GROUP, IQueryBuilder::PARAM_INT)),
+                    $builder->expr()->in('a.value', $builder->createNamedParameter($groupIds, IQueryBuilder::PARAM_STR_ARRAY)),
+                ),
+            ));
+
+        return $this->getMountsFromQuery($query);
+    }
+
+    public function modifyMountsOnUserDelete(string $uid): void {
+        $this->modifyMountsOnDelete($uid, self::APPLICABLE_TYPE_USER);
+    }
+
+    public function modifyMountsOnGroupDelete(string $gid): void {
+        $this->modifyMountsOnDelete($gid, self::APPLICABLE_TYPE_GROUP);
+    }
+
+    protected function modifyMountsOnDelete(string $applicableId, int $applicableType): void {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select(['a.mount_id', $builder->func()->count('a.mount_id', 'count')])
+            ->from('external_applicable', 'a')
+            ->leftJoin('a', 'external_applicable', 'b', $builder->expr()->eq('a.mount_id', 'b.mount_id'))
+            ->where($builder->expr()->andX(
+                $builder->expr()->eq('b.type', $builder->createNamedParameter($applicableType, IQueryBuilder::PARAM_INT)),
+                $builder->expr()->eq('b.value', $builder->createNamedParameter($applicableId)),
+            ),
+            )
+            ->groupBy(['a.mount_id']);
+        $stmt = $query->executeQuery();
+        $result = $stmt->fetchAll();
+        $stmt->closeCursor();
+
+        foreach ($result as $row) {
+            if ((int)$row['count'] > 1) {
+                $this->removeApplicable($row['mount_id'], $applicableType, $applicableId);
+            } else {
+                $this->removeMount($row['mount_id']);
+            }
+        }
+    }
+
+    /**
+     * Get admin defined mounts
+     *
+     * @return array
+     */
+    public function getAdminMounts() {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select(['mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'type'])
+            ->from('external_mounts')
+            ->where($builder->expr()->eq('type', $builder->expr()->literal(self::MOUNT_TYPE_ADMIN, IQueryBuilder::PARAM_INT)));
+        return $this->getMountsFromQuery($query);
+    }
+
+    protected function getForQuery(IQueryBuilder $builder, $type, $value) {
+        $query = $builder->select(['m.mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'm.type'])
+            ->from('external_mounts', 'm')
+            ->innerJoin('m', 'external_applicable', 'a', $builder->expr()->eq('m.mount_id', 'a.mount_id'))
+            ->where($builder->expr()->eq('a.type', $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)));
+
+        if (is_null($value)) {
+            $query = $query->andWhere($builder->expr()->isNull('a.value'));
+        } else {
+            $query = $query->andWhere($builder->expr()->eq('a.value', $builder->createNamedParameter($value)));
+        }
+
+        return $query;
+    }
+
+    /**
+     * Get mounts by applicable
+     *
+     * @param int $type any of the self::APPLICABLE_TYPE_ constants
+     * @param string|null $value user_id, group_id or null for global mounts
+     * @return array
+     */
+    public function getMountsFor($type, $value) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $this->getForQuery($builder, $type, $value);
+
+        return $this->getMountsFromQuery($query);
+    }
+
+    /**
+     * Get admin defined mounts by applicable
+     *
+     * @param int $type any of the self::APPLICABLE_TYPE_ constants
+     * @param string|null $value user_id, group_id or null for global mounts
+     * @return array
+     */
+    public function getAdminMountsFor($type, $value) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $this->getForQuery($builder, $type, $value);
+        $query->andWhere($builder->expr()->eq('m.type', $builder->expr()->literal(self::MOUNT_TYPE_ADMIN, IQueryBuilder::PARAM_INT)));
+
+        return $this->getMountsFromQuery($query);
+    }
+
+    /**
+     * Get admin defined mounts for multiple applicable
+     *
+     * @param int $type any of the self::APPLICABLE_TYPE_ constants
+     * @param string[] $values user_ids or group_ids
+     * @return array
+     */
+    public function getAdminMountsForMultiple($type, array $values) {
+        $builder = $this->connection->getQueryBuilder();
+        $params = array_map(function ($value) use ($builder) {
+            return $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR);
+        }, $values);
+
+        $query = $builder->select(['m.mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'm.type'])
+            ->from('external_mounts', 'm')
+            ->innerJoin('m', 'external_applicable', 'a', $builder->expr()->eq('m.mount_id', 'a.mount_id'))
+            ->where($builder->expr()->eq('a.type', $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)))
+            ->andWhere($builder->expr()->in('a.value', $params));
+        $query->andWhere($builder->expr()->eq('m.type', $builder->expr()->literal(self::MOUNT_TYPE_ADMIN, IQueryBuilder::PARAM_INT)));
+
+        return $this->getMountsFromQuery($query);
+    }
+
+    /**
+     * Get user defined mounts by applicable
+     *
+     * @param int $type any of the self::APPLICABLE_TYPE_ constants
+     * @param string|null $value user_id, group_id or null for global mounts
+     * @return array
+     */
+    public function getUserMountsFor($type, $value) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $this->getForQuery($builder, $type, $value);
+        $query->andWhere($builder->expr()->eq('m.type', $builder->expr()->literal(self::MOUNT_TYPE_PERSONAL, IQueryBuilder::PARAM_INT)));
+
+        return $this->getMountsFromQuery($query);
+    }
+
+    /**
+     * Add a mount to the database
+     *
+     * @param string $mountPoint
+     * @param string $storageBackend
+     * @param string $authBackend
+     * @param int $priority
+     * @param int $type self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAL
+     * @return int the id of the new mount
+     */
+    public function addMount($mountPoint, $storageBackend, $authBackend, $priority, $type) {
+        if (!$priority) {
+            $priority = 100;
+        }
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->insert('external_mounts')
+            ->values([
+                'mount_point' => $builder->createNamedParameter($mountPoint, IQueryBuilder::PARAM_STR),
+                'storage_backend' => $builder->createNamedParameter($storageBackend, IQueryBuilder::PARAM_STR),
+                'auth_backend' => $builder->createNamedParameter($authBackend, IQueryBuilder::PARAM_STR),
+                'priority' => $builder->createNamedParameter($priority, IQueryBuilder::PARAM_INT),
+                'type' => $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT),
+            ]);
+        $query->executeStatement();
+        return $query->getLastInsertId();
+    }
+
+    /**
+     * Remove a mount from the database
+     *
+     * @param int $mountId
+     */
+    public function removeMount($mountId) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->delete('external_mounts')
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->delete('external_applicable')
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->delete('external_config')
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->delete('external_options')
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+    }
+
+    /**
+     * @param int $mountId
+     * @param string $newMountPoint
+     */
+    public function setMountPoint($mountId, $newMountPoint) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->update('external_mounts')
+            ->set('mount_point', $builder->createNamedParameter($newMountPoint))
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+
+        $query->executeStatement();
+    }
+
+    /**
+     * @param int $mountId
+     * @param string $newAuthBackend
+     */
+    public function setAuthBackend($mountId, $newAuthBackend) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->update('external_mounts')
+            ->set('auth_backend', $builder->createNamedParameter($newAuthBackend))
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+
+        $query->executeStatement();
+    }
+
+    /**
+     * @param int $mountId
+     * @param string $key
+     * @param string $value
+     */
+    public function setConfig($mountId, $key, $value) {
+        if ($key === 'password') {
+            $value = $this->encryptValue($value);
+        }
+
+        try {
+            $builder = $this->connection->getQueryBuilder();
+            $builder->insert('external_config')
+                ->setValue('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT))
+                ->setValue('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR))
+                ->setValue('value', $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR))
+                ->executeStatement();
+        } catch (Exception $e) {
+            if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                throw $e;
+            }
+            $builder = $this->connection->getQueryBuilder();
+            $query = $builder->update('external_config')
+                ->set('value', $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR))
+                ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
+                ->andWhere($builder->expr()->eq('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR)));
+            $query->executeStatement();
+        }
+    }
+
+    /**
+     * @param int $mountId
+     * @param string $key
+     * @param string $value
+     */
+    public function setOption($mountId, $key, $value) {
+        try {
+            $builder = $this->connection->getQueryBuilder();
+            $builder->insert('external_options')
+                ->setValue('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT))
+                ->setValue('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR))
+                ->setValue('value', $builder->createNamedParameter(json_encode($value), IQueryBuilder::PARAM_STR))
+                ->executeStatement();
+        } catch (Exception $e) {
+            if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                throw $e;
+            }
+            $builder = $this->connection->getQueryBuilder();
+            $query = $builder->update('external_options')
+                ->set('value', $builder->createNamedParameter(json_encode($value), IQueryBuilder::PARAM_STR))
+                ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
+                ->andWhere($builder->expr()->eq('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR)));
+            $query->executeStatement();
+        }
+    }
+
+    public function addApplicable($mountId, $type, $value) {
+        try {
+            $builder = $this->connection->getQueryBuilder();
+            $builder->insert('external_applicable')
+                ->setValue('mount_id', $builder->createNamedParameter($mountId))
+                ->setValue('type', $builder->createNamedParameter($type))
+                ->setValue('value', $builder->createNamedParameter($value))
+                ->executeStatement();
+        } catch (Exception $e) {
+            // applicable exists already
+            if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                throw $e;
+            }
+        }
+    }
+
+    public function removeApplicable($mountId, $type, $value) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->delete('external_applicable')
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
+            ->andWhere($builder->expr()->eq('type', $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)));
+
+        if (is_null($value)) {
+            $query = $query->andWhere($builder->expr()->isNull('value'));
+        } else {
+            $query = $query->andWhere($builder->expr()->eq('value', $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR)));
+        }
+
+        $query->executeStatement();
+    }
+
+    private function getMountsFromQuery(IQueryBuilder $query) {
+        $result = $query->executeQuery();
+        $mounts = $result->fetchAll();
+        $uniqueMounts = [];
+        foreach ($mounts as $mount) {
+            $id = $mount['mount_id'];
+            if (!isset($uniqueMounts[$id])) {
+                $uniqueMounts[$id] = $mount;
+            }
+        }
+        $uniqueMounts = array_values($uniqueMounts);
+
+        $mountIds = array_map(function ($mount) {
+            return $mount['mount_id'];
+        }, $uniqueMounts);
+        $mountIds = array_values(array_unique($mountIds));
+
+        $applicable = $this->getApplicableForMounts($mountIds);
+        $config = $this->getConfigForMounts($mountIds);
+        $options = $this->getOptionsForMounts($mountIds);
+
+        return array_map(function ($mount, $applicable, $config, $options) {
+            $mount['type'] = (int)$mount['type'];
+            $mount['priority'] = (int)$mount['priority'];
+            $mount['applicable'] = $applicable;
+            $mount['config'] = $config;
+            $mount['options'] = $options;
+            return $mount;
+        }, $uniqueMounts, $applicable, $config, $options);
+    }
+
+    /**
+     * Get mount options from a table grouped by mount id
+     *
+     * @param string $table
+     * @param string[] $fields
+     * @param int[] $mountIds
+     * @return array [$mountId => [['field1' => $value1, ...], ...], ...]
+     */
+    private function selectForMounts($table, array $fields, array $mountIds) {
+        if (count($mountIds) === 0) {
+            return [];
+        }
+        $builder = $this->connection->getQueryBuilder();
+        $fields[] = 'mount_id';
+        $placeHolders = array_map(function ($id) use ($builder) {
+            return $builder->createPositionalParameter($id, IQueryBuilder::PARAM_INT);
+        }, $mountIds);
+        $query = $builder->select($fields)
+            ->from($table)
+            ->where($builder->expr()->in('mount_id', $placeHolders));
+
+        $result = $query->executeQuery();
+        $rows = $result->fetchAll();
+        $result->closeCursor();
+
+        $result = [];
+        foreach ($mountIds as $mountId) {
+            $result[$mountId] = [];
+        }
+        foreach ($rows as $row) {
+            if (isset($row['type'])) {
+                $row['type'] = (int)$row['type'];
+            }
+            $result[$row['mount_id']][] = $row;
+        }
+        return $result;
+    }
+
+    /**
+     * @param int[] $mountIds
+     * @return array [$id => [['type' => $type, 'value' => $value], ...], ...]
+     */
+    public function getApplicableForMounts($mountIds) {
+        return $this->selectForMounts('external_applicable', ['type', 'value'], $mountIds);
+    }
+
+    /**
+     * @param int[] $mountIds
+     * @return array [$id => ['key1' => $value1, ...], ...]
+     */
+    public function getConfigForMounts($mountIds) {
+        $mountConfigs = $this->selectForMounts('external_config', ['key', 'value'], $mountIds);
+        return array_map([$this, 'createKeyValueMap'], $mountConfigs);
+    }
+
+    /**
+     * @param int[] $mountIds
+     * @return array [$id => ['key1' => $value1, ...], ...]
+     */
+    public function getOptionsForMounts($mountIds) {
+        $mountOptions = $this->selectForMounts('external_options', ['key', 'value'], $mountIds);
+        $optionsMap = array_map([$this, 'createKeyValueMap'], $mountOptions);
+        return array_map(function (array $options) {
+            return array_map(function ($option) {
+                return json_decode($option);
+            }, $options);
+        }, $optionsMap);
+    }
+
+    /**
+     * @param array $keyValuePairs [['key'=>$key, 'value=>$value], ...]
+     * @return array ['key1' => $value1, ...]
+     */
+    private function createKeyValueMap(array $keyValuePairs) {
+        $decryptedPairts = array_map(function ($pair) {
+            if ($pair['key'] === 'password') {
+                $pair['value'] = $this->decryptValue($pair['value']);
+            }
+            return $pair;
+        }, $keyValuePairs);
+        $keys = array_map(function ($pair) {
+            return $pair['key'];
+        }, $decryptedPairts);
+        $values = array_map(function ($pair) {
+            return $pair['value'];
+        }, $decryptedPairts);
+
+        return array_combine($keys, $values);
+    }
+
+    private function encryptValue($value) {
+        return $this->crypto->encrypt($value);
+    }
+
+    private function decryptValue($value) {
+        try {
+            return $this->crypto->decrypt($value);
+        } catch (\Exception $e) {
+            return $value;
+        }
+    }
+
+    /**
+     * Check if any mountpoint is configured that overwrite the home folder
+     */
+    public function hasHomeFolderOverwriteMount(): bool {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select('mount_id')
+            ->from('external_mounts')
+            ->where($builder->expr()->eq('mount_point', $builder->createNamedParameter('/')))
+            ->setMaxResults(1);
+        $result = $query->executeQuery();
+        return count($result->fetchAll()) > 0;
+    }
 }

apps/files_external/tests/Service/StoragesServiceTestCase.php

Indentation +455 added lines, -455 removed lines

@@ -38,465 +38,465 @@
 use PHPUnit\Framework\MockObject\MockObject;
 
 class CleaningDBConfig extends DBConfigService {
-	private array $mountIds = [];
-
-	public function addMount($mountPoint, $storageBackend, $authBackend, $priority, $type) {
-		$id = parent::addMount($mountPoint, $storageBackend, $authBackend, $priority, $type); // TODO: Change the autogenerated stub
-		$this->mountIds[] = $id;
-		return $id;
-	}
-
-	public function clean() {
-		foreach ($this->mountIds as $id) {
-			$this->removeMount($id);
-		}
-	}
+    private array $mountIds = [];
+
+    public function addMount($mountPoint, $storageBackend, $authBackend, $priority, $type) {
+        $id = parent::addMount($mountPoint, $storageBackend, $authBackend, $priority, $type); // TODO: Change the autogenerated stub
+        $this->mountIds[] = $id;
+        return $id;
+    }
+
+    public function clean() {
+        foreach ($this->mountIds as $id) {
+            $this->removeMount($id);
+        }
+    }
 }
 
 /**
  * @group DB
  */
 abstract class StoragesServiceTestCase extends \Test\TestCase {
-	protected StoragesService $service;
-	protected BackendService&MockObject $backendService;
-	protected string $dataDir;
-	protected CleaningDBConfig $dbConfig;
-	protected static array $hookCalls;
-	protected IUserMountCache&MockObject $mountCache;
-	protected IEventDispatcher&MockObject $eventDispatcher;
-	protected IAppConfig&MockObject $appConfig;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->dbConfig = new CleaningDBConfig(Server::get(IDBConnection::class), Server::get(ICrypto::class));
-		self::$hookCalls = [];
-		$config = Server::get(IConfig::class);
-		$this->dataDir = $config->getSystemValue(
-			'datadirectory',
-			\OC::$SERVERROOT . '/data/'
-		);
-		MountConfig::$skipTest = true;
-
-		$this->mountCache = $this->createMock(IUserMountCache::class);
-		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
-		$this->appConfig = $this->createMock(IAppConfig::class);
-
-		// prepare BackendService mock
-		$this->backendService = $this->createMock(BackendService::class);
-
-		$authMechanisms = [
-			'identifier:\Auth\Mechanism' => $this->getAuthMechMock('null', '\Auth\Mechanism'),
-			'identifier:\Other\Auth\Mechanism' => $this->getAuthMechMock('null', '\Other\Auth\Mechanism'),
-			'identifier:\OCA\Files_External\Lib\Auth\NullMechanism' => $this->getAuthMechMock(),
-		];
-		$this->backendService->method('getAuthMechanism')
-			->willReturnCallback(function ($class) use ($authMechanisms) {
-				if (isset($authMechanisms[$class])) {
-					return $authMechanisms[$class];
-				}
-				return null;
-			});
-		$this->backendService->method('getAuthMechanismsByScheme')
-			->willReturnCallback(function ($schemes) use ($authMechanisms) {
-				return array_filter($authMechanisms, function ($authMech) use ($schemes) {
-					return in_array($authMech->getScheme(), $schemes, true);
-				});
-			});
-		$this->backendService->method('getAuthMechanisms')
-			->willReturn($authMechanisms);
-
-		$sftpBackend = $this->getBackendMock('\OCA\Files_External\Lib\Backend\SFTP', '\OCA\Files_External\Lib\Storage\SFTP');
-		$backends = [
-			'identifier:\OCA\Files_External\Lib\Backend\DAV' => $this->getBackendMock('\OCA\Files_External\Lib\Backend\DAV', '\OC\Files\Storage\DAV'),
-			'identifier:\OCA\Files_External\Lib\Backend\SMB' => $this->getBackendMock('\OCA\Files_External\Lib\Backend\SMB', '\OCA\Files_External\Lib\Storage\SMB'),
-			'identifier:\OCA\Files_External\Lib\Backend\SFTP' => $sftpBackend,
-			'identifier:sftp_alias' => $sftpBackend,
-		];
-		$backends['identifier:\OCA\Files_External\Lib\Backend\SFTP']->method('getLegacyAuthMechanism')
-			->willReturn($authMechanisms['identifier:\Other\Auth\Mechanism']);
-		$this->backendService->method('getBackend')
-			->willReturnCallback(function ($backendClass) use ($backends) {
-				if (isset($backends[$backendClass])) {
-					return $backends[$backendClass];
-				}
-				return null;
-			});
-		$this->backendService->method('getBackends')
-			->willReturn($backends);
-		$this->overwriteService(BackendService::class, $this->backendService);
-
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_create_mount,
-			get_class($this), 'createHookCallback');
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_delete_mount,
-			get_class($this), 'deleteHookCallback');
-
-		$containerMock = $this->createMock(IAppContainer::class);
-		$containerMock->method('query')
-			->willReturnCallback(function ($name) {
-				if ($name === 'OCA\Files_External\Service\BackendService') {
-					return $this->backendService;
-				}
-			});
-	}
-
-	protected function tearDown(): void {
-		MountConfig::$skipTest = false;
-		self::$hookCalls = [];
-		if ($this->dbConfig) {
-			$this->dbConfig->clean();
-		}
-		parent::tearDown();
-	}
-
-	protected function getBackendMock($class = SMB::class, $storageClass = \OCA\Files_External\Lib\Storage\SMB::class) {
-		$backend = $this->createMock(Backend::class);
-		$backend->method('getStorageClass')
-			->willReturn($storageClass);
-		$backend->method('getIdentifier')
-			->willReturn('identifier:' . $class);
-		return $backend;
-	}
-
-	protected function getAuthMechMock($scheme = 'null', $class = NullMechanism::class) {
-		$authMech = $this->createMock(AuthMechanism::class);
-		$authMech->method('getScheme')
-			->willReturn($scheme);
-		$authMech->method('getIdentifier')
-			->willReturn('identifier:' . $class);
-
-		return $authMech;
-	}
-
-	/**
-	 * Creates a StorageConfig instance based on array data
-	 */
-	protected function makeStorageConfig(array $data): StorageConfig {
-		$storage = new StorageConfig();
-		if (isset($data['id'])) {
-			$storage->setId($data['id']);
-		}
-		$storage->setMountPoint($data['mountPoint']);
-		if (!isset($data['backend'])) {
-			// data providers are run before $this->backendService is initialised
-			// so $data['backend'] can be specified directly
-			$data['backend'] = $this->backendService->getBackend($data['backendIdentifier']);
-		}
-		if (!isset($data['backend'])) {
-			throw new \Exception('oops, no backend');
-		}
-		if (!isset($data['authMechanism'])) {
-			$data['authMechanism'] = $this->backendService->getAuthMechanism($data['authMechanismIdentifier']);
-		}
-		if (!isset($data['authMechanism'])) {
-			throw new \Exception('oops, no auth mechanism');
-		}
-		$storage->setBackend($data['backend']);
-		$storage->setAuthMechanism($data['authMechanism']);
-		$storage->setBackendOptions($data['backendOptions']);
-		if (isset($data['applicableUsers'])) {
-			$storage->setApplicableUsers($data['applicableUsers']);
-		}
-		if (isset($data['applicableGroups'])) {
-			$storage->setApplicableGroups($data['applicableGroups']);
-		}
-		if (isset($data['priority'])) {
-			$storage->setPriority($data['priority']);
-		}
-		if (isset($data['mountOptions'])) {
-			$storage->setMountOptions($data['mountOptions']);
-		}
-		return $storage;
-	}
-
-
-	protected function ActualNonExistingStorageTest() {
-		$backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
-		$authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
-		$storage = new StorageConfig(255);
-		$storage->setMountPoint('mountpoint');
-		$storage->setBackend($backend);
-		$storage->setAuthMechanism($authMechanism);
-		$this->service->updateStorage($storage);
-	}
-
-	public function testNonExistingStorage(): void {
-		$this->expectException(NotFoundException::class);
-
-		$this->ActualNonExistingStorageTest();
-	}
-
-	public static function deleteStorageDataProvider(): array {
-		return [
-			// regular case, can properly delete the oc_storages entry
-			[
-				[
-					'host' => 'example.com',
-					'user' => 'test',
-					'password' => 'testPassword',
-					'root' => 'someroot',
-				],
-				'webdav::test@example.com//someroot/'
-			],
-			[
-				[
-					'host' => 'example.com',
-					'user' => '$user',
-					'password' => 'testPassword',
-					'root' => 'someroot',
-				],
-				'webdav::someone@example.com//someroot/'
-			],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('deleteStorageDataProvider')]
-	public function testDeleteStorage(array $backendOptions, string $rustyStorageId): void {
-		$backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\DAV');
-		$authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
-		$storage = new StorageConfig(255);
-		$storage->setMountPoint('mountpoint');
-		$storage->setBackend($backend);
-		$storage->setAuthMechanism($authMechanism);
-		$storage->setBackendOptions($backendOptions);
-
-		$newStorage = $this->service->addStorage($storage);
-		$id = $newStorage->getId();
-
-		// manually trigger storage entry because normally it happens on first
-		// access, which isn't possible within this test
-		$storageCache = new Storage($rustyStorageId, true, Server::get(IDBConnection::class));
-
-		/** @var IUserMountCache $mountCache */
-		$mountCache = Server::get(IUserMountCache::class);
-		$mountCache->clear();
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')->willReturn('test');
-		$cache = $this->createMock(ICache::class);
-		$storage = $this->createMock(IStorage::class);
-		$storage->method('getCache')->willReturn($cache);
-		$mount = $this->createMock(IMountPoint::class);
-		$mount->method('getStorage')
-			->willReturn($storage);
-		$mount->method('getStorageId')
-			->willReturn($rustyStorageId);
-		$mount->method('getNumericStorageId')
-			->willReturn($storageCache->getNumericId());
-		$mount->method('getStorageRootId')
-			->willReturn(1);
-		$mount->method('getMountPoint')
-			->willReturn('dummy');
-		$mount->method('getMountId')
-			->willReturn($id);
-		$mountCache->registerMounts($user, [
-			$mount
-		]);
-
-		// get numeric id for later check
-		$numericId = $storageCache->getNumericId();
-
-		$this->service->removeStorage($id);
-
-		$caught = false;
-		try {
-			$this->service->getStorage(1);
-		} catch (NotFoundException $e) {
-			$caught = true;
-		}
-
-		$this->assertTrue($caught);
-
-		// storage id was removed from oc_storages
-		$qb = Server::get(IDBConnection::class)->getQueryBuilder();
-		$storageCheckQuery = $qb->select('*')
-			->from('storages')
-			->where($qb->expr()->eq('numeric_id', $qb->expr()->literal($numericId)));
-
-		$result = $storageCheckQuery->execute();
-		$storages = $result->fetchAll();
-		$result->closeCursor();
-		$this->assertCount(0, $storages, 'expected 0 storages, got ' . json_encode($storages));
-	}
-
-	protected function actualDeletedUnexistingStorageTest() {
-		$this->service->removeStorage(255);
-	}
-
-	public function testDeleteUnexistingStorage(): void {
-		$this->expectException(NotFoundException::class);
-
-		$this->actualDeletedUnexistingStorageTest();
-	}
-
-	public function testCreateStorage(): void {
-		$mountPoint = 'mount';
-		$backendIdentifier = 'identifier:\OCA\Files_External\Lib\Backend\SMB';
-		$authMechanismIdentifier = 'identifier:\Auth\Mechanism';
-		$backendOptions = ['param' => 'foo', 'param2' => 'bar'];
-		$mountOptions = ['option' => 'foobar'];
-		$applicableUsers = ['user1', 'user2'];
-		$applicableGroups = ['group'];
-		$priority = 123;
-
-		$backend = $this->backendService->getBackend($backendIdentifier);
-		$authMechanism = $this->backendService->getAuthMechanism($authMechanismIdentifier);
-
-		$storage = $this->service->createStorage(
-			$mountPoint,
-			$backendIdentifier,
-			$authMechanismIdentifier,
-			$backendOptions,
-			$mountOptions,
-			$applicableUsers,
-			$applicableGroups,
-			$priority
-		);
-
-		$this->assertEquals('/' . $mountPoint, $storage->getMountPoint());
-		$this->assertEquals($backend, $storage->getBackend());
-		$this->assertEquals($authMechanism, $storage->getAuthMechanism());
-		$this->assertEquals($backendOptions, $storage->getBackendOptions());
-		$this->assertEquals($mountOptions, $storage->getMountOptions());
-		$this->assertEquals($applicableUsers, $storage->getApplicableUsers());
-		$this->assertEquals($applicableGroups, $storage->getApplicableGroups());
-		$this->assertEquals($priority, $storage->getPriority());
-	}
-
-	public function testCreateStorageInvalidClass(): void {
-		$storage = $this->service->createStorage(
-			'mount',
-			'identifier:\OC\Not\A\Backend',
-			'identifier:\Auth\Mechanism',
-			[]
-		);
-		$this->assertInstanceOf(InvalidBackend::class, $storage->getBackend());
-	}
-
-	public function testCreateStorageInvalidAuthMechanismClass(): void {
-		$storage = $this->service->createStorage(
-			'mount',
-			'identifier:\OCA\Files_External\Lib\Backend\SMB',
-			'identifier:\Not\An\Auth\Mechanism',
-			[]
-		);
-		$this->assertInstanceOf(InvalidAuth::class, $storage->getAuthMechanism());
-	}
-
-	public function testGetStoragesBackendNotVisible(): void {
-		$backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
-		$backend->expects($this->once())
-			->method('isVisibleFor')
-			->with($this->service->getVisibilityType())
-			->willReturn(false);
-		$authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
-		$authMechanism->method('isVisibleFor')
-			->with($this->service->getVisibilityType())
-			->willReturn(true);
-
-		$storage = new StorageConfig(255);
-		$storage->setMountPoint('mountpoint');
-		$storage->setBackend($backend);
-		$storage->setAuthMechanism($authMechanism);
-		$storage->setBackendOptions(['password' => 'testPassword']);
-
-		$newStorage = $this->service->addStorage($storage);
-
-		$this->assertCount(1, $this->service->getAllStorages());
-		$this->assertEmpty($this->service->getStorages());
-	}
-
-	public function testGetStoragesAuthMechanismNotVisible(): void {
-		$backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
-		$backend->method('isVisibleFor')
-			->with($this->service->getVisibilityType())
-			->willReturn(true);
-		$authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
-		$authMechanism->expects($this->once())
-			->method('isVisibleFor')
-			->with($this->service->getVisibilityType())
-			->willReturn(false);
-
-		$storage = new StorageConfig(255);
-		$storage->setMountPoint('mountpoint');
-		$storage->setBackend($backend);
-		$storage->setAuthMechanism($authMechanism);
-		$storage->setBackendOptions(['password' => 'testPassword']);
-
-		$newStorage = $this->service->addStorage($storage);
-
-		$this->assertCount(1, $this->service->getAllStorages());
-		$this->assertEmpty($this->service->getStorages());
-	}
-
-	public static function createHookCallback($params): void {
-		self::$hookCalls[] = [
-			'signal' => Filesystem::signal_create_mount,
-			'params' => $params
-		];
-	}
-
-	public static function deleteHookCallback($params): void {
-		self::$hookCalls[] = [
-			'signal' => Filesystem::signal_delete_mount,
-			'params' => $params
-		];
-	}
-
-	/**
-	 * Asserts hook call
-	 *
-	 * @param array $callData hook call data to check
-	 * @param string $signal signal name
-	 * @param string $mountPath mount path
-	 * @param string $mountType mount type
-	 * @param string $applicable applicable users
-	 */
-	protected function assertHookCall($callData, $signal, $mountPath, $mountType, $applicable) {
-		$this->assertEquals($signal, $callData['signal']);
-		$params = $callData['params'];
-		$this->assertEquals(
-			$mountPath,
-			$params[Filesystem::signal_param_path]
-		);
-		$this->assertEquals(
-			$mountType,
-			$params[Filesystem::signal_param_mount_type]
-		);
-		$this->assertEquals(
-			$applicable,
-			$params[Filesystem::signal_param_users]
-		);
-	}
-
-	public function testUpdateStorageMountPoint(): void {
-		$backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
-		$authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
-
-		$storage = new StorageConfig();
-		$storage->setMountPoint('mountpoint');
-		$storage->setBackend($backend);
-		$storage->setAuthMechanism($authMechanism);
-		$storage->setBackendOptions(['password' => 'testPassword']);
-
-		$savedStorage = $this->service->addStorage($storage);
-
-		$newAuthMechanism = $this->backendService->getAuthMechanism('identifier:\Other\Auth\Mechanism');
-
-		$updatedStorage = new StorageConfig($savedStorage->getId());
-		$updatedStorage->setMountPoint('mountpoint2');
-		$updatedStorage->setBackend($backend);
-		$updatedStorage->setAuthMechanism($newAuthMechanism);
-		$updatedStorage->setBackendOptions(['password' => 'password2']);
-
-		$this->service->updateStorage($updatedStorage);
-
-		$savedStorage = $this->service->getStorage($updatedStorage->getId());
-
-		$this->assertEquals('/mountpoint2', $savedStorage->getMountPoint());
-		$this->assertEquals($newAuthMechanism, $savedStorage->getAuthMechanism());
-		$this->assertEquals('password2', $savedStorage->getBackendOption('password'));
-	}
+    protected StoragesService $service;
+    protected BackendService&MockObject $backendService;
+    protected string $dataDir;
+    protected CleaningDBConfig $dbConfig;
+    protected static array $hookCalls;
+    protected IUserMountCache&MockObject $mountCache;
+    protected IEventDispatcher&MockObject $eventDispatcher;
+    protected IAppConfig&MockObject $appConfig;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->dbConfig = new CleaningDBConfig(Server::get(IDBConnection::class), Server::get(ICrypto::class));
+        self::$hookCalls = [];
+        $config = Server::get(IConfig::class);
+        $this->dataDir = $config->getSystemValue(
+            'datadirectory',
+            \OC::$SERVERROOT . '/data/'
+        );
+        MountConfig::$skipTest = true;
+
+        $this->mountCache = $this->createMock(IUserMountCache::class);
+        $this->eventDispatcher = $this->createMock(IEventDispatcher::class);
+        $this->appConfig = $this->createMock(IAppConfig::class);
+
+        // prepare BackendService mock
+        $this->backendService = $this->createMock(BackendService::class);
+
+        $authMechanisms = [
+            'identifier:\Auth\Mechanism' => $this->getAuthMechMock('null', '\Auth\Mechanism'),
+            'identifier:\Other\Auth\Mechanism' => $this->getAuthMechMock('null', '\Other\Auth\Mechanism'),
+            'identifier:\OCA\Files_External\Lib\Auth\NullMechanism' => $this->getAuthMechMock(),
+        ];
+        $this->backendService->method('getAuthMechanism')
+            ->willReturnCallback(function ($class) use ($authMechanisms) {
+                if (isset($authMechanisms[$class])) {
+                    return $authMechanisms[$class];
+                }
+                return null;
+            });
+        $this->backendService->method('getAuthMechanismsByScheme')
+            ->willReturnCallback(function ($schemes) use ($authMechanisms) {
+                return array_filter($authMechanisms, function ($authMech) use ($schemes) {
+                    return in_array($authMech->getScheme(), $schemes, true);
+                });
+            });
+        $this->backendService->method('getAuthMechanisms')
+            ->willReturn($authMechanisms);
+
+        $sftpBackend = $this->getBackendMock('\OCA\Files_External\Lib\Backend\SFTP', '\OCA\Files_External\Lib\Storage\SFTP');
+        $backends = [
+            'identifier:\OCA\Files_External\Lib\Backend\DAV' => $this->getBackendMock('\OCA\Files_External\Lib\Backend\DAV', '\OC\Files\Storage\DAV'),
+            'identifier:\OCA\Files_External\Lib\Backend\SMB' => $this->getBackendMock('\OCA\Files_External\Lib\Backend\SMB', '\OCA\Files_External\Lib\Storage\SMB'),
+            'identifier:\OCA\Files_External\Lib\Backend\SFTP' => $sftpBackend,
+            'identifier:sftp_alias' => $sftpBackend,
+        ];
+        $backends['identifier:\OCA\Files_External\Lib\Backend\SFTP']->method('getLegacyAuthMechanism')
+            ->willReturn($authMechanisms['identifier:\Other\Auth\Mechanism']);
+        $this->backendService->method('getBackend')
+            ->willReturnCallback(function ($backendClass) use ($backends) {
+                if (isset($backends[$backendClass])) {
+                    return $backends[$backendClass];
+                }
+                return null;
+            });
+        $this->backendService->method('getBackends')
+            ->willReturn($backends);
+        $this->overwriteService(BackendService::class, $this->backendService);
+
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_create_mount,
+            get_class($this), 'createHookCallback');
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_delete_mount,
+            get_class($this), 'deleteHookCallback');
+
+        $containerMock = $this->createMock(IAppContainer::class);
+        $containerMock->method('query')
+            ->willReturnCallback(function ($name) {
+                if ($name === 'OCA\Files_External\Service\BackendService') {
+                    return $this->backendService;
+                }
+            });
+    }
+
+    protected function tearDown(): void {
+        MountConfig::$skipTest = false;
+        self::$hookCalls = [];
+        if ($this->dbConfig) {
+            $this->dbConfig->clean();
+        }
+        parent::tearDown();
+    }
+
+    protected function getBackendMock($class = SMB::class, $storageClass = \OCA\Files_External\Lib\Storage\SMB::class) {
+        $backend = $this->createMock(Backend::class);
+        $backend->method('getStorageClass')
+            ->willReturn($storageClass);
+        $backend->method('getIdentifier')
+            ->willReturn('identifier:' . $class);
+        return $backend;
+    }
+
+    protected function getAuthMechMock($scheme = 'null', $class = NullMechanism::class) {
+        $authMech = $this->createMock(AuthMechanism::class);
+        $authMech->method('getScheme')
+            ->willReturn($scheme);
+        $authMech->method('getIdentifier')
+            ->willReturn('identifier:' . $class);
+
+        return $authMech;
+    }
+
+    /**
+     * Creates a StorageConfig instance based on array data
+     */
+    protected function makeStorageConfig(array $data): StorageConfig {
+        $storage = new StorageConfig();
+        if (isset($data['id'])) {
+            $storage->setId($data['id']);
+        }
+        $storage->setMountPoint($data['mountPoint']);
+        if (!isset($data['backend'])) {
+            // data providers are run before $this->backendService is initialised
+            // so $data['backend'] can be specified directly
+            $data['backend'] = $this->backendService->getBackend($data['backendIdentifier']);
+        }
+        if (!isset($data['backend'])) {
+            throw new \Exception('oops, no backend');
+        }
+        if (!isset($data['authMechanism'])) {
+            $data['authMechanism'] = $this->backendService->getAuthMechanism($data['authMechanismIdentifier']);
+        }
+        if (!isset($data['authMechanism'])) {
+            throw new \Exception('oops, no auth mechanism');
+        }
+        $storage->setBackend($data['backend']);
+        $storage->setAuthMechanism($data['authMechanism']);
+        $storage->setBackendOptions($data['backendOptions']);
+        if (isset($data['applicableUsers'])) {
+            $storage->setApplicableUsers($data['applicableUsers']);
+        }
+        if (isset($data['applicableGroups'])) {
+            $storage->setApplicableGroups($data['applicableGroups']);
+        }
+        if (isset($data['priority'])) {
+            $storage->setPriority($data['priority']);
+        }
+        if (isset($data['mountOptions'])) {
+            $storage->setMountOptions($data['mountOptions']);
+        }
+        return $storage;
+    }
+
+
+    protected function ActualNonExistingStorageTest() {
+        $backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
+        $authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
+        $storage = new StorageConfig(255);
+        $storage->setMountPoint('mountpoint');
+        $storage->setBackend($backend);
+        $storage->setAuthMechanism($authMechanism);
+        $this->service->updateStorage($storage);
+    }
+
+    public function testNonExistingStorage(): void {
+        $this->expectException(NotFoundException::class);
+
+        $this->ActualNonExistingStorageTest();
+    }
+
+    public static function deleteStorageDataProvider(): array {
+        return [
+            // regular case, can properly delete the oc_storages entry
+            [
+                [
+                    'host' => 'example.com',
+                    'user' => 'test',
+                    'password' => 'testPassword',
+                    'root' => 'someroot',
+                ],
+                'webdav::test@example.com//someroot/'
+            ],
+            [
+                [
+                    'host' => 'example.com',
+                    'user' => '$user',
+                    'password' => 'testPassword',
+                    'root' => 'someroot',
+                ],
+                'webdav::someone@example.com//someroot/'
+            ],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('deleteStorageDataProvider')]
+    public function testDeleteStorage(array $backendOptions, string $rustyStorageId): void {
+        $backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\DAV');
+        $authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
+        $storage = new StorageConfig(255);
+        $storage->setMountPoint('mountpoint');
+        $storage->setBackend($backend);
+        $storage->setAuthMechanism($authMechanism);
+        $storage->setBackendOptions($backendOptions);
+
+        $newStorage = $this->service->addStorage($storage);
+        $id = $newStorage->getId();
+
+        // manually trigger storage entry because normally it happens on first
+        // access, which isn't possible within this test
+        $storageCache = new Storage($rustyStorageId, true, Server::get(IDBConnection::class));
+
+        /** @var IUserMountCache $mountCache */
+        $mountCache = Server::get(IUserMountCache::class);
+        $mountCache->clear();
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')->willReturn('test');
+        $cache = $this->createMock(ICache::class);
+        $storage = $this->createMock(IStorage::class);
+        $storage->method('getCache')->willReturn($cache);
+        $mount = $this->createMock(IMountPoint::class);
+        $mount->method('getStorage')
+            ->willReturn($storage);
+        $mount->method('getStorageId')
+            ->willReturn($rustyStorageId);
+        $mount->method('getNumericStorageId')
+            ->willReturn($storageCache->getNumericId());
+        $mount->method('getStorageRootId')
+            ->willReturn(1);
+        $mount->method('getMountPoint')
+            ->willReturn('dummy');
+        $mount->method('getMountId')
+            ->willReturn($id);
+        $mountCache->registerMounts($user, [
+            $mount
+        ]);
+
+        // get numeric id for later check
+        $numericId = $storageCache->getNumericId();
+
+        $this->service->removeStorage($id);
+
+        $caught = false;
+        try {
+            $this->service->getStorage(1);
+        } catch (NotFoundException $e) {
+            $caught = true;
+        }
+
+        $this->assertTrue($caught);
+
+        // storage id was removed from oc_storages
+        $qb = Server::get(IDBConnection::class)->getQueryBuilder();
+        $storageCheckQuery = $qb->select('*')
+            ->from('storages')
+            ->where($qb->expr()->eq('numeric_id', $qb->expr()->literal($numericId)));
+
+        $result = $storageCheckQuery->execute();
+        $storages = $result->fetchAll();
+        $result->closeCursor();
+        $this->assertCount(0, $storages, 'expected 0 storages, got ' . json_encode($storages));
+    }
+
+    protected function actualDeletedUnexistingStorageTest() {
+        $this->service->removeStorage(255);
+    }
+
+    public function testDeleteUnexistingStorage(): void {
+        $this->expectException(NotFoundException::class);
+
+        $this->actualDeletedUnexistingStorageTest();
+    }
+
+    public function testCreateStorage(): void {
+        $mountPoint = 'mount';
+        $backendIdentifier = 'identifier:\OCA\Files_External\Lib\Backend\SMB';
+        $authMechanismIdentifier = 'identifier:\Auth\Mechanism';
+        $backendOptions = ['param' => 'foo', 'param2' => 'bar'];
+        $mountOptions = ['option' => 'foobar'];
+        $applicableUsers = ['user1', 'user2'];
+        $applicableGroups = ['group'];
+        $priority = 123;
+
+        $backend = $this->backendService->getBackend($backendIdentifier);
+        $authMechanism = $this->backendService->getAuthMechanism($authMechanismIdentifier);
+
+        $storage = $this->service->createStorage(
+            $mountPoint,
+            $backendIdentifier,
+            $authMechanismIdentifier,
+            $backendOptions,
+            $mountOptions,
+            $applicableUsers,
+            $applicableGroups,
+            $priority
+        );
+
+        $this->assertEquals('/' . $mountPoint, $storage->getMountPoint());
+        $this->assertEquals($backend, $storage->getBackend());
+        $this->assertEquals($authMechanism, $storage->getAuthMechanism());
+        $this->assertEquals($backendOptions, $storage->getBackendOptions());
+        $this->assertEquals($mountOptions, $storage->getMountOptions());
+        $this->assertEquals($applicableUsers, $storage->getApplicableUsers());
+        $this->assertEquals($applicableGroups, $storage->getApplicableGroups());
+        $this->assertEquals($priority, $storage->getPriority());
+    }
+
+    public function testCreateStorageInvalidClass(): void {
+        $storage = $this->service->createStorage(
+            'mount',
+            'identifier:\OC\Not\A\Backend',
+            'identifier:\Auth\Mechanism',
+            []
+        );
+        $this->assertInstanceOf(InvalidBackend::class, $storage->getBackend());
+    }
+
+    public function testCreateStorageInvalidAuthMechanismClass(): void {
+        $storage = $this->service->createStorage(
+            'mount',
+            'identifier:\OCA\Files_External\Lib\Backend\SMB',
+            'identifier:\Not\An\Auth\Mechanism',
+            []
+        );
+        $this->assertInstanceOf(InvalidAuth::class, $storage->getAuthMechanism());
+    }
+
+    public function testGetStoragesBackendNotVisible(): void {
+        $backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
+        $backend->expects($this->once())
+            ->method('isVisibleFor')
+            ->with($this->service->getVisibilityType())
+            ->willReturn(false);
+        $authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
+        $authMechanism->method('isVisibleFor')
+            ->with($this->service->getVisibilityType())
+            ->willReturn(true);
+
+        $storage = new StorageConfig(255);
+        $storage->setMountPoint('mountpoint');
+        $storage->setBackend($backend);
+        $storage->setAuthMechanism($authMechanism);
+        $storage->setBackendOptions(['password' => 'testPassword']);
+
+        $newStorage = $this->service->addStorage($storage);
+
+        $this->assertCount(1, $this->service->getAllStorages());
+        $this->assertEmpty($this->service->getStorages());
+    }
+
+    public function testGetStoragesAuthMechanismNotVisible(): void {
+        $backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
+        $backend->method('isVisibleFor')
+            ->with($this->service->getVisibilityType())
+            ->willReturn(true);
+        $authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
+        $authMechanism->expects($this->once())
+            ->method('isVisibleFor')
+            ->with($this->service->getVisibilityType())
+            ->willReturn(false);
+
+        $storage = new StorageConfig(255);
+        $storage->setMountPoint('mountpoint');
+        $storage->setBackend($backend);
+        $storage->setAuthMechanism($authMechanism);
+        $storage->setBackendOptions(['password' => 'testPassword']);
+
+        $newStorage = $this->service->addStorage($storage);
+
+        $this->assertCount(1, $this->service->getAllStorages());
+        $this->assertEmpty($this->service->getStorages());
+    }
+
+    public static function createHookCallback($params): void {
+        self::$hookCalls[] = [
+            'signal' => Filesystem::signal_create_mount,
+            'params' => $params
+        ];
+    }
+
+    public static function deleteHookCallback($params): void {
+        self::$hookCalls[] = [
+            'signal' => Filesystem::signal_delete_mount,
+            'params' => $params
+        ];
+    }
+
+    /**
+     * Asserts hook call
+     *
+     * @param array $callData hook call data to check
+     * @param string $signal signal name
+     * @param string $mountPath mount path
+     * @param string $mountType mount type
+     * @param string $applicable applicable users
+     */
+    protected function assertHookCall($callData, $signal, $mountPath, $mountType, $applicable) {
+        $this->assertEquals($signal, $callData['signal']);
+        $params = $callData['params'];
+        $this->assertEquals(
+            $mountPath,
+            $params[Filesystem::signal_param_path]
+        );
+        $this->assertEquals(
+            $mountType,
+            $params[Filesystem::signal_param_mount_type]
+        );
+        $this->assertEquals(
+            $applicable,
+            $params[Filesystem::signal_param_users]
+        );
+    }
+
+    public function testUpdateStorageMountPoint(): void {
+        $backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
+        $authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
+
+        $storage = new StorageConfig();
+        $storage->setMountPoint('mountpoint');
+        $storage->setBackend($backend);
+        $storage->setAuthMechanism($authMechanism);
+        $storage->setBackendOptions(['password' => 'testPassword']);
+
+        $savedStorage = $this->service->addStorage($storage);
+
+        $newAuthMechanism = $this->backendService->getAuthMechanism('identifier:\Other\Auth\Mechanism');
+
+        $updatedStorage = new StorageConfig($savedStorage->getId());
+        $updatedStorage->setMountPoint('mountpoint2');
+        $updatedStorage->setBackend($backend);
+        $updatedStorage->setAuthMechanism($newAuthMechanism);
+        $updatedStorage->setBackendOptions(['password' => 'password2']);
+
+        $this->service->updateStorage($updatedStorage);
+
+        $savedStorage = $this->service->getStorage($updatedStorage->getId());
+
+        $this->assertEquals('/mountpoint2', $savedStorage->getMountPoint());
+        $this->assertEquals($newAuthMechanism, $savedStorage->getAuthMechanism());
+        $this->assertEquals('password2', $savedStorage->getBackendOption('password'));
+    }
 }