diff options
Diffstat (limited to 'lib/private/Server.php')
| -rw-r--r-- | lib/private/Server.php | 2023 |
1 files changed, 1082 insertions, 941 deletions
diff --git a/lib/private/Server.php b/lib/private/Server.php index 5bc72e3614f..22cd13438b8 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -1,100 +1,244 @@ <?php + /** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * @copyright Copyright (c) 2016, Lukas Reschke <lukas@statuscode.ch> - * - * @author Arthur Schiwon <blizzz@arthur-schiwon.de> - * @author Bart Visscher <bartv@thisnet.nl> - * @author Bernhard Posselt <dev@bernhard-posselt.com> - * @author Bernhard Reiter <ockham@raz.or.at> - * @author Bjoern Schiessle <bjoern@schiessle.org> - * @author Björn Schießle <bjoern@schiessle.org> - * @author Christopher Schäpers <kondou@ts.unde.re> - * @author Christoph Wurst <christoph@owncloud.com> - * @author Joas Schilling <coding@schilljs.com> - * @author Jörn Friedrich Dreyer <jfd@butonic.de> - * @author Lukas Reschke <lukas@statuscode.ch> - * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin Appelman <robin@icewind.nl> - * @author Robin McCorkell <robin@mccorkell.me.uk> - * @author Roeland Jago Douma <roeland@famdouma.nl> - * @author Sander <brantje@gmail.com> - * @author Thomas Müller <thomas.mueller@tmit.eu> - * @author Thomas Tanghus <thomas@tanghus.net> - * @author Vincent Petry <pvince81@owncloud.com> - * @author Roger Szabo <roger.szabo@web.de> - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * + * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors + * SPDX-FileCopyrightText: 2016 ownCloud, Inc. + * SPDX-License-Identifier: AGPL-3.0-only */ namespace OC; use bantu\IniGetWrapper\IniGetWrapper; +use NCU\Security\Signature\ISignatureManager; +use OC\Accounts\AccountManager; +use OC\App\AppManager; +use OC\App\AppStore\Bundles\BundleFetcher; use OC\App\AppStore\Fetcher\AppFetcher; -use OC\App\AppStore\Fetcher\CategoryFetcher; +use OC\AppFramework\Bootstrap\Coordinator; use OC\AppFramework\Http\Request; +use OC\AppFramework\Http\RequestId; use OC\AppFramework\Utility\TimeFactory; -use OC\Command\AsyncBus; +use OC\Authentication\Events\LoginFailed; +use OC\Authentication\Listeners\LoginFailedListener; +use OC\Authentication\Listeners\UserLoggedInListener; +use OC\Authentication\LoginCredentials\Store; +use OC\Authentication\Token\IProvider; +use OC\Avatar\AvatarManager; +use OC\Blurhash\Listener\GenerateBlurhashMetadata; +use OC\Collaboration\Collaborators\GroupPlugin; +use OC\Collaboration\Collaborators\MailPlugin; +use OC\Collaboration\Collaborators\RemoteGroupPlugin; +use OC\Collaboration\Collaborators\RemotePlugin; +use OC\Collaboration\Collaborators\UserPlugin; +use OC\Collaboration\Reference\ReferenceManager; +use OC\Command\CronBus; +use OC\Comments\ManagerFactory as CommentsManagerFactory; +use OC\Contacts\ContactsMenu\ActionFactory; +use OC\Contacts\ContactsMenu\ContactsStore; +use OC\DB\Connection; +use OC\DB\ConnectionAdapter; use OC\Diagnostics\EventLogger; -use OC\Diagnostics\NullEventLogger; -use OC\Diagnostics\NullQueryLogger; use OC\Diagnostics\QueryLogger; +use OC\Federation\CloudFederationFactory; +use OC\Federation\CloudFederationProviderManager; +use OC\Federation\CloudIdManager; +use OC\Files\Cache\FileAccess; +use OC\Files\Config\MountProviderCollection; use OC\Files\Config\UserMountCache; use OC\Files\Config\UserMountCacheListener; +use OC\Files\Conversion\ConversionManager; +use OC\Files\Lock\LockManager; use OC\Files\Mount\CacheMountProvider; use OC\Files\Mount\LocalHomeMountProvider; use OC\Files\Mount\ObjectHomeMountProvider; +use OC\Files\Mount\ObjectStorePreviewCacheMountProvider; +use OC\Files\Mount\RootMountProvider; use OC\Files\Node\HookConnector; use OC\Files\Node\LazyRoot; use OC\Files\Node\Root; +use OC\Files\ObjectStore\PrimaryObjectStoreConfig; +use OC\Files\SetupManager; +use OC\Files\Storage\StorageFactory; +use OC\Files\Template\TemplateManager; +use OC\Files\Type\Loader; use OC\Files\View; +use OC\FilesMetadata\FilesMetadataManager; +use OC\FullTextSearch\FullTextSearchManager; use OC\Http\Client\ClientService; +use OC\Http\Client\NegativeDnsCache; use OC\IntegrityCheck\Checker; use OC\IntegrityCheck\Helpers\AppLocator; use OC\IntegrityCheck\Helpers\EnvironmentHelper; use OC\IntegrityCheck\Helpers\FileAccessHelper; +use OC\KnownUser\KnownUserService; +use OC\LDAP\NullLDAPProviderFactory; use OC\Lock\DBLockingProvider; use OC\Lock\MemcacheLockingProvider; use OC\Lock\NoopLockingProvider; use OC\Lockdown\LockdownManager; +use OC\Log\LogFactory; +use OC\Log\PsrLoggerAdapter; use OC\Mail\Mailer; use OC\Memcache\ArrayCache; +use OC\Memcache\Factory; use OC\Notification\Manager; -use OC\Repair\NC11\CleanPreviewsBackgroundJob; +use OC\OCM\Model\OCMProvider; +use OC\OCM\OCMDiscoveryService; +use OC\OCS\DiscoveryService; +use OC\Preview\GeneratorHelper; +use OC\Preview\IMagickSupport; +use OC\Preview\MimeIconProvider; +use OC\Profile\ProfileManager; +use OC\Profiler\Profiler; +use OC\Remote\Api\ApiFactory; +use OC\Remote\InstanceFactory; use OC\RichObjectStrings\Validator; +use OC\Route\CachingRouter; +use OC\Route\Router; use OC\Security\Bruteforce\Throttler; use OC\Security\CertificateManager; -use OC\Security\CSP\ContentSecurityPolicyManager; +use OC\Security\CredentialsManager; use OC\Security\Crypto; +use OC\Security\CSP\ContentSecurityPolicyManager; use OC\Security\CSP\ContentSecurityPolicyNonceManager; -use OC\Security\CSRF\CsrfTokenGenerator; use OC\Security\CSRF\CsrfTokenManager; use OC\Security\CSRF\TokenStorage\SessionStorage; use OC\Security\Hasher; -use OC\Security\CredentialsManager; +use OC\Security\Ip\RemoteAddress; +use OC\Security\RateLimiting\Limiter; use OC\Security\SecureRandom; +use OC\Security\Signature\SignatureManager; use OC\Security\TrustedDomainHelper; +use OC\Security\VerificationToken\VerificationToken; use OC\Session\CryptoWrapper; -use OC\Tagging\TagMapper; +use OC\Settings\DeclarativeManager; +use OC\SetupCheck\SetupCheckManager; +use OC\Share20\ProviderFactory; +use OC\Share20\ShareHelper; +use OC\SpeechToText\SpeechToTextManager; +use OC\SystemTag\ManagerFactory as SystemTagManagerFactory; +use OC\Talk\Broker; +use OC\Teams\TeamManager; +use OC\Template\JSCombiner; +use OC\Translation\TranslationManager; +use OC\User\AvailabilityCoordinator; +use OC\User\DisplayNameCache; +use OC\User\Listeners\BeforeUserDeletedListener; +use OC\User\Listeners\UserChangedListener; +use OC\User\Session; +use OCA\Theming\ImageManager; +use OCA\Theming\Service\BackgroundService; use OCA\Theming\ThemingDefaults; +use OCA\Theming\Util; +use OCP\Accounts\IAccountManager; +use OCP\App\IAppManager; +use OCP\AppFramework\Utility\ITimeFactory; +use OCP\Authentication\LoginCredentials\IStore; +use OCP\Authentication\Token\IProvider as OCPIProvider; +use OCP\BackgroundJob\IJobList; +use OCP\Collaboration\Reference\IReferenceManager; +use OCP\Command\IBus; +use OCP\Comments\ICommentsManager; +use OCP\Config\IUserConfig; +use OCP\Contacts\ContactsMenu\IActionFactory; +use OCP\Contacts\ContactsMenu\IContactsStore; +use OCP\Defaults; +use OCP\Diagnostics\IEventLogger; +use OCP\Diagnostics\IQueryLogger; +use OCP\Encryption\IFile; +use OCP\Encryption\Keys\IStorage; +use OCP\EventDispatcher\IEventDispatcher; +use OCP\Federation\ICloudFederationFactory; +use OCP\Federation\ICloudFederationProviderManager; +use OCP\Federation\ICloudIdManager; +use OCP\Files\Cache\IFileAccess; +use OCP\Files\Config\IMountProviderCollection; +use OCP\Files\Config\IUserMountCache; +use OCP\Files\Conversion\IConversionManager; +use OCP\Files\IMimeTypeDetector; +use OCP\Files\IMimeTypeLoader; +use OCP\Files\IRootFolder; +use OCP\Files\Lock\ILockManager; +use OCP\Files\Mount\IMountManager; +use OCP\Files\Storage\IStorageFactory; +use OCP\Files\Template\ITemplateManager; +use OCP\FilesMetadata\IFilesMetadataManager; +use OCP\FullTextSearch\IFullTextSearchManager; +use OCP\Group\ISubAdmin; +use OCP\Http\Client\IClientService; +use OCP\IAppConfig; +use OCP\IAvatarManager; +use OCP\IBinaryFinder; +use OCP\ICache; +use OCP\ICacheFactory; +use OCP\ICertificateManager; +use OCP\IDateTimeFormatter; +use OCP\IDateTimeZone; +use OCP\IDBConnection; +use OCP\IEventSourceFactory; +use OCP\IGroupManager; +use OCP\IInitialStateService; use OCP\IL10N; +use OCP\INavigationManager; +use OCP\IPhoneNumberUtil; +use OCP\IPreview; +use OCP\IRequest; +use OCP\IRequestId; use OCP\IServerContainer; +use OCP\ISession; +use OCP\ITempManager; +use OCP\IURLGenerator; +use OCP\IUserManager; +use OCP\IUserSession; +use OCP\L10N\IFactory; +use OCP\LDAP\ILDAPProvider; +use OCP\LDAP\ILDAPProviderFactory; +use OCP\Lock\ILockingProvider; +use OCP\Lockdown\ILockdownManager; +use OCP\Log\ILogFactory; +use OCP\Mail\IMailer; +use OCP\OCM\ICapabilityAwareOCMProvider; +use OCP\OCM\IOCMDiscoveryService; +use OCP\OCM\IOCMProvider; +use OCP\Preview\IMimeIconProvider; +use OCP\Profile\IProfileManager; +use OCP\Profiler\IProfiler; +use OCP\Remote\Api\IApiFactory; +use OCP\Remote\IInstanceFactory; +use OCP\RichObjectStrings\IRichTextFormatter; use OCP\RichObjectStrings\IValidator; -use OCP\Security\IContentSecurityPolicyManager; -use Symfony\Component\EventDispatcher\EventDispatcher; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use OCP\Route\IRouter; +use OCP\Security\Bruteforce\IThrottler; +use OCP\Security\ICredentialsManager; +use OCP\Security\ICrypto; +use OCP\Security\IHasher; +use OCP\Security\Ip\IRemoteAddress; +use OCP\Security\ISecureRandom; +use OCP\Security\ITrustedDomainHelper; +use OCP\Security\RateLimiting\ILimiter; +use OCP\Security\VerificationToken\IVerificationToken; +use OCP\ServerVersion; +use OCP\Settings\IDeclarativeManager; +use OCP\SetupCheck\ISetupCheckManager; +use OCP\Share\IProviderFactory; +use OCP\Share\IShareHelper; +use OCP\SpeechToText\ISpeechToTextManager; +use OCP\SystemTag\ISystemTagManager; +use OCP\SystemTag\ISystemTagObjectMapper; +use OCP\Talk\IBroker; +use OCP\Teams\ITeamManager; +use OCP\Translation\ITranslationManager; +use OCP\User\Events\BeforeUserDeletedEvent; +use OCP\User\Events\BeforeUserLoggedInEvent; +use OCP\User\Events\BeforeUserLoggedInWithCookieEvent; +use OCP\User\Events\BeforeUserLoggedOutEvent; +use OCP\User\Events\PostLoginEvent; +use OCP\User\Events\UserChangedEvent; +use OCP\User\Events\UserLoggedInEvent; +use OCP\User\Events\UserLoggedInWithCookieEvent; +use OCP\User\Events\UserLoggedOutEvent; +use OCP\User\IAvailabilityCoordinator; +use Psr\Container\ContainerInterface; +use Psr\Log\LoggerInterface; /** * Class Server @@ -115,479 +259,621 @@ class Server extends ServerContainer implements IServerContainer { parent::__construct(); $this->webRoot = $webRoot; - $this->registerService('ContactsManager', function ($c) { - return new ContactsManager(); + // 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->registerService('PreviewManager', function (Server $c) { + $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->getConfig(), - $c->getRootFolder(), - $c->getAppDataDir('preview'), - $c->getEventDispatcher() + $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 (Server $c) { + $this->registerService(\OC\Preview\Watcher::class, function (ContainerInterface $c) { return new \OC\Preview\Watcher( - $c->getAppDataDir('preview') + new \OC\Preview\Storage\Root( + $c->get(IRootFolder::class), + $c->get(SystemConfig::class) + ) ); }); - $this->registerService('EncryptionManager', function (Server $c) { + $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->getUserManager(), - $c->getGroupManager(), - $c->getConfig() + $c->get(IUserManager::class), + $c->get(IGroupManager::class), + $c->get(\OCP\IConfig::class) ); return new Encryption\Manager( - $c->getConfig(), - $c->getLogger(), + $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('EncryptionFileHelper', function (Server $c) { + $this->registerService(IFile::class, function (ContainerInterface $c) { $util = new Encryption\Util( new View(), - $c->getUserManager(), - $c->getGroupManager(), - $c->getConfig() + $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) ); - return new Encryption\File($util); }); - $this->registerService('EncryptionKeyStorage', function (Server $c) { + $this->registerService(IStorage::class, function (ContainerInterface $c) { $view = new View(); $util = new Encryption\Util( $view, - $c->getUserManager(), - $c->getGroupManager(), - $c->getConfig() + $c->get(IUserManager::class), + $c->get(IGroupManager::class), + $c->get(\OCP\IConfig::class) ); - return new Encryption\Keys\Storage($view, $util); - }); - $this->registerService('TagMapper', function (Server $c) { - return new TagMapper($c->getDatabaseConnection()); - }); - $this->registerService('TagManager', function (Server $c) { - $tagMapper = $c->query('TagMapper'); - return new TagManager($tagMapper, $c->getUserSession()); + return new Encryption\Keys\Storage( + $view, + $util, + $c->get(ICrypto::class), + $c->get(\OCP\IConfig::class) + ); }); - $this->registerService('SystemTagManagerFactory', function (Server $c) { - $config = $c->getConfig(); - $factoryClass = $config->getSystemValue('systemtags.managerFactory', '\OC\SystemTag\ManagerFactory'); - /** @var \OC\SystemTag\ManagerFactory $factory */ - $factory = new $factoryClass($this); - return $factory; + + $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('SystemTagManager', function (Server $c) { - return $c->query('SystemTagManagerFactory')->getManager(); + $this->registerService(ISystemTagManager::class, function (ContainerInterface $c) { + return $c->get('SystemTagManagerFactory')->getManager(); }); - $this->registerService('SystemTagObjectMapper', function (Server $c) { - return $c->query('SystemTagManagerFactory')->getObjectMapper(); + /** @deprecated 19.0.0 */ + $this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class); + + $this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) { + return $c->get('SystemTagManagerFactory')->getObjectMapper(); }); - $this->registerService('RootFolder', function (Server $c) { - $manager = \OC\Files\Filesystem::getMountManager(null); + $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, - null, - $c->getUserMountCache(), - $this->getLogger(), - $this->getUserManager() + $userSession->getUser(), + $c->get(IUserMountCache::class), + $this->get(LoggerInterface::class), + $this->get(IUserManager::class), + $this->get(IEventDispatcher::class), + $this->get(ICacheFactory::class), ); - $connector = new HookConnector($root, $view); - $connector->viewToNode(); - $previewConnector = new \OC\Preview\WatcherConnector($root, $c->getSystemConfig()); + $previewConnector = new \OC\Preview\WatcherConnector( + $root, + $c->get(SystemConfig::class), + $this->get(IEventDispatcher::class) + ); $previewConnector->connectWatcher(); return $root; }); - $this->registerService('LazyRootFolder', function(Server $c) { - return new LazyRoot(function() use ($c) { - return $c->query('RootFolder'); + $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->registerService('UserManager', function (Server $c) { - $config = $c->getConfig(); - return new \OC\User\Manager($config); + + $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('GroupManager', function (Server $c) { - $groupManager = new \OC\Group\Manager($this->getUserManager()); - $groupManager->listen('\OC\Group', 'preCreate', function ($gid) { - \OC_Hook::emit('OC_Group', 'pre_createGroup', array('run' => true, 'gid' => $gid)); - }); - $groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $gid) { - \OC_Hook::emit('OC_User', 'post_createGroup', array('gid' => $gid->getGID())); - }); - $groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) { - \OC_Hook::emit('OC_Group', 'pre_deleteGroup', array('run' => true, 'gid' => $group->getGID())); - }); - $groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) { - \OC_Hook::emit('OC_User', 'post_deleteGroup', array('gid' => $group->getGID())); - }); - $groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) { - \OC_Hook::emit('OC_Group', 'pre_addToGroup', array('run' => true, 'uid' => $user->getUID(), 'gid' => $group->getGID())); - }); - $groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) { - \OC_Hook::emit('OC_Group', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID())); - //Minimal fix to keep it backward compatible TODO: clean up all the GroupManager hooks - \OC_Hook::emit('OC_User', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID())); - }); + + $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('OC\Authentication\Token\DefaultTokenMapper', function (Server $c) { - $dbConnection = $c->getDatabaseConnection(); - return new Authentication\Token\DefaultTokenMapper($dbConnection); - }); - $this->registerService('OC\Authentication\Token\DefaultTokenProvider', function (Server $c) { - $mapper = $c->query('OC\Authentication\Token\DefaultTokenMapper'); - $crypto = $c->getCrypto(); - $config = $c->getConfig(); - $logger = $c->getLogger(); - $timeFactory = new TimeFactory(); - return new \OC\Authentication\Token\DefaultTokenProvider($mapper, $crypto, $config, $logger, $timeFactory); + + $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('OC\Authentication\Token\IProvider', 'OC\Authentication\Token\DefaultTokenProvider'); - $this->registerService('UserSession', function (Server $c) { - $manager = $c->getUserManager(); - $session = new \OC\Session\Memory(''); + $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 ownCloud is not yet setup. - if (\OC::$server->getSystemConfig()->getValue('installed', false)) { - $defaultTokenProvider = $c->query('OC\Authentication\Token\IProvider'); + // 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 { - $defaultTokenProvider = null; + $provider = null; } - $userSession = new \OC\User\Session($manager, $session, $timeFactory, $defaultTokenProvider, $c->getConfig(), $c->getSecureRandom()); + $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', array('run' => true, 'uid' => $uid, 'password' => $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 $user \OC\User\User */ - \OC_Hook::emit('OC_User', 'post_createUser', array('uid' => $user->getUID(), 'password' => $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 $user \OC\User\User */ - \OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID())); + /** @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 $user \OC\User\User */ - \OC_Hook::emit('OC_User', 'post_deleteUser', array('uid' => $user->getUID())); + /** @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 $user \OC\User\User */ - \OC_Hook::emit('OC_User', 'pre_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $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 $user \OC\User\User */ - \OC_Hook::emit('OC_User', 'post_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $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', array('run' => true, 'uid' => $uid, 'password' => $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, $password) { - /** @var $user \OC\User\User */ - \OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $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 () { - \OC_Hook::emit('OC_User', 'logout', array()); + $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) { - /** @var $user \OC\User\User */ - \OC_Hook::emit('OC_User', 'changeUser', array('run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value)); + $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->registerService(\OC\Authentication\TwoFactorAuth\Manager::class, function (Server $c) { - return new \OC\Authentication\TwoFactorAuth\Manager($c->getAppManager(), $c->getSession(), $c->getConfig(), $c->getActivityManager(), $c->getLogger()); - }); + $this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class); - $this->registerService('NavigationManager', function ($c) { - return new \OC\NavigationManager(); - }); - $this->registerService('AllConfig', function (Server $c) { - return new \OC\AllConfig( - $c->getSystemConfig() - ); - }); - $this->registerService('SystemConfig', function ($c) use ($config) { + $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->registerService('AppConfig', function (Server $c) { - return new \OC\AppConfig($c->getDatabaseConnection()); - }); - $this->registerService('L10NFactory', function (Server $c) { + + $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->getConfig(), + $c->get(\OCP\IConfig::class), $c->getRequest(), - $c->getUserSession(), - \OC::$SERVERROOT + $c->get(IUserSession::class), + $c->get(ICacheFactory::class), + \OC::$SERVERROOT, + $c->get(IAppManager::class), ); }); - $this->registerService('URLGenerator', function (Server $c) { - $config = $c->getConfig(); - $cacheFactory = $c->getMemCacheFactory(); - return new \OC\URLGenerator( - $config, - $cacheFactory - ); - }); - $this->registerService('AppHelper', function ($c) { - return new \OC\AppHelper(); - }); - $this->registerService('AppFetcher', function ($c) { - return new AppFetcher( - $this->getAppDataDir('appstore'), - $this->getHTTPClientService(), - $this->query(TimeFactory::class), - $this->getConfig() - ); - }); - $this->registerService('CategoryFetcher', function ($c) { - return new CategoryFetcher( - $this->getAppDataDir('appstore'), - $this->getHTTPClientService(), - $this->query(TimeFactory::class), - $this->getConfig() - ); - }); - $this->registerService('UserCache', function ($c) { + + $this->registerAlias(IURLGenerator::class, URLGenerator::class); + + $this->registerService(ICache::class, function ($c) { return new Cache\File(); }); - $this->registerService('MemCacheFactory', function (Server $c) { - $config = $c->getConfig(); - - if ($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) { - $v = \OC_App::getAppVersions(); - $v['core'] = md5(file_get_contents(\OC::$SERVERROOT . '/version.php')); - $version = implode(',', $v); - $instanceId = \OC_Util::getInstanceId(); - $path = \OC::$SERVERROOT; - $prefix = md5($instanceId . '-' . $version . '-' . $path); - return new \OC\Memcache\Factory($prefix, $c->getLogger(), - $config->getSystemValue('memcache.local', null), - $config->getSystemValue('memcache.distributed', null), - $config->getSystemValue('memcache.locking', null) - ); - } - return new \OC\Memcache\Factory('', $c->getLogger(), - '\\OC\\Memcache\\ArrayCache', - '\\OC\\Memcache\\ArrayCache', - '\\OC\\Memcache\\ArrayCache' + $this->registerService(Factory::class, function (Server $c) { + $profiler = $c->get(IProfiler::class); + $arrayCacheFactory = new \OC\Memcache\Factory(fn () => '', $c->get(LoggerInterface::class), + $profiler, + ArrayCache::class, + ArrayCache::class, + ArrayCache::class ); + /** @var SystemConfig $config */ + $config = $c->get(SystemConfig::class); + /** @var ServerVersion $serverVersion */ + $serverVersion = $c->get(ServerVersion::class); + + if ($config->getValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) { + $logQuery = $config->getValue('log_query'); + $prefixClosure = function () use ($logQuery, $serverVersion): ?string { + if (!$logQuery) { + try { + $v = \OCP\Server::get(IAppConfig::class)->getAppInstalledVersions(true); + } catch (\Doctrine\DBAL\Exception $e) { + // Database service probably unavailable + // Probably related to https://github.com/nextcloud/server/issues/37424 + return null; + } + } else { + // If the log_query is enabled, we can not get the app versions + // as that does a query, which will be logged and the logging + // depends on redis and here we are back again in the same function. + $v = [ + 'log_query' => 'enabled', + ]; + } + $v['core'] = implode(',', $serverVersion->getVersion()); + $version = implode(',', array_keys($v)) . implode(',', $v); + $instanceId = \OC_Util::getInstanceId(); + $path = \OC::$SERVERROOT; + return md5($instanceId . '-' . $version . '-' . $path); + }; + return new \OC\Memcache\Factory($prefixClosure, + $c->get(LoggerInterface::class), + $profiler, + /** @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') + ); + } + return $arrayCacheFactory; }); + $this->registerAlias(ICacheFactory::class, Factory::class); + $this->registerService('RedisFactory', function (Server $c) { - $systemConfig = $c->getSystemConfig(); - return new RedisFactory($systemConfig); + $systemConfig = $c->get(SystemConfig::class); + return new RedisFactory($systemConfig, $c->get(IEventLogger::class)); }); - $this->registerService('ActivityManager', function (Server $c) { + + $this->registerService(\OCP\Activity\IManager::class, function (Server $c) { + $l10n = $this->get(IFactory::class)->get('lib'); return new \OC\Activity\Manager( $c->getRequest(), - $c->getUserSession(), - $c->getConfig(), - $c->query(IValidator::class) + $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', function (Server $c) { + + $this->registerService(AvatarManager::class, function (Server $c) { return new AvatarManager( - $c->getUserManager(), + $c->get(IUserSession::class), + $c->get(\OC\User\Manager::class), $c->getAppDataDir('avatar'), $c->getL10N('lib'), - $c->getLogger(), - $c->getConfig() + $c->get(LoggerInterface::class), + $c->get(\OCP\IConfig::class), + $c->get(IAccountManager::class), + $c->get(KnownUserService::class) ); }); - $this->registerService('Logger', function (Server $c) { - $logClass = $c->query('AllConfig')->getSystemValue('log_type', 'file'); - // TODO: Drop backwards compatibility for config in the future - $logger = 'OC\\Log\\' . ucfirst($logClass=='owncloud' ? 'file' : $logClass); - call_user_func(array($logger, 'init')); - return new Log($logger); + $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); }); - $this->registerService('JobList', function (Server $c) { - $config = $c->getConfig(); - return new \OC\BackgroundJob\JobList( - $c->getDatabaseConnection(), - $config, - new TimeFactory() - ); + // 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->registerService('Router', function (Server $c) { - $cacheFactory = $c->getMemCacheFactory(); - $logger = $c->getLogger(); - if ($cacheFactory->isAvailable()) { - $router = new \OC\Route\CachingRouter($cacheFactory->create('route'), $logger); + + $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 = new \OC\Route\Router($logger); + $router = $c->resolve(Router::class); } return $router; }); - $this->registerService('Search', function ($c) { - return new Search(); - }); - $this->registerService('SecureRandom', function ($c) { - return new SecureRandom(); - }); - $this->registerService('Crypto', function (Server $c) { - return new Crypto($c->getConfig(), $c->getSecureRandom()); - }); - $this->registerService('Hasher', function (Server $c) { - return new Hasher($c->getConfig()); - }); - $this->registerService('CredentialsManager', function (Server $c) { - return new CredentialsManager($c->getCrypto(), $c->getDatabaseConnection()); + $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->registerService('DatabaseConnection', function (Server $c) { - $systemConfig = $c->getSystemConfig(); - $factory = new \OC\DB\ConnectionFactory($c->getConfig()); + + $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'); } - $connectionParams = $factory->createConnectionParams($systemConfig); - $connection = $factory->getConnection($type, $connectionParams); - $connection->getConfiguration()->setSQLLogger($c->getQueryLogger()); + $connection = $factory->getConnection($type, []); return $connection; }); - $this->registerService('HTTPHelper', function (Server $c) { - $config = $c->getConfig(); - return new HTTPHelper( - $config, - $c->getHTTPClientService() - ); - }); - $this->registerService('HttpClientService', function (Server $c) { - $user = \OC_User::getUser(); - $uid = $user ? $user : null; - return new ClientService( - $c->getConfig(), - new \OC\Security\CertificateManager($uid, new View(), $c->getConfig()) + + $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->registerService('EventLogger', function (Server $c) { - if ($c->getSystemConfig()->getValue('debug', false)) { - return new EventLogger(); - } else { - return new NullEventLogger(); - } + $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('QueryLogger', function (Server $c) { - if ($c->getSystemConfig()->getValue('debug', false)) { - return new QueryLogger(); - } else { - return new NullQueryLogger(); + + $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->registerService('TempManager', function (Server $c) { - return new TempManager( - $c->getLogger(), - $c->getConfig() - ); - }); - $this->registerService('AppManager', function (Server $c) { - return new \OC\App\AppManager( - $c->getUserSession(), - $c->getAppConfig(), - $c->getGroupManager(), - $c->getMemCacheFactory(), - $c->getEventDispatcher() - ); - }); - $this->registerService('DateTimeZone', function (Server $c) { - return new DateTimeZone( - $c->getConfig(), - $c->getSession() - ); - }); - $this->registerService('DateTimeFormatter', function (Server $c) { - $language = $c->getConfig()->getUserValue($c->getSession()->get('user_id'), 'core', 'lang', null); + + $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->getDateTimeZone()->getTimeZone(), + $c->get(IDateTimeZone::class)->getTimeZone(), $c->getL10N('lib', $language) ); }); - $this->registerService('UserMountCache', function (Server $c) { - $mountCache = new UserMountCache($c->getDatabaseConnection(), $c->getUserManager(), $c->getLogger()); + + $this->registerService(IUserMountCache::class, function (ContainerInterface $c) { + $mountCache = $c->get(UserMountCache::class); $listener = new UserMountCacheListener($mountCache); - $listener->listen($c->getUserManager()); + $listener->listen($c->get(IUserManager::class)); return $mountCache; }); - $this->registerService('MountConfigManager', function (Server $c) { - $loader = \OC\Files\Filesystem::getLoader(); - $mountCache = $c->query('UserMountCache'); - $manager = new \OC\Files\Config\MountProviderCollection($loader, $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->getConfig(); + $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($config)); + $manager->registerHomeProvider(new ObjectHomeMountProvider($objectStoreConfig)); + $manager->registerRootProvider(new RootMountProvider($objectStoreConfig, $config)); + $manager->registerRootProvider(new ObjectStorePreviewCacheMountProvider($logger, $config)); return $manager; }); - $this->registerService('IniWrapper', function ($c) { - return new IniGetWrapper(); - }); - $this->registerService('AsyncCommandBus', function (Server $c) { - $jobList = $c->getJobList(); - return new AsyncBus($jobList); - }); - $this->registerService('TrustedDomainHelper', function ($c) { - return new TrustedDomainHelper($this->getConfig()); + + $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->registerService('Throttler', function(Server $c) { - return new Throttler( - $c->getDatabaseConnection(), - new TimeFactory(), - $c->getLogger(), - $c->getConfig() - ); + $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->registerService('IntegrityCodeChecker', function (Server $c) { - // IConfig and IAppManager requires a working database. This code - // might however be called when ownCloud is not yet setup. - if(\OC::$server->getSystemConfig()->getValue('installed', false)) { - $config = $c->getConfig(); - $appManager = $c->getAppManager(); + + $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; - $appManager = null; + $appConfig = null; } return new Checker( - new EnvironmentHelper(), - new FileAccessHelper(), - new AppLocator(), - $config, - $c->getMemCacheFactory(), - $appManager, - $c->getTempManager() + $c->get(ServerVersion::class), + $c->get(EnvironmentHelper::class), + new FileAccessHelper(), + new AppLocator(), + $config, + $appConfig, + $c->get(ICacheFactory::class), + $c->get(IAppManager::class), + $c->get(IMimeTypeDetector::class) ); }); - $this->registerService('Request', function ($c) { + $this->registerService(Request::class, function (ContainerInterface $c) { if (isset($this['urlParams'])) { $urlParams = $this['urlParams']; } else { @@ -612,112 +898,186 @@ class Server extends ServerContainer implements IServerContainer { 'cookies' => $_COOKIE, 'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD'])) ? $_SERVER['REQUEST_METHOD'] - : null, + : '', 'urlParams' => $urlParams, ], - $this->getSecureRandom(), - $this->getConfig(), - $this->getCsrfTokenManager(), + $this->get(IRequestId::class), + $this->get(\OCP\IConfig::class), + $this->get(CsrfTokenManager::class), $stream ); }); - $this->registerService('Mailer', function (Server $c) { + $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) + ); + }); + + $this->registerService(IMailer::class, function (Server $c) { return new Mailer( - $c->getConfig(), - $c->getLogger(), - $c->getThemingDefaults() + $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) ); }); - $this->registerService('LDAPProvider', function(Server $c) { - $config = $c->getConfig(); + + /** @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)) { - throw new \Exception('ldapProviderFactory not set'); + if (is_null($factoryClass) || !class_exists($factoryClass)) { + return new NullLDAPProviderFactory($this); } /** @var \OCP\LDAP\ILDAPProviderFactory $factory */ - $factory = new $factoryClass($this); + return new $factoryClass($this); + }); + $this->registerService(ILDAPProvider::class, function (ContainerInterface $c) { + $factory = $c->get(ILDAPProviderFactory::class); return $factory->getLDAPProvider(); }); - $this->registerService('LockingProvider', function (Server $c) { - $ini = $c->getIniWrapper(); - $config = $c->getConfig(); - $ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time'))); - if ($config->getSystemValue('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) { + $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) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) { /** @var \OC\Memcache\Factory $memcacheFactory */ - $memcacheFactory = $c->getMemCacheFactory(); + $memcacheFactory = $c->get(ICacheFactory::class); $memcache = $memcacheFactory->createLocking('lock'); if (!($memcache instanceof \OC\Memcache\NullCache)) { - return new MemcacheLockingProvider($memcache, $ttl); + $timeFactory = $c->get(ITimeFactory::class); + return new MemcacheLockingProvider($memcache, $timeFactory, $ttl); } - return new DBLockingProvider($c->getDatabaseConnection(), $c->getLogger(), new TimeFactory(), $ttl); + return new DBLockingProvider( + $c->get(IDBConnection::class), + new TimeFactory(), + $ttl, + !\OC::$CLI + ); } return new NoopLockingProvider(); }); - $this->registerService('MountManager', function () { - return new \OC\Files\Mount\Manager(); + + $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->registerService('MimeTypeDetector', function (Server $c) { + $this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class); + + $this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) { return new \OC\Files\Type\Detection( - $c->getURLGenerator(), + $c->get(IURLGenerator::class), + $c->get(LoggerInterface::class), \OC::$configDir, \OC::$SERVERROOT . '/resources/config/' ); }); - $this->registerService('MimeTypeLoader', function (Server $c) { - return new \OC\Files\Type\Loader( - $c->getDatabaseConnection() - ); - }); - $this->registerService('NotificationManager', function (Server $c) { - return new Manager( - $c->query(IValidator::class) - ); + + $this->registerAlias(IMimeTypeLoader::class, Loader::class); + $this->registerService(BundleFetcher::class, function () { + return new BundleFetcher($this->getL10N('lib')); }); - $this->registerService('CapabilitiesManager', function (Server $c) { - $manager = new \OC\CapabilitiesManager($c->getLogger()); + $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->getConfig()); + 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('CommentsManager', function(Server $c) { - $config = $c->getConfig(); - $factoryClass = $config->getSystemValue('comments.managerFactory', '\OC\Comments\ManagerFactory'); + + $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); - return $factory->getManager(); - }); - $this->registerService('ThemingDefaults', function(Server $c) { - /* - * Dark magic for autoloader. - * If we do a class_exists it will try to load the class which will - * make composer cache the result. Resulting in errors when enabling - * the theming app. - */ - $prefixes = \OC::$composerAutoloader->getPrefixesPsr4(); - if (isset($prefixes['OCA\\Theming\\'])) { - $classExists = true; - } else { + $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->getConfig()->getSystemValue('installed', false) && $c->getAppManager()->isInstalled('theming')) { + 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->getConfig(), + $c->get(\OCP\IConfig::class), + $c->get(\OCP\IAppConfig::class), $c->getL10N('theming'), - $c->getURLGenerator(), - new \OC_Defaults(), - $c->getLazyRootFolder(), - $c->getMemCacheFactory() + $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('EventDispatcher', function () { - return new EventDispatcher(); + $this->registerService(JSCombiner::class, function (Server $c) { + return new JSCombiner( + $c->getAppDataDir('js'), + $c->get(IURLGenerator::class), + $this->get(ICacheFactory::class), + $c->get(SystemConfig::class), + $c->get(LoggerInterface::class) + ); }); - $this->registerService('CryptoWrapper', function (Server $c) { - // FIXME: Instantiiated here due to cyclic dependency + $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, @@ -730,120 +1090,240 @@ class Server extends ServerContainer implements IServerContainer { ? $_SERVER['REQUEST_METHOD'] : null, ], - $c->getSecureRandom(), - $c->getConfig() + $c->get(IRequestId::class), + $c->get(\OCP\IConfig::class) ); return new CryptoWrapper( - $c->getConfig(), - $c->getCrypto(), - $c->getSecureRandom(), + $c->get(ICrypto::class), + $c->get(ISecureRandom::class), $request ); }); - $this->registerService('CsrfTokenManager', function (Server $c) { - $tokenGenerator = new CsrfTokenGenerator($c->getSecureRandom()); + $this->registerService(SessionStorage::class, function (ContainerInterface $c) { + return new SessionStorage($c->get(ISession::class)); + }); + $this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class); - return new CsrfTokenManager( - $tokenGenerator, - $c->query(SessionStorage::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->registerService(SessionStorage::class, function (Server $c) { - return new SessionStorage($c->getSession()); + + $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->registerService('ContentSecurityPolicyManager', function (Server $c) { - return new ContentSecurityPolicyManager(); + $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('ContentSecurityPolicyNonceManager', function(Server $c) { - return new ContentSecurityPolicyNonceManager( - $c->getCsrfTokenManager(), - $c->getRequest() + + $this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) { + return new DiscoveryService( + $c->get(ICacheFactory::class), + $c->get(IClientService::class) ); }); - $this->registerService('ShareManager', function(Server $c) { - $config = $c->getConfig(); - $factoryClass = $config->getSystemValue('sharing.managerFactory', '\OC\Share20\ProviderFactory'); - /** @var \OCP\Share\IProviderFactory $factory */ - $factory = new $factoryClass($this); + $this->registerAlias(IOCMDiscoveryService::class, OCMDiscoveryService::class); - $manager = new \OC\Share20\Manager( - $c->getLogger(), - $c->getConfig(), - $c->getSecureRandom(), - $c->getHasher(), - $c->getMountManager(), - $c->getGroupManager(), - $c->getL10N('core'), - $factory, - $c->getUserManager(), - $c->getLazyRootFolder(), - $c->getEventDispatcher() + $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), ); + }); - return $manager; + $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->registerService('SettingsManager', function(Server $c) { - $manager = new \OC\Settings\Manager( - $c->getLogger(), - $c->getDatabaseConnection(), - $c->getL10N('lib'), - $c->getConfig(), - $c->getEncryptionManager(), - $c->getUserManager(), - $c->getLockingProvider(), - new \OC\Settings\Mapper($c->getDatabaseConnection()) + + $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->registerService(Defaults::class, function (Server $c) { + return new Defaults( + $c->get('ThemingDefaults') ); - return $manager; }); - $this->registerService(\OC\Files\AppData\Factory::class, function (Server $c) { - return new \OC\Files\AppData\Factory( - $c->getRootFolder(), - $c->getSystemConfig() + + $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('LockdownManager', function (Server $c) { - return new LockdownManager(); + $this->registerService(Installer::class, function (ContainerInterface $c) { + return new Installer( + $c->get(AppFetcher::class), + $c->get(IClientService::class), + $c->get(ITempManager::class), + $c->get(LoggerInterface::class), + $c->get(\OCP\IConfig::class), + \OC::$CLI + ); }); - /* To trick DI since we don't extend the DIContainer here */ - $this->registerService(CleanPreviewsBackgroundJob::class, function (Server $c) { - return new CleanPreviewsBackgroundJob( - $c->getRootFolder(), - $c->getLogger(), - $c->getJobList(), - new TimeFactory() - ); + $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->registerAlias(IContactsStore::class, ContactsStore::class); + $this->registerAlias(IAccountManager::class, AccountManager::class); + + $this->registerAlias(IStorageFactory::class, StorageFactory::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(ISubAdmin::class, SubAdmin::class); + + $this->registerAlias(IInitialStateService::class, InitialStateService::class); + + $this->registerAlias(\OCP\IEmojiHelper::class, \OC\EmojiHelper::class); + + $this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class); + + $this->registerAlias(IBroker::class, Broker::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(IBinaryFinder::class, BinaryFinder::class); + + $this->registerAlias(\OCP\Share\IPublicShareTemplateFactory::class, \OC\Share20\PublicShareTemplateFactory::class); + + $this->registerAlias(ITranslationManager::class, TranslationManager::class); + + $this->registerAlias(IConversionManager::class, ConversionManager::class); + + $this->registerAlias(ISpeechToTextManager::class, SpeechToTextManager::class); + + $this->registerAlias(IEventSourceFactory::class, EventSourceFactory::class); + + $this->registerAlias(\OCP\TextProcessing\IManager::class, \OC\TextProcessing\Manager::class); + + $this->registerAlias(\OCP\TextToImage\IManager::class, \OC\TextToImage\Manager::class); + + $this->registerAlias(ILimiter::class, Limiter::class); + + $this->registerAlias(IPhoneNumberUtil::class, PhoneNumberUtil::class); + + $this->registerAlias(ICapabilityAwareOCMProvider::class, OCMProvider::class); + $this->registerDeprecatedAlias(IOCMProvider::class, OCMProvider::class); + + $this->registerAlias(ISetupCheckManager::class, SetupCheckManager::class); + + $this->registerAlias(IProfileManager::class, ProfileManager::class); + + $this->registerAlias(IAvailabilityCoordinator::class, AvailabilityCoordinator::class); + + $this->registerAlias(IDeclarativeManager::class, DeclarativeManager::class); + + $this->registerAlias(\OCP\TaskProcessing\IManager::class, \OC\TaskProcessing\Manager::class); + + $this->registerAlias(IRemoteAddress::class, RemoteAddress::class); + + $this->registerAlias(\OCP\Security\Ip\IFactory::class, \OC\Security\Ip\Factory::class); + + $this->registerAlias(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class); + + $this->registerAlias(ISignatureManager::class, SignatureManager::class); + + $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->query('ContactsManager'); + return $this->get(\OCP\Contacts\IManager::class); } /** * @return \OC\Encryption\Manager + * @deprecated 20.0.0 */ public function getEncryptionManager() { - return $this->query('EncryptionManager'); + return $this->get(\OCP\Encryption\IManager::class); } /** * @return \OC\Encryption\File + * @deprecated 20.0.0 */ public function getEncryptionFilesHelper() { - return $this->query('EncryptionFileHelper'); - } - - /** - * @return \OCP\Encryption\Keys\IStorage - */ - public function getEncryptionKeyStorage() { - return $this->query('EncryptionKeyStorage'); + return $this->get(IFile::class); } /** @@ -852,69 +1332,20 @@ class Server extends ServerContainer implements IServerContainer { * 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->query('Request'); - } - - /** - * Returns the preview manager which can create preview images for a given file - * - * @return \OCP\IPreview - */ - public function getPreviewManager() { - return $this->query('PreviewManager'); - } - - /** - * Returns the tag manager which can get and set tags for different object types - * - * @see \OCP\ITagManager::load() - * @return \OCP\ITagManager - */ - public function getTagManager() { - return $this->query('TagManager'); - } - - /** - * Returns the system-tag manager - * - * @return \OCP\SystemTag\ISystemTagManager - * - * @since 9.0.0 - */ - public function getSystemTagManager() { - return $this->query('SystemTagManager'); - } - - /** - * Returns the system-tag object mapper - * - * @return \OCP\SystemTag\ISystemTagObjectMapper - * - * @since 9.0.0 - */ - public function getSystemTagObjectMapper() { - return $this->query('SystemTagObjectMapper'); - } - - - /** - * Returns the avatar manager, used for avatar functionality - * - * @return \OCP\IAvatarManager - */ - public function getAvatarManager() { - return $this->query('AvatarManager'); + return $this->get(IRequest::class); } /** * Returns the root folder of ownCloud's data directory * - * @return \OCP\Files\IRootFolder + * @return IRootFolder + * @deprecated 20.0.0 */ public function getRootFolder() { - return $this->query('LazyRootFolder'); + return $this->get(IRootFolder::class); } /** @@ -922,10 +1353,11 @@ class Server extends ServerContainer implements IServerContainer { * This is the lazy variant so this gets only initialized once it * is actually used. * - * @return \OCP\Files\IRootFolder + * @return IRootFolder + * @deprecated 20.0.0 */ public function getLazyRootFolder() { - return $this->query('LazyRootFolder'); + return $this->get(IRootFolder::class); } /** @@ -933,115 +1365,84 @@ class Server extends ServerContainer implements IServerContainer { * * @param string $userId user ID * @return \OCP\Files\Folder|null + * @deprecated 20.0.0 */ public function getUserFolder($userId = null) { if ($userId === null) { - $user = $this->getUserSession()->getUser(); + $user = $this->get(IUserSession::class)->getUser(); if (!$user) { return null; } $userId = $user->getUID(); } - $root = $this->getRootFolder(); + $root = $this->get(IRootFolder::class); return $root->getUserFolder($userId); } /** - * Returns an app-specific view in ownClouds data directory - * - * @return \OCP\Files\Folder - * @deprecated since 9.2.0 use IAppData - */ - public function getAppFolder() { - $dir = '/' . \OC_App::getCurrentApp(); - $root = $this->getRootFolder(); - if (!$root->nodeExists($dir)) { - $folder = $root->newFolder($dir); - } else { - $folder = $root->get($dir); - } - return $folder; - } - - /** * @return \OC\User\Manager + * @deprecated 20.0.0 */ public function getUserManager() { - return $this->query('UserManager'); + return $this->get(IUserManager::class); } /** * @return \OC\Group\Manager + * @deprecated 20.0.0 */ public function getGroupManager() { - return $this->query('GroupManager'); + return $this->get(IGroupManager::class); } /** * @return \OC\User\Session + * @deprecated 20.0.0 */ public function getUserSession() { - return $this->query('UserSession'); + return $this->get(IUserSession::class); } /** * @return \OCP\ISession + * @deprecated 20.0.0 */ public function getSession() { - return $this->query('UserSession')->getSession(); + return $this->get(Session::class)->getSession(); } /** * @param \OCP\ISession $session + * @return void */ public function setSession(\OCP\ISession $session) { - $this->query(SessionStorage::class)->setSession($session); - return $this->query('UserSession')->setSession($session); - } - - /** - * @return \OC\Authentication\TwoFactorAuth\Manager - */ - public function getTwoFactorAuthManager() { - return $this->query('\OC\Authentication\TwoFactorAuth\Manager'); - } - - /** - * @return \OC\NavigationManager - */ - public function getNavigationManager() { - return $this->query('NavigationManager'); + $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->query('AllConfig'); + return $this->get(AllConfig::class); } /** - * @internal For internal use only * @return \OC\SystemConfig + * @deprecated 20.0.0 */ public function getSystemConfig() { - return $this->query('SystemConfig'); - } - - /** - * Returns the app config manager - * - * @return \OCP\IAppConfig - */ - public function getAppConfig() { - return $this->query('AppConfig'); + return $this->get(SystemConfig::class); } /** - * @return \OCP\L10N\IFactory + * @return IFactory + * @deprecated 20.0.0 */ public function getL10NFactory() { - return $this->query('L10NFactory'); + return $this->get(IFactory::class); } /** @@ -1050,366 +1451,179 @@ class Server extends ServerContainer implements IServerContainer { * @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->getL10NFactory()->get($app, $lang); + return $this->get(IFactory::class)->get($app, $lang); } /** - * @return \OCP\IURLGenerator + * @return IURLGenerator + * @deprecated 20.0.0 */ public function getURLGenerator() { - return $this->query('URLGenerator'); - } - - /** - * @return \OCP\IHelper - */ - public function getHelper() { - return $this->query('AppHelper'); - } - - /** - * @return AppFetcher - */ - public function getAppFetcher() { - return $this->query('AppFetcher'); + return $this->get(IURLGenerator::class); } /** * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use * getMemCacheFactory() instead. * - * @return \OCP\ICache + * @return ICache * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache */ public function getCache() { - return $this->query('UserCache'); + return $this->get(ICache::class); } /** * Returns an \OCP\CacheFactory instance * * @return \OCP\ICacheFactory + * @deprecated 20.0.0 */ public function getMemCacheFactory() { - return $this->query('MemCacheFactory'); + return $this->get(ICacheFactory::class); } /** - * Returns an \OC\RedisFactory instance - * - * @return \OC\RedisFactory - */ - public function getGetRedisFactory() { - return $this->query('RedisFactory'); - } - - - /** * Returns the current session * * @return \OCP\IDBConnection + * @deprecated 20.0.0 */ public function getDatabaseConnection() { - return $this->query('DatabaseConnection'); + return $this->get(IDBConnection::class); } /** * Returns the activity manager * * @return \OCP\Activity\IManager + * @deprecated 20.0.0 */ public function getActivityManager() { - return $this->query('ActivityManager'); + return $this->get(\OCP\Activity\IManager::class); } /** * Returns an job list for controlling background jobs * - * @return \OCP\BackgroundJob\IJobList + * @return IJobList + * @deprecated 20.0.0 */ public function getJobList() { - return $this->query('JobList'); - } - - /** - * Returns a logger instance - * - * @return \OCP\ILogger - */ - public function getLogger() { - return $this->query('Logger'); - } - - /** - * Returns a router for generating and matching urls - * - * @return \OCP\Route\IRouter - */ - public function getRouter() { - return $this->query('Router'); - } - - /** - * Returns a search instance - * - * @return \OCP\ISearch - */ - public function getSearch() { - return $this->query('Search'); + return $this->get(IJobList::class); } /** * Returns a SecureRandom instance * * @return \OCP\Security\ISecureRandom + * @deprecated 20.0.0 */ public function getSecureRandom() { - return $this->query('SecureRandom'); + return $this->get(ISecureRandom::class); } /** * Returns a Crypto instance * - * @return \OCP\Security\ICrypto + * @return ICrypto + * @deprecated 20.0.0 */ public function getCrypto() { - return $this->query('Crypto'); + return $this->get(ICrypto::class); } /** * Returns a Hasher instance * - * @return \OCP\Security\IHasher + * @return IHasher + * @deprecated 20.0.0 */ public function getHasher() { - return $this->query('Hasher'); - } - - /** - * Returns a CredentialsManager instance - * - * @return \OCP\Security\ICredentialsManager - */ - public function getCredentialsManager() { - return $this->query('CredentialsManager'); - } - - /** - * Returns an instance of the HTTP helper class - * - * @deprecated Use getHTTPClientService() - * @return \OC\HTTPHelper - */ - public function getHTTPHelper() { - return $this->query('HTTPHelper'); - } - - /** - * Get the certificate manager for the user - * - * @param string $userId (optional) if not specified the current loggedin user is used, use null to get the system certificate manager - * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in - */ - public function getCertificateManager($userId = '') { - if ($userId === '') { - $userSession = $this->getUserSession(); - $user = $userSession->getUser(); - if (is_null($user)) { - return null; - } - $userId = $user->getUID(); - } - return new CertificateManager($userId, new View(), $this->getConfig()); + return $this->get(IHasher::class); } /** - * Returns an instance of the HTTP client service + * Get the certificate manager * - * @return \OCP\Http\Client\IClientService + * @return \OCP\ICertificateManager */ - public function getHTTPClientService() { - return $this->query('HttpClientService'); - } - - /** - * Create a new event source - * - * @return \OCP\IEventSource - */ - public function createEventSource() { - return new \OC_EventSource(); - } - - /** - * Get the active event logger - * - * The returned logger only logs data when debug mode is enabled - * - * @return \OCP\Diagnostics\IEventLogger - */ - public function getEventLogger() { - return $this->query('EventLogger'); - } - - /** - * Get the active query logger - * - * The returned logger only logs data when debug mode is enabled - * - * @return \OCP\Diagnostics\IQueryLogger - */ - public function getQueryLogger() { - return $this->query('QueryLogger'); + 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->query('TempManager'); + return $this->get(ITempManager::class); } /** * Get the app manager * * @return \OCP\App\IAppManager + * @deprecated 20.0.0 */ public function getAppManager() { - return $this->query('AppManager'); + return $this->get(IAppManager::class); } /** * Creates a new mailer * - * @return \OCP\Mail\IMailer + * @return IMailer + * @deprecated 20.0.0 */ public function getMailer() { - return $this->query('Mailer'); + return $this->get(IMailer::class); } /** * Get the webroot * * @return string + * @deprecated 20.0.0 */ public function getWebRoot() { return $this->webRoot; } /** - * @return \OC\OCSClient - */ - public function getOcsClient() { - return $this->query('OcsClient'); - } - - /** - * @return \OCP\IDateTimeZone - */ - public function getDateTimeZone() { - return $this->query('DateTimeZone'); - } - - /** - * @return \OCP\IDateTimeFormatter - */ - public function getDateTimeFormatter() { - return $this->query('DateTimeFormatter'); - } - - /** - * @return \OCP\Files\Config\IMountProviderCollection - */ - public function getMountProviderCollection() { - return $this->query('MountConfigManager'); - } - - /** - * Get the IniWrapper - * - * @return IniGetWrapper - */ - public function getIniWrapper() { - return $this->query('IniWrapper'); - } - - /** - * @return \OCP\Command\IBus - */ - public function getCommandBus() { - return $this->query('AsyncCommandBus'); - } - - /** - * Get the trusted domain helper - * - * @return TrustedDomainHelper - */ - public function getTrustedDomainHelper() { - return $this->query('TrustedDomainHelper'); - } - - /** * Get the locking provider * - * @return \OCP\Lock\ILockingProvider + * @return ILockingProvider * @since 8.1.0 + * @deprecated 20.0.0 */ public function getLockingProvider() { - return $this->query('LockingProvider'); - } - - /** - * @return \OCP\Files\Mount\IMountManager - **/ - function getMountManager() { - return $this->query('MountManager'); - } - - /** @return \OCP\Files\Config\IUserMountCache */ - function getUserMountCache() { - return $this->query('UserMountCache'); + return $this->get(ILockingProvider::class); } /** * Get the MimeTypeDetector * - * @return \OCP\Files\IMimeTypeDetector + * @return IMimeTypeDetector + * @deprecated 20.0.0 */ public function getMimeTypeDetector() { - return $this->query('MimeTypeDetector'); + return $this->get(IMimeTypeDetector::class); } /** * Get the MimeTypeLoader * - * @return \OCP\Files\IMimeTypeLoader + * @return IMimeTypeLoader + * @deprecated 20.0.0 */ public function getMimeTypeLoader() { - return $this->query('MimeTypeLoader'); - } - - /** - * Get the manager of all the capabilities - * - * @return \OC\CapabilitiesManager - */ - public function getCapabilitiesManager() { - return $this->query('CapabilitiesManager'); - } - - /** - * Get the EventDispatcher - * - * @return EventDispatcherInterface - * @since 8.2.0 - */ - public function getEventDispatcher() { - return $this->query('EventDispatcher'); + return $this->get(IMimeTypeLoader::class); } /** @@ -1417,139 +1631,66 @@ class Server extends ServerContainer implements IServerContainer { * * @return \OCP\Notification\IManager * @since 8.2.0 + * @deprecated 20.0.0 */ public function getNotificationManager() { - return $this->query('NotificationManager'); + return $this->get(\OCP\Notification\IManager::class); } /** - * @return \OCP\Comments\ICommentsManager - */ - public function getCommentsManager() { - return $this->query('CommentsManager'); - } - - /** - * @return \OC_Defaults + * @return \OCA\Theming\ThemingDefaults + * @deprecated 20.0.0 */ public function getThemingDefaults() { - return $this->query('ThemingDefaults'); + return $this->get('ThemingDefaults'); } /** * @return \OC\IntegrityCheck\Checker + * @deprecated 20.0.0 */ public function getIntegrityCodeChecker() { - return $this->query('IntegrityCodeChecker'); - } - - /** - * @return \OC\Session\CryptoWrapper - */ - public function getSessionCryptoWrapper() { - return $this->query('CryptoWrapper'); + return $this->get('IntegrityCodeChecker'); } /** * @return CsrfTokenManager + * @deprecated 20.0.0 */ public function getCsrfTokenManager() { - return $this->query('CsrfTokenManager'); - } - - /** - * @return Throttler - */ - public function getBruteForceThrottler() { - return $this->query('Throttler'); - } - - /** - * @return IContentSecurityPolicyManager - */ - public function getContentSecurityPolicyManager() { - return $this->query('ContentSecurityPolicyManager'); + return $this->get(CsrfTokenManager::class); } /** * @return ContentSecurityPolicyNonceManager + * @deprecated 20.0.0 */ public function getContentSecurityPolicyNonceManager() { - return $this->query('ContentSecurityPolicyNonceManager'); - } - - /** - * Not a public API as of 8.2, wait for 9.0 - * - * @return \OCA\Files_External\Service\BackendService - */ - public function getStoragesBackendService() { - return $this->query('OCA\\Files_External\\Service\\BackendService'); - } - - /** - * Not a public API as of 8.2, wait for 9.0 - * - * @return \OCA\Files_External\Service\GlobalStoragesService - */ - public function getGlobalStoragesService() { - return $this->query('OCA\\Files_External\\Service\\GlobalStoragesService'); - } - - /** - * Not a public API as of 8.2, wait for 9.0 - * - * @return \OCA\Files_External\Service\UserGlobalStoragesService - */ - public function getUserGlobalStoragesService() { - return $this->query('OCA\\Files_External\\Service\\UserGlobalStoragesService'); - } - - /** - * Not a public API as of 8.2, wait for 9.0 - * - * @return \OCA\Files_External\Service\UserStoragesService - */ - public function getUserStoragesService() { - return $this->query('OCA\\Files_External\\Service\\UserStoragesService'); - } - - /** - * @return \OCP\Share\IManager - */ - public function getShareManager() { - return $this->query('ShareManager'); - } - - /** - * Returns the LDAP Provider - * - * @return \OCP\LDAP\ILDAPProvider - */ - public function getLDAPProvider() { - return $this->query('LDAPProvider'); + return $this->get(ContentSecurityPolicyNonceManager::class); } /** * @return \OCP\Settings\IManager + * @deprecated 20.0.0 */ public function getSettingsManager() { - return $this->query('SettingsManager'); + 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) { - /** @var \OC\Files\AppData\Factory $factory */ - $factory = $this->query(\OC\Files\AppData\Factory::class); + $factory = $this->get(\OC\Files\AppData\Factory::class); return $factory->get($app); } /** - * @return \OCP\Lockdown\ILockdownManager + * @return \OCP\Federation\ICloudIdManager + * @deprecated 20.0.0 */ - public function getLockdownManager() { - return $this->query('LockdownManager'); + public function getCloudIdManager() { + return $this->get(ICloudIdManager::class); } } |