nextcloud / server

apps/dav/appinfo/v1/carddav.php

Indentation +25 added lines, -25 removed lines

@@ -36,33 +36,33 @@ 
 use Sabre\CardDAV\Plugin;
 
 $authBackend = new Auth(
-	Server::get(ISession::class),
-	Server::get(IUserSession::class),
-	Server::get(IRequest::class),
-	Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
-	Server::get(IThrottler::class),
-	'principals/'
+    Server::get(ISession::class),
+    Server::get(IUserSession::class),
+    Server::get(IRequest::class),
+    Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
+    Server::get(IThrottler::class),
+    'principals/'
 );
 $principalBackend = new Principal(
-	Server::get(IUserManager::class),
-	Server::get(IGroupManager::class),
-	Server::get(IAccountManager::class),
-	Server::get(\OCP\Share\IManager::class),
-	Server::get(IUserSession::class),
-	Server::get(IAppManager::class),
-	Server::get(ProxyMapper::class),
-	Server::get(KnownUserService::class),
-	Server::get(IConfig::class),
-	\OC::$server->getL10NFactory(),
-	'principals/'
+    Server::get(IUserManager::class),
+    Server::get(IGroupManager::class),
+    Server::get(IAccountManager::class),
+    Server::get(\OCP\Share\IManager::class),
+    Server::get(IUserSession::class),
+    Server::get(IAppManager::class),
+    Server::get(ProxyMapper::class),
+    Server::get(KnownUserService::class),
+    Server::get(IConfig::class),
+    \OC::$server->getL10NFactory(),
+    'principals/'
 );
 $db = Server::get(IDBConnection::class);
 $cardDavBackend = new CardDavBackend(
-	$db,
-	$principalBackend,
-	Server::get(IUserManager::class),
-	Server::get(IEventDispatcher::class),
-	Server::get(\OCA\DAV\CardDAV\Sharing\Backend::class),
+    $db,
+    $principalBackend,
+    Server::get(IUserManager::class),
+    Server::get(IEventDispatcher::class),
+    Server::get(\OCA\DAV\CardDAV\Sharing\Backend::class),
 );
 
 $debugging = Server::get(IConfig::class)->getSystemValue('debug', false);
@@ -76,8 +76,8 @@ 
 $addressBookRoot->disableListing = !$debugging; // Disable listing
 
 $nodes = [
-	$principalCollection,
-	$addressBookRoot,
+    $principalCollection,
+    $addressBookRoot,
 ];
 
 // Fire up server
@@ -92,7 +92,7 @@ 
 
 $server->addPlugin(new LegacyDAVACL());
 if ($debugging) {
-	$server->addPlugin(new Sabre\DAV\Browser\Plugin());
+    $server->addPlugin(new Sabre\DAV\Browser\Plugin());
 }
 
 $server->addPlugin(new \Sabre\DAV\Sync\Plugin());

apps/dav/lib/Server.php

Indentation +324 added lines, -324 removed lines

@@ -99,329 +99,329 @@
 use SearchDAV\DAV\SearchPlugin;
 
 class Server {
-	public Connector\Sabre\Server $server;
-	private IProfiler $profiler;
-
-	public function __construct(
-		private IRequest $request,
-		private string $baseUri,
-	) {
-		$this->profiler = \OCP\Server::get(IProfiler::class);
-		if ($this->profiler->isEnabled()) {
-			/** @var IEventLogger $eventLogger */
-			$eventLogger = \OCP\Server::get(IEventLogger::class);
-			$eventLogger->start('runtime', 'DAV Runtime');
-		}
-
-		$logger = \OCP\Server::get(LoggerInterface::class);
-		$eventDispatcher = \OCP\Server::get(IEventDispatcher::class);
-
-		$root = new RootCollection();
-		$this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
-
-		// Add maintenance plugin
-		$this->server->addPlugin(new MaintenancePlugin(\OCP\Server::get(IConfig::class), \OC::$server->getL10N('dav')));
-
-		$this->server->addPlugin(new AppleQuirksPlugin());
-
-		// Backends
-		$authBackend = new Auth(
-			\OCP\Server::get(ISession::class),
-			\OCP\Server::get(IUserSession::class),
-			\OCP\Server::get(IRequest::class),
-			\OCP\Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
-			\OCP\Server::get(IThrottler::class)
-		);
-
-		// Set URL explicitly due to reverse-proxy situations
-		$this->server->httpRequest->setUrl($this->request->getRequestUri());
-		$this->server->setBaseUri($this->baseUri);
-
-		$this->server->addPlugin(new ProfilerPlugin($this->request));
-		$this->server->addPlugin(new BlockLegacyClientPlugin(
-			\OCP\Server::get(IConfig::class),
-			\OCP\Server::get(ThemingDefaults::class),
-		));
-		$this->server->addPlugin(new AnonymousOptionsPlugin());
-		$authPlugin = new Plugin();
-		$authPlugin->addBackend(new PublicAuth());
-		$this->server->addPlugin($authPlugin);
-
-		// allow setup of additional auth backends
-		$event = new SabrePluginEvent($this->server);
-		$eventDispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
-
-		$newAuthEvent = new SabrePluginAuthInitEvent($this->server);
-		$eventDispatcher->dispatchTyped($newAuthEvent);
-
-		$bearerAuthBackend = new BearerAuth(
-			\OCP\Server::get(IUserSession::class),
-			\OCP\Server::get(ISession::class),
-			\OCP\Server::get(IRequest::class),
-			\OCP\Server::get(IConfig::class),
-		);
-		$authPlugin->addBackend($bearerAuthBackend);
-		// because we are throwing exceptions this plugin has to be the last one
-		$authPlugin->addBackend($authBackend);
-
-		// debugging
-		if (\OCP\Server::get(IConfig::class)->getSystemValue('debug', false)) {
-			$this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
-		} else {
-			$this->server->addPlugin(new DummyGetResponsePlugin());
-		}
-
-		$this->server->addPlugin(new ExceptionLoggerPlugin('webdav', $logger));
-		$this->server->addPlugin(new LockPlugin());
-		$this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
-
-		// acl
-		$acl = new DavAclPlugin();
-		$acl->principalCollectionSet = [
-			'principals/users',
-			'principals/groups',
-			'principals/calendar-resources',
-			'principals/calendar-rooms',
-		];
-		$this->server->addPlugin($acl);
-
-		// calendar plugins
-		if ($this->requestIsForSubtree(['calendars', 'public-calendars', 'system-calendars', 'principals'])) {
-			$this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OCP\Server::get(IRequest::class), \OCP\Server::get(IConfig::class)));
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
-			$this->server->addPlugin(new ICSExportPlugin(\OCP\Server::get(IConfig::class), $logger));
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(\OCP\Server::get(IConfig::class), \OCP\Server::get(LoggerInterface::class), \OCP\Server::get(DefaultCalendarValidator::class)));
-
-			$this->server->addPlugin(\OCP\Server::get(\OCA\DAV\CalDAV\Trashbin\Plugin::class));
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\WebcalCaching\Plugin($this->request));
-			if (\OCP\Server::get(IConfig::class)->getAppValue('dav', 'allow_calendar_link_subscriptions', 'yes') === 'yes') {
-				$this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
-			}
-
-			$this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
-			$this->server->addPlugin(new PublishPlugin(
-				\OCP\Server::get(IConfig::class),
-				\OCP\Server::get(IURLGenerator::class)
-			));
-
-			$this->server->addPlugin(\OCP\Server::get(RateLimitingPlugin::class));
-			$this->server->addPlugin(\OCP\Server::get(CalDavValidatePlugin::class));
-		}
-
-		// addressbook plugins
-		if ($this->requestIsForSubtree(['addressbooks', 'principals'])) {
-			$this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OCP\Server::get(IRequest::class), \OCP\Server::get(IConfig::class)));
-			$this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
-			$this->server->addPlugin(new VCFExportPlugin());
-			$this->server->addPlugin(new MultiGetExportPlugin());
-			$this->server->addPlugin(new HasPhotoPlugin());
-			$this->server->addPlugin(new ImageExportPlugin(\OCP\Server::get(PhotoCache::class)));
-
-			$this->server->addPlugin(\OCP\Server::get(CardDavRateLimitingPlugin::class));
-			$this->server->addPlugin(\OCP\Server::get(CardDavValidatePlugin::class));
-		}
-
-		// system tags plugins
-		$this->server->addPlugin(\OCP\Server::get(SystemTagPlugin::class));
-
-		// comments plugin
-		$this->server->addPlugin(new CommentsPlugin(
-			\OCP\Server::get(ICommentsManager::class),
-			\OCP\Server::get(IUserSession::class)
-		));
-
-		$this->server->addPlugin(new CopyEtagHeaderPlugin());
-		$this->server->addPlugin(new RequestIdHeaderPlugin(\OCP\Server::get(IRequest::class)));
-		$this->server->addPlugin(new ChunkingV2Plugin(\OCP\Server::get(ICacheFactory::class)));
-		$this->server->addPlugin(new ChunkingPlugin());
-		$this->server->addPlugin(new ZipFolderPlugin(
-			$this->server->tree,
-			$logger,
-			$eventDispatcher,
-		));
-		$this->server->addPlugin(\OCP\Server::get(PaginatePlugin::class));
-
-		// allow setup of additional plugins
-		$eventDispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
-		$typedEvent = new SabrePluginAddEvent($this->server);
-		$eventDispatcher->dispatchTyped($typedEvent);
-
-		// Some WebDAV clients do require Class 2 WebDAV support (locking), since
-		// we do not provide locking we emulate it using a fake locking plugin.
-		if ($this->request->isUserAgent([
-			'/WebDAVFS/',
-			'/OneNote/',
-			'/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
-		])) {
-			$this->server->addPlugin(new FakeLockerPlugin());
-		}
-
-		if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
-			$this->server->addPlugin(new BrowserErrorPagePlugin());
-		}
-
-		$lazySearchBackend = new LazySearchBackend();
-		$this->server->addPlugin(new SearchPlugin($lazySearchBackend));
-
-		// wait with registering these until auth is handled and the filesystem is setup
-		$this->server->on('beforeMethod:*', function () use ($root, $lazySearchBackend, $logger): void {
-			// Allow view-only plugin for webdav requests
-			$this->server->addPlugin(new ViewOnlyPlugin(
-				\OC::$server->getUserFolder(),
-			));
-
-			// custom properties plugin must be the last one
-			$userSession = \OCP\Server::get(IUserSession::class);
-			$user = $userSession->getUser();
-			if ($user !== null) {
-				$view = Filesystem::getView();
-				$config = \OCP\Server::get(IConfig::class);
-				$this->server->addPlugin(
-					new FilesPlugin(
-						$this->server->tree,
-						$config,
-						$this->request,
-						\OCP\Server::get(IPreview::class),
-						\OCP\Server::get(IUserSession::class),
-						\OCP\Server::get(IFilenameValidator::class),
-						\OCP\Server::get(IAccountManager::class),
-						false,
-						$config->getSystemValueBool('debug', false) === false,
-					)
-				);
-				$this->server->addPlugin(new ChecksumUpdatePlugin());
-
-				$this->server->addPlugin(
-					new \Sabre\DAV\PropertyStorage\Plugin(
-						new CustomPropertiesBackend(
-							$this->server,
-							$this->server->tree,
-							\OCP\Server::get(IDBConnection::class),
-							\OCP\Server::get(IUserSession::class)->getUser(),
-							\OCP\Server::get(DefaultCalendarValidator::class),
-						)
-					)
-				);
-				if ($view !== null) {
-					$this->server->addPlugin(
-						new QuotaPlugin($view));
-				}
-				$this->server->addPlugin(
-					new TagsPlugin(
-						$this->server->tree, \OCP\Server::get(ITagManager::class), \OCP\Server::get(IEventDispatcher::class), \OCP\Server::get(IUserSession::class)
-					)
-				);
-
-				// TODO: switch to LazyUserFolder
-				$userFolder = \OC::$server->getUserFolder();
-				$shareManager = \OCP\Server::get(\OCP\Share\IManager::class);
-				$this->server->addPlugin(new SharesPlugin(
-					$this->server->tree,
-					$userSession,
-					$userFolder,
-					$shareManager,
-				));
-				$this->server->addPlugin(new CommentPropertiesPlugin(
-					\OCP\Server::get(ICommentsManager::class),
-					$userSession
-				));
-				if (\OCP\Server::get(IConfig::class)->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') {
-					$this->server->addPlugin(new IMipPlugin(
-						\OCP\Server::get(IAppConfig::class),
-						\OCP\Server::get(IMailer::class),
-						\OCP\Server::get(LoggerInterface::class),
-						\OCP\Server::get(ITimeFactory::class),
-						\OCP\Server::get(Defaults::class),
-						$userSession,
-						\OCP\Server::get(IMipService::class),
-						\OCP\Server::get(EventComparisonService::class),
-						\OCP\Server::get(\OCP\Mail\Provider\IManager::class)
-					));
-				}
-				$this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
-				if ($view !== null) {
-					$this->server->addPlugin(new FilesReportPlugin(
-						$this->server->tree,
-						$view,
-						\OCP\Server::get(ISystemTagManager::class),
-						\OCP\Server::get(ISystemTagObjectMapper::class),
-						\OCP\Server::get(ITagManager::class),
-						$userSession,
-						\OCP\Server::get(IGroupManager::class),
-						$userFolder,
-						\OCP\Server::get(IAppManager::class)
-					));
-					$lazySearchBackend->setBackend(new FileSearchBackend(
-						$this->server->tree,
-						$user,
-						\OCP\Server::get(IRootFolder::class),
-						$shareManager,
-						$view,
-						\OCP\Server::get(IFilesMetadataManager::class)
-					));
-					$this->server->addPlugin(
-						new BulkUploadPlugin(
-							$userFolder,
-							$logger
-						)
-					);
-				}
-				$this->server->addPlugin(new EnablePlugin(
-					\OCP\Server::get(IConfig::class),
-					\OCP\Server::get(BirthdayService::class),
-					$user
-				));
-				$this->server->addPlugin(new AppleProvisioningPlugin(
-					\OCP\Server::get(IUserSession::class),
-					\OCP\Server::get(IURLGenerator::class),
-					\OCP\Server::get(ThemingDefaults::class),
-					\OCP\Server::get(IRequest::class),
-					\OC::$server->getL10N('dav'),
-					function () {
-						return UUIDUtil::getUUID();
-					}
-				));
-			}
-
-			// register plugins from apps
-			$pluginManager = new PluginManager(
-				\OC::$server,
-				\OCP\Server::get(IAppManager::class)
-			);
-			foreach ($pluginManager->getAppPlugins() as $appPlugin) {
-				$this->server->addPlugin($appPlugin);
-			}
-			foreach ($pluginManager->getAppCollections() as $appCollection) {
-				$root->addChild($appCollection);
-			}
-		});
-
-		$this->server->addPlugin(
-			new PropfindCompressionPlugin()
-		);
-	}
-
-	public function exec() {
-		/** @var IEventLogger $eventLogger */
-		$eventLogger = \OCP\Server::get(IEventLogger::class);
-		$eventLogger->start('dav_server_exec', '');
-		$this->server->start();
-		$eventLogger->end('dav_server_exec');
-		if ($this->profiler->isEnabled()) {
-			$eventLogger->end('runtime');
-			$profile = $this->profiler->collect(\OCP\Server::get(IRequest::class), new Response());
-			$this->profiler->saveProfile($profile);
-		}
-	}
-
-	private function requestIsForSubtree(array $subTrees): bool {
-		foreach ($subTrees as $subTree) {
-			$subTree = trim($subTree, ' /');
-			if (str_starts_with($this->server->getRequestUri(), $subTree . '/')) {
-				return true;
-			}
-		}
-		return false;
-	}
+    public Connector\Sabre\Server $server;
+    private IProfiler $profiler;
+
+    public function __construct(
+        private IRequest $request,
+        private string $baseUri,
+    ) {
+        $this->profiler = \OCP\Server::get(IProfiler::class);
+        if ($this->profiler->isEnabled()) {
+            /** @var IEventLogger $eventLogger */
+            $eventLogger = \OCP\Server::get(IEventLogger::class);
+            $eventLogger->start('runtime', 'DAV Runtime');
+        }
+
+        $logger = \OCP\Server::get(LoggerInterface::class);
+        $eventDispatcher = \OCP\Server::get(IEventDispatcher::class);
+
+        $root = new RootCollection();
+        $this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
+
+        // Add maintenance plugin
+        $this->server->addPlugin(new MaintenancePlugin(\OCP\Server::get(IConfig::class), \OC::$server->getL10N('dav')));
+
+        $this->server->addPlugin(new AppleQuirksPlugin());
+
+        // Backends
+        $authBackend = new Auth(
+            \OCP\Server::get(ISession::class),
+            \OCP\Server::get(IUserSession::class),
+            \OCP\Server::get(IRequest::class),
+            \OCP\Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
+            \OCP\Server::get(IThrottler::class)
+        );
+
+        // Set URL explicitly due to reverse-proxy situations
+        $this->server->httpRequest->setUrl($this->request->getRequestUri());
+        $this->server->setBaseUri($this->baseUri);
+
+        $this->server->addPlugin(new ProfilerPlugin($this->request));
+        $this->server->addPlugin(new BlockLegacyClientPlugin(
+            \OCP\Server::get(IConfig::class),
+            \OCP\Server::get(ThemingDefaults::class),
+        ));
+        $this->server->addPlugin(new AnonymousOptionsPlugin());
+        $authPlugin = new Plugin();
+        $authPlugin->addBackend(new PublicAuth());
+        $this->server->addPlugin($authPlugin);
+
+        // allow setup of additional auth backends
+        $event = new SabrePluginEvent($this->server);
+        $eventDispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
+
+        $newAuthEvent = new SabrePluginAuthInitEvent($this->server);
+        $eventDispatcher->dispatchTyped($newAuthEvent);
+
+        $bearerAuthBackend = new BearerAuth(
+            \OCP\Server::get(IUserSession::class),
+            \OCP\Server::get(ISession::class),
+            \OCP\Server::get(IRequest::class),
+            \OCP\Server::get(IConfig::class),
+        );
+        $authPlugin->addBackend($bearerAuthBackend);
+        // because we are throwing exceptions this plugin has to be the last one
+        $authPlugin->addBackend($authBackend);
+
+        // debugging
+        if (\OCP\Server::get(IConfig::class)->getSystemValue('debug', false)) {
+            $this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
+        } else {
+            $this->server->addPlugin(new DummyGetResponsePlugin());
+        }
+
+        $this->server->addPlugin(new ExceptionLoggerPlugin('webdav', $logger));
+        $this->server->addPlugin(new LockPlugin());
+        $this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
+
+        // acl
+        $acl = new DavAclPlugin();
+        $acl->principalCollectionSet = [
+            'principals/users',
+            'principals/groups',
+            'principals/calendar-resources',
+            'principals/calendar-rooms',
+        ];
+        $this->server->addPlugin($acl);
+
+        // calendar plugins
+        if ($this->requestIsForSubtree(['calendars', 'public-calendars', 'system-calendars', 'principals'])) {
+            $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OCP\Server::get(IRequest::class), \OCP\Server::get(IConfig::class)));
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
+            $this->server->addPlugin(new ICSExportPlugin(\OCP\Server::get(IConfig::class), $logger));
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(\OCP\Server::get(IConfig::class), \OCP\Server::get(LoggerInterface::class), \OCP\Server::get(DefaultCalendarValidator::class)));
+
+            $this->server->addPlugin(\OCP\Server::get(\OCA\DAV\CalDAV\Trashbin\Plugin::class));
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\WebcalCaching\Plugin($this->request));
+            if (\OCP\Server::get(IConfig::class)->getAppValue('dav', 'allow_calendar_link_subscriptions', 'yes') === 'yes') {
+                $this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
+            }
+
+            $this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
+            $this->server->addPlugin(new PublishPlugin(
+                \OCP\Server::get(IConfig::class),
+                \OCP\Server::get(IURLGenerator::class)
+            ));
+
+            $this->server->addPlugin(\OCP\Server::get(RateLimitingPlugin::class));
+            $this->server->addPlugin(\OCP\Server::get(CalDavValidatePlugin::class));
+        }
+
+        // addressbook plugins
+        if ($this->requestIsForSubtree(['addressbooks', 'principals'])) {
+            $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OCP\Server::get(IRequest::class), \OCP\Server::get(IConfig::class)));
+            $this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
+            $this->server->addPlugin(new VCFExportPlugin());
+            $this->server->addPlugin(new MultiGetExportPlugin());
+            $this->server->addPlugin(new HasPhotoPlugin());
+            $this->server->addPlugin(new ImageExportPlugin(\OCP\Server::get(PhotoCache::class)));
+
+            $this->server->addPlugin(\OCP\Server::get(CardDavRateLimitingPlugin::class));
+            $this->server->addPlugin(\OCP\Server::get(CardDavValidatePlugin::class));
+        }
+
+        // system tags plugins
+        $this->server->addPlugin(\OCP\Server::get(SystemTagPlugin::class));
+
+        // comments plugin
+        $this->server->addPlugin(new CommentsPlugin(
+            \OCP\Server::get(ICommentsManager::class),
+            \OCP\Server::get(IUserSession::class)
+        ));
+
+        $this->server->addPlugin(new CopyEtagHeaderPlugin());
+        $this->server->addPlugin(new RequestIdHeaderPlugin(\OCP\Server::get(IRequest::class)));
+        $this->server->addPlugin(new ChunkingV2Plugin(\OCP\Server::get(ICacheFactory::class)));
+        $this->server->addPlugin(new ChunkingPlugin());
+        $this->server->addPlugin(new ZipFolderPlugin(
+            $this->server->tree,
+            $logger,
+            $eventDispatcher,
+        ));
+        $this->server->addPlugin(\OCP\Server::get(PaginatePlugin::class));
+
+        // allow setup of additional plugins
+        $eventDispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
+        $typedEvent = new SabrePluginAddEvent($this->server);
+        $eventDispatcher->dispatchTyped($typedEvent);
+
+        // Some WebDAV clients do require Class 2 WebDAV support (locking), since
+        // we do not provide locking we emulate it using a fake locking plugin.
+        if ($this->request->isUserAgent([
+            '/WebDAVFS/',
+            '/OneNote/',
+            '/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
+        ])) {
+            $this->server->addPlugin(new FakeLockerPlugin());
+        }
+
+        if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
+            $this->server->addPlugin(new BrowserErrorPagePlugin());
+        }
+
+        $lazySearchBackend = new LazySearchBackend();
+        $this->server->addPlugin(new SearchPlugin($lazySearchBackend));
+
+        // wait with registering these until auth is handled and the filesystem is setup
+        $this->server->on('beforeMethod:*', function () use ($root, $lazySearchBackend, $logger): void {
+            // Allow view-only plugin for webdav requests
+            $this->server->addPlugin(new ViewOnlyPlugin(
+                \OC::$server->getUserFolder(),
+            ));
+
+            // custom properties plugin must be the last one
+            $userSession = \OCP\Server::get(IUserSession::class);
+            $user = $userSession->getUser();
+            if ($user !== null) {
+                $view = Filesystem::getView();
+                $config = \OCP\Server::get(IConfig::class);
+                $this->server->addPlugin(
+                    new FilesPlugin(
+                        $this->server->tree,
+                        $config,
+                        $this->request,
+                        \OCP\Server::get(IPreview::class),
+                        \OCP\Server::get(IUserSession::class),
+                        \OCP\Server::get(IFilenameValidator::class),
+                        \OCP\Server::get(IAccountManager::class),
+                        false,
+                        $config->getSystemValueBool('debug', false) === false,
+                    )
+                );
+                $this->server->addPlugin(new ChecksumUpdatePlugin());
+
+                $this->server->addPlugin(
+                    new \Sabre\DAV\PropertyStorage\Plugin(
+                        new CustomPropertiesBackend(
+                            $this->server,
+                            $this->server->tree,
+                            \OCP\Server::get(IDBConnection::class),
+                            \OCP\Server::get(IUserSession::class)->getUser(),
+                            \OCP\Server::get(DefaultCalendarValidator::class),
+                        )
+                    )
+                );
+                if ($view !== null) {
+                    $this->server->addPlugin(
+                        new QuotaPlugin($view));
+                }
+                $this->server->addPlugin(
+                    new TagsPlugin(
+                        $this->server->tree, \OCP\Server::get(ITagManager::class), \OCP\Server::get(IEventDispatcher::class), \OCP\Server::get(IUserSession::class)
+                    )
+                );
+
+                // TODO: switch to LazyUserFolder
+                $userFolder = \OC::$server->getUserFolder();
+                $shareManager = \OCP\Server::get(\OCP\Share\IManager::class);
+                $this->server->addPlugin(new SharesPlugin(
+                    $this->server->tree,
+                    $userSession,
+                    $userFolder,
+                    $shareManager,
+                ));
+                $this->server->addPlugin(new CommentPropertiesPlugin(
+                    \OCP\Server::get(ICommentsManager::class),
+                    $userSession
+                ));
+                if (\OCP\Server::get(IConfig::class)->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') {
+                    $this->server->addPlugin(new IMipPlugin(
+                        \OCP\Server::get(IAppConfig::class),
+                        \OCP\Server::get(IMailer::class),
+                        \OCP\Server::get(LoggerInterface::class),
+                        \OCP\Server::get(ITimeFactory::class),
+                        \OCP\Server::get(Defaults::class),
+                        $userSession,
+                        \OCP\Server::get(IMipService::class),
+                        \OCP\Server::get(EventComparisonService::class),
+                        \OCP\Server::get(\OCP\Mail\Provider\IManager::class)
+                    ));
+                }
+                $this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
+                if ($view !== null) {
+                    $this->server->addPlugin(new FilesReportPlugin(
+                        $this->server->tree,
+                        $view,
+                        \OCP\Server::get(ISystemTagManager::class),
+                        \OCP\Server::get(ISystemTagObjectMapper::class),
+                        \OCP\Server::get(ITagManager::class),
+                        $userSession,
+                        \OCP\Server::get(IGroupManager::class),
+                        $userFolder,
+                        \OCP\Server::get(IAppManager::class)
+                    ));
+                    $lazySearchBackend->setBackend(new FileSearchBackend(
+                        $this->server->tree,
+                        $user,
+                        \OCP\Server::get(IRootFolder::class),
+                        $shareManager,
+                        $view,
+                        \OCP\Server::get(IFilesMetadataManager::class)
+                    ));
+                    $this->server->addPlugin(
+                        new BulkUploadPlugin(
+                            $userFolder,
+                            $logger
+                        )
+                    );
+                }
+                $this->server->addPlugin(new EnablePlugin(
+                    \OCP\Server::get(IConfig::class),
+                    \OCP\Server::get(BirthdayService::class),
+                    $user
+                ));
+                $this->server->addPlugin(new AppleProvisioningPlugin(
+                    \OCP\Server::get(IUserSession::class),
+                    \OCP\Server::get(IURLGenerator::class),
+                    \OCP\Server::get(ThemingDefaults::class),
+                    \OCP\Server::get(IRequest::class),
+                    \OC::$server->getL10N('dav'),
+                    function () {
+                        return UUIDUtil::getUUID();
+                    }
+                ));
+            }
+
+            // register plugins from apps
+            $pluginManager = new PluginManager(
+                \OC::$server,
+                \OCP\Server::get(IAppManager::class)
+            );
+            foreach ($pluginManager->getAppPlugins() as $appPlugin) {
+                $this->server->addPlugin($appPlugin);
+            }
+            foreach ($pluginManager->getAppCollections() as $appCollection) {
+                $root->addChild($appCollection);
+            }
+        });
+
+        $this->server->addPlugin(
+            new PropfindCompressionPlugin()
+        );
+    }
+
+    public function exec() {
+        /** @var IEventLogger $eventLogger */
+        $eventLogger = \OCP\Server::get(IEventLogger::class);
+        $eventLogger->start('dav_server_exec', '');
+        $this->server->start();
+        $eventLogger->end('dav_server_exec');
+        if ($this->profiler->isEnabled()) {
+            $eventLogger->end('runtime');
+            $profile = $this->profiler->collect(\OCP\Server::get(IRequest::class), new Response());
+            $this->profiler->saveProfile($profile);
+        }
+    }
+
+    private function requestIsForSubtree(array $subTrees): bool {
+        foreach ($subTrees as $subTree) {
+            $subTree = trim($subTree, ' /');
+            if (str_starts_with($this->server->getRequestUri(), $subTree . '/')) {
+                return true;
+            }
+        }
+        return false;
+    }
 
 }

apps/dav/lib/CardDAV/PhotoCache.php

Indentation +250 added lines, -250 removed lines

@@ -21,254 +21,254 @@
 use Sabre\VObject\Reader;
 
 class PhotoCache {
-	private ?IAppData $photoCacheAppData = null;
-
-	/** @var array */
-	public const ALLOWED_CONTENT_TYPES = [
-		'image/png' => 'png',
-		'image/jpeg' => 'jpg',
-		'image/gif' => 'gif',
-		'image/vnd.microsoft.icon' => 'ico',
-		'image/webp' => 'webp',
-		'image/avif' => 'avif',
-	];
-
-	public function __construct(
-		private IAppDataFactory $appDataFactory,
-		private LoggerInterface $logger,
-	) {
-	}
-
-	/**
-	 * @throws NotFoundException
-	 */
-	public function get(int $addressBookId, string $cardUri, int $size, Card $card): ISimpleFile {
-		$folder = $this->getFolder($addressBookId, $cardUri);
-
-		if ($this->isEmpty($folder)) {
-			$this->init($folder, $card);
-		}
-
-		if (!$this->hasPhoto($folder)) {
-			throw new NotFoundException();
-		}
-
-		if ($size !== -1) {
-			$size = 2 ** ceil(log($size) / log(2));
-		}
-
-		return $this->getFile($folder, $size);
-	}
-
-	private function isEmpty(ISimpleFolder $folder): bool {
-		return $folder->getDirectoryListing() === [];
-	}
-
-	/**
-	 * @throws NotPermittedException
-	 */
-	private function init(ISimpleFolder $folder, Card $card): void {
-		$data = $this->getPhoto($card);
-
-		if ($data === false || !isset($data['Content-Type'])) {
-			$folder->newFile('nophoto', '');
-			return;
-		}
-
-		$contentType = $data['Content-Type'];
-		$extension = self::ALLOWED_CONTENT_TYPES[$contentType] ?? null;
-
-		if ($extension === null) {
-			$folder->newFile('nophoto', '');
-			return;
-		}
-
-		$file = $folder->newFile('photo.' . $extension);
-		$file->putContent($data['body']);
-	}
-
-	private function hasPhoto(ISimpleFolder $folder): bool {
-		return !$folder->fileExists('nophoto');
-	}
-
-	/**
-	 * @param float|-1 $size
-	 */
-	private function getFile(ISimpleFolder $folder, $size): ISimpleFile {
-		$ext = $this->getExtension($folder);
-
-		if ($size === -1) {
-			$path = 'photo.' . $ext;
-		} else {
-			$path = 'photo.' . $size . '.' . $ext;
-		}
-
-		try {
-			$file = $folder->getFile($path);
-		} catch (NotFoundException $e) {
-			if ($size <= 0) {
-				throw new NotFoundException;
-			}
-
-			$photo = new Image();
-			/** @var ISimpleFile $file */
-			$file = $folder->getFile('photo.' . $ext);
-			$photo->loadFromData($file->getContent());
-
-			$ratio = $photo->width() / $photo->height();
-			if ($ratio < 1) {
-				$ratio = 1 / $ratio;
-			}
-
-			$size = (int)($size * $ratio);
-			if ($size !== -1) {
-				$photo->resize($size);
-			}
-
-			try {
-				$file = $folder->newFile($path);
-				$file->putContent($photo->data());
-			} catch (NotPermittedException $e) {
-			}
-		}
-
-		return $file;
-	}
-
-	/**
-	 * @throws NotFoundException
-	 * @throws NotPermittedException
-	 */
-	private function getFolder(int $addressBookId, string $cardUri, bool $createIfNotExists = true): ISimpleFolder {
-		$hash = md5($addressBookId . ' ' . $cardUri);
-		try {
-			return $this->getPhotoCacheAppData()->getFolder($hash);
-		} catch (NotFoundException $e) {
-			if ($createIfNotExists) {
-				return $this->getPhotoCacheAppData()->newFolder($hash);
-			}
-			throw $e;
-		}
-	}
-
-	/**
-	 * Get the extension of the avatar. If there is no avatar throw Exception
-	 *
-	 * @throws NotFoundException
-	 */
-	private function getExtension(ISimpleFolder $folder): string {
-		foreach (self::ALLOWED_CONTENT_TYPES as $extension) {
-			if ($folder->fileExists('photo.' . $extension)) {
-				return $extension;
-			}
-		}
-
-		throw new NotFoundException('Avatar not found');
-	}
-
-	/**
-	 * @param Card $node
-	 * @return false|array{body: string, Content-Type: string}
-	 */
-	private function getPhoto(Card $node) {
-		try {
-			$vObject = $this->readCard($node->get());
-			return $this->getPhotoFromVObject($vObject);
-		} catch (\Exception $e) {
-			$this->logger->error('Exception during vcard photo parsing', [
-				'exception' => $e
-			]);
-		}
-		return false;
-	}
-
-	/**
-	 * @return false|array{body: string, Content-Type: string}
-	 */
-	public function getPhotoFromVObject(Document $vObject) {
-		try {
-			if (!$vObject->PHOTO) {
-				return false;
-			}
-
-			$photo = $vObject->PHOTO;
-			$val = $photo->getValue();
-
-			// handle data URI. e.g PHOTO;VALUE=URI:data:image/jpeg;base64,/9j/4AAQSkZJRgABAQE
-			if ($photo->getValueType() === 'URI') {
-				$parsed = \Sabre\URI\parse($val);
-
-				// only allow data://
-				if ($parsed['scheme'] !== 'data') {
-					return false;
-				}
-				if (substr_count($parsed['path'], ';') === 1) {
-					[$type] = explode(';', $parsed['path']);
-				}
-				$val = file_get_contents($val);
-			} else {
-				// get type if binary data
-				$type = $this->getBinaryType($photo);
-			}
-
-			if (empty($type) || !isset(self::ALLOWED_CONTENT_TYPES[$type])) {
-				$type = 'application/octet-stream';
-			}
-
-			return [
-				'Content-Type' => $type,
-				'body' => $val
-			];
-		} catch (\Exception $e) {
-			$this->logger->error('Exception during vcard photo parsing', [
-				'exception' => $e
-			]);
-		}
-		return false;
-	}
-
-	private function readCard(string $cardData): Document {
-		return Reader::read($cardData);
-	}
-
-	/**
-	 * @param Binary $photo
-	 * @return string
-	 */
-	private function getBinaryType(Binary $photo) {
-		$params = $photo->parameters();
-		if (isset($params['TYPE']) || isset($params['MEDIATYPE'])) {
-			/** @var Parameter $typeParam */
-			$typeParam = isset($params['TYPE']) ? $params['TYPE'] : $params['MEDIATYPE'];
-			$type = (string)$typeParam->getValue();
-
-			if (str_starts_with($type, 'image/')) {
-				return $type;
-			} else {
-				return 'image/' . strtolower($type);
-			}
-		}
-		return '';
-	}
-
-	/**
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 * @throws NotPermittedException
-	 */
-	public function delete($addressBookId, $cardUri) {
-		try {
-			$folder = $this->getFolder($addressBookId, $cardUri, false);
-			$folder->delete();
-		} catch (NotFoundException $e) {
-			// that's OK, nothing to do
-		}
-	}
-
-	private function getPhotoCacheAppData(): IAppData {
-		if ($this->photoCacheAppData === null) {
-			$this->photoCacheAppData = $this->appDataFactory->get('dav-photocache');
-		}
-		return $this->photoCacheAppData;
-	}
+    private ?IAppData $photoCacheAppData = null;
+
+    /** @var array */
+    public const ALLOWED_CONTENT_TYPES = [
+        'image/png' => 'png',
+        'image/jpeg' => 'jpg',
+        'image/gif' => 'gif',
+        'image/vnd.microsoft.icon' => 'ico',
+        'image/webp' => 'webp',
+        'image/avif' => 'avif',
+    ];
+
+    public function __construct(
+        private IAppDataFactory $appDataFactory,
+        private LoggerInterface $logger,
+    ) {
+    }
+
+    /**
+     * @throws NotFoundException
+     */
+    public function get(int $addressBookId, string $cardUri, int $size, Card $card): ISimpleFile {
+        $folder = $this->getFolder($addressBookId, $cardUri);
+
+        if ($this->isEmpty($folder)) {
+            $this->init($folder, $card);
+        }
+
+        if (!$this->hasPhoto($folder)) {
+            throw new NotFoundException();
+        }
+
+        if ($size !== -1) {
+            $size = 2 ** ceil(log($size) / log(2));
+        }
+
+        return $this->getFile($folder, $size);
+    }
+
+    private function isEmpty(ISimpleFolder $folder): bool {
+        return $folder->getDirectoryListing() === [];
+    }
+
+    /**
+     * @throws NotPermittedException
+     */
+    private function init(ISimpleFolder $folder, Card $card): void {
+        $data = $this->getPhoto($card);
+
+        if ($data === false || !isset($data['Content-Type'])) {
+            $folder->newFile('nophoto', '');
+            return;
+        }
+
+        $contentType = $data['Content-Type'];
+        $extension = self::ALLOWED_CONTENT_TYPES[$contentType] ?? null;
+
+        if ($extension === null) {
+            $folder->newFile('nophoto', '');
+            return;
+        }
+
+        $file = $folder->newFile('photo.' . $extension);
+        $file->putContent($data['body']);
+    }
+
+    private function hasPhoto(ISimpleFolder $folder): bool {
+        return !$folder->fileExists('nophoto');
+    }
+
+    /**
+     * @param float|-1 $size
+     */
+    private function getFile(ISimpleFolder $folder, $size): ISimpleFile {
+        $ext = $this->getExtension($folder);
+
+        if ($size === -1) {
+            $path = 'photo.' . $ext;
+        } else {
+            $path = 'photo.' . $size . '.' . $ext;
+        }
+
+        try {
+            $file = $folder->getFile($path);
+        } catch (NotFoundException $e) {
+            if ($size <= 0) {
+                throw new NotFoundException;
+            }
+
+            $photo = new Image();
+            /** @var ISimpleFile $file */
+            $file = $folder->getFile('photo.' . $ext);
+            $photo->loadFromData($file->getContent());
+
+            $ratio = $photo->width() / $photo->height();
+            if ($ratio < 1) {
+                $ratio = 1 / $ratio;
+            }
+
+            $size = (int)($size * $ratio);
+            if ($size !== -1) {
+                $photo->resize($size);
+            }
+
+            try {
+                $file = $folder->newFile($path);
+                $file->putContent($photo->data());
+            } catch (NotPermittedException $e) {
+            }
+        }
+
+        return $file;
+    }
+
+    /**
+     * @throws NotFoundException
+     * @throws NotPermittedException
+     */
+    private function getFolder(int $addressBookId, string $cardUri, bool $createIfNotExists = true): ISimpleFolder {
+        $hash = md5($addressBookId . ' ' . $cardUri);
+        try {
+            return $this->getPhotoCacheAppData()->getFolder($hash);
+        } catch (NotFoundException $e) {
+            if ($createIfNotExists) {
+                return $this->getPhotoCacheAppData()->newFolder($hash);
+            }
+            throw $e;
+        }
+    }
+
+    /**
+     * Get the extension of the avatar. If there is no avatar throw Exception
+     *
+     * @throws NotFoundException
+     */
+    private function getExtension(ISimpleFolder $folder): string {
+        foreach (self::ALLOWED_CONTENT_TYPES as $extension) {
+            if ($folder->fileExists('photo.' . $extension)) {
+                return $extension;
+            }
+        }
+
+        throw new NotFoundException('Avatar not found');
+    }
+
+    /**
+     * @param Card $node
+     * @return false|array{body: string, Content-Type: string}
+     */
+    private function getPhoto(Card $node) {
+        try {
+            $vObject = $this->readCard($node->get());
+            return $this->getPhotoFromVObject($vObject);
+        } catch (\Exception $e) {
+            $this->logger->error('Exception during vcard photo parsing', [
+                'exception' => $e
+            ]);
+        }
+        return false;
+    }
+
+    /**
+     * @return false|array{body: string, Content-Type: string}
+     */
+    public function getPhotoFromVObject(Document $vObject) {
+        try {
+            if (!$vObject->PHOTO) {
+                return false;
+            }
+
+            $photo = $vObject->PHOTO;
+            $val = $photo->getValue();
+
+            // handle data URI. e.g PHOTO;VALUE=URI:data:image/jpeg;base64,/9j/4AAQSkZJRgABAQE
+            if ($photo->getValueType() === 'URI') {
+                $parsed = \Sabre\URI\parse($val);
+
+                // only allow data://
+                if ($parsed['scheme'] !== 'data') {
+                    return false;
+                }
+                if (substr_count($parsed['path'], ';') === 1) {
+                    [$type] = explode(';', $parsed['path']);
+                }
+                $val = file_get_contents($val);
+            } else {
+                // get type if binary data
+                $type = $this->getBinaryType($photo);
+            }
+
+            if (empty($type) || !isset(self::ALLOWED_CONTENT_TYPES[$type])) {
+                $type = 'application/octet-stream';
+            }
+
+            return [
+                'Content-Type' => $type,
+                'body' => $val
+            ];
+        } catch (\Exception $e) {
+            $this->logger->error('Exception during vcard photo parsing', [
+                'exception' => $e
+            ]);
+        }
+        return false;
+    }
+
+    private function readCard(string $cardData): Document {
+        return Reader::read($cardData);
+    }
+
+    /**
+     * @param Binary $photo
+     * @return string
+     */
+    private function getBinaryType(Binary $photo) {
+        $params = $photo->parameters();
+        if (isset($params['TYPE']) || isset($params['MEDIATYPE'])) {
+            /** @var Parameter $typeParam */
+            $typeParam = isset($params['TYPE']) ? $params['TYPE'] : $params['MEDIATYPE'];
+            $type = (string)$typeParam->getValue();
+
+            if (str_starts_with($type, 'image/')) {
+                return $type;
+            } else {
+                return 'image/' . strtolower($type);
+            }
+        }
+        return '';
+    }
+
+    /**
+     * @param int $addressBookId
+     * @param string $cardUri
+     * @throws NotPermittedException
+     */
+    public function delete($addressBookId, $cardUri) {
+        try {
+            $folder = $this->getFolder($addressBookId, $cardUri, false);
+            $folder->delete();
+        } catch (NotFoundException $e) {
+            // that's OK, nothing to do
+        }
+    }
+
+    private function getPhotoCacheAppData(): IAppData {
+        if ($this->photoCacheAppData === null) {
+            $this->photoCacheAppData = $this->appDataFactory->get('dav-photocache');
+        }
+        return $this->photoCacheAppData;
+    }
 }

apps/dav/lib/Command/ClearContactsPhotoCache.php

Indentation +38 added lines, -38 removed lines

@@ -20,56 +20,56 @@
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 #[AsCommand(
-	name: 'dav:clear-contacts-photo-cache',
-	description: 'Clear cached contact photos',
-	hidden: false,
+    name: 'dav:clear-contacts-photo-cache',
+    description: 'Clear cached contact photos',
+    hidden: false,
 )]
 class ClearContactsPhotoCache extends Command {
 
-	public function __construct(
-		private IAppDataFactory $appDataFactory,
-	) {
-		parent::__construct();
-	}
+    public function __construct(
+        private IAppDataFactory $appDataFactory,
+    ) {
+        parent::__construct();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$photoCacheAppData = $this->appDataFactory->get('dav-photocache');
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $photoCacheAppData = $this->appDataFactory->get('dav-photocache');
 
-		$folders = $photoCacheAppData->getDirectoryListing();
-		$countFolders = count($folders);
+        $folders = $photoCacheAppData->getDirectoryListing();
+        $countFolders = count($folders);
 
-		if ($countFolders === 0) {
-			$output->writeln('No cached contact photos found.');
-			return self::SUCCESS;
-		}
+        if ($countFolders === 0) {
+            $output->writeln('No cached contact photos found.');
+            return self::SUCCESS;
+        }
 
-		$output->writeln('Found ' . count($folders) . ' cached contact photos.');
+        $output->writeln('Found ' . count($folders) . ' cached contact photos.');
 
-		/** @var QuestionHelper $helper */
-		$helper = $this->getHelper('question');
-		$question = new ConfirmationQuestion('Please confirm to clear the contacts photo cache [y/n] ', true);
+        /** @var QuestionHelper $helper */
+        $helper = $this->getHelper('question');
+        $question = new ConfirmationQuestion('Please confirm to clear the contacts photo cache [y/n] ', true);
 
-		if ($helper->ask($input, $output, $question) === false) {
-			$output->writeln('Clearing the contacts photo cache aborted.');
-			return self::SUCCESS;
-		}
+        if ($helper->ask($input, $output, $question) === false) {
+            $output->writeln('Clearing the contacts photo cache aborted.');
+            return self::SUCCESS;
+        }
 
-		$progressBar = new ProgressBar($output, $countFolders);
-		$progressBar->start();
+        $progressBar = new ProgressBar($output, $countFolders);
+        $progressBar->start();
 
-		foreach ($folders as $folder) {
-			try {
-				$folder->delete();
-			} catch (NotPermittedException) {
-			}
-			$progressBar->advance();
-		}
+        foreach ($folders as $folder) {
+            try {
+                $folder->delete();
+            } catch (NotPermittedException) {
+            }
+            $progressBar->advance();
+        }
 
-		$progressBar->finish();
+        $progressBar->finish();
 
-		$output->writeln('');
-		$output->writeln('Contacts photo cache cleared.');
+        $output->writeln('');
+        $output->writeln('Contacts photo cache cleared.');
 
-		return self::SUCCESS;
-	}
+        return self::SUCCESS;
+    }
 }

apps/dav/lib/AppInfo/Application.php

Indentation +146 added lines, -146 removed lines

@@ -102,180 +102,180 @@
 use function is_null;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'dav';
+    public const APP_ID = 'dav';
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerServiceAlias('CardDAVSyncService', SyncService::class);
-		$context->registerService(AppCalendarPlugin::class, function (ContainerInterface $c) {
-			return new AppCalendarPlugin(
-				$c->get(ICalendarManager::class),
-				$c->get(LoggerInterface::class)
-			);
-		});
+    public function register(IRegistrationContext $context): void {
+        $context->registerServiceAlias('CardDAVSyncService', SyncService::class);
+        $context->registerService(AppCalendarPlugin::class, function (ContainerInterface $c) {
+            return new AppCalendarPlugin(
+                $c->get(ICalendarManager::class),
+                $c->get(LoggerInterface::class)
+            );
+        });
 
-		/*
+        /*
 		 * Register capabilities
 		 */
-		$context->registerCapability(Capabilities::class);
+        $context->registerCapability(Capabilities::class);
 
-		/*
+        /*
 		 * Register Search Providers
 		 */
-		$context->registerSearchProvider(ContactsSearchProvider::class);
-		$context->registerSearchProvider(EventsSearchProvider::class);
-		$context->registerSearchProvider(TasksSearchProvider::class);
+        $context->registerSearchProvider(ContactsSearchProvider::class);
+        $context->registerSearchProvider(EventsSearchProvider::class);
+        $context->registerSearchProvider(TasksSearchProvider::class);
 
-		/**
-		 * Register event listeners
-		 */
-		$context->registerEventListener(AddMissingIndicesEvent::class, AddMissingIndicesListener::class);
+        /**
+         * Register event listeners
+         */
+        $context->registerEventListener(AddMissingIndicesEvent::class, AddMissingIndicesListener::class);
 
-		$context->registerEventListener(CalendarCreatedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarDeletedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarDeletedEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarDeletedEvent::class, CalendarDeletionDefaultUpdaterListener::class);
-		$context->registerEventListener(CalendarMovedToTrashEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarMovedToTrashEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarUpdatedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarRestoredEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarRestoredEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectCreatedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarContactInteractionListener::class);
-		$context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectUpdatedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarContactInteractionListener::class);
-		$context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectDeletedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectDeletedEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectMovedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectMovedEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectMovedToTrashEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectMovedToTrashEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectRestoredEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectRestoredEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarShareUpdatedEvent::class, CalendarContactInteractionListener::class);
-		$context->registerEventListener(CalendarPublishedEvent::class, CalendarPublicationListener::class);
-		$context->registerEventListener(CalendarUnpublishedEvent::class, CalendarPublicationListener::class);
-		$context->registerEventListener(CalendarShareUpdatedEvent::class, CalendarShareUpdateListener::class);
+        $context->registerEventListener(CalendarCreatedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarDeletedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarDeletedEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarDeletedEvent::class, CalendarDeletionDefaultUpdaterListener::class);
+        $context->registerEventListener(CalendarMovedToTrashEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarMovedToTrashEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarUpdatedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarRestoredEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarRestoredEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectCreatedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarContactInteractionListener::class);
+        $context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectUpdatedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarContactInteractionListener::class);
+        $context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectDeletedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectDeletedEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectMovedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectMovedEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectMovedToTrashEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectMovedToTrashEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectRestoredEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectRestoredEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarShareUpdatedEvent::class, CalendarContactInteractionListener::class);
+        $context->registerEventListener(CalendarPublishedEvent::class, CalendarPublicationListener::class);
+        $context->registerEventListener(CalendarUnpublishedEvent::class, CalendarPublicationListener::class);
+        $context->registerEventListener(CalendarShareUpdatedEvent::class, CalendarShareUpdateListener::class);
 
-		$context->registerEventListener(SubscriptionCreatedEvent::class, SubscriptionListener::class);
-		$context->registerEventListener(SubscriptionDeletedEvent::class, SubscriptionListener::class);
+        $context->registerEventListener(SubscriptionCreatedEvent::class, SubscriptionListener::class);
+        $context->registerEventListener(SubscriptionDeletedEvent::class, SubscriptionListener::class);
 
 
-		$context->registerEventListener(AddressBookCreatedEvent::class, AddressbookListener::class);
-		$context->registerEventListener(AddressBookDeletedEvent::class, AddressbookListener::class);
-		$context->registerEventListener(AddressBookUpdatedEvent::class, AddressbookListener::class);
-		$context->registerEventListener(AddressBookShareUpdatedEvent::class, AddressbookListener::class);
-		$context->registerEventListener(CardCreatedEvent::class, CardListener::class);
-		$context->registerEventListener(CardDeletedEvent::class, CardListener::class);
-		$context->registerEventListener(CardUpdatedEvent::class, CardListener::class);
-		$context->registerEventListener(CardCreatedEvent::class, BirthdayListener::class);
-		$context->registerEventListener(CardDeletedEvent::class, BirthdayListener::class);
-		$context->registerEventListener(CardUpdatedEvent::class, BirthdayListener::class);
-		$context->registerEventListener(CardDeletedEvent::class, ClearPhotoCacheListener::class);
-		$context->registerEventListener(CardUpdatedEvent::class, ClearPhotoCacheListener::class);
-		$context->registerEventListener(TrustedServerRemovedEvent::class, TrustedServerRemovedListener::class);
+        $context->registerEventListener(AddressBookCreatedEvent::class, AddressbookListener::class);
+        $context->registerEventListener(AddressBookDeletedEvent::class, AddressbookListener::class);
+        $context->registerEventListener(AddressBookUpdatedEvent::class, AddressbookListener::class);
+        $context->registerEventListener(AddressBookShareUpdatedEvent::class, AddressbookListener::class);
+        $context->registerEventListener(CardCreatedEvent::class, CardListener::class);
+        $context->registerEventListener(CardDeletedEvent::class, CardListener::class);
+        $context->registerEventListener(CardUpdatedEvent::class, CardListener::class);
+        $context->registerEventListener(CardCreatedEvent::class, BirthdayListener::class);
+        $context->registerEventListener(CardDeletedEvent::class, BirthdayListener::class);
+        $context->registerEventListener(CardUpdatedEvent::class, BirthdayListener::class);
+        $context->registerEventListener(CardDeletedEvent::class, ClearPhotoCacheListener::class);
+        $context->registerEventListener(CardUpdatedEvent::class, ClearPhotoCacheListener::class);
+        $context->registerEventListener(TrustedServerRemovedEvent::class, TrustedServerRemovedListener::class);
 
-		$context->registerEventListener(BeforePreferenceDeletedEvent::class, UserPreferenceListener::class);
-		$context->registerEventListener(BeforePreferenceSetEvent::class, UserPreferenceListener::class);
+        $context->registerEventListener(BeforePreferenceDeletedEvent::class, UserPreferenceListener::class);
+        $context->registerEventListener(BeforePreferenceSetEvent::class, UserPreferenceListener::class);
 
-		$context->registerEventListener(OutOfOfficeChangedEvent::class, OutOfOfficeListener::class);
-		$context->registerEventListener(OutOfOfficeClearedEvent::class, OutOfOfficeListener::class);
-		$context->registerEventListener(OutOfOfficeScheduledEvent::class, OutOfOfficeListener::class);
+        $context->registerEventListener(OutOfOfficeChangedEvent::class, OutOfOfficeListener::class);
+        $context->registerEventListener(OutOfOfficeClearedEvent::class, OutOfOfficeListener::class);
+        $context->registerEventListener(OutOfOfficeScheduledEvent::class, OutOfOfficeListener::class);
 
-		$context->registerEventListener(UserFirstTimeLoggedInEvent::class, UserEventsListener::class);
-		$context->registerEventListener(UserIdAssignedEvent::class, UserEventsListener::class);
-		$context->registerEventListener(BeforeUserIdUnassignedEvent::class, UserEventsListener::class);
-		$context->registerEventListener(UserIdUnassignedEvent::class, UserEventsListener::class);
-		$context->registerEventListener(BeforeUserDeletedEvent::class, UserEventsListener::class);
-		$context->registerEventListener(UserDeletedEvent::class, UserEventsListener::class);
-		$context->registerEventListener(UserCreatedEvent::class, UserEventsListener::class);
-		$context->registerEventListener(UserChangedEvent::class, UserEventsListener::class);
-		$context->registerEventListener(UserUpdatedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(UserFirstTimeLoggedInEvent::class, UserEventsListener::class);
+        $context->registerEventListener(UserIdAssignedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(BeforeUserIdUnassignedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(UserIdUnassignedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(BeforeUserDeletedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(UserDeletedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(UserCreatedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(UserChangedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(UserUpdatedEvent::class, UserEventsListener::class);
 
-		$context->registerNotifierService(Notifier::class);
+        $context->registerNotifierService(Notifier::class);
 
-		$context->registerCalendarProvider(CalendarProvider::class);
-		$context->registerCalendarProvider(CachedSubscriptionProvider::class);
+        $context->registerCalendarProvider(CalendarProvider::class);
+        $context->registerCalendarProvider(CachedSubscriptionProvider::class);
 
-		$context->registerUserMigrator(CalendarMigrator::class);
-		$context->registerUserMigrator(ContactsMigrator::class);
+        $context->registerUserMigrator(CalendarMigrator::class);
+        $context->registerUserMigrator(ContactsMigrator::class);
 
-		$context->registerSetupCheck(NeedsSystemAddressBookSync::class);
-		$context->registerSetupCheck(WebdavEndpoint::class);
+        $context->registerSetupCheck(NeedsSystemAddressBookSync::class);
+        $context->registerSetupCheck(WebdavEndpoint::class);
 
-		// register admin settings form and listener(s)
-		$context->registerDeclarativeSettings(SystemAddressBookSettings::class);
-		$context->registerEventListener(DeclarativeSettingsGetValueEvent::class, DavAdminSettingsListener::class);
-		$context->registerEventListener(DeclarativeSettingsSetValueEvent::class, DavAdminSettingsListener::class);
+        // register admin settings form and listener(s)
+        $context->registerDeclarativeSettings(SystemAddressBookSettings::class);
+        $context->registerEventListener(DeclarativeSettingsGetValueEvent::class, DavAdminSettingsListener::class);
+        $context->registerEventListener(DeclarativeSettingsSetValueEvent::class, DavAdminSettingsListener::class);
 
-	}
+    }
 
-	public function boot(IBootContext $context): void {
-		// Load all dav apps
-		\OC_App::loadApps(['dav']);
+    public function boot(IBootContext $context): void {
+        // Load all dav apps
+        \OC_App::loadApps(['dav']);
 
-		$context->injectFn($this->registerContactsManager(...));
-		$context->injectFn($this->registerCalendarManager(...));
-		$context->injectFn($this->registerCalendarReminders(...));
-	}
+        $context->injectFn($this->registerContactsManager(...));
+        $context->injectFn($this->registerCalendarManager(...));
+        $context->injectFn($this->registerCalendarReminders(...));
+    }
 
-	public function registerContactsManager(IContactsManager $cm, IAppContainer $container): void {
-		$cm->register(function () use ($container, $cm): void {
-			$user = Server::get(IUserSession::class)->getUser();
-			if (!is_null($user)) {
-				$this->setupContactsProvider($cm, $container, $user->getUID());
-			} else {
-				$this->setupSystemContactsProvider($cm, $container);
-			}
-		});
-	}
+    public function registerContactsManager(IContactsManager $cm, IAppContainer $container): void {
+        $cm->register(function () use ($container, $cm): void {
+            $user = Server::get(IUserSession::class)->getUser();
+            if (!is_null($user)) {
+                $this->setupContactsProvider($cm, $container, $user->getUID());
+            } else {
+                $this->setupSystemContactsProvider($cm, $container);
+            }
+        });
+    }
 
-	private function setupContactsProvider(IContactsManager $contactsManager,
-		IAppContainer $container,
-		string $userID): void {
-		/** @var ContactsManager $cm */
-		$cm = $container->query(ContactsManager::class);
-		$urlGenerator = $container->getServer()->getURLGenerator();
-		$cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
-	}
+    private function setupContactsProvider(IContactsManager $contactsManager,
+        IAppContainer $container,
+        string $userID): void {
+        /** @var ContactsManager $cm */
+        $cm = $container->query(ContactsManager::class);
+        $urlGenerator = $container->getServer()->getURLGenerator();
+        $cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
+    }
 
-	private function setupSystemContactsProvider(IContactsManager $contactsManager, IAppContainer $container): void {
-		/** @var ContactsManager $cm */
-		$cm = $container->query(ContactsManager::class);
-		$urlGenerator = $container->getServer()->getURLGenerator();
-		$cm->setupSystemContactsProvider($contactsManager, null, $urlGenerator);
-	}
+    private function setupSystemContactsProvider(IContactsManager $contactsManager, IAppContainer $container): void {
+        /** @var ContactsManager $cm */
+        $cm = $container->query(ContactsManager::class);
+        $urlGenerator = $container->getServer()->getURLGenerator();
+        $cm->setupSystemContactsProvider($contactsManager, null, $urlGenerator);
+    }
 
-	public function registerCalendarManager(ICalendarManager $calendarManager,
-		IAppContainer $container): void {
-		$calendarManager->register(function () use ($container, $calendarManager): void {
-			$user = Server::get(IUserSession::class)->getUser();
-			if ($user !== null) {
-				$this->setupCalendarProvider($calendarManager, $container, $user->getUID());
-			}
-		});
-	}
+    public function registerCalendarManager(ICalendarManager $calendarManager,
+        IAppContainer $container): void {
+        $calendarManager->register(function () use ($container, $calendarManager): void {
+            $user = Server::get(IUserSession::class)->getUser();
+            if ($user !== null) {
+                $this->setupCalendarProvider($calendarManager, $container, $user->getUID());
+            }
+        });
+    }
 
-	private function setupCalendarProvider(ICalendarManager $calendarManager,
-		IAppContainer $container,
-		$userId) {
-		$cm = $container->query(CalendarManager::class);
-		$cm->setupCalendarProvider($calendarManager, $userId);
-	}
+    private function setupCalendarProvider(ICalendarManager $calendarManager,
+        IAppContainer $container,
+        $userId) {
+        $cm = $container->query(CalendarManager::class);
+        $cm->setupCalendarProvider($calendarManager, $userId);
+    }
 
-	public function registerCalendarReminders(NotificationProviderManager $manager,
-		LoggerInterface $logger): void {
-		try {
-			$manager->registerProvider(AudioProvider::class);
-			$manager->registerProvider(EmailProvider::class);
-			$manager->registerProvider(PushProvider::class);
-		} catch (Throwable $ex) {
-			$logger->error($ex->getMessage(), ['exception' => $ex]);
-		}
-	}
+    public function registerCalendarReminders(NotificationProviderManager $manager,
+        LoggerInterface $logger): void {
+        try {
+            $manager->registerProvider(AudioProvider::class);
+            $manager->registerProvider(EmailProvider::class);
+            $manager->registerProvider(PushProvider::class);
+        } catch (Throwable $ex) {
+            $logger->error($ex->getMessage(), ['exception' => $ex]);
+        }
+    }
 }

lib/private/Repair.php

Indentation +190 added lines, -190 removed lines

@@ -72,212 +72,212 @@
 use Throwable;
 
 class Repair implements IOutput {
-	/** @var IRepairStep[] */
-	private array $repairSteps = [];
+    /** @var IRepairStep[] */
+    private array $repairSteps = [];
 
-	private string $currentStep;
+    private string $currentStep;
 
-	public function __construct(
-		private IEventDispatcher $dispatcher,
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private IEventDispatcher $dispatcher,
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	/** @param IRepairStep[] $repairSteps */
-	public function setRepairSteps(array $repairSteps): void {
-		$this->repairSteps = $repairSteps;
-	}
+    /** @param IRepairStep[] $repairSteps */
+    public function setRepairSteps(array $repairSteps): void {
+        $this->repairSteps = $repairSteps;
+    }
 
-	/**
-	 * Run a series of repair steps for common problems
-	 */
-	public function run() {
-		if (count($this->repairSteps) === 0) {
-			$this->dispatcher->dispatchTyped(new RepairInfoEvent('No repair steps available'));
+    /**
+     * Run a series of repair steps for common problems
+     */
+    public function run() {
+        if (count($this->repairSteps) === 0) {
+            $this->dispatcher->dispatchTyped(new RepairInfoEvent('No repair steps available'));
 
-			return;
-		}
-		// run each repair step
-		foreach ($this->repairSteps as $step) {
-			$this->currentStep = $step->getName();
-			$this->dispatcher->dispatchTyped(new RepairStepEvent($this->currentStep));
-			try {
-				$step->run($this);
-			} catch (\Exception $e) {
-				$this->logger->error('Exception while executing repair step ' . $step->getName(), ['exception' => $e]);
-				$this->dispatcher->dispatchTyped(new RepairErrorEvent($e->getMessage()));
-			}
-		}
+            return;
+        }
+        // run each repair step
+        foreach ($this->repairSteps as $step) {
+            $this->currentStep = $step->getName();
+            $this->dispatcher->dispatchTyped(new RepairStepEvent($this->currentStep));
+            try {
+                $step->run($this);
+            } catch (\Exception $e) {
+                $this->logger->error('Exception while executing repair step ' . $step->getName(), ['exception' => $e]);
+                $this->dispatcher->dispatchTyped(new RepairErrorEvent($e->getMessage()));
+            }
+        }
 
-		$this->repairSteps = [];
-	}
+        $this->repairSteps = [];
+    }
 
-	/**
-	 * Add repair step
-	 *
-	 * @param IRepairStep|string $repairStep repair step
-	 * @throws \Exception
-	 */
-	public function addStep($repairStep) {
-		if (is_string($repairStep)) {
-			try {
-				$s = \OC::$server->get($repairStep);
-			} catch (QueryException $e) {
-				if (class_exists($repairStep)) {
-					try {
-						// Last resort: hope there are no constructor arguments
-						$s = new $repairStep();
-					} catch (Throwable $inner) {
-						// Well, it was worth a try
-						throw new \Exception("Repair step '$repairStep' can't be instantiated: " . $e->getMessage(), 0, $e);
-					}
-				} else {
-					throw new \Exception("Repair step '$repairStep' is unknown", 0, $e);
-				}
-			}
+    /**
+     * Add repair step
+     *
+     * @param IRepairStep|string $repairStep repair step
+     * @throws \Exception
+     */
+    public function addStep($repairStep) {
+        if (is_string($repairStep)) {
+            try {
+                $s = \OC::$server->get($repairStep);
+            } catch (QueryException $e) {
+                if (class_exists($repairStep)) {
+                    try {
+                        // Last resort: hope there are no constructor arguments
+                        $s = new $repairStep();
+                    } catch (Throwable $inner) {
+                        // Well, it was worth a try
+                        throw new \Exception("Repair step '$repairStep' can't be instantiated: " . $e->getMessage(), 0, $e);
+                    }
+                } else {
+                    throw new \Exception("Repair step '$repairStep' is unknown", 0, $e);
+                }
+            }
 
-			if ($s instanceof IRepairStep) {
-				$this->repairSteps[] = $s;
-			} else {
-				throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
-			}
-		} else {
-			$this->repairSteps[] = $repairStep;
-		}
-	}
+            if ($s instanceof IRepairStep) {
+                $this->repairSteps[] = $s;
+            } else {
+                throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
+            }
+        } else {
+            $this->repairSteps[] = $repairStep;
+        }
+    }
 
-	/**
-	 * Returns the default repair steps to be run on the
-	 * command line or after an upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getRepairSteps(): array {
-		return [
-			new Collation(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class), \OC::$server->getDatabaseConnection(), false),
-			new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
-			new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
-			new MoveUpdaterStepFile(\OC::$server->getConfig()),
-			new MoveAvatars(
-				\OC::$server->getJobList(),
-				\OC::$server->getConfig()
-			),
-			new CleanPreviews(
-				\OC::$server->getJobList(),
-				\OC::$server->getUserManager(),
-				\OC::$server->getConfig()
-			),
-			\OC::$server->get(MigrateOauthTables::class),
-			new UpdateLanguageCodes(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
-			new AddLogRotateJob(\OC::$server->getJobList()),
-			new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OCP\Server::get(JSCombiner::class)),
-			\OCP\Server::get(ClearGeneratedAvatarCache::class),
-			new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
-			new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
-			new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OCP\Server::get(IAppDataFactory::class), \OC::$server->get(LoggerInterface::class)),
-			new AddClenupLoginFlowV2BackgroundJob(\OC::$server->getJobList()),
-			new RemoveLinkShares(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->get(INotificationManager::class), \OCP\Server::get(ITimeFactory::class)),
-			new ClearCollectionsAccessCache(\OC::$server->getConfig(), \OCP\Server::get(IManager::class)),
-			\OCP\Server::get(ResetGeneratedAvatarFlag::class),
-			\OCP\Server::get(EncryptionLegacyCipher::class),
-			\OCP\Server::get(EncryptionMigration::class),
-			\OCP\Server::get(ShippedDashboardEnable::class),
-			\OCP\Server::get(AddBruteForceCleanupJob::class),
-			\OCP\Server::get(AddCheckForUserCertificatesJob::class),
-			\OCP\Server::get(RepairDavShares::class),
-			\OCP\Server::get(LookupServerSendCheck::class),
-			\OCP\Server::get(AddTokenCleanupJob::class),
-			\OCP\Server::get(CleanUpAbandonedApps::class),
-			\OCP\Server::get(AddMissingSecretJob::class),
-			\OCP\Server::get(AddRemoveOldTasksBackgroundJob::class),
-			\OCP\Server::get(AddMetadataGenerationJob::class),
-			\OCP\Server::get(AddAppConfigLazyMigration::class),
-			\OCP\Server::get(RepairLogoDimension::class),
-			\OCP\Server::get(RemoveLegacyDatadirFile::class),
-			\OCP\Server::get(AddCleanupDeletedUsersBackgroundJob::class),
-			\OCP\Server::get(SanitizeAccountProperties::class),
-		];
-	}
+    /**
+     * Returns the default repair steps to be run on the
+     * command line or after an upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getRepairSteps(): array {
+        return [
+            new Collation(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class), \OC::$server->getDatabaseConnection(), false),
+            new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
+            new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
+            new MoveUpdaterStepFile(\OC::$server->getConfig()),
+            new MoveAvatars(
+                \OC::$server->getJobList(),
+                \OC::$server->getConfig()
+            ),
+            new CleanPreviews(
+                \OC::$server->getJobList(),
+                \OC::$server->getUserManager(),
+                \OC::$server->getConfig()
+            ),
+            \OC::$server->get(MigrateOauthTables::class),
+            new UpdateLanguageCodes(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
+            new AddLogRotateJob(\OC::$server->getJobList()),
+            new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OCP\Server::get(JSCombiner::class)),
+            \OCP\Server::get(ClearGeneratedAvatarCache::class),
+            new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
+            new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
+            new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OCP\Server::get(IAppDataFactory::class), \OC::$server->get(LoggerInterface::class)),
+            new AddClenupLoginFlowV2BackgroundJob(\OC::$server->getJobList()),
+            new RemoveLinkShares(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->get(INotificationManager::class), \OCP\Server::get(ITimeFactory::class)),
+            new ClearCollectionsAccessCache(\OC::$server->getConfig(), \OCP\Server::get(IManager::class)),
+            \OCP\Server::get(ResetGeneratedAvatarFlag::class),
+            \OCP\Server::get(EncryptionLegacyCipher::class),
+            \OCP\Server::get(EncryptionMigration::class),
+            \OCP\Server::get(ShippedDashboardEnable::class),
+            \OCP\Server::get(AddBruteForceCleanupJob::class),
+            \OCP\Server::get(AddCheckForUserCertificatesJob::class),
+            \OCP\Server::get(RepairDavShares::class),
+            \OCP\Server::get(LookupServerSendCheck::class),
+            \OCP\Server::get(AddTokenCleanupJob::class),
+            \OCP\Server::get(CleanUpAbandonedApps::class),
+            \OCP\Server::get(AddMissingSecretJob::class),
+            \OCP\Server::get(AddRemoveOldTasksBackgroundJob::class),
+            \OCP\Server::get(AddMetadataGenerationJob::class),
+            \OCP\Server::get(AddAppConfigLazyMigration::class),
+            \OCP\Server::get(RepairLogoDimension::class),
+            \OCP\Server::get(RemoveLegacyDatadirFile::class),
+            \OCP\Server::get(AddCleanupDeletedUsersBackgroundJob::class),
+            \OCP\Server::get(SanitizeAccountProperties::class),
+        ];
+    }
 
-	/**
-	 * Returns expensive repair steps to be run on the
-	 * command line with a special option.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getExpensiveRepairSteps() {
-		return [
-			new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager()),
-			new RemoveBrokenProperties(\OCP\Server::get(IDBConnection::class)),
-			new RepairMimeTypes(
-				\OCP\Server::get(IConfig::class),
-				\OCP\Server::get(IAppConfig::class),
-				\OCP\Server::get(IDBConnection::class)
-			),
-			\OCP\Server::get(DeleteSchedulingObjects::class),
-		];
-	}
+    /**
+     * Returns expensive repair steps to be run on the
+     * command line with a special option.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getExpensiveRepairSteps() {
+        return [
+            new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager()),
+            new RemoveBrokenProperties(\OCP\Server::get(IDBConnection::class)),
+            new RepairMimeTypes(
+                \OCP\Server::get(IConfig::class),
+                \OCP\Server::get(IAppConfig::class),
+                \OCP\Server::get(IDBConnection::class)
+            ),
+            \OCP\Server::get(DeleteSchedulingObjects::class),
+        ];
+    }
 
-	/**
-	 * Returns the repair steps to be run before an
-	 * upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getBeforeUpgradeRepairSteps() {
-		/** @var ConnectionAdapter $connectionAdapter */
-		$connectionAdapter = \OC::$server->get(ConnectionAdapter::class);
-		$config = \OC::$server->getConfig();
-		$steps = [
-			new Collation(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class), $connectionAdapter, true),
-			new SaveAccountsTableData($connectionAdapter, $config),
-			new DropAccountTermsTable($connectionAdapter),
-		];
+    /**
+     * Returns the repair steps to be run before an
+     * upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getBeforeUpgradeRepairSteps() {
+        /** @var ConnectionAdapter $connectionAdapter */
+        $connectionAdapter = \OC::$server->get(ConnectionAdapter::class);
+        $config = \OC::$server->getConfig();
+        $steps = [
+            new Collation(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class), $connectionAdapter, true),
+            new SaveAccountsTableData($connectionAdapter, $config),
+            new DropAccountTermsTable($connectionAdapter),
+        ];
 
-		return $steps;
-	}
+        return $steps;
+    }
 
-	public function debug(string $message): void {
-	}
+    public function debug(string $message): void {
+    }
 
-	/**
-	 * @param string $message
-	 */
-	public function info($message) {
-		// for now just emit as we did in the past
-		$this->dispatcher->dispatchTyped(new RepairInfoEvent($message));
-	}
+    /**
+     * @param string $message
+     */
+    public function info($message) {
+        // for now just emit as we did in the past
+        $this->dispatcher->dispatchTyped(new RepairInfoEvent($message));
+    }
 
-	/**
-	 * @param string $message
-	 */
-	public function warning($message) {
-		// for now just emit as we did in the past
-		$this->dispatcher->dispatchTyped(new RepairWarningEvent($message));
-	}
+    /**
+     * @param string $message
+     */
+    public function warning($message) {
+        // for now just emit as we did in the past
+        $this->dispatcher->dispatchTyped(new RepairWarningEvent($message));
+    }
 
-	/**
-	 * @param int $max
-	 */
-	public function startProgress($max = 0) {
-		// for now just emit as we did in the past
-		$this->dispatcher->dispatchTyped(new RepairStartEvent($max, $this->currentStep));
-	}
+    /**
+     * @param int $max
+     */
+    public function startProgress($max = 0) {
+        // for now just emit as we did in the past
+        $this->dispatcher->dispatchTyped(new RepairStartEvent($max, $this->currentStep));
+    }
 
-	/**
-	 * @param int $step number of step to advance
-	 * @param string $description
-	 */
-	public function advance($step = 1, $description = '') {
-		// for now just emit as we did in the past
-		$this->dispatcher->dispatchTyped(new RepairAdvanceEvent($step, $description));
-	}
+    /**
+     * @param int $step number of step to advance
+     * @param string $description
+     */
+    public function advance($step = 1, $description = '') {
+        // for now just emit as we did in the past
+        $this->dispatcher->dispatchTyped(new RepairAdvanceEvent($step, $description));
+    }
 
-	/**
-	 * @param int $max
-	 */
-	public function finishProgress() {
-		// for now just emit as we did in the past
-		$this->dispatcher->dispatchTyped(new RepairFinishEvent());
-	}
+    /**
+     * @param int $max
+     */
+    public function finishProgress() {
+        // for now just emit as we did in the past
+        $this->dispatcher->dispatchTyped(new RepairFinishEvent());
+    }
 }

lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php

Indentation +48 added lines, -48 removed lines

@@ -28,61 +28,61 @@
  * photo could be returned for this vcard. These invalid files are removed by this migration step.
  */
 class CleanupCardDAVPhotoCache implements IRepairStep {
-	public function __construct(
-		private IConfig $config,
-		private IAppDataFactory $appDataFactory,
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private IConfig $config,
+        private IAppDataFactory $appDataFactory,
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	public function getName(): string {
-		return 'Cleanup invalid photocache files for carddav';
-	}
+    public function getName(): string {
+        return 'Cleanup invalid photocache files for carddav';
+    }
 
-	private function repair(IOutput $output): void {
-		$photoCacheAppData = $this->appDataFactory->get('dav-photocache');
+    private function repair(IOutput $output): void {
+        $photoCacheAppData = $this->appDataFactory->get('dav-photocache');
 
-		try {
-			$folders = $photoCacheAppData->getDirectoryListing();
-		} catch (NotFoundException $e) {
-			return;
-		} catch (RuntimeException $e) {
-			$this->logger->error('Failed to fetch directory listing in CleanupCardDAVPhotoCache', ['exception' => $e]);
-			return;
-		}
+        try {
+            $folders = $photoCacheAppData->getDirectoryListing();
+        } catch (NotFoundException $e) {
+            return;
+        } catch (RuntimeException $e) {
+            $this->logger->error('Failed to fetch directory listing in CleanupCardDAVPhotoCache', ['exception' => $e]);
+            return;
+        }
 
-		$folders = array_filter($folders, function (ISimpleFolder $folder) {
-			return $folder->fileExists('photo.');
-		});
+        $folders = array_filter($folders, function (ISimpleFolder $folder) {
+            return $folder->fileExists('photo.');
+        });
 
-		if (empty($folders)) {
-			return;
-		}
+        if (empty($folders)) {
+            return;
+        }
 
-		$output->info('Delete ' . count($folders) . ' "photo." files');
+        $output->info('Delete ' . count($folders) . ' "photo." files');
 
-		foreach ($folders as $folder) {
-			try {
-				/** @var ISimpleFolder $folder */
-				$folder->getFile('photo.')->delete();
-			} catch (\Exception $e) {
-				$this->logger->error($e->getMessage(), ['exception' => $e]);
-				$output->warning('Could not delete file "dav-photocache/' . $folder->getName() . '/photo."');
-			}
-		}
-	}
+        foreach ($folders as $folder) {
+            try {
+                /** @var ISimpleFolder $folder */
+                $folder->getFile('photo.')->delete();
+            } catch (\Exception $e) {
+                $this->logger->error($e->getMessage(), ['exception' => $e]);
+                $output->warning('Could not delete file "dav-photocache/' . $folder->getName() . '/photo."');
+            }
+        }
+    }
 
-	private function shouldRun(): bool {
-		return version_compare(
-			$this->config->getSystemValueString('version', '0.0.0.0'),
-			'16.0.0.0',
-			'<='
-		);
-	}
+    private function shouldRun(): bool {
+        return version_compare(
+            $this->config->getSystemValueString('version', '0.0.0.0'),
+            '16.0.0.0',
+            '<='
+        );
+    }
 
-	public function run(IOutput $output): void {
-		if ($this->shouldRun()) {
-			$this->repair($output);
-		}
-	}
+    public function run(IOutput $output): void {
+        if ($this->shouldRun()) {
+            $this->repair($output);
+        }
+    }
 }