nextcloud / server

apps/provisioning_api/lib/AppInfo/Application.php

Indentation +38 added lines, -38 removed lines

@@ -53,47 +53,47 @@
 use Psr\Container\ContainerInterface;
 
 class Application extends App implements IBootstrap {
-	public function __construct(array $urlParams = []) {
-		parent::__construct('provisioning_api', $urlParams);
-	}
+    public function __construct(array $urlParams = []) {
+        parent::__construct('provisioning_api', $urlParams);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
+    public function register(IRegistrationContext $context): void {
+        $context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
 
-		$context->registerService(NewUserMailHelper::class, function (ContainerInterface $c) {
-			return new NewUserMailHelper(
-				$c->get(Defaults::class),
-				$c->get(IURLGenerator::class),
-				$c->get(IFactory::class),
-				$c->get(IMailer::class),
-				$c->get(ISecureRandom::class),
-				$c->get(ITimeFactory::class),
-				$c->get(IConfig::class),
-				$c->get(ICrypto::class),
-				Util::getDefaultEmailAddress('no-reply')
-			);
-		});
-		$context->registerService(ProvisioningApiMiddleware::class, function (ContainerInterface $c) {
-			$user = $c->get(IUserManager::class)->get($c->get('UserId'));
-			$isAdmin = false;
-			$isSubAdmin = false;
+        $context->registerService(NewUserMailHelper::class, function (ContainerInterface $c) {
+            return new NewUserMailHelper(
+                $c->get(Defaults::class),
+                $c->get(IURLGenerator::class),
+                $c->get(IFactory::class),
+                $c->get(IMailer::class),
+                $c->get(ISecureRandom::class),
+                $c->get(ITimeFactory::class),
+                $c->get(IConfig::class),
+                $c->get(ICrypto::class),
+                Util::getDefaultEmailAddress('no-reply')
+            );
+        });
+        $context->registerService(ProvisioningApiMiddleware::class, function (ContainerInterface $c) {
+            $user = $c->get(IUserManager::class)->get($c->get('UserId'));
+            $isAdmin = false;
+            $isSubAdmin = false;
 
-			if ($user instanceof IUser) {
-				$groupManager = $c->get(IGroupManager::class);
-				assert($groupManager instanceof GroupManager);
-				$isAdmin = $groupManager->isAdmin($user->getUID());
-				$isSubAdmin = $groupManager->getSubAdmin()->isSubAdmin($user);
-			}
+            if ($user instanceof IUser) {
+                $groupManager = $c->get(IGroupManager::class);
+                assert($groupManager instanceof GroupManager);
+                $isAdmin = $groupManager->isAdmin($user->getUID());
+                $isSubAdmin = $groupManager->getSubAdmin()->isSubAdmin($user);
+            }
 
-			return new ProvisioningApiMiddleware(
-				$c->get(IControllerMethodReflector::class),
-				$isAdmin,
-				$isSubAdmin
-			);
-		});
-		$context->registerMiddleware(ProvisioningApiMiddleware::class);
-	}
+            return new ProvisioningApiMiddleware(
+                $c->get(IControllerMethodReflector::class),
+                $isAdmin,
+                $isSubAdmin
+            );
+        });
+        $context->registerMiddleware(ProvisioningApiMiddleware::class);
+    }
 
-	public function boot(IBootContext $context): void {
-	}
+    public function boot(IBootContext $context): void {
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
 	public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
 
-		$context->registerService(NewUserMailHelper::class, function (ContainerInterface $c) {
+		$context->registerService(NewUserMailHelper::class, function(ContainerInterface $c) {
 			return new NewUserMailHelper(
 				$c->get(Defaults::class),
 				$c->get(IURLGenerator::class),
@@ -73,7 +73,7 @@ 
 				Util::getDefaultEmailAddress('no-reply')
 			);
 		});
-		$context->registerService(ProvisioningApiMiddleware::class, function (ContainerInterface $c) {
+		$context->registerService(ProvisioningApiMiddleware::class, function(ContainerInterface $c) {
 			$user = $c->get(IUserManager::class)->get($c->get('UserId'));
 			$isAdmin = false;
 			$isSubAdmin = false;

apps/provisioning_api/lib/Listener/UserDeletedListener.php

Indentation +16 added lines, -16 removed lines

@@ -30,25 +30,25 @@
 
 class UserDeletedListener implements IEventListener {
 
-	/** @var KnownUserService */
-	private $service;
+    /** @var KnownUserService */
+    private $service;
 
-	public function __construct(KnownUserService $service) {
-		$this->service = $service;
-	}
+    public function __construct(KnownUserService $service) {
+        $this->service = $service;
+    }
 
-	public function handle(Event $event): void {
-		if (!($event instanceof UserDeletedEvent)) {
-			// Unrelated
-			return;
-		}
+    public function handle(Event $event): void {
+        if (!($event instanceof UserDeletedEvent)) {
+            // Unrelated
+            return;
+        }
 
-		$user = $event->getUser();
+        $user = $event->getUser();
 
-		// Delete all entries of this user
-		$this->service->deleteKnownTo($user->getUID());
+        // Delete all entries of this user
+        $this->service->deleteKnownTo($user->getUID());
 
-		// Delete all entries that other users know this user
-		$this->service->deleteByContactUserId($user->getUID());
-	}
+        // Delete all entries that other users know this user
+        $this->service->deleteByContactUserId($user->getUID());
+    }
 }

apps/provisioning_api/composer/composer/autoload_static.php

Spacing +18 added lines, -18 removed lines

@@ -6,37 +6,37 @@
 
 class ComposerStaticInitProvisioning_API
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\Provisioning_API\\' => 21,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Provisioning_API\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
-        'OCA\\Provisioning_API\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Provisioning_API\\Controller\\AUserData' => __DIR__ . '/..' . '/../lib/Controller/AUserData.php',
-        'OCA\\Provisioning_API\\Controller\\AppConfigController' => __DIR__ . '/..' . '/../lib/Controller/AppConfigController.php',
-        'OCA\\Provisioning_API\\Controller\\AppsController' => __DIR__ . '/..' . '/../lib/Controller/AppsController.php',
-        'OCA\\Provisioning_API\\Controller\\GroupsController' => __DIR__ . '/..' . '/../lib/Controller/GroupsController.php',
-        'OCA\\Provisioning_API\\Controller\\UsersController' => __DIR__ . '/..' . '/../lib/Controller/UsersController.php',
-        'OCA\\Provisioning_API\\FederatedShareProviderFactory' => __DIR__ . '/..' . '/../lib/FederatedShareProviderFactory.php',
-        'OCA\\Provisioning_API\\Listener\\UserDeletedListener' => __DIR__ . '/..' . '/../lib/Listener/UserDeletedListener.php',
-        'OCA\\Provisioning_API\\Middleware\\Exceptions\\NotSubAdminException' => __DIR__ . '/..' . '/../lib/Middleware/Exceptions/NotSubAdminException.php',
-        'OCA\\Provisioning_API\\Middleware\\ProvisioningApiMiddleware' => __DIR__ . '/..' . '/../lib/Middleware/ProvisioningApiMiddleware.php',
+    public static $classMap = array(
+        'Composer\\InstalledVersions' => __DIR__.'/..'.'/composer/InstalledVersions.php',
+        'OCA\\Provisioning_API\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Provisioning_API\\Controller\\AUserData' => __DIR__.'/..'.'/../lib/Controller/AUserData.php',
+        'OCA\\Provisioning_API\\Controller\\AppConfigController' => __DIR__.'/..'.'/../lib/Controller/AppConfigController.php',
+        'OCA\\Provisioning_API\\Controller\\AppsController' => __DIR__.'/..'.'/../lib/Controller/AppsController.php',
+        'OCA\\Provisioning_API\\Controller\\GroupsController' => __DIR__.'/..'.'/../lib/Controller/GroupsController.php',
+        'OCA\\Provisioning_API\\Controller\\UsersController' => __DIR__.'/..'.'/../lib/Controller/UsersController.php',
+        'OCA\\Provisioning_API\\FederatedShareProviderFactory' => __DIR__.'/..'.'/../lib/FederatedShareProviderFactory.php',
+        'OCA\\Provisioning_API\\Listener\\UserDeletedListener' => __DIR__.'/..'.'/../lib/Listener/UserDeletedListener.php',
+        'OCA\\Provisioning_API\\Middleware\\Exceptions\\NotSubAdminException' => __DIR__.'/..'.'/../lib/Middleware/Exceptions/NotSubAdminException.php',
+        'OCA\\Provisioning_API\\Middleware\\ProvisioningApiMiddleware' => __DIR__.'/..'.'/../lib/Middleware/ProvisioningApiMiddleware.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitProvisioning_API::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitProvisioning_API::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitProvisioning_API::$classMap;

apps/provisioning_api/composer/composer/autoload_classmap.php

Spacing +11 added lines, -11 removed lines

@@ -6,15 +6,15 @@
 $baseDir = $vendorDir;
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
-    'OCA\\Provisioning_API\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\Provisioning_API\\Controller\\AUserData' => $baseDir . '/../lib/Controller/AUserData.php',
-    'OCA\\Provisioning_API\\Controller\\AppConfigController' => $baseDir . '/../lib/Controller/AppConfigController.php',
-    'OCA\\Provisioning_API\\Controller\\AppsController' => $baseDir . '/../lib/Controller/AppsController.php',
-    'OCA\\Provisioning_API\\Controller\\GroupsController' => $baseDir . '/../lib/Controller/GroupsController.php',
-    'OCA\\Provisioning_API\\Controller\\UsersController' => $baseDir . '/../lib/Controller/UsersController.php',
-    'OCA\\Provisioning_API\\FederatedShareProviderFactory' => $baseDir . '/../lib/FederatedShareProviderFactory.php',
-    'OCA\\Provisioning_API\\Listener\\UserDeletedListener' => $baseDir . '/../lib/Listener/UserDeletedListener.php',
-    'OCA\\Provisioning_API\\Middleware\\Exceptions\\NotSubAdminException' => $baseDir . '/../lib/Middleware/Exceptions/NotSubAdminException.php',
-    'OCA\\Provisioning_API\\Middleware\\ProvisioningApiMiddleware' => $baseDir . '/../lib/Middleware/ProvisioningApiMiddleware.php',
+    'Composer\\InstalledVersions' => $vendorDir.'/composer/InstalledVersions.php',
+    'OCA\\Provisioning_API\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\Provisioning_API\\Controller\\AUserData' => $baseDir.'/../lib/Controller/AUserData.php',
+    'OCA\\Provisioning_API\\Controller\\AppConfigController' => $baseDir.'/../lib/Controller/AppConfigController.php',
+    'OCA\\Provisioning_API\\Controller\\AppsController' => $baseDir.'/../lib/Controller/AppsController.php',
+    'OCA\\Provisioning_API\\Controller\\GroupsController' => $baseDir.'/../lib/Controller/GroupsController.php',
+    'OCA\\Provisioning_API\\Controller\\UsersController' => $baseDir.'/../lib/Controller/UsersController.php',
+    'OCA\\Provisioning_API\\FederatedShareProviderFactory' => $baseDir.'/../lib/FederatedShareProviderFactory.php',
+    'OCA\\Provisioning_API\\Listener\\UserDeletedListener' => $baseDir.'/../lib/Listener/UserDeletedListener.php',
+    'OCA\\Provisioning_API\\Middleware\\Exceptions\\NotSubAdminException' => $baseDir.'/../lib/Middleware/Exceptions/NotSubAdminException.php',
+    'OCA\\Provisioning_API\\Middleware\\ProvisioningApiMiddleware' => $baseDir.'/../lib/Middleware/ProvisioningApiMiddleware.php',
 );

apps/dav/lib/RootCollection.php

Indentation +129 added lines, -129 removed lines

@@ -50,133 +50,133 @@
 use Sabre\DAV\SimpleCollection;
 
 class RootCollection extends SimpleCollection {
-	public function __construct() {
-		$config = \OC::$server->getConfig();
-		$l10n = \OC::$server->getL10N('dav');
-		$random = \OC::$server->getSecureRandom();
-		$logger = \OC::$server->getLogger();
-		$userManager = \OC::$server->getUserManager();
-		$userSession = \OC::$server->getUserSession();
-		$groupManager = \OC::$server->getGroupManager();
-		$shareManager = \OC::$server->getShareManager();
-		$db = \OC::$server->getDatabaseConnection();
-		$dispatcher = \OC::$server->get(IEventDispatcher::class);
-		$legacyDispatcher = \OC::$server->getEventDispatcher();
-		$proxyMapper = \OC::$server->query(ProxyMapper::class);
-
-		$userPrincipalBackend = new Principal(
-			$userManager,
-			$groupManager,
-			$shareManager,
-			\OC::$server->getUserSession(),
-			\OC::$server->getAppManager(),
-			$proxyMapper,
-			\OC::$server->get(KnownUserService::class),
-			\OC::$server->getConfig()
-		);
-		$groupPrincipalBackend = new GroupPrincipalBackend($groupManager, $userSession, $shareManager, $config);
-		$calendarResourcePrincipalBackend = new ResourcePrincipalBackend($db, $userSession, $groupManager, $logger, $proxyMapper);
-		$calendarRoomPrincipalBackend = new RoomPrincipalBackend($db, $userSession, $groupManager, $logger, $proxyMapper);
-		// as soon as debug mode is enabled we allow listing of principals
-		$disableListing = !$config->getSystemValue('debug', false);
-
-		// setup the first level of the dav tree
-		$userPrincipals = new Collection($userPrincipalBackend, 'principals/users');
-		$userPrincipals->disableListing = $disableListing;
-		$groupPrincipals = new Collection($groupPrincipalBackend, 'principals/groups');
-		$groupPrincipals->disableListing = $disableListing;
-		$systemPrincipals = new Collection(new SystemPrincipalBackend(), 'principals/system');
-		$systemPrincipals->disableListing = $disableListing;
-		$calendarResourcePrincipals = new Collection($calendarResourcePrincipalBackend, 'principals/calendar-resources');
-		$calendarResourcePrincipals->disableListing = $disableListing;
-		$calendarRoomPrincipals = new Collection($calendarRoomPrincipalBackend, 'principals/calendar-rooms');
-		$calendarRoomPrincipals->disableListing = $disableListing;
-
-
-		$filesCollection = new Files\RootCollection($userPrincipalBackend, 'principals/users');
-		$filesCollection->disableListing = $disableListing;
-		$caldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher, $legacyDispatcher);
-		$userCalendarRoot = new CalendarRoot($userPrincipalBackend, $caldavBackend, 'principals/users');
-		$userCalendarRoot->disableListing = $disableListing;
-
-		$resourceCalendarCaldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher, $legacyDispatcher);
-		$resourceCalendarRoot = new CalendarRoot($calendarResourcePrincipalBackend, $caldavBackend, 'principals/calendar-resources');
-		$resourceCalendarRoot->disableListing = $disableListing;
-		$roomCalendarCaldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher, $legacyDispatcher);
-		$roomCalendarRoot = new CalendarRoot($calendarRoomPrincipalBackend, $roomCalendarCaldavBackend, 'principals/calendar-rooms');
-		$roomCalendarRoot->disableListing = $disableListing;
-
-		$publicCalendarRoot = new PublicCalendarRoot($caldavBackend, $l10n, $config);
-		$publicCalendarRoot->disableListing = $disableListing;
-
-		$systemTagCollection = new SystemTag\SystemTagsByIdCollection(
-			\OC::$server->getSystemTagManager(),
-			\OC::$server->getUserSession(),
-			$groupManager
-		);
-		$systemTagRelationsCollection = new SystemTag\SystemTagsRelationsCollection(
-			\OC::$server->getSystemTagManager(),
-			\OC::$server->getSystemTagObjectMapper(),
-			\OC::$server->getUserSession(),
-			$groupManager,
-			\OC::$server->getEventDispatcher()
-		);
-		$commentsCollection = new Comments\RootCollection(
-			\OC::$server->getCommentsManager(),
-			$userManager,
-			\OC::$server->getUserSession(),
-			\OC::$server->getEventDispatcher(),
-			\OC::$server->getLogger()
-		);
-
-		$pluginManager = new PluginManager(\OC::$server, \OC::$server->query(IAppManager::class));
-		$usersCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher, $legacyDispatcher);
-		$usersAddressBookRoot = new AddressBookRoot($userPrincipalBackend, $usersCardDavBackend, $pluginManager, 'principals/users');
-		$usersAddressBookRoot->disableListing = $disableListing;
-
-		$systemCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher, $legacyDispatcher);
-		$systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, $pluginManager, 'principals/system');
-		$systemAddressBookRoot->disableListing = $disableListing;
-
-		$uploadCollection = new Upload\RootCollection(
-			$userPrincipalBackend,
-			'principals/users',
-			\OC::$server->query(CleanupService::class));
-		$uploadCollection->disableListing = $disableListing;
-
-		$avatarCollection = new Avatars\RootCollection($userPrincipalBackend, 'principals/users');
-		$avatarCollection->disableListing = $disableListing;
-
-		$appleProvisioning = new AppleProvisioningNode(
-			\OC::$server->query(ITimeFactory::class));
-
-		$children = [
-			new SimpleCollection('principals', [
-				$userPrincipals,
-				$groupPrincipals,
-				$systemPrincipals,
-				$calendarResourcePrincipals,
-				$calendarRoomPrincipals]),
-			$filesCollection,
-			$userCalendarRoot,
-			new SimpleCollection('system-calendars', [
-				$resourceCalendarRoot,
-				$roomCalendarRoot,
-			]),
-			$publicCalendarRoot,
-			new SimpleCollection('addressbooks', [
-				$usersAddressBookRoot,
-				$systemAddressBookRoot]),
-			$systemTagCollection,
-			$systemTagRelationsCollection,
-			$commentsCollection,
-			$uploadCollection,
-			$avatarCollection,
-			new SimpleCollection('provisioning', [
-				$appleProvisioning
-			])
-		];
-
-		parent::__construct('root', $children);
-	}
+    public function __construct() {
+        $config = \OC::$server->getConfig();
+        $l10n = \OC::$server->getL10N('dav');
+        $random = \OC::$server->getSecureRandom();
+        $logger = \OC::$server->getLogger();
+        $userManager = \OC::$server->getUserManager();
+        $userSession = \OC::$server->getUserSession();
+        $groupManager = \OC::$server->getGroupManager();
+        $shareManager = \OC::$server->getShareManager();
+        $db = \OC::$server->getDatabaseConnection();
+        $dispatcher = \OC::$server->get(IEventDispatcher::class);
+        $legacyDispatcher = \OC::$server->getEventDispatcher();
+        $proxyMapper = \OC::$server->query(ProxyMapper::class);
+
+        $userPrincipalBackend = new Principal(
+            $userManager,
+            $groupManager,
+            $shareManager,
+            \OC::$server->getUserSession(),
+            \OC::$server->getAppManager(),
+            $proxyMapper,
+            \OC::$server->get(KnownUserService::class),
+            \OC::$server->getConfig()
+        );
+        $groupPrincipalBackend = new GroupPrincipalBackend($groupManager, $userSession, $shareManager, $config);
+        $calendarResourcePrincipalBackend = new ResourcePrincipalBackend($db, $userSession, $groupManager, $logger, $proxyMapper);
+        $calendarRoomPrincipalBackend = new RoomPrincipalBackend($db, $userSession, $groupManager, $logger, $proxyMapper);
+        // as soon as debug mode is enabled we allow listing of principals
+        $disableListing = !$config->getSystemValue('debug', false);
+
+        // setup the first level of the dav tree
+        $userPrincipals = new Collection($userPrincipalBackend, 'principals/users');
+        $userPrincipals->disableListing = $disableListing;
+        $groupPrincipals = new Collection($groupPrincipalBackend, 'principals/groups');
+        $groupPrincipals->disableListing = $disableListing;
+        $systemPrincipals = new Collection(new SystemPrincipalBackend(), 'principals/system');
+        $systemPrincipals->disableListing = $disableListing;
+        $calendarResourcePrincipals = new Collection($calendarResourcePrincipalBackend, 'principals/calendar-resources');
+        $calendarResourcePrincipals->disableListing = $disableListing;
+        $calendarRoomPrincipals = new Collection($calendarRoomPrincipalBackend, 'principals/calendar-rooms');
+        $calendarRoomPrincipals->disableListing = $disableListing;
+
+
+        $filesCollection = new Files\RootCollection($userPrincipalBackend, 'principals/users');
+        $filesCollection->disableListing = $disableListing;
+        $caldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher, $legacyDispatcher);
+        $userCalendarRoot = new CalendarRoot($userPrincipalBackend, $caldavBackend, 'principals/users');
+        $userCalendarRoot->disableListing = $disableListing;
+
+        $resourceCalendarCaldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher, $legacyDispatcher);
+        $resourceCalendarRoot = new CalendarRoot($calendarResourcePrincipalBackend, $caldavBackend, 'principals/calendar-resources');
+        $resourceCalendarRoot->disableListing = $disableListing;
+        $roomCalendarCaldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher, $legacyDispatcher);
+        $roomCalendarRoot = new CalendarRoot($calendarRoomPrincipalBackend, $roomCalendarCaldavBackend, 'principals/calendar-rooms');
+        $roomCalendarRoot->disableListing = $disableListing;
+
+        $publicCalendarRoot = new PublicCalendarRoot($caldavBackend, $l10n, $config);
+        $publicCalendarRoot->disableListing = $disableListing;
+
+        $systemTagCollection = new SystemTag\SystemTagsByIdCollection(
+            \OC::$server->getSystemTagManager(),
+            \OC::$server->getUserSession(),
+            $groupManager
+        );
+        $systemTagRelationsCollection = new SystemTag\SystemTagsRelationsCollection(
+            \OC::$server->getSystemTagManager(),
+            \OC::$server->getSystemTagObjectMapper(),
+            \OC::$server->getUserSession(),
+            $groupManager,
+            \OC::$server->getEventDispatcher()
+        );
+        $commentsCollection = new Comments\RootCollection(
+            \OC::$server->getCommentsManager(),
+            $userManager,
+            \OC::$server->getUserSession(),
+            \OC::$server->getEventDispatcher(),
+            \OC::$server->getLogger()
+        );
+
+        $pluginManager = new PluginManager(\OC::$server, \OC::$server->query(IAppManager::class));
+        $usersCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher, $legacyDispatcher);
+        $usersAddressBookRoot = new AddressBookRoot($userPrincipalBackend, $usersCardDavBackend, $pluginManager, 'principals/users');
+        $usersAddressBookRoot->disableListing = $disableListing;
+
+        $systemCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher, $legacyDispatcher);
+        $systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, $pluginManager, 'principals/system');
+        $systemAddressBookRoot->disableListing = $disableListing;
+
+        $uploadCollection = new Upload\RootCollection(
+            $userPrincipalBackend,
+            'principals/users',
+            \OC::$server->query(CleanupService::class));
+        $uploadCollection->disableListing = $disableListing;
+
+        $avatarCollection = new Avatars\RootCollection($userPrincipalBackend, 'principals/users');
+        $avatarCollection->disableListing = $disableListing;
+
+        $appleProvisioning = new AppleProvisioningNode(
+            \OC::$server->query(ITimeFactory::class));
+
+        $children = [
+            new SimpleCollection('principals', [
+                $userPrincipals,
+                $groupPrincipals,
+                $systemPrincipals,
+                $calendarResourcePrincipals,
+                $calendarRoomPrincipals]),
+            $filesCollection,
+            $userCalendarRoot,
+            new SimpleCollection('system-calendars', [
+                $resourceCalendarRoot,
+                $roomCalendarRoot,
+            ]),
+            $publicCalendarRoot,
+            new SimpleCollection('addressbooks', [
+                $usersAddressBookRoot,
+                $systemAddressBookRoot]),
+            $systemTagCollection,
+            $systemTagRelationsCollection,
+            $commentsCollection,
+            $uploadCollection,
+            $avatarCollection,
+            new SimpleCollection('provisioning', [
+                $appleProvisioning
+            ])
+        ];
+
+        parent::__construct('root', $children);
+    }
 }

apps/dav/lib/CardDAV/SystemAddressbook.php

Indentation +18 added lines, -18 removed lines

@@ -33,22 +33,22 @@
 use Sabre\CardDAV\Backend\BackendInterface;
 
 class SystemAddressbook extends AddressBook {
-	/** @var IConfig */
-	private $config;
-
-	public function __construct(BackendInterface $carddavBackend, array $addressBookInfo, IL10N $l10n, IConfig $config) {
-		parent::__construct($carddavBackend, $addressBookInfo, $l10n);
-		$this->config = $config;
-	}
-
-	public function getChildren() {
-		$shareEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-		$shareEnumerationGroup = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
-		$shareEnumerationPhone = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_phone', 'no') === 'yes';
-		if (!$shareEnumeration || $shareEnumerationGroup || $shareEnumerationPhone) {
-			return [];
-		}
-
-		return parent::getChildren();
-	}
+    /** @var IConfig */
+    private $config;
+
+    public function __construct(BackendInterface $carddavBackend, array $addressBookInfo, IL10N $l10n, IConfig $config) {
+        parent::__construct($carddavBackend, $addressBookInfo, $l10n);
+        $this->config = $config;
+    }
+
+    public function getChildren() {
+        $shareEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+        $shareEnumerationGroup = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
+        $shareEnumerationPhone = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_phone', 'no') === 'yes';
+        if (!$shareEnumeration || $shareEnumerationGroup || $shareEnumerationPhone) {
+            return [];
+        }
+
+        return parent::getChildren();
+    }
 }

apps/dav/lib/Command/CreateCalendar.php

Indentation +52 added lines, -52 removed lines

@@ -42,62 +42,62 @@
 
 class CreateCalendar extends Command {
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/** @var IGroupManager $groupManager */
-	private $groupManager;
+    /** @var IGroupManager $groupManager */
+    private $groupManager;
 
-	/** @var \OCP\IDBConnection */
-	protected $dbConnection;
+    /** @var \OCP\IDBConnection */
+    protected $dbConnection;
 
-	/**
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param IDBConnection $dbConnection
-	 */
-	public function __construct(IUserManager $userManager, IGroupManager $groupManager, IDBConnection $dbConnection) {
-		parent::__construct();
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->dbConnection = $dbConnection;
-	}
+    /**
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param IDBConnection $dbConnection
+     */
+    public function __construct(IUserManager $userManager, IGroupManager $groupManager, IDBConnection $dbConnection) {
+        parent::__construct();
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->dbConnection = $dbConnection;
+    }
 
-	protected function configure() {
-		$this
-			->setName('dav:create-calendar')
-			->setDescription('Create a dav calendar')
-			->addArgument('user',
-				InputArgument::REQUIRED,
-				'User for whom the calendar will be created')
-			->addArgument('name',
-				InputArgument::REQUIRED,
-				'Name of the calendar');
-	}
+    protected function configure() {
+        $this
+            ->setName('dav:create-calendar')
+            ->setDescription('Create a dav calendar')
+            ->addArgument('user',
+                InputArgument::REQUIRED,
+                'User for whom the calendar will be created')
+            ->addArgument('name',
+                InputArgument::REQUIRED,
+                'Name of the calendar');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$user = $input->getArgument('user');
-		if (!$this->userManager->userExists($user)) {
-			throw new \InvalidArgumentException("User <$user> in unknown.");
-		}
-		$principalBackend = new Principal(
-			$this->userManager,
-			$this->groupManager,
-			\OC::$server->getShareManager(),
-			\OC::$server->getUserSession(),
-			\OC::$server->getAppManager(),
-			\OC::$server->query(ProxyMapper::class),
-			\OC::$server->get(KnownUserService::class),
-			\OC::$server->getConfig()
-		);
-		$random = \OC::$server->getSecureRandom();
-		$logger = \OC::$server->getLogger();
-		$dispatcher = \OC::$server->get(IEventDispatcher::class);
-		$legacyDispatcher = \OC::$server->getEventDispatcher();
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $user = $input->getArgument('user');
+        if (!$this->userManager->userExists($user)) {
+            throw new \InvalidArgumentException("User <$user> in unknown.");
+        }
+        $principalBackend = new Principal(
+            $this->userManager,
+            $this->groupManager,
+            \OC::$server->getShareManager(),
+            \OC::$server->getUserSession(),
+            \OC::$server->getAppManager(),
+            \OC::$server->query(ProxyMapper::class),
+            \OC::$server->get(KnownUserService::class),
+            \OC::$server->getConfig()
+        );
+        $random = \OC::$server->getSecureRandom();
+        $logger = \OC::$server->getLogger();
+        $dispatcher = \OC::$server->get(IEventDispatcher::class);
+        $legacyDispatcher = \OC::$server->getEventDispatcher();
 
-		$name = $input->getArgument('name');
-		$caldav = new CalDavBackend($this->dbConnection, $principalBackend, $this->userManager, $this->groupManager, $random, $logger, $dispatcher, $legacyDispatcher);
-		$caldav->createCalendar("principals/users/$user", $name, []);
-		return 0;
-	}
+        $name = $input->getArgument('name');
+        $caldav = new CalDavBackend($this->dbConnection, $principalBackend, $this->userManager, $this->groupManager, $random, $logger, $dispatcher, $legacyDispatcher);
+        $caldav->createCalendar("principals/users/$user", $name, []);
+        return 0;
+    }
 }

apps/dav/lib/Connector/Sabre/Principal.php

Indentation +527 added lines, -527 removed lines

@@ -56,531 +56,531 @@
 
 class Principal implements BackendInterface {
 
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var IShareManager */
-	private $shareManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IAppManager */
-	private $appManager;
-
-	/** @var string */
-	private $principalPrefix;
-
-	/** @var bool */
-	private $hasGroups;
-
-	/** @var bool */
-	private $hasCircles;
-
-	/** @var ProxyMapper */
-	private $proxyMapper;
-
-	/** @var KnownUserService */
-	private $knownUserService;
-
-	/** @var IConfig */
-	private $config;
-
-	public function __construct(IUserManager $userManager,
-								IGroupManager $groupManager,
-								IShareManager $shareManager,
-								IUserSession $userSession,
-								IAppManager $appManager,
-								ProxyMapper $proxyMapper,
-								KnownUserService $knownUserService,
-								IConfig $config,
-								string $principalPrefix = 'principals/users/') {
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->shareManager = $shareManager;
-		$this->userSession = $userSession;
-		$this->appManager = $appManager;
-		$this->principalPrefix = trim($principalPrefix, '/');
-		$this->hasGroups = $this->hasCircles = ($principalPrefix === 'principals/users/');
-		$this->proxyMapper = $proxyMapper;
-		$this->knownUserService = $knownUserService;
-		$this->config = $config;
-	}
-
-	use PrincipalProxyTrait {
-		getGroupMembership as protected traitGetGroupMembership;
-	}
-
-	/**
-	 * Returns a list of principals based on a prefix.
-	 *
-	 * This prefix will often contain something like 'principals'. You are only
-	 * expected to return principals that are in this base path.
-	 *
-	 * You are expected to return at least a 'uri' for every user, you can
-	 * return any additional properties if you wish so. Common properties are:
-	 *   {DAV:}displayname
-	 *
-	 * @param string $prefixPath
-	 * @return string[]
-	 */
-	public function getPrincipalsByPrefix($prefixPath) {
-		$principals = [];
-
-		if ($prefixPath === $this->principalPrefix) {
-			foreach ($this->userManager->search('') as $user) {
-				$principals[] = $this->userToPrincipal($user);
-			}
-		}
-
-		return $principals;
-	}
-
-	/**
-	 * Returns a specific principal, specified by it's path.
-	 * The returned structure should be the exact same as from
-	 * getPrincipalsByPrefix.
-	 *
-	 * @param string $path
-	 * @return array
-	 */
-	public function getPrincipalByPath($path) {
-		[$prefix, $name] = \Sabre\Uri\split($path);
-		$decodedName = urldecode($name);
-
-		if ($name === 'calendar-proxy-write' || $name === 'calendar-proxy-read') {
-			[$prefix2, $name2] = \Sabre\Uri\split($prefix);
-
-			if ($prefix2 === $this->principalPrefix) {
-				$user = $this->userManager->get($name2);
-
-				if ($user !== null) {
-					return [
-						'uri' => 'principals/users/' . $user->getUID() . '/' . $name,
-					];
-				}
-				return null;
-			}
-		}
-
-		if ($prefix === $this->principalPrefix) {
-			// Depending on where it is called, it may happen that this function
-			// is called either with a urlencoded version of the name or with a non-urlencoded one.
-			// The urldecode function replaces %## and +, both of which are forbidden in usernames.
-			// Hence there can be no ambiguity here and it is safe to call urldecode on all usernames
-			$user = $this->userManager->get($decodedName);
-
-			if ($user !== null) {
-				return $this->userToPrincipal($user);
-			}
-		} elseif ($prefix === 'principals/circles') {
-			if ($this->userSession->getUser() !== null) {
-				// At the time of writing - 2021-01-19 — a mixed state is possible.
-				// The second condition can be removed when this is fixed.
-				return $this->circleToPrincipal($decodedName)
-					?: $this->circleToPrincipal($name);
-			}
-		} elseif ($prefix === 'principals/groups') {
-			// At the time of writing - 2021-01-19 — a mixed state is possible.
-			// The second condition can be removed when this is fixed.
-			$group = $this->groupManager->get($decodedName)
-				?: $this->groupManager->get($name);
-			if ($group instanceof IGroup) {
-				return [
-					'uri' => 'principals/groups/' . $name,
-					'{DAV:}displayname' => $group->getDisplayName(),
-				];
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the list of groups a principal is a member of
-	 *
-	 * @param string $principal
-	 * @param bool $needGroups
-	 * @return array
-	 * @throws Exception
-	 */
-	public function getGroupMembership($principal, $needGroups = false) {
-		[$prefix, $name] = \Sabre\Uri\split($principal);
-
-		if ($prefix !== $this->principalPrefix) {
-			return [];
-		}
-
-		$user = $this->userManager->get($name);
-		if (!$user) {
-			throw new Exception('Principal not found');
-		}
-
-		$groups = [];
-
-		if ($this->hasGroups || $needGroups) {
-			$userGroups = $this->groupManager->getUserGroups($user);
-			foreach ($userGroups as $userGroup) {
-				$groups[] = 'principals/groups/' . urlencode($userGroup->getGID());
-			}
-		}
-
-		$groups = array_unique(array_merge(
-			$groups,
-			$this->traitGetGroupMembership($principal, $needGroups)
-		));
-
-		return $groups;
-	}
-
-	/**
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 * @return int
-	 */
-	public function updatePrincipal($path, PropPatch $propPatch) {
-		return 0;
-	}
-
-	/**
-	 * Search user principals
-	 *
-	 * @param array $searchProperties
-	 * @param string $test
-	 * @return array
-	 */
-	protected function searchUserPrincipals(array $searchProperties, $test = 'allof') {
-		$results = [];
-
-		// If sharing is disabled, return the empty array
-		$shareAPIEnabled = $this->shareManager->shareApiEnabled();
-		if (!$shareAPIEnabled) {
-			return [];
-		}
-
-		$allowEnumeration = $this->shareManager->allowEnumeration();
-		$limitEnumerationGroup = $this->shareManager->limitEnumerationToGroups();
-		$limitEnumerationPhone = $this->shareManager->limitEnumerationToPhone();
-		$allowEnumerationFullMatch = $this->shareManager->allowEnumerationFullMatch();
-
-		// If sharing is restricted to group members only,
-		// return only members that have groups in common
-		$restrictGroups = false;
-		$currentUser = $this->userSession->getUser();
-		if ($this->shareManager->shareWithGroupMembersOnly()) {
-			if (!$currentUser instanceof IUser) {
-				return [];
-			}
-
-			$restrictGroups = $this->groupManager->getUserGroupIds($currentUser);
-		}
-
-		$currentUserGroups = [];
-		if ($limitEnumerationGroup) {
-			if ($currentUser instanceof IUser) {
-				$currentUserGroups = $this->groupManager->getUserGroupIds($currentUser);
-			}
-		}
-
-		$searchLimit = $this->config->getSystemValueInt('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT);
-		if ($searchLimit <= 0) {
-			$searchLimit = null;
-		}
-		foreach ($searchProperties as $prop => $value) {
-			switch ($prop) {
-				case '{http://sabredav.org/ns}email-address':
-					if (!$allowEnumeration) {
-						if ($allowEnumerationFullMatch) {
-							$users = $this->userManager->getByEmail($value);
-							$users = \array_filter($users, static function (IUser $user) use ($value) {
-								return $user->getEMailAddress() === $value;
-							});
-						} else {
-							$users = [];
-						}
-					} else {
-						$users = $this->userManager->getByEmail($value);
-						$users = \array_filter($users, function (IUser $user) use ($currentUser, $value, $limitEnumerationPhone, $limitEnumerationGroup, $allowEnumerationFullMatch, $currentUserGroups) {
-							if ($allowEnumerationFullMatch && $user->getEMailAddress() === $value) {
-								return true;
-							}
-
-							if ($limitEnumerationPhone
-								&& $currentUser instanceof IUser
-								&& $this->knownUserService->isKnownToUser($currentUser->getUID(), $user->getUID())) {
-								// Synced phonebook match
-								return true;
-							}
-
-							if (!$limitEnumerationGroup) {
-								// No limitation on enumeration, all allowed
-								return true;
-							}
-
-							return !empty($currentUserGroups) && !empty(array_intersect(
-								$this->groupManager->getUserGroupIds($user),
-								$currentUserGroups
-							));
-						});
-					}
-
-					$results[] = array_reduce($users, function (array $carry, IUser $user) use ($restrictGroups) {
-						// is sharing restricted to groups only?
-						if ($restrictGroups !== false) {
-							$userGroups = $this->groupManager->getUserGroupIds($user);
-							if (count(array_intersect($userGroups, $restrictGroups)) === 0) {
-								return $carry;
-							}
-						}
-
-						$carry[] = $this->principalPrefix . '/' . $user->getUID();
-						return $carry;
-					}, []);
-					break;
-
-				case '{DAV:}displayname':
-
-					if (!$allowEnumeration) {
-						if ($allowEnumerationFullMatch) {
-							$users = $this->userManager->searchDisplayName($value, $searchLimit);
-							$users = \array_filter($users, static function (IUser $user) use ($value) {
-								return $user->getDisplayName() === $value;
-							});
-						} else {
-							$users = [];
-						}
-					} else {
-						$users = $this->userManager->searchDisplayName($value, $searchLimit);
-						$users = \array_filter($users, function (IUser $user) use ($currentUser, $value, $limitEnumerationPhone, $limitEnumerationGroup, $allowEnumerationFullMatch, $currentUserGroups) {
-							if ($allowEnumerationFullMatch && $user->getDisplayName() === $value) {
-								return true;
-							}
-
-							if ($limitEnumerationPhone
-								&& $currentUser instanceof IUser
-								&& $this->knownUserService->isKnownToUser($currentUser->getUID(), $user->getUID())) {
-								// Synced phonebook match
-								return true;
-							}
-
-							if (!$limitEnumerationGroup) {
-								// No limitation on enumeration, all allowed
-								return true;
-							}
-
-							return !empty($currentUserGroups) && !empty(array_intersect(
-								$this->groupManager->getUserGroupIds($user),
-								$currentUserGroups
-							));
-						});
-					}
-
-					$results[] = array_reduce($users, function (array $carry, IUser $user) use ($restrictGroups) {
-						// is sharing restricted to groups only?
-						if ($restrictGroups !== false) {
-							$userGroups = $this->groupManager->getUserGroupIds($user);
-							if (count(array_intersect($userGroups, $restrictGroups)) === 0) {
-								return $carry;
-							}
-						}
-
-						$carry[] = $this->principalPrefix . '/' . $user->getUID();
-						return $carry;
-					}, []);
-					break;
-
-				case '{urn:ietf:params:xml:ns:caldav}calendar-user-address-set':
-					// If you add support for more search properties that qualify as a user-address,
-					// please also add them to the array below
-					$results[] = $this->searchUserPrincipals([
-						// In theory this should also search for principal:principals/users/...
-						// but that's used internally only anyway and i don't know of any client querying that
-						'{http://sabredav.org/ns}email-address' => $value,
-					], 'anyof');
-					break;
-
-				default:
-					$results[] = [];
-					break;
-			}
-		}
-
-		// results is an array of arrays, so this is not the first search result
-		// but the results of the first searchProperty
-		if (count($results) === 1) {
-			return $results[0];
-		}
-
-		switch ($test) {
-			case 'anyof':
-				return array_values(array_unique(array_merge(...$results)));
-
-			case 'allof':
-			default:
-				return array_values(array_intersect(...$results));
-		}
-	}
-
-	/**
-	 * @param string $prefixPath
-	 * @param array $searchProperties
-	 * @param string $test
-	 * @return array
-	 */
-	public function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
-		if (count($searchProperties) === 0) {
-			return [];
-		}
-
-		switch ($prefixPath) {
-			case 'principals/users':
-				return $this->searchUserPrincipals($searchProperties, $test);
-
-			default:
-				return [];
-		}
-	}
-
-	/**
-	 * @param string $uri
-	 * @param string $principalPrefix
-	 * @return string
-	 */
-	public function findByUri($uri, $principalPrefix) {
-		// If sharing is disabled, return the empty array
-		$shareAPIEnabled = $this->shareManager->shareApiEnabled();
-		if (!$shareAPIEnabled) {
-			return null;
-		}
-
-		// If sharing is restricted to group members only,
-		// return only members that have groups in common
-		$restrictGroups = false;
-		if ($this->shareManager->shareWithGroupMembersOnly()) {
-			$user = $this->userSession->getUser();
-			if (!$user) {
-				return null;
-			}
-
-			$restrictGroups = $this->groupManager->getUserGroupIds($user);
-		}
-
-		if (strpos($uri, 'mailto:') === 0) {
-			if ($principalPrefix === 'principals/users') {
-				$users = $this->userManager->getByEmail(substr($uri, 7));
-				if (count($users) !== 1) {
-					return null;
-				}
-				$user = $users[0];
-
-				if ($restrictGroups !== false) {
-					$userGroups = $this->groupManager->getUserGroupIds($user);
-					if (count(array_intersect($userGroups, $restrictGroups)) === 0) {
-						return null;
-					}
-				}
-
-				return $this->principalPrefix . '/' . $user->getUID();
-			}
-		}
-		if (substr($uri, 0, 10) === 'principal:') {
-			$principal = substr($uri, 10);
-			$principal = $this->getPrincipalByPath($principal);
-			if ($principal !== null) {
-				return $principal['uri'];
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return array
-	 */
-	protected function userToPrincipal($user) {
-		$userId = $user->getUID();
-		$displayName = $user->getDisplayName();
-		$principal = [
-			'uri' => $this->principalPrefix . '/' . $userId,
-			'{DAV:}displayname' => is_null($displayName) ? $userId : $displayName,
-			'{urn:ietf:params:xml:ns:caldav}calendar-user-type' => 'INDIVIDUAL',
-		];
-
-		$email = $user->getEMailAddress();
-		if (!empty($email)) {
-			$principal['{http://sabredav.org/ns}email-address'] = $email;
-		}
-
-		return $principal;
-	}
-
-	public function getPrincipalPrefix() {
-		return $this->principalPrefix;
-	}
-
-	/**
-	 * @param string $circleUniqueId
-	 * @return array|null
-	 */
-	protected function circleToPrincipal($circleUniqueId) {
-		if (!$this->appManager->isEnabledForUser('circles') || !class_exists('\OCA\Circles\Api\v1\Circles')) {
-			return null;
-		}
-
-		try {
-			$circle = \OCA\Circles\Api\v1\Circles::detailsCircle($circleUniqueId, true);
-		} catch (QueryException $ex) {
-			return null;
-		} catch (CircleDoesNotExistException $ex) {
-			return null;
-		}
-
-		if (!$circle) {
-			return null;
-		}
-
-		$principal = [
-			'uri' => 'principals/circles/' . $circleUniqueId,
-			'{DAV:}displayname' => $circle->getName(),
-		];
-
-		return $principal;
-	}
-
-	/**
-	 * Returns the list of circles a principal is a member of
-	 *
-	 * @param string $principal
-	 * @return array
-	 * @throws Exception
-	 * @throws \OCP\AppFramework\QueryException
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	public function getCircleMembership($principal):array {
-		if (!$this->appManager->isEnabledForUser('circles') || !class_exists('\OCA\Circles\Api\v1\Circles')) {
-			return [];
-		}
-
-		[$prefix, $name] = \Sabre\Uri\split($principal);
-		if ($this->hasCircles && $prefix === $this->principalPrefix) {
-			$user = $this->userManager->get($name);
-			if (!$user) {
-				throw new Exception('Principal not found');
-			}
-
-			$circles = \OCA\Circles\Api\v1\Circles::joinedCircles($name, true);
-
-			$circles = array_map(function ($circle) {
-				/** @var \OCA\Circles\Model\Circle $circle */
-				return 'principals/circles/' . urlencode($circle->getUniqueId());
-			}, $circles);
-
-			return $circles;
-		}
-
-		return [];
-	}
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /** @var IShareManager */
+    private $shareManager;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var IAppManager */
+    private $appManager;
+
+    /** @var string */
+    private $principalPrefix;
+
+    /** @var bool */
+    private $hasGroups;
+
+    /** @var bool */
+    private $hasCircles;
+
+    /** @var ProxyMapper */
+    private $proxyMapper;
+
+    /** @var KnownUserService */
+    private $knownUserService;
+
+    /** @var IConfig */
+    private $config;
+
+    public function __construct(IUserManager $userManager,
+                                IGroupManager $groupManager,
+                                IShareManager $shareManager,
+                                IUserSession $userSession,
+                                IAppManager $appManager,
+                                ProxyMapper $proxyMapper,
+                                KnownUserService $knownUserService,
+                                IConfig $config,
+                                string $principalPrefix = 'principals/users/') {
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->shareManager = $shareManager;
+        $this->userSession = $userSession;
+        $this->appManager = $appManager;
+        $this->principalPrefix = trim($principalPrefix, '/');
+        $this->hasGroups = $this->hasCircles = ($principalPrefix === 'principals/users/');
+        $this->proxyMapper = $proxyMapper;
+        $this->knownUserService = $knownUserService;
+        $this->config = $config;
+    }
+
+    use PrincipalProxyTrait {
+        getGroupMembership as protected traitGetGroupMembership;
+    }
+
+    /**
+     * Returns a list of principals based on a prefix.
+     *
+     * This prefix will often contain something like 'principals'. You are only
+     * expected to return principals that are in this base path.
+     *
+     * You are expected to return at least a 'uri' for every user, you can
+     * return any additional properties if you wish so. Common properties are:
+     *   {DAV:}displayname
+     *
+     * @param string $prefixPath
+     * @return string[]
+     */
+    public function getPrincipalsByPrefix($prefixPath) {
+        $principals = [];
+
+        if ($prefixPath === $this->principalPrefix) {
+            foreach ($this->userManager->search('') as $user) {
+                $principals[] = $this->userToPrincipal($user);
+            }
+        }
+
+        return $principals;
+    }
+
+    /**
+     * Returns a specific principal, specified by it's path.
+     * The returned structure should be the exact same as from
+     * getPrincipalsByPrefix.
+     *
+     * @param string $path
+     * @return array
+     */
+    public function getPrincipalByPath($path) {
+        [$prefix, $name] = \Sabre\Uri\split($path);
+        $decodedName = urldecode($name);
+
+        if ($name === 'calendar-proxy-write' || $name === 'calendar-proxy-read') {
+            [$prefix2, $name2] = \Sabre\Uri\split($prefix);
+
+            if ($prefix2 === $this->principalPrefix) {
+                $user = $this->userManager->get($name2);
+
+                if ($user !== null) {
+                    return [
+                        'uri' => 'principals/users/' . $user->getUID() . '/' . $name,
+                    ];
+                }
+                return null;
+            }
+        }
+
+        if ($prefix === $this->principalPrefix) {
+            // Depending on where it is called, it may happen that this function
+            // is called either with a urlencoded version of the name or with a non-urlencoded one.
+            // The urldecode function replaces %## and +, both of which are forbidden in usernames.
+            // Hence there can be no ambiguity here and it is safe to call urldecode on all usernames
+            $user = $this->userManager->get($decodedName);
+
+            if ($user !== null) {
+                return $this->userToPrincipal($user);
+            }
+        } elseif ($prefix === 'principals/circles') {
+            if ($this->userSession->getUser() !== null) {
+                // At the time of writing - 2021-01-19 — a mixed state is possible.
+                // The second condition can be removed when this is fixed.
+                return $this->circleToPrincipal($decodedName)
+                    ?: $this->circleToPrincipal($name);
+            }
+        } elseif ($prefix === 'principals/groups') {
+            // At the time of writing - 2021-01-19 — a mixed state is possible.
+            // The second condition can be removed when this is fixed.
+            $group = $this->groupManager->get($decodedName)
+                ?: $this->groupManager->get($name);
+            if ($group instanceof IGroup) {
+                return [
+                    'uri' => 'principals/groups/' . $name,
+                    '{DAV:}displayname' => $group->getDisplayName(),
+                ];
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Returns the list of groups a principal is a member of
+     *
+     * @param string $principal
+     * @param bool $needGroups
+     * @return array
+     * @throws Exception
+     */
+    public function getGroupMembership($principal, $needGroups = false) {
+        [$prefix, $name] = \Sabre\Uri\split($principal);
+
+        if ($prefix !== $this->principalPrefix) {
+            return [];
+        }
+
+        $user = $this->userManager->get($name);
+        if (!$user) {
+            throw new Exception('Principal not found');
+        }
+
+        $groups = [];
+
+        if ($this->hasGroups || $needGroups) {
+            $userGroups = $this->groupManager->getUserGroups($user);
+            foreach ($userGroups as $userGroup) {
+                $groups[] = 'principals/groups/' . urlencode($userGroup->getGID());
+            }
+        }
+
+        $groups = array_unique(array_merge(
+            $groups,
+            $this->traitGetGroupMembership($principal, $needGroups)
+        ));
+
+        return $groups;
+    }
+
+    /**
+     * @param string $path
+     * @param PropPatch $propPatch
+     * @return int
+     */
+    public function updatePrincipal($path, PropPatch $propPatch) {
+        return 0;
+    }
+
+    /**
+     * Search user principals
+     *
+     * @param array $searchProperties
+     * @param string $test
+     * @return array
+     */
+    protected function searchUserPrincipals(array $searchProperties, $test = 'allof') {
+        $results = [];
+
+        // If sharing is disabled, return the empty array
+        $shareAPIEnabled = $this->shareManager->shareApiEnabled();
+        if (!$shareAPIEnabled) {
+            return [];
+        }
+
+        $allowEnumeration = $this->shareManager->allowEnumeration();
+        $limitEnumerationGroup = $this->shareManager->limitEnumerationToGroups();
+        $limitEnumerationPhone = $this->shareManager->limitEnumerationToPhone();
+        $allowEnumerationFullMatch = $this->shareManager->allowEnumerationFullMatch();
+
+        // If sharing is restricted to group members only,
+        // return only members that have groups in common
+        $restrictGroups = false;
+        $currentUser = $this->userSession->getUser();
+        if ($this->shareManager->shareWithGroupMembersOnly()) {
+            if (!$currentUser instanceof IUser) {
+                return [];
+            }
+
+            $restrictGroups = $this->groupManager->getUserGroupIds($currentUser);
+        }
+
+        $currentUserGroups = [];
+        if ($limitEnumerationGroup) {
+            if ($currentUser instanceof IUser) {
+                $currentUserGroups = $this->groupManager->getUserGroupIds($currentUser);
+            }
+        }
+
+        $searchLimit = $this->config->getSystemValueInt('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT);
+        if ($searchLimit <= 0) {
+            $searchLimit = null;
+        }
+        foreach ($searchProperties as $prop => $value) {
+            switch ($prop) {
+                case '{http://sabredav.org/ns}email-address':
+                    if (!$allowEnumeration) {
+                        if ($allowEnumerationFullMatch) {
+                            $users = $this->userManager->getByEmail($value);
+                            $users = \array_filter($users, static function (IUser $user) use ($value) {
+                                return $user->getEMailAddress() === $value;
+                            });
+                        } else {
+                            $users = [];
+                        }
+                    } else {
+                        $users = $this->userManager->getByEmail($value);
+                        $users = \array_filter($users, function (IUser $user) use ($currentUser, $value, $limitEnumerationPhone, $limitEnumerationGroup, $allowEnumerationFullMatch, $currentUserGroups) {
+                            if ($allowEnumerationFullMatch && $user->getEMailAddress() === $value) {
+                                return true;
+                            }
+
+                            if ($limitEnumerationPhone
+                                && $currentUser instanceof IUser
+                                && $this->knownUserService->isKnownToUser($currentUser->getUID(), $user->getUID())) {
+                                // Synced phonebook match
+                                return true;
+                            }
+
+                            if (!$limitEnumerationGroup) {
+                                // No limitation on enumeration, all allowed
+                                return true;
+                            }
+
+                            return !empty($currentUserGroups) && !empty(array_intersect(
+                                $this->groupManager->getUserGroupIds($user),
+                                $currentUserGroups
+                            ));
+                        });
+                    }
+
+                    $results[] = array_reduce($users, function (array $carry, IUser $user) use ($restrictGroups) {
+                        // is sharing restricted to groups only?
+                        if ($restrictGroups !== false) {
+                            $userGroups = $this->groupManager->getUserGroupIds($user);
+                            if (count(array_intersect($userGroups, $restrictGroups)) === 0) {
+                                return $carry;
+                            }
+                        }
+
+                        $carry[] = $this->principalPrefix . '/' . $user->getUID();
+                        return $carry;
+                    }, []);
+                    break;
+
+                case '{DAV:}displayname':
+
+                    if (!$allowEnumeration) {
+                        if ($allowEnumerationFullMatch) {
+                            $users = $this->userManager->searchDisplayName($value, $searchLimit);
+                            $users = \array_filter($users, static function (IUser $user) use ($value) {
+                                return $user->getDisplayName() === $value;
+                            });
+                        } else {
+                            $users = [];
+                        }
+                    } else {
+                        $users = $this->userManager->searchDisplayName($value, $searchLimit);
+                        $users = \array_filter($users, function (IUser $user) use ($currentUser, $value, $limitEnumerationPhone, $limitEnumerationGroup, $allowEnumerationFullMatch, $currentUserGroups) {
+                            if ($allowEnumerationFullMatch && $user->getDisplayName() === $value) {
+                                return true;
+                            }
+
+                            if ($limitEnumerationPhone
+                                && $currentUser instanceof IUser
+                                && $this->knownUserService->isKnownToUser($currentUser->getUID(), $user->getUID())) {
+                                // Synced phonebook match
+                                return true;
+                            }
+
+                            if (!$limitEnumerationGroup) {
+                                // No limitation on enumeration, all allowed
+                                return true;
+                            }
+
+                            return !empty($currentUserGroups) && !empty(array_intersect(
+                                $this->groupManager->getUserGroupIds($user),
+                                $currentUserGroups
+                            ));
+                        });
+                    }
+
+                    $results[] = array_reduce($users, function (array $carry, IUser $user) use ($restrictGroups) {
+                        // is sharing restricted to groups only?
+                        if ($restrictGroups !== false) {
+                            $userGroups = $this->groupManager->getUserGroupIds($user);
+                            if (count(array_intersect($userGroups, $restrictGroups)) === 0) {
+                                return $carry;
+                            }
+                        }
+
+                        $carry[] = $this->principalPrefix . '/' . $user->getUID();
+                        return $carry;
+                    }, []);
+                    break;
+
+                case '{urn:ietf:params:xml:ns:caldav}calendar-user-address-set':
+                    // If you add support for more search properties that qualify as a user-address,
+                    // please also add them to the array below
+                    $results[] = $this->searchUserPrincipals([
+                        // In theory this should also search for principal:principals/users/...
+                        // but that's used internally only anyway and i don't know of any client querying that
+                        '{http://sabredav.org/ns}email-address' => $value,
+                    ], 'anyof');
+                    break;
+
+                default:
+                    $results[] = [];
+                    break;
+            }
+        }
+
+        // results is an array of arrays, so this is not the first search result
+        // but the results of the first searchProperty
+        if (count($results) === 1) {
+            return $results[0];
+        }
+
+        switch ($test) {
+            case 'anyof':
+                return array_values(array_unique(array_merge(...$results)));
+
+            case 'allof':
+            default:
+                return array_values(array_intersect(...$results));
+        }
+    }
+
+    /**
+     * @param string $prefixPath
+     * @param array $searchProperties
+     * @param string $test
+     * @return array
+     */
+    public function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
+        if (count($searchProperties) === 0) {
+            return [];
+        }
+
+        switch ($prefixPath) {
+            case 'principals/users':
+                return $this->searchUserPrincipals($searchProperties, $test);
+
+            default:
+                return [];
+        }
+    }
+
+    /**
+     * @param string $uri
+     * @param string $principalPrefix
+     * @return string
+     */
+    public function findByUri($uri, $principalPrefix) {
+        // If sharing is disabled, return the empty array
+        $shareAPIEnabled = $this->shareManager->shareApiEnabled();
+        if (!$shareAPIEnabled) {
+            return null;
+        }
+
+        // If sharing is restricted to group members only,
+        // return only members that have groups in common
+        $restrictGroups = false;
+        if ($this->shareManager->shareWithGroupMembersOnly()) {
+            $user = $this->userSession->getUser();
+            if (!$user) {
+                return null;
+            }
+
+            $restrictGroups = $this->groupManager->getUserGroupIds($user);
+        }
+
+        if (strpos($uri, 'mailto:') === 0) {
+            if ($principalPrefix === 'principals/users') {
+                $users = $this->userManager->getByEmail(substr($uri, 7));
+                if (count($users) !== 1) {
+                    return null;
+                }
+                $user = $users[0];
+
+                if ($restrictGroups !== false) {
+                    $userGroups = $this->groupManager->getUserGroupIds($user);
+                    if (count(array_intersect($userGroups, $restrictGroups)) === 0) {
+                        return null;
+                    }
+                }
+
+                return $this->principalPrefix . '/' . $user->getUID();
+            }
+        }
+        if (substr($uri, 0, 10) === 'principal:') {
+            $principal = substr($uri, 10);
+            $principal = $this->getPrincipalByPath($principal);
+            if ($principal !== null) {
+                return $principal['uri'];
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @param IUser $user
+     * @return array
+     */
+    protected function userToPrincipal($user) {
+        $userId = $user->getUID();
+        $displayName = $user->getDisplayName();
+        $principal = [
+            'uri' => $this->principalPrefix . '/' . $userId,
+            '{DAV:}displayname' => is_null($displayName) ? $userId : $displayName,
+            '{urn:ietf:params:xml:ns:caldav}calendar-user-type' => 'INDIVIDUAL',
+        ];
+
+        $email = $user->getEMailAddress();
+        if (!empty($email)) {
+            $principal['{http://sabredav.org/ns}email-address'] = $email;
+        }
+
+        return $principal;
+    }
+
+    public function getPrincipalPrefix() {
+        return $this->principalPrefix;
+    }
+
+    /**
+     * @param string $circleUniqueId
+     * @return array|null
+     */
+    protected function circleToPrincipal($circleUniqueId) {
+        if (!$this->appManager->isEnabledForUser('circles') || !class_exists('\OCA\Circles\Api\v1\Circles')) {
+            return null;
+        }
+
+        try {
+            $circle = \OCA\Circles\Api\v1\Circles::detailsCircle($circleUniqueId, true);
+        } catch (QueryException $ex) {
+            return null;
+        } catch (CircleDoesNotExistException $ex) {
+            return null;
+        }
+
+        if (!$circle) {
+            return null;
+        }
+
+        $principal = [
+            'uri' => 'principals/circles/' . $circleUniqueId,
+            '{DAV:}displayname' => $circle->getName(),
+        ];
+
+        return $principal;
+    }
+
+    /**
+     * Returns the list of circles a principal is a member of
+     *
+     * @param string $principal
+     * @return array
+     * @throws Exception
+     * @throws \OCP\AppFramework\QueryException
+     * @suppress PhanUndeclaredClassMethod
+     */
+    public function getCircleMembership($principal):array {
+        if (!$this->appManager->isEnabledForUser('circles') || !class_exists('\OCA\Circles\Api\v1\Circles')) {
+            return [];
+        }
+
+        [$prefix, $name] = \Sabre\Uri\split($principal);
+        if ($this->hasCircles && $prefix === $this->principalPrefix) {
+            $user = $this->userManager->get($name);
+            if (!$user) {
+                throw new Exception('Principal not found');
+            }
+
+            $circles = \OCA\Circles\Api\v1\Circles::joinedCircles($name, true);
+
+            $circles = array_map(function ($circle) {
+                /** @var \OCA\Circles\Model\Circle $circle */
+                return 'principals/circles/' . urlencode($circle->getUniqueId());
+            }, $circles);
+
+            return $circles;
+        }
+
+        return [];
+    }
 }

Spacing +16 added lines, -16 removed lines

@@ -159,7 +159,7 @@ 
 
 				if ($user !== null) {
 					return [
-						'uri' => 'principals/users/' . $user->getUID() . '/' . $name,
+						'uri' => 'principals/users/'.$user->getUID().'/'.$name,
 					];
 				}
 				return null;
@@ -190,7 +190,7 @@ 
 				?: $this->groupManager->get($name);
 			if ($group instanceof IGroup) {
 				return [
-					'uri' => 'principals/groups/' . $name,
+					'uri' => 'principals/groups/'.$name,
 					'{DAV:}displayname' => $group->getDisplayName(),
 				];
 			}
@@ -223,7 +223,7 @@ 
 		if ($this->hasGroups || $needGroups) {
 			$userGroups = $this->groupManager->getUserGroups($user);
 			foreach ($userGroups as $userGroup) {
-				$groups[] = 'principals/groups/' . urlencode($userGroup->getGID());
+				$groups[] = 'principals/groups/'.urlencode($userGroup->getGID());
 			}
 		}
 
@@ -294,7 +294,7 @@ 
 					if (!$allowEnumeration) {
 						if ($allowEnumerationFullMatch) {
 							$users = $this->userManager->getByEmail($value);
-							$users = \array_filter($users, static function (IUser $user) use ($value) {
+							$users = \array_filter($users, static function(IUser $user) use ($value) {
 								return $user->getEMailAddress() === $value;
 							});
 						} else {
@@ -302,7 +302,7 @@ 
 						}
 					} else {
 						$users = $this->userManager->getByEmail($value);
-						$users = \array_filter($users, function (IUser $user) use ($currentUser, $value, $limitEnumerationPhone, $limitEnumerationGroup, $allowEnumerationFullMatch, $currentUserGroups) {
+						$users = \array_filter($users, function(IUser $user) use ($currentUser, $value, $limitEnumerationPhone, $limitEnumerationGroup, $allowEnumerationFullMatch, $currentUserGroups) {
 							if ($allowEnumerationFullMatch && $user->getEMailAddress() === $value) {
 								return true;
 							}
@@ -326,7 +326,7 @@ 
 						});
 					}
 
-					$results[] = array_reduce($users, function (array $carry, IUser $user) use ($restrictGroups) {
+					$results[] = array_reduce($users, function(array $carry, IUser $user) use ($restrictGroups) {
 						// is sharing restricted to groups only?
 						if ($restrictGroups !== false) {
 							$userGroups = $this->groupManager->getUserGroupIds($user);
@@ -335,7 +335,7 @@ 
 							}
 						}
 
-						$carry[] = $this->principalPrefix . '/' . $user->getUID();
+						$carry[] = $this->principalPrefix.'/'.$user->getUID();
 						return $carry;
 					}, []);
 					break;
@@ -345,7 +345,7 @@ 
 					if (!$allowEnumeration) {
 						if ($allowEnumerationFullMatch) {
 							$users = $this->userManager->searchDisplayName($value, $searchLimit);
-							$users = \array_filter($users, static function (IUser $user) use ($value) {
+							$users = \array_filter($users, static function(IUser $user) use ($value) {
 								return $user->getDisplayName() === $value;
 							});
 						} else {
@@ -353,7 +353,7 @@ 
 						}
 					} else {
 						$users = $this->userManager->searchDisplayName($value, $searchLimit);
-						$users = \array_filter($users, function (IUser $user) use ($currentUser, $value, $limitEnumerationPhone, $limitEnumerationGroup, $allowEnumerationFullMatch, $currentUserGroups) {
+						$users = \array_filter($users, function(IUser $user) use ($currentUser, $value, $limitEnumerationPhone, $limitEnumerationGroup, $allowEnumerationFullMatch, $currentUserGroups) {
 							if ($allowEnumerationFullMatch && $user->getDisplayName() === $value) {
 								return true;
 							}
@@ -377,7 +377,7 @@ 
 						});
 					}
 
-					$results[] = array_reduce($users, function (array $carry, IUser $user) use ($restrictGroups) {
+					$results[] = array_reduce($users, function(array $carry, IUser $user) use ($restrictGroups) {
 						// is sharing restricted to groups only?
 						if ($restrictGroups !== false) {
 							$userGroups = $this->groupManager->getUserGroupIds($user);
@@ -386,7 +386,7 @@ 
 							}
 						}
 
-						$carry[] = $this->principalPrefix . '/' . $user->getUID();
+						$carry[] = $this->principalPrefix.'/'.$user->getUID();
 						return $carry;
 					}, []);
 					break;
@@ -482,7 +482,7 @@ 
 					}
 				}
 
-				return $this->principalPrefix . '/' . $user->getUID();
+				return $this->principalPrefix.'/'.$user->getUID();
 			}
 		}
 		if (substr($uri, 0, 10) === 'principal:') {
@@ -504,7 +504,7 @@ 
 		$userId = $user->getUID();
 		$displayName = $user->getDisplayName();
 		$principal = [
-			'uri' => $this->principalPrefix . '/' . $userId,
+			'uri' => $this->principalPrefix.'/'.$userId,
 			'{DAV:}displayname' => is_null($displayName) ? $userId : $displayName,
 			'{urn:ietf:params:xml:ns:caldav}calendar-user-type' => 'INDIVIDUAL',
 		];
@@ -543,7 +543,7 @@ 
 		}
 
 		$principal = [
-			'uri' => 'principals/circles/' . $circleUniqueId,
+			'uri' => 'principals/circles/'.$circleUniqueId,
 			'{DAV:}displayname' => $circle->getName(),
 		];
 
@@ -573,9 +573,9 @@ 
 
 			$circles = \OCA\Circles\Api\v1\Circles::joinedCircles($name, true);
 
-			$circles = array_map(function ($circle) {
+			$circles = array_map(function($circle) {
 				/** @var \OCA\Circles\Model\Circle $circle */
-				return 'principals/circles/' . urlencode($circle->getUniqueId());
+				return 'principals/circles/'.urlencode($circle->getUniqueId());
 			}, $circles);
 
 			return $circles;

apps/dav/appinfo/v1/caldav.php

Indentation +19 added lines, -19 removed lines

@@ -37,23 +37,23 @@ 
 use OCA\DAV\Connector\Sabre\Principal;
 
 $authBackend = new Auth(
-	\OC::$server->getSession(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getRequest(),
-	\OC::$server->getTwoFactorAuthManager(),
-	\OC::$server->getBruteForceThrottler(),
-	'principals/'
+    \OC::$server->getSession(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getRequest(),
+    \OC::$server->getTwoFactorAuthManager(),
+    \OC::$server->getBruteForceThrottler(),
+    'principals/'
 );
 $principalBackend = new Principal(
-	\OC::$server->getUserManager(),
-	\OC::$server->getGroupManager(),
-	\OC::$server->getShareManager(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getAppManager(),
-	\OC::$server->query(\OCA\DAV\CalDAV\Proxy\ProxyMapper::class),
-	\OC::$server->get(KnownUserService::class),
-	\OC::$server->getConfig(),
-	'principals/'
+    \OC::$server->getUserManager(),
+    \OC::$server->getGroupManager(),
+    \OC::$server->getShareManager(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getAppManager(),
+    \OC::$server->query(\OCA\DAV\CalDAV\Proxy\ProxyMapper::class),
+    \OC::$server->get(KnownUserService::class),
+    \OC::$server->getConfig(),
+    'principals/'
 );
 $db = \OC::$server->getDatabaseConnection();
 $userManager = \OC::$server->getUserManager();
@@ -75,8 +75,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());
@@ -100,7 +100,7 @@ 
 $server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(\OC::$server->getConfig()));
 
 if ($sendInvitations) {
-	$server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));
+    $server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));
 }
 $server->addPlugin(new ExceptionLoggerPlugin('caldav', \OC::$server->getLogger()));