nextcloud / server

apps/dav/tests/unit/CalDAV/Reminder/NotificationProviderManagerTest.php

Indentation +48 added lines, -48 removed lines

@@ -19,63 +19,63 @@
 
 #[\PHPUnit\Framework\Attributes\Group(name: 'DB')]
 class NotificationProviderManagerTest extends TestCase {
-	private NotificationProviderManager $providerManager;
+    private NotificationProviderManager $providerManager;
 
-	/**
-	 * @throws ContainerExceptionInterface
-	 */
-	protected function setUp(): void {
-		parent::setUp();
+    /**
+     * @throws ContainerExceptionInterface
+     */
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->providerManager = new NotificationProviderManager();
-		$this->providerManager->registerProvider(EmailProvider::class);
-	}
+        $this->providerManager = new NotificationProviderManager();
+        $this->providerManager->registerProvider(EmailProvider::class);
+    }
 
-	/**
-	 * @throws ProviderNotAvailableException
-	 * @throws NotificationTypeDoesNotExistException
-	 */
-	public function testGetProviderForUnknownType(): void {
-		$this->expectException(NotificationTypeDoesNotExistException::class);
-		$this->expectExceptionMessage('Type NOT EXISTENT is not an accepted type of notification');
+    /**
+     * @throws ProviderNotAvailableException
+     * @throws NotificationTypeDoesNotExistException
+     */
+    public function testGetProviderForUnknownType(): void {
+        $this->expectException(NotificationTypeDoesNotExistException::class);
+        $this->expectExceptionMessage('Type NOT EXISTENT is not an accepted type of notification');
 
-		$this->providerManager->getProvider('NOT EXISTENT');
-	}
+        $this->providerManager->getProvider('NOT EXISTENT');
+    }
 
-	/**
-	 * @throws NotificationTypeDoesNotExistException
-	 * @throws ProviderNotAvailableException
-	 */
-	public function testGetProviderForUnRegisteredType(): void {
-		$this->expectException(ProviderNotAvailableException::class);
-		$this->expectExceptionMessage('No notification provider for type AUDIO available');
+    /**
+     * @throws NotificationTypeDoesNotExistException
+     * @throws ProviderNotAvailableException
+     */
+    public function testGetProviderForUnRegisteredType(): void {
+        $this->expectException(ProviderNotAvailableException::class);
+        $this->expectExceptionMessage('No notification provider for type AUDIO available');
 
-		$this->providerManager->getProvider('AUDIO');
-	}
+        $this->providerManager->getProvider('AUDIO');
+    }
 
-	public function testGetProvider(): void {
-		$provider = $this->providerManager->getProvider('EMAIL');
-		$this->assertInstanceOf(EmailProvider::class, $provider);
-	}
+    public function testGetProvider(): void {
+        $provider = $this->providerManager->getProvider('EMAIL');
+        $this->assertInstanceOf(EmailProvider::class, $provider);
+    }
 
-	public function testRegisterProvider(): void {
-		$this->providerManager->registerProvider(PushProvider::class);
-		$provider = $this->providerManager->getProvider('DISPLAY');
-		$this->assertInstanceOf(PushProvider::class, $provider);
-	}
+    public function testRegisterProvider(): void {
+        $this->providerManager->registerProvider(PushProvider::class);
+        $provider = $this->providerManager->getProvider('DISPLAY');
+        $this->assertInstanceOf(PushProvider::class, $provider);
+    }
 
-	/**
-	 * @throws ContainerExceptionInterface
-	 */
-	public function testRegisterBadProvider(): void {
-		$this->expectException(\InvalidArgumentException::class);
-		$this->expectExceptionMessage('Invalid notification provider registered');
+    /**
+     * @throws ContainerExceptionInterface
+     */
+    public function testRegisterBadProvider(): void {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Invalid notification provider registered');
 
-		$this->providerManager->registerProvider(Capabilities::class);
-	}
+        $this->providerManager->registerProvider(Capabilities::class);
+    }
 
-	public function testHasProvider(): void {
-		$this->assertTrue($this->providerManager->hasProvider('EMAIL'));
-		$this->assertFalse($this->providerManager->hasProvider('EMAIL123'));
-	}
+    public function testHasProvider(): void {
+        $this->assertTrue($this->providerManager->hasProvider('EMAIL'));
+        $this->assertFalse($this->providerManager->hasProvider('EMAIL123'));
+    }
 }

apps/dav/lib/CalDAV/Reminder/NotificationProviderManager.php

Indentation +42 added lines, -42 removed lines

@@ -19,51 +19,51 @@
  */
 class NotificationProviderManager {
 
-	/** @var INotificationProvider[] */
-	private $providers = [];
+    /** @var INotificationProvider[] */
+    private $providers = [];
 
-	/**
-	 * Checks whether a provider for a given ACTION exists
-	 *
-	 * @param string $type
-	 * @return bool
-	 */
-	public function hasProvider(string $type):bool {
-		return (\in_array($type, ReminderService::REMINDER_TYPES, true)
-			&& isset($this->providers[$type]));
-	}
+    /**
+     * Checks whether a provider for a given ACTION exists
+     *
+     * @param string $type
+     * @return bool
+     */
+    public function hasProvider(string $type):bool {
+        return (\in_array($type, ReminderService::REMINDER_TYPES, true)
+            && isset($this->providers[$type]));
+    }
 
-	/**
-	 * Get provider for a given ACTION
-	 *
-	 * @param string $type
-	 * @return INotificationProvider
-	 * @throws NotificationProvider\ProviderNotAvailableException
-	 * @throws NotificationTypeDoesNotExistException
-	 */
-	public function getProvider(string $type):INotificationProvider {
-		if (in_array($type, ReminderService::REMINDER_TYPES, true)) {
-			if (isset($this->providers[$type])) {
-				return $this->providers[$type];
-			}
-			throw new ProviderNotAvailableException($type);
-		}
-		throw new NotificationTypeDoesNotExistException($type);
-	}
+    /**
+     * Get provider for a given ACTION
+     *
+     * @param string $type
+     * @return INotificationProvider
+     * @throws NotificationProvider\ProviderNotAvailableException
+     * @throws NotificationTypeDoesNotExistException
+     */
+    public function getProvider(string $type):INotificationProvider {
+        if (in_array($type, ReminderService::REMINDER_TYPES, true)) {
+            if (isset($this->providers[$type])) {
+                return $this->providers[$type];
+            }
+            throw new ProviderNotAvailableException($type);
+        }
+        throw new NotificationTypeDoesNotExistException($type);
+    }
 
-	/**
-	 * Registers a new provider
-	 *
-	 * @param string $providerClassName
-	 * @throws ContainerExceptionInterface
-	 */
-	public function registerProvider(string $providerClassName):void {
-		$provider = Server::get($providerClassName);
+    /**
+     * Registers a new provider
+     *
+     * @param string $providerClassName
+     * @throws ContainerExceptionInterface
+     */
+    public function registerProvider(string $providerClassName):void {
+        $provider = Server::get($providerClassName);
 
-		if (!$provider instanceof INotificationProvider) {
-			throw new \InvalidArgumentException('Invalid notification provider registered');
-		}
+        if (!$provider instanceof INotificationProvider) {
+            throw new \InvalidArgumentException('Invalid notification provider registered');
+        }
 
-		$this->providers[$provider::NOTIFICATION_TYPE] = $provider;
-	}
+        $this->providers[$provider::NOTIFICATION_TYPE] = $provider;
+    }
 }

apps/dav/lib/CardDAV/UserAddressBooks.php

Indentation +98 added lines, -98 removed lines

@@ -33,112 +33,112 @@
 use function array_map;
 
 class UserAddressBooks extends \Sabre\CardDAV\AddressBookHome {
-	protected IL10N $l10n;
-	protected IConfig $config;
-	protected IAppConfig $appConfig;
+    protected IL10N $l10n;
+    protected IConfig $config;
+    protected IAppConfig $appConfig;
 
-	public function __construct(
-		Backend\BackendInterface $carddavBackend,
-		string $principalUri,
-		private PluginManager $pluginManager,
-		private ?IUser $user,
-		private ?IGroupManager $groupManager,
-	) {
-		parent::__construct($carddavBackend, $principalUri);
+    public function __construct(
+        Backend\BackendInterface $carddavBackend,
+        string $principalUri,
+        private PluginManager $pluginManager,
+        private ?IUser $user,
+        private ?IGroupManager $groupManager,
+    ) {
+        parent::__construct($carddavBackend, $principalUri);
 
-		$this->l10n = Util::getL10N('dav');
-		$this->config = Server::get(IConfig::class);
-		$this->appConfig = Server::get(IAppConfig::class);
-	}
+        $this->l10n = Util::getL10N('dav');
+        $this->config = Server::get(IConfig::class);
+        $this->appConfig = Server::get(IAppConfig::class);
+    }
 
-	/**
-	 * Returns a list of address books
-	 *
-	 * @return IAddressBook[]
-	 */
-	public function getChildren() {
-		/** @var string|array $principal */
-		$principal = $this->principalUri;
-		$addressBooks = $this->carddavBackend->getAddressBooksForUser($this->principalUri);
-		// add the system address book
-		$systemAddressBook = null;
-		$systemAddressBookExposed = $this->appConfig->getValueBool(Application::APP_ID, ConfigLexicon::SYSTEM_ADDRESSBOOK_EXPOSED);
-		if ($systemAddressBookExposed && is_string($principal) && $principal !== 'principals/system/system' && $this->carddavBackend instanceof CardDavBackend) {
-			$systemAddressBook = $this->carddavBackend->getAddressBooksByUri('principals/system/system', 'system');
-			if ($systemAddressBook !== null) {
-				$systemAddressBook['uri'] = SystemAddressbook::URI_SHARED;
-			}
-		}
-		if (!is_null($systemAddressBook)) {
-			$addressBooks[] = $systemAddressBook;
-		}
+    /**
+     * Returns a list of address books
+     *
+     * @return IAddressBook[]
+     */
+    public function getChildren() {
+        /** @var string|array $principal */
+        $principal = $this->principalUri;
+        $addressBooks = $this->carddavBackend->getAddressBooksForUser($this->principalUri);
+        // add the system address book
+        $systemAddressBook = null;
+        $systemAddressBookExposed = $this->appConfig->getValueBool(Application::APP_ID, ConfigLexicon::SYSTEM_ADDRESSBOOK_EXPOSED);
+        if ($systemAddressBookExposed && is_string($principal) && $principal !== 'principals/system/system' && $this->carddavBackend instanceof CardDavBackend) {
+            $systemAddressBook = $this->carddavBackend->getAddressBooksByUri('principals/system/system', 'system');
+            if ($systemAddressBook !== null) {
+                $systemAddressBook['uri'] = SystemAddressbook::URI_SHARED;
+            }
+        }
+        if (!is_null($systemAddressBook)) {
+            $addressBooks[] = $systemAddressBook;
+        }
 
-		$objects = [];
-		if (!empty($addressBooks)) {
-			/** @var IAddressBook[] $objects */
-			$objects = array_map(function (array $addressBook) {
-				$trustedServers = null;
-				$request = null;
-				try {
-					$trustedServers = Server::get(TrustedServers::class);
-					$request = Server::get(IRequest::class);
-				} catch (NotFoundExceptionInterface|ContainerExceptionInterface $e) {
-					// nothing to do, the request / trusted servers don't exist
-				}
-				if ($addressBook['principaluri'] === 'principals/system/system') {
-					return new SystemAddressbook(
-						$this->carddavBackend,
-						$addressBook,
-						$this->l10n,
-						$this->config,
-						Server::get(IUserSession::class),
-						$request,
-						$trustedServers,
-						$this->groupManager
-					);
-				}
+        $objects = [];
+        if (!empty($addressBooks)) {
+            /** @var IAddressBook[] $objects */
+            $objects = array_map(function (array $addressBook) {
+                $trustedServers = null;
+                $request = null;
+                try {
+                    $trustedServers = Server::get(TrustedServers::class);
+                    $request = Server::get(IRequest::class);
+                } catch (NotFoundExceptionInterface|ContainerExceptionInterface $e) {
+                    // nothing to do, the request / trusted servers don't exist
+                }
+                if ($addressBook['principaluri'] === 'principals/system/system') {
+                    return new SystemAddressbook(
+                        $this->carddavBackend,
+                        $addressBook,
+                        $this->l10n,
+                        $this->config,
+                        Server::get(IUserSession::class),
+                        $request,
+                        $trustedServers,
+                        $this->groupManager
+                    );
+                }
 
-				return new AddressBook($this->carddavBackend, $addressBook, $this->l10n);
-			}, $addressBooks);
-		}
-		/** @var IAddressBook[][] $objectsFromPlugins */
-		$objectsFromPlugins = array_map(function (IAddressBookProvider $plugin): array {
-			return $plugin->fetchAllForAddressBookHome($this->principalUri);
-		}, $this->pluginManager->getAddressBookPlugins());
+                return new AddressBook($this->carddavBackend, $addressBook, $this->l10n);
+            }, $addressBooks);
+        }
+        /** @var IAddressBook[][] $objectsFromPlugins */
+        $objectsFromPlugins = array_map(function (IAddressBookProvider $plugin): array {
+            return $plugin->fetchAllForAddressBookHome($this->principalUri);
+        }, $this->pluginManager->getAddressBookPlugins());
 
-		return array_merge($objects, ...$objectsFromPlugins);
-	}
+        return array_merge($objects, ...$objectsFromPlugins);
+    }
 
-	public function createExtendedCollection($name, MkCol $mkCol) {
-		if (ExternalAddressBook::doesViolateReservedName($name)) {
-			throw new MethodNotAllowed('The resource you tried to create has a reserved name');
-		}
+    public function createExtendedCollection($name, MkCol $mkCol) {
+        if (ExternalAddressBook::doesViolateReservedName($name)) {
+            throw new MethodNotAllowed('The resource you tried to create has a reserved name');
+        }
 
-		parent::createExtendedCollection($name, $mkCol);
-	}
+        parent::createExtendedCollection($name, $mkCol);
+    }
 
-	/**
-	 * Returns a list of ACE's for this node.
-	 *
-	 * Each ACE has the following properties:
-	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-	 *     currently the only supported privileges
-	 *   * 'principal', a url to the principal who owns the node
-	 *   * 'protected' (optional), indicating that this ACE is not allowed to
-	 *      be updated.
-	 *
-	 * @return array
-	 */
-	public function getACL() {
-		$acl = parent::getACL();
-		if ($this->principalUri === 'principals/system/system') {
-			$acl[] = [
-				'privilege' => '{DAV:}read',
-				'principal' => '{DAV:}authenticated',
-				'protected' => true,
-			];
-		}
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+        $acl = parent::getACL();
+        if ($this->principalUri === 'principals/system/system') {
+            $acl[] = [
+                'privilege' => '{DAV:}read',
+                'principal' => '{DAV:}authenticated',
+                'protected' => true,
+            ];
+        }
 
-		return $acl;
-	}
+        return $acl;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -76,13 +76,13 @@ 
 		$objects = [];
 		if (!empty($addressBooks)) {
 			/** @var IAddressBook[] $objects */
-			$objects = array_map(function (array $addressBook) {
+			$objects = array_map(function(array $addressBook) {
 				$trustedServers = null;
 				$request = null;
 				try {
 					$trustedServers = Server::get(TrustedServers::class);
 					$request = Server::get(IRequest::class);
-				} catch (NotFoundExceptionInterface|ContainerExceptionInterface $e) {
+				} catch (NotFoundExceptionInterface | ContainerExceptionInterface $e) {
 					// nothing to do, the request / trusted servers don't exist
 				}
 				if ($addressBook['principaluri'] === 'principals/system/system') {
@@ -102,7 +102,7 @@ 
 			}, $addressBooks);
 		}
 		/** @var IAddressBook[][] $objectsFromPlugins */
-		$objectsFromPlugins = array_map(function (IAddressBookProvider $plugin): array {
+		$objectsFromPlugins = array_map(function(IAddressBookProvider $plugin): array {
 			return $plugin->fetchAllForAddressBookHome($this->principalUri);
 		}, $this->pluginManager->getAddressBookPlugins());
 

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

Indentation +597 added lines, -597 removed lines

@@ -33,601 +33,601 @@
 
 class Principal implements BackendInterface {
 
-	/** @var string */
-	private $principalPrefix;
-
-	/** @var bool */
-	private $hasGroups;
-
-	/** @var bool */
-	private $hasCircles;
-
-	/** @var KnownUserService */
-	private $knownUserService;
-
-	public function __construct(
-		private IUserManager $userManager,
-		private IGroupManager $groupManager,
-		private IAccountManager $accountManager,
-		private IShareManager $shareManager,
-		private IUserSession $userSession,
-		private IAppManager $appManager,
-		private ProxyMapper $proxyMapper,
-		KnownUserService $knownUserService,
-		private IConfig $config,
-		private IFactory $languageFactory,
-		string $principalPrefix = 'principals/users/',
-	) {
-		$this->principalPrefix = trim($principalPrefix, '/');
-		$this->hasGroups = $this->hasCircles = ($principalPrefix === 'principals/users/');
-		$this->knownUserService = $knownUserService;
-	}
-
-	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) {
-		return $this->getPrincipalPropertiesByPath($path);
-	}
-
-	/**
-	 * Returns a specific principal, specified by its path.
-	 * The returned structure should be the exact same as from
-	 * getPrincipalsByPrefix.
-	 *
-	 * It is possible to optionally filter retrieved properties in case only a limited set is
-	 * required. Note that the implementation might return more properties than requested.
-	 *
-	 * @param string $path The path of the principal
-	 * @param string[]|null $propertyFilter A list of properties to be retrieved or all if null. An empty array will cause a very shallow principal to be retrieved.
-	 */
-	public function getPrincipalPropertiesByPath($path, ?array $propertyFilter = null): ?array {
-		[$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, $propertyFilter);
-			}
-		} 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(),
-				];
-			}
-		} elseif ($prefix === 'principals/system') {
-			return [
-				'uri' => 'principals/system/' . $name,
-				'{DAV:}displayname' => $this->languageFactory->get('dav')->t('Accounts'),
-			];
-		} elseif ($prefix === 'principals/shares') {
-			return [
-				'uri' => 'principals/shares/' . $name,
-				'{DAV:}displayname' => $name,
-			];
-		}
-		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) {
-				if ($userGroup->hideFromCollaboration()) {
-					continue;
-				}
-				$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) {
-		// Updating schedule-default-calendar-URL is handled in CustomPropertiesBackend
-		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();
-		$ignoreSecondDisplayName = $this->shareManager->ignoreSecondDisplayName();
-		$matchEmail = $this->shareManager->matchEmail();
-
-		// 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 && $matchEmail) {
-							$users = $this->userManager->getByEmail($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->getSystemEMailAddress() === $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) {
-							$lowerSearch = strtolower($value);
-							$users = $this->userManager->searchDisplayName($value, $searchLimit);
-							$users = \array_filter($users, static function (IUser $user) use ($lowerSearch, $ignoreSecondDisplayName) {
-								$lowerDisplayName = strtolower($user->getDisplayName());
-								return $lowerDisplayName === $lowerSearch || ($ignoreSecondDisplayName && trim(preg_replace('/ \(.*\)$/', '', $lowerDisplayName)) === $lowerSearch);
-							});
-						} 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 (str_starts_with($uri, 'mailto:')) {
-			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 (str_starts_with($uri, 'principal:')) {
-			$principal = substr($uri, 10);
-			$principal = $this->getPrincipalByPath($principal);
-			if ($principal !== null) {
-				return $principal['uri'];
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @param string[]|null $propertyFilter
-	 * @return array
-	 * @throws PropertyDoesNotExistException
-	 */
-	protected function userToPrincipal($user, ?array $propertyFilter = null) {
-		$wantsProperty = static function (string $name) use ($propertyFilter) {
-			if ($propertyFilter === null) {
-				return true;
-			}
-
-			return in_array($name, $propertyFilter, true);
-		};
-
-		$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',
-		];
-
-		if ($wantsProperty('{http://nextcloud.com/ns}language')) {
-			$principal['{http://nextcloud.com/ns}language'] = $this->languageFactory->getUserLanguage($user);
-		}
-
-		if ($wantsProperty('{http://sabredav.org/ns}email-address')) {
-			$email = $user->getSystemEMailAddress();
-			if (!empty($email)) {
-				$principal['{http://sabredav.org/ns}email-address'] = $email;
-			}
-		}
-
-		if ($wantsProperty('{DAV:}alternate-URI-set')) {
-			$account = $this->accountManager->getAccount($user);
-			$alternativeEmails = array_map(static fn (IAccountProperty $property) => 'mailto:' . $property->getValue(), $account->getPropertyCollection(IAccountManager::COLLECTION_EMAIL)->getProperties());
-			if (!empty($alternativeEmails)) {
-				$principal['{DAV:}alternate-URI-set'] = $alternativeEmails;
-			}
-		}
-
-		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 = Circles::detailsCircle($circleUniqueId, true);
-		} catch (ContainerExceptionInterface $ex) {
-			return null;
-		} catch (CircleNotFoundException $ex) {
-			return null;
-		}
-
-		if (!$circle) {
-			return null;
-		}
-
-		$principal = [
-			'uri' => 'principals/circles/' . $circleUniqueId,
-			'{DAV:}displayname' => $circle->getDisplayName(),
-		];
-
-		return $principal;
-	}
-
-	/**
-	 * Returns the list of circles a principal is a member of
-	 *
-	 * @param string $principal
-	 * @return array
-	 * @throws Exception
-	 * @throws ContainerExceptionInterface
-	 * @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 = Circles::joinedCircles($name, true);
-
-			$circles = array_map(function ($circle) {
-				/** @var Circle $circle */
-				return 'principals/circles/' . urlencode($circle->getSingleId());
-			}, $circles);
-
-			return $circles;
-		}
-
-		return [];
-	}
-
-	/**
-	 * Get all email addresses associated to a principal.
-	 *
-	 * @param array $principal Data from getPrincipal*()
-	 * @return string[] All email addresses without the mailto: prefix
-	 */
-	public function getEmailAddressesOfPrincipal(array $principal): array {
-		$emailAddresses = [];
-
-		if (isset($principal['{http://sabredav.org/ns}email-address'])) {
-			$emailAddresses[] = $principal['{http://sabredav.org/ns}email-address'];
-		}
-
-		if (isset($principal['{DAV:}alternate-URI-set'])) {
-			foreach ($principal['{DAV:}alternate-URI-set'] as $address) {
-				if (str_starts_with($address, 'mailto:')) {
-					$emailAddresses[] = substr($address, 7);
-				}
-			}
-		}
-
-		if (isset($principal['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set'])) {
-			foreach ($principal['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set'] as $address) {
-				if (str_starts_with($address, 'mailto:')) {
-					$emailAddresses[] = substr($address, 7);
-				}
-			}
-		}
-
-		if (isset($principal['{http://calendarserver.org/ns/}email-address-set'])) {
-			foreach ($principal['{http://calendarserver.org/ns/}email-address-set'] as $address) {
-				if (str_starts_with($address, 'mailto:')) {
-					$emailAddresses[] = substr($address, 7);
-				}
-			}
-		}
-
-		return array_values(array_unique($emailAddresses));
-	}
+    /** @var string */
+    private $principalPrefix;
+
+    /** @var bool */
+    private $hasGroups;
+
+    /** @var bool */
+    private $hasCircles;
+
+    /** @var KnownUserService */
+    private $knownUserService;
+
+    public function __construct(
+        private IUserManager $userManager,
+        private IGroupManager $groupManager,
+        private IAccountManager $accountManager,
+        private IShareManager $shareManager,
+        private IUserSession $userSession,
+        private IAppManager $appManager,
+        private ProxyMapper $proxyMapper,
+        KnownUserService $knownUserService,
+        private IConfig $config,
+        private IFactory $languageFactory,
+        string $principalPrefix = 'principals/users/',
+    ) {
+        $this->principalPrefix = trim($principalPrefix, '/');
+        $this->hasGroups = $this->hasCircles = ($principalPrefix === 'principals/users/');
+        $this->knownUserService = $knownUserService;
+    }
+
+    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) {
+        return $this->getPrincipalPropertiesByPath($path);
+    }
+
+    /**
+     * Returns a specific principal, specified by its path.
+     * The returned structure should be the exact same as from
+     * getPrincipalsByPrefix.
+     *
+     * It is possible to optionally filter retrieved properties in case only a limited set is
+     * required. Note that the implementation might return more properties than requested.
+     *
+     * @param string $path The path of the principal
+     * @param string[]|null $propertyFilter A list of properties to be retrieved or all if null. An empty array will cause a very shallow principal to be retrieved.
+     */
+    public function getPrincipalPropertiesByPath($path, ?array $propertyFilter = null): ?array {
+        [$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, $propertyFilter);
+            }
+        } 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(),
+                ];
+            }
+        } elseif ($prefix === 'principals/system') {
+            return [
+                'uri' => 'principals/system/' . $name,
+                '{DAV:}displayname' => $this->languageFactory->get('dav')->t('Accounts'),
+            ];
+        } elseif ($prefix === 'principals/shares') {
+            return [
+                'uri' => 'principals/shares/' . $name,
+                '{DAV:}displayname' => $name,
+            ];
+        }
+        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) {
+                if ($userGroup->hideFromCollaboration()) {
+                    continue;
+                }
+                $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) {
+        // Updating schedule-default-calendar-URL is handled in CustomPropertiesBackend
+        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();
+        $ignoreSecondDisplayName = $this->shareManager->ignoreSecondDisplayName();
+        $matchEmail = $this->shareManager->matchEmail();
+
+        // 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 && $matchEmail) {
+                            $users = $this->userManager->getByEmail($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->getSystemEMailAddress() === $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) {
+                            $lowerSearch = strtolower($value);
+                            $users = $this->userManager->searchDisplayName($value, $searchLimit);
+                            $users = \array_filter($users, static function (IUser $user) use ($lowerSearch, $ignoreSecondDisplayName) {
+                                $lowerDisplayName = strtolower($user->getDisplayName());
+                                return $lowerDisplayName === $lowerSearch || ($ignoreSecondDisplayName && trim(preg_replace('/ \(.*\)$/', '', $lowerDisplayName)) === $lowerSearch);
+                            });
+                        } 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 (str_starts_with($uri, 'mailto:')) {
+            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 (str_starts_with($uri, 'principal:')) {
+            $principal = substr($uri, 10);
+            $principal = $this->getPrincipalByPath($principal);
+            if ($principal !== null) {
+                return $principal['uri'];
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @param IUser $user
+     * @param string[]|null $propertyFilter
+     * @return array
+     * @throws PropertyDoesNotExistException
+     */
+    protected function userToPrincipal($user, ?array $propertyFilter = null) {
+        $wantsProperty = static function (string $name) use ($propertyFilter) {
+            if ($propertyFilter === null) {
+                return true;
+            }
+
+            return in_array($name, $propertyFilter, true);
+        };
+
+        $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',
+        ];
+
+        if ($wantsProperty('{http://nextcloud.com/ns}language')) {
+            $principal['{http://nextcloud.com/ns}language'] = $this->languageFactory->getUserLanguage($user);
+        }
+
+        if ($wantsProperty('{http://sabredav.org/ns}email-address')) {
+            $email = $user->getSystemEMailAddress();
+            if (!empty($email)) {
+                $principal['{http://sabredav.org/ns}email-address'] = $email;
+            }
+        }
+
+        if ($wantsProperty('{DAV:}alternate-URI-set')) {
+            $account = $this->accountManager->getAccount($user);
+            $alternativeEmails = array_map(static fn (IAccountProperty $property) => 'mailto:' . $property->getValue(), $account->getPropertyCollection(IAccountManager::COLLECTION_EMAIL)->getProperties());
+            if (!empty($alternativeEmails)) {
+                $principal['{DAV:}alternate-URI-set'] = $alternativeEmails;
+            }
+        }
+
+        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 = Circles::detailsCircle($circleUniqueId, true);
+        } catch (ContainerExceptionInterface $ex) {
+            return null;
+        } catch (CircleNotFoundException $ex) {
+            return null;
+        }
+
+        if (!$circle) {
+            return null;
+        }
+
+        $principal = [
+            'uri' => 'principals/circles/' . $circleUniqueId,
+            '{DAV:}displayname' => $circle->getDisplayName(),
+        ];
+
+        return $principal;
+    }
+
+    /**
+     * Returns the list of circles a principal is a member of
+     *
+     * @param string $principal
+     * @return array
+     * @throws Exception
+     * @throws ContainerExceptionInterface
+     * @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 = Circles::joinedCircles($name, true);
+
+            $circles = array_map(function ($circle) {
+                /** @var Circle $circle */
+                return 'principals/circles/' . urlencode($circle->getSingleId());
+            }, $circles);
+
+            return $circles;
+        }
+
+        return [];
+    }
+
+    /**
+     * Get all email addresses associated to a principal.
+     *
+     * @param array $principal Data from getPrincipal*()
+     * @return string[] All email addresses without the mailto: prefix
+     */
+    public function getEmailAddressesOfPrincipal(array $principal): array {
+        $emailAddresses = [];
+
+        if (isset($principal['{http://sabredav.org/ns}email-address'])) {
+            $emailAddresses[] = $principal['{http://sabredav.org/ns}email-address'];
+        }
+
+        if (isset($principal['{DAV:}alternate-URI-set'])) {
+            foreach ($principal['{DAV:}alternate-URI-set'] as $address) {
+                if (str_starts_with($address, 'mailto:')) {
+                    $emailAddresses[] = substr($address, 7);
+                }
+            }
+        }
+
+        if (isset($principal['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set'])) {
+            foreach ($principal['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set'] as $address) {
+                if (str_starts_with($address, 'mailto:')) {
+                    $emailAddresses[] = substr($address, 7);
+                }
+            }
+        }
+
+        if (isset($principal['{http://calendarserver.org/ns/}email-address-set'])) {
+            foreach ($principal['{http://calendarserver.org/ns/}email-address-set'] as $address) {
+                if (str_starts_with($address, 'mailto:')) {
+                    $emailAddresses[] = substr($address, 7);
+                }
+            }
+        }
+
+        return array_values(array_unique($emailAddresses));
+    }
 }

apps/dav/lib/AppInfo/PluginManager.php

Indentation +268 added lines, -268 removed lines

@@ -27,272 +27,272 @@
  */
 class PluginManager {
 
-	/**
-	 * App plugins
-	 *
-	 * @var ServerPlugin[]
-	 */
-	private $plugins = [];
-
-	/**
-	 * App collections
-	 *
-	 * @var Collection[]
-	 */
-	private $collections = [];
-
-	/**
-	 * Address book plugins
-	 *
-	 * @var IAddressBookProvider[]
-	 */
-	private $addressBookPlugins = [];
-
-	/**
-	 * Calendar plugins
-	 *
-	 * @var ICalendarProvider[]
-	 */
-	private $calendarPlugins = [];
-
-	/** @var bool */
-	private $populated = false;
-
-	/**
-	 * Contstruct a PluginManager
-	 *
-	 * @param ServerContainer $container server container for resolving plugin classes
-	 * @param IAppManager $appManager app manager to loading apps and their info
-	 */
-	public function __construct(
-		private ServerContainer $container,
-		private IAppManager $appManager,
-	) {
-	}
-
-	/**
-	 * Returns an array of app-registered plugins
-	 *
-	 * @return ServerPlugin[]
-	 */
-	public function getAppPlugins() {
-		$this->populate();
-		return $this->plugins;
-	}
-
-	/**
-	 * Returns an array of app-registered collections
-	 *
-	 * @return array
-	 */
-	public function getAppCollections() {
-		$this->populate();
-		return $this->collections;
-	}
-
-	/**
-	 * @return IAddressBookProvider[]
-	 */
-	public function getAddressBookPlugins(): array {
-		$this->populate();
-		return $this->addressBookPlugins;
-	}
-
-	/**
-	 * Returns an array of app-registered calendar plugins
-	 *
-	 * @return ICalendarProvider[]
-	 */
-	public function getCalendarPlugins():array {
-		$this->populate();
-		return $this->calendarPlugins;
-	}
-
-	/**
-	 * Retrieve plugin and collection list and populate attributes
-	 */
-	private function populate(): void {
-		if ($this->populated) {
-			return;
-		}
-		$this->populated = true;
-
-		$this->calendarPlugins[] = $this->container->get(AppCalendarPlugin::class);
-
-		foreach ($this->appManager->getEnabledApps() as $app) {
-			// load plugins and collections from info.xml
-			$info = $this->appManager->getAppInfo($app);
-			if (!isset($info['types']) || !in_array('dav', $info['types'], true)) {
-				continue;
-			}
-			$plugins = $this->loadSabrePluginsFromInfoXml($this->extractPluginList($info));
-			foreach ($plugins as $plugin) {
-				$this->plugins[] = $plugin;
-			}
-
-			$collections = $this->loadSabreCollectionsFromInfoXml($this->extractCollectionList($info));
-			foreach ($collections as $collection) {
-				$this->collections[] = $collection;
-			}
-
-			$addresbookPlugins = $this->loadSabreAddressBookPluginsFromInfoXml($this->extractAddressBookPluginList($info));
-			foreach ($addresbookPlugins as $addresbookPlugin) {
-				$this->addressBookPlugins[] = $addresbookPlugin;
-			}
-
-			$calendarPlugins = $this->loadSabreCalendarPluginsFromInfoXml($this->extractCalendarPluginList($info));
-			foreach ($calendarPlugins as $calendarPlugin) {
-				$this->calendarPlugins[] = $calendarPlugin;
-			}
-		}
-	}
-
-	/**
-	 * @param array $array
-	 * @return string[]
-	 */
-	private function extractPluginList(array $array): array {
-		if (isset($array['sabre']) && is_array($array['sabre'])) {
-			if (isset($array['sabre']['plugins']) && is_array($array['sabre']['plugins'])) {
-				if (isset($array['sabre']['plugins']['plugin'])) {
-					$items = $array['sabre']['plugins']['plugin'];
-					if (!is_array($items)) {
-						$items = [$items];
-					}
-					return $items;
-				}
-			}
-		}
-		return [];
-	}
-
-	/**
-	 * @param array $array
-	 * @return string[]
-	 */
-	private function extractCollectionList(array $array): array {
-		if (isset($array['sabre']) && is_array($array['sabre'])) {
-			if (isset($array['sabre']['collections']) && is_array($array['sabre']['collections'])) {
-				if (isset($array['sabre']['collections']['collection'])) {
-					$items = $array['sabre']['collections']['collection'];
-					if (!is_array($items)) {
-						$items = [$items];
-					}
-					return $items;
-				}
-			}
-		}
-		return [];
-	}
-
-	/**
-	 * @param array $array
-	 * @return string[]
-	 */
-	private function extractAddressBookPluginList(array $array): array {
-		if (!isset($array['sabre']) || !is_array($array['sabre'])) {
-			return [];
-		}
-		if (!isset($array['sabre']['address-book-plugins']) || !is_array($array['sabre']['address-book-plugins'])) {
-			return [];
-		}
-		if (!isset($array['sabre']['address-book-plugins']['plugin'])) {
-			return [];
-		}
-
-		$items = $array['sabre']['address-book-plugins']['plugin'];
-		if (!is_array($items)) {
-			$items = [$items];
-		}
-		return $items;
-	}
-
-	/**
-	 * @param array $array
-	 * @return string[]
-	 */
-	private function extractCalendarPluginList(array $array): array {
-		if (isset($array['sabre']) && is_array($array['sabre'])) {
-			if (isset($array['sabre']['calendar-plugins']) && is_array($array['sabre']['calendar-plugins'])) {
-				if (isset($array['sabre']['calendar-plugins']['plugin'])) {
-					$items = $array['sabre']['calendar-plugins']['plugin'];
-					if (!is_array($items)) {
-						$items = [$items];
-					}
-					return $items;
-				}
-			}
-		}
-		return [];
-	}
-
-	private function createClass(string $className): object {
-		try {
-			return $this->container->get($className);
-		} catch (ContainerExceptionInterface $e) {
-			if (class_exists($className)) {
-				return new $className();
-			}
-		}
-
-		throw new \Exception('Could not load ' . $className, 0, $e);
-	}
-
-
-	/**
-	 * @param string[] $classes
-	 * @return ServerPlugin[]
-	 * @throws \Exception
-	 */
-	private function loadSabrePluginsFromInfoXml(array $classes): array {
-		return array_map(function (string $className): ServerPlugin {
-			$instance = $this->createClass($className);
-			if (!($instance instanceof ServerPlugin)) {
-				throw new \Exception('Sabre server plugin ' . $className . ' does not implement the ' . ServerPlugin::class . ' interface');
-			}
-			return $instance;
-		}, $classes);
-	}
-
-	/**
-	 * @param string[] $classes
-	 * @return Collection[]
-	 */
-	private function loadSabreCollectionsFromInfoXml(array $classes): array {
-		return array_map(function (string $className): Collection {
-			$instance = $this->createClass($className);
-			if (!($instance instanceof Collection)) {
-				throw new \Exception('Sabre collection plugin ' . $className . ' does not implement the ' . Collection::class . ' interface');
-			}
-			return $instance;
-		}, $classes);
-	}
-
-	/**
-	 * @param string[] $classes
-	 * @return IAddressBookProvider[]
-	 */
-	private function loadSabreAddressBookPluginsFromInfoXml(array $classes): array {
-		return array_map(function (string $className): IAddressBookProvider {
-			$instance = $this->createClass($className);
-			if (!($instance instanceof IAddressBookProvider)) {
-				throw new \Exception('Sabre address book plugin class ' . $className . ' does not implement the ' . IAddressBookProvider::class . ' interface');
-			}
-			return $instance;
-		}, $classes);
-	}
-
-	/**
-	 * @param string[] $classes
-	 * @return ICalendarProvider[]
-	 */
-	private function loadSabreCalendarPluginsFromInfoXml(array $classes): array {
-		return array_map(function (string $className): ICalendarProvider {
-			$instance = $this->createClass($className);
-			if (!($instance instanceof ICalendarProvider)) {
-				throw new \Exception('Sabre calendar plugin class ' . $className . ' does not implement the ' . ICalendarProvider::class . ' interface');
-			}
-			return $instance;
-		}, $classes);
-	}
+    /**
+     * App plugins
+     *
+     * @var ServerPlugin[]
+     */
+    private $plugins = [];
+
+    /**
+     * App collections
+     *
+     * @var Collection[]
+     */
+    private $collections = [];
+
+    /**
+     * Address book plugins
+     *
+     * @var IAddressBookProvider[]
+     */
+    private $addressBookPlugins = [];
+
+    /**
+     * Calendar plugins
+     *
+     * @var ICalendarProvider[]
+     */
+    private $calendarPlugins = [];
+
+    /** @var bool */
+    private $populated = false;
+
+    /**
+     * Contstruct a PluginManager
+     *
+     * @param ServerContainer $container server container for resolving plugin classes
+     * @param IAppManager $appManager app manager to loading apps and their info
+     */
+    public function __construct(
+        private ServerContainer $container,
+        private IAppManager $appManager,
+    ) {
+    }
+
+    /**
+     * Returns an array of app-registered plugins
+     *
+     * @return ServerPlugin[]
+     */
+    public function getAppPlugins() {
+        $this->populate();
+        return $this->plugins;
+    }
+
+    /**
+     * Returns an array of app-registered collections
+     *
+     * @return array
+     */
+    public function getAppCollections() {
+        $this->populate();
+        return $this->collections;
+    }
+
+    /**
+     * @return IAddressBookProvider[]
+     */
+    public function getAddressBookPlugins(): array {
+        $this->populate();
+        return $this->addressBookPlugins;
+    }
+
+    /**
+     * Returns an array of app-registered calendar plugins
+     *
+     * @return ICalendarProvider[]
+     */
+    public function getCalendarPlugins():array {
+        $this->populate();
+        return $this->calendarPlugins;
+    }
+
+    /**
+     * Retrieve plugin and collection list and populate attributes
+     */
+    private function populate(): void {
+        if ($this->populated) {
+            return;
+        }
+        $this->populated = true;
+
+        $this->calendarPlugins[] = $this->container->get(AppCalendarPlugin::class);
+
+        foreach ($this->appManager->getEnabledApps() as $app) {
+            // load plugins and collections from info.xml
+            $info = $this->appManager->getAppInfo($app);
+            if (!isset($info['types']) || !in_array('dav', $info['types'], true)) {
+                continue;
+            }
+            $plugins = $this->loadSabrePluginsFromInfoXml($this->extractPluginList($info));
+            foreach ($plugins as $plugin) {
+                $this->plugins[] = $plugin;
+            }
+
+            $collections = $this->loadSabreCollectionsFromInfoXml($this->extractCollectionList($info));
+            foreach ($collections as $collection) {
+                $this->collections[] = $collection;
+            }
+
+            $addresbookPlugins = $this->loadSabreAddressBookPluginsFromInfoXml($this->extractAddressBookPluginList($info));
+            foreach ($addresbookPlugins as $addresbookPlugin) {
+                $this->addressBookPlugins[] = $addresbookPlugin;
+            }
+
+            $calendarPlugins = $this->loadSabreCalendarPluginsFromInfoXml($this->extractCalendarPluginList($info));
+            foreach ($calendarPlugins as $calendarPlugin) {
+                $this->calendarPlugins[] = $calendarPlugin;
+            }
+        }
+    }
+
+    /**
+     * @param array $array
+     * @return string[]
+     */
+    private function extractPluginList(array $array): array {
+        if (isset($array['sabre']) && is_array($array['sabre'])) {
+            if (isset($array['sabre']['plugins']) && is_array($array['sabre']['plugins'])) {
+                if (isset($array['sabre']['plugins']['plugin'])) {
+                    $items = $array['sabre']['plugins']['plugin'];
+                    if (!is_array($items)) {
+                        $items = [$items];
+                    }
+                    return $items;
+                }
+            }
+        }
+        return [];
+    }
+
+    /**
+     * @param array $array
+     * @return string[]
+     */
+    private function extractCollectionList(array $array): array {
+        if (isset($array['sabre']) && is_array($array['sabre'])) {
+            if (isset($array['sabre']['collections']) && is_array($array['sabre']['collections'])) {
+                if (isset($array['sabre']['collections']['collection'])) {
+                    $items = $array['sabre']['collections']['collection'];
+                    if (!is_array($items)) {
+                        $items = [$items];
+                    }
+                    return $items;
+                }
+            }
+        }
+        return [];
+    }
+
+    /**
+     * @param array $array
+     * @return string[]
+     */
+    private function extractAddressBookPluginList(array $array): array {
+        if (!isset($array['sabre']) || !is_array($array['sabre'])) {
+            return [];
+        }
+        if (!isset($array['sabre']['address-book-plugins']) || !is_array($array['sabre']['address-book-plugins'])) {
+            return [];
+        }
+        if (!isset($array['sabre']['address-book-plugins']['plugin'])) {
+            return [];
+        }
+
+        $items = $array['sabre']['address-book-plugins']['plugin'];
+        if (!is_array($items)) {
+            $items = [$items];
+        }
+        return $items;
+    }
+
+    /**
+     * @param array $array
+     * @return string[]
+     */
+    private function extractCalendarPluginList(array $array): array {
+        if (isset($array['sabre']) && is_array($array['sabre'])) {
+            if (isset($array['sabre']['calendar-plugins']) && is_array($array['sabre']['calendar-plugins'])) {
+                if (isset($array['sabre']['calendar-plugins']['plugin'])) {
+                    $items = $array['sabre']['calendar-plugins']['plugin'];
+                    if (!is_array($items)) {
+                        $items = [$items];
+                    }
+                    return $items;
+                }
+            }
+        }
+        return [];
+    }
+
+    private function createClass(string $className): object {
+        try {
+            return $this->container->get($className);
+        } catch (ContainerExceptionInterface $e) {
+            if (class_exists($className)) {
+                return new $className();
+            }
+        }
+
+        throw new \Exception('Could not load ' . $className, 0, $e);
+    }
+
+
+    /**
+     * @param string[] $classes
+     * @return ServerPlugin[]
+     * @throws \Exception
+     */
+    private function loadSabrePluginsFromInfoXml(array $classes): array {
+        return array_map(function (string $className): ServerPlugin {
+            $instance = $this->createClass($className);
+            if (!($instance instanceof ServerPlugin)) {
+                throw new \Exception('Sabre server plugin ' . $className . ' does not implement the ' . ServerPlugin::class . ' interface');
+            }
+            return $instance;
+        }, $classes);
+    }
+
+    /**
+     * @param string[] $classes
+     * @return Collection[]
+     */
+    private function loadSabreCollectionsFromInfoXml(array $classes): array {
+        return array_map(function (string $className): Collection {
+            $instance = $this->createClass($className);
+            if (!($instance instanceof Collection)) {
+                throw new \Exception('Sabre collection plugin ' . $className . ' does not implement the ' . Collection::class . ' interface');
+            }
+            return $instance;
+        }, $classes);
+    }
+
+    /**
+     * @param string[] $classes
+     * @return IAddressBookProvider[]
+     */
+    private function loadSabreAddressBookPluginsFromInfoXml(array $classes): array {
+        return array_map(function (string $className): IAddressBookProvider {
+            $instance = $this->createClass($className);
+            if (!($instance instanceof IAddressBookProvider)) {
+                throw new \Exception('Sabre address book plugin class ' . $className . ' does not implement the ' . IAddressBookProvider::class . ' interface');
+            }
+            return $instance;
+        }, $classes);
+    }
+
+    /**
+     * @param string[] $classes
+     * @return ICalendarProvider[]
+     */
+    private function loadSabreCalendarPluginsFromInfoXml(array $classes): array {
+        return array_map(function (string $className): ICalendarProvider {
+            $instance = $this->createClass($className);
+            if (!($instance instanceof ICalendarProvider)) {
+                throw new \Exception('Sabre calendar plugin class ' . $className . ' does not implement the ' . ICalendarProvider::class . ' interface');
+            }
+            return $instance;
+        }, $classes);
+    }
 }

apps/files_external/lib/MountConfig.php

Indentation +160 added lines, -160 removed lines

@@ -27,176 +27,176 @@
  * Class to configure mount.json globally and for users
  */
 class MountConfig {
-	// TODO: make this class non-static and give it a proper namespace
+    // TODO: make this class non-static and give it a proper namespace
 
-	public const MOUNT_TYPE_GLOBAL = 'global';
-	public const MOUNT_TYPE_GROUP = 'group';
-	public const MOUNT_TYPE_USER = 'user';
-	public const MOUNT_TYPE_PERSONAL = 'personal';
+    public const MOUNT_TYPE_GLOBAL = 'global';
+    public const MOUNT_TYPE_GROUP = 'group';
+    public const MOUNT_TYPE_USER = 'user';
+    public const MOUNT_TYPE_PERSONAL = 'personal';
 
-	// whether to skip backend test (for unit tests, as this static class is not mockable)
-	public static $skipTest = false;
+    // whether to skip backend test (for unit tests, as this static class is not mockable)
+    public static $skipTest = false;
 
-	public function __construct(
-		private UserGlobalStoragesService $userGlobalStorageService,
-		private UserStoragesService $userStorageService,
-		private GlobalStoragesService $globalStorageService,
-	) {
-	}
+    public function __construct(
+        private UserGlobalStoragesService $userGlobalStorageService,
+        private UserStoragesService $userStorageService,
+        private GlobalStoragesService $globalStorageService,
+    ) {
+    }
 
-	/**
-	 * @param mixed $input
-	 * @param string|null $userId
-	 * @return mixed
-	 * @throws ContainerExceptionInterface
-	 * @since 16.0.0
-	 */
-	public static function substitutePlaceholdersInConfig($input, ?string $userId = null) {
-		/** @var BackendService $backendService */
-		$backendService = Server::get(BackendService::class);
-		/** @var IConfigHandler[] $handlers */
-		$handlers = $backendService->getConfigHandlers();
-		foreach ($handlers as $handler) {
-			if ($handler instanceof UserContext && $userId !== null) {
-				$handler->setUserId($userId);
-			}
-			$input = $handler->handle($input);
-		}
-		return $input;
-	}
+    /**
+     * @param mixed $input
+     * @param string|null $userId
+     * @return mixed
+     * @throws ContainerExceptionInterface
+     * @since 16.0.0
+     */
+    public static function substitutePlaceholdersInConfig($input, ?string $userId = null) {
+        /** @var BackendService $backendService */
+        $backendService = Server::get(BackendService::class);
+        /** @var IConfigHandler[] $handlers */
+        $handlers = $backendService->getConfigHandlers();
+        foreach ($handlers as $handler) {
+            if ($handler instanceof UserContext && $userId !== null) {
+                $handler->setUserId($userId);
+            }
+            $input = $handler->handle($input);
+        }
+        return $input;
+    }
 
-	/**
-	 * Test connecting using the given backend configuration
-	 *
-	 * @param string $class backend class name
-	 * @param array $options backend configuration options
-	 * @param boolean $isPersonal
-	 * @return int see self::STATUS_*
-	 * @throws \Exception
-	 */
-	public static function getBackendStatus($class, $options) {
-		if (self::$skipTest) {
-			return StorageNotAvailableException::STATUS_SUCCESS;
-		}
-		foreach ($options as $key => &$option) {
-			if ($key === 'password') {
-				// no replacements in passwords
-				continue;
-			}
-			$option = self::substitutePlaceholdersInConfig($option);
-		}
-		if (class_exists($class)) {
-			try {
-				/** @var Common $storage */
-				$storage = new $class($options);
+    /**
+     * Test connecting using the given backend configuration
+     *
+     * @param string $class backend class name
+     * @param array $options backend configuration options
+     * @param boolean $isPersonal
+     * @return int see self::STATUS_*
+     * @throws \Exception
+     */
+    public static function getBackendStatus($class, $options) {
+        if (self::$skipTest) {
+            return StorageNotAvailableException::STATUS_SUCCESS;
+        }
+        foreach ($options as $key => &$option) {
+            if ($key === 'password') {
+                // no replacements in passwords
+                continue;
+            }
+            $option = self::substitutePlaceholdersInConfig($option);
+        }
+        if (class_exists($class)) {
+            try {
+                /** @var Common $storage */
+                $storage = new $class($options);
 
-				try {
-					$result = $storage->test();
-					$storage->setAvailability($result);
-					if ($result) {
-						return StorageNotAvailableException::STATUS_SUCCESS;
-					}
-				} catch (\Exception $e) {
-					$storage->setAvailability(false);
-					throw $e;
-				}
-			} catch (\Exception $exception) {
-				Server::get(LoggerInterface::class)->error($exception->getMessage(), ['exception' => $exception, 'app' => 'files_external']);
-				throw $exception;
-			}
-		}
-		return StorageNotAvailableException::STATUS_ERROR;
-	}
+                try {
+                    $result = $storage->test();
+                    $storage->setAvailability($result);
+                    if ($result) {
+                        return StorageNotAvailableException::STATUS_SUCCESS;
+                    }
+                } catch (\Exception $e) {
+                    $storage->setAvailability(false);
+                    throw $e;
+                }
+            } catch (\Exception $exception) {
+                Server::get(LoggerInterface::class)->error($exception->getMessage(), ['exception' => $exception, 'app' => 'files_external']);
+                throw $exception;
+            }
+        }
+        return StorageNotAvailableException::STATUS_ERROR;
+    }
 
-	/**
-	 * Encrypt passwords in the given config options
-	 *
-	 * @param array $options mount options
-	 * @return array updated options
-	 */
-	public static function encryptPasswords($options) {
-		if (isset($options['password'])) {
-			$options['password_encrypted'] = self::encryptPassword($options['password']);
-			// do not unset the password, we want to keep the keys order
-			// on load... because that's how the UI currently works
-			$options['password'] = '';
-		}
-		return $options;
-	}
+    /**
+     * Encrypt passwords in the given config options
+     *
+     * @param array $options mount options
+     * @return array updated options
+     */
+    public static function encryptPasswords($options) {
+        if (isset($options['password'])) {
+            $options['password_encrypted'] = self::encryptPassword($options['password']);
+            // do not unset the password, we want to keep the keys order
+            // on load... because that's how the UI currently works
+            $options['password'] = '';
+        }
+        return $options;
+    }
 
-	/**
-	 * Decrypt passwords in the given config options
-	 *
-	 * @param array $options mount options
-	 * @return array updated options
-	 */
-	public static function decryptPasswords($options) {
-		// note: legacy options might still have the unencrypted password in the "password" field
-		if (isset($options['password_encrypted'])) {
-			$options['password'] = self::decryptPassword($options['password_encrypted']);
-			unset($options['password_encrypted']);
-		}
-		return $options;
-	}
+    /**
+     * Decrypt passwords in the given config options
+     *
+     * @param array $options mount options
+     * @return array updated options
+     */
+    public static function decryptPasswords($options) {
+        // note: legacy options might still have the unencrypted password in the "password" field
+        if (isset($options['password_encrypted'])) {
+            $options['password'] = self::decryptPassword($options['password_encrypted']);
+            unset($options['password_encrypted']);
+        }
+        return $options;
+    }
 
-	/**
-	 * Encrypt a single password
-	 *
-	 * @param string $password plain text password
-	 * @return string encrypted password
-	 */
-	private static function encryptPassword($password) {
-		$cipher = self::getCipher();
-		$iv = Server::get(ISecureRandom::class)->generate(16);
-		$cipher->setIV($iv);
-		return base64_encode($iv . $cipher->encrypt($password));
-	}
+    /**
+     * Encrypt a single password
+     *
+     * @param string $password plain text password
+     * @return string encrypted password
+     */
+    private static function encryptPassword($password) {
+        $cipher = self::getCipher();
+        $iv = Server::get(ISecureRandom::class)->generate(16);
+        $cipher->setIV($iv);
+        return base64_encode($iv . $cipher->encrypt($password));
+    }
 
-	/**
-	 * Decrypts a single password
-	 *
-	 * @param string $encryptedPassword encrypted password
-	 * @return string plain text password
-	 */
-	private static function decryptPassword($encryptedPassword) {
-		$cipher = self::getCipher();
-		$binaryPassword = base64_decode($encryptedPassword);
-		$iv = substr($binaryPassword, 0, 16);
-		$cipher->setIV($iv);
-		$binaryPassword = substr($binaryPassword, 16);
-		return $cipher->decrypt($binaryPassword);
-	}
+    /**
+     * Decrypts a single password
+     *
+     * @param string $encryptedPassword encrypted password
+     * @return string plain text password
+     */
+    private static function decryptPassword($encryptedPassword) {
+        $cipher = self::getCipher();
+        $binaryPassword = base64_decode($encryptedPassword);
+        $iv = substr($binaryPassword, 0, 16);
+        $cipher->setIV($iv);
+        $binaryPassword = substr($binaryPassword, 16);
+        return $cipher->decrypt($binaryPassword);
+    }
 
-	/**
-	 * Returns the encryption cipher
-	 *
-	 * @return AES
-	 */
-	private static function getCipher() {
-		$cipher = new AES(AES::MODE_CBC);
-		$cipher->setKey(Server::get(IConfig::class)->getSystemValue('passwordsalt', null));
-		return $cipher;
-	}
+    /**
+     * Returns the encryption cipher
+     *
+     * @return AES
+     */
+    private static function getCipher() {
+        $cipher = new AES(AES::MODE_CBC);
+        $cipher->setKey(Server::get(IConfig::class)->getSystemValue('passwordsalt', null));
+        return $cipher;
+    }
 
-	/**
-	 * Computes a hash based on the given configuration.
-	 * This is mostly used to find out whether configurations
-	 * are the same.
-	 *
-	 * @param array $config
-	 * @return string
-	 */
-	public static function makeConfigHash($config) {
-		$data = json_encode(
-			[
-				'c' => $config['backend'],
-				'a' => $config['authMechanism'],
-				'm' => $config['mountpoint'],
-				'o' => $config['options'],
-				'p' => $config['priority'] ?? -1,
-				'mo' => $config['mountOptions'] ?? [],
-			]
-		);
-		return hash('md5', $data);
-	}
+    /**
+     * Computes a hash based on the given configuration.
+     * This is mostly used to find out whether configurations
+     * are the same.
+     *
+     * @param array $config
+     * @return string
+     */
+    public static function makeConfigHash($config) {
+        $data = json_encode(
+            [
+                'c' => $config['backend'],
+                'a' => $config['authMechanism'],
+                'm' => $config['mountpoint'],
+                'o' => $config['options'],
+                'p' => $config['priority'] ?? -1,
+                'mo' => $config['mountOptions'] ?? [],
+            ]
+        );
+        return hash('md5', $data);
+    }
 }

apps/files_external/lib/Config/ConfigAdapter.php

Indentation +139 added lines, -139 removed lines

@@ -34,143 +34,143 @@
  * Make the old files_external config work with the new public mount config api
  */
 class ConfigAdapter implements IMountProvider, IAuthoritativeMountProvider {
-	public function __construct(
-		private UserStoragesService $userStoragesService,
-		private UserGlobalStoragesService $userGlobalStoragesService,
-		private ClockInterface $clock,
-	) {
-	}
-
-	/**
-	 * @param class-string $class
-	 * @return class-string<IObjectStore>
-	 * @throws \InvalidArgumentException
-	 * @psalm-taint-escape callable
-	 */
-	private function validateObjectStoreClassString(string $class): string {
-		if (!\is_subclass_of($class, IObjectStore::class)) {
-			throw new \InvalidArgumentException('Invalid object store');
-		}
-		return $class;
-	}
-
-	/**
-	 * Process storage ready for mounting
-	 *
-	 * @throws ContainerExceptionInterface
-	 */
-	private function prepareStorageConfig(StorageConfig &$storage, IUser $user): void {
-		foreach ($storage->getBackendOptions() as $option => $value) {
-			$storage->setBackendOption($option, MountConfig::substitutePlaceholdersInConfig($value, $user->getUID()));
-		}
-
-		$objectStore = $storage->getBackendOption('objectstore');
-		if ($objectStore) {
-			$objectClass = $this->validateObjectStoreClassString($objectStore['class']);
-			$storage->setBackendOption('objectstore', new $objectClass($objectStore));
-		}
-
-		$storage->getAuthMechanism()->manipulateStorageConfig($storage, $user);
-		$storage->getBackend()->manipulateStorageConfig($storage, $user);
-	}
-
-	public function constructStorageForUser(IUser $user, StorageConfig $storage) {
-		$this->prepareStorageConfig($storage, $user);
-		return $this->constructStorage($storage);
-	}
-
-	/**
-	 * Construct the storage implementation
-	 *
-	 * @param StorageConfig $storageConfig
-	 */
-	private function constructStorage(StorageConfig $storageConfig): IStorage {
-		$class = $storageConfig->getBackend()->getStorageClass();
-		if (!is_a($class, IConstructableStorage::class, true)) {
-			Server::get(LoggerInterface::class)->warning('Building a storage not implementing IConstructableStorage is deprecated since 31.0.0', ['class' => $class]);
-		}
-		$storage = new $class($storageConfig->getBackendOptions());
-
-		// auth mechanism should fire first
-		$storage = $storageConfig->getBackend()->wrapStorage($storage);
-		$storage = $storageConfig->getAuthMechanism()->wrapStorage($storage);
-
-		return $storage;
-	}
-
-	/**
-	 * Get all mountpoints applicable for the user
-	 *
-	 * @return IMountPoint[]
-	 */
-	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
-		$this->userStoragesService->setUser($user);
-		$this->userGlobalStoragesService->setUser($user);
-
-		$storageConfigs = $this->userGlobalStoragesService->getAllStoragesForUser();
-
-		$storages = array_map(function (StorageConfig $storageConfig) use ($user) {
-			try {
-				return $this->constructStorageForUser($user, $storageConfig);
-			} catch (\Exception $e) {
-				// propagate exception into filesystem
-				return new FailedStorage(['exception' => $e]);
-			}
-		}, $storageConfigs);
-
-
-		Storage::getGlobalCache()->loadForStorageIds(array_map(function (IStorage $storage) {
-			return $storage->getId();
-		}, $storages));
-
-		$availableStorages = array_map(function (IStorage $storage, StorageConfig $storageConfig): IStorage {
-			try {
-				$availability = $storage->getAvailability();
-				if (!$availability['available'] && !Availability::shouldRecheck($availability)) {
-					$storage = new FailedStorage([
-						'exception' => new StorageNotAvailableException('Storage with mount id ' . $storageConfig->getId() . ' is not available'),
-					]);
-				}
-			} catch (\Exception $e) {
-				// propagate exception into filesystem
-				$storage = new FailedStorage(['exception' => $e]);
-			}
-			return $storage;
-		}, $storages, $storageConfigs);
-
-		$mounts = array_map(function (StorageConfig $storageConfig, IStorage $storage) use ($user, $loader) {
-			$storage->setOwner($user->getUID());
-			if ($storageConfig->getType() === StorageConfig::MOUNT_TYPE_PERSONAL) {
-				return new PersonalMount(
-					$this->userStoragesService,
-					$storageConfig,
-					$storageConfig->getId(),
-					new KnownMtime([
-						'storage' => $storage,
-						'clock' => $this->clock,
-					]),
-					'/' . $user->getUID() . '/files' . $storageConfig->getMountPoint(),
-					null,
-					$loader,
-					$storageConfig->getMountOptions(),
-					$storageConfig->getId(),
-				);
-			} else {
-				return new SystemMountPoint(
-					$storageConfig,
-					$storage,
-					'/' . $user->getUID() . '/files' . $storageConfig->getMountPoint(),
-					null,
-					$loader,
-					$storageConfig->getMountOptions(),
-					$storageConfig->getId(),
-				);
-			}
-		}, $storageConfigs, $availableStorages);
-
-		$this->userStoragesService->resetUser();
-		$this->userGlobalStoragesService->resetUser();
-
-		return $mounts;
-	}
+    public function __construct(
+        private UserStoragesService $userStoragesService,
+        private UserGlobalStoragesService $userGlobalStoragesService,
+        private ClockInterface $clock,
+    ) {
+    }
+
+    /**
+     * @param class-string $class
+     * @return class-string<IObjectStore>
+     * @throws \InvalidArgumentException
+     * @psalm-taint-escape callable
+     */
+    private function validateObjectStoreClassString(string $class): string {
+        if (!\is_subclass_of($class, IObjectStore::class)) {
+            throw new \InvalidArgumentException('Invalid object store');
+        }
+        return $class;
+    }
+
+    /**
+     * Process storage ready for mounting
+     *
+     * @throws ContainerExceptionInterface
+     */
+    private function prepareStorageConfig(StorageConfig &$storage, IUser $user): void {
+        foreach ($storage->getBackendOptions() as $option => $value) {
+            $storage->setBackendOption($option, MountConfig::substitutePlaceholdersInConfig($value, $user->getUID()));
+        }
+
+        $objectStore = $storage->getBackendOption('objectstore');
+        if ($objectStore) {
+            $objectClass = $this->validateObjectStoreClassString($objectStore['class']);
+            $storage->setBackendOption('objectstore', new $objectClass($objectStore));
+        }
+
+        $storage->getAuthMechanism()->manipulateStorageConfig($storage, $user);
+        $storage->getBackend()->manipulateStorageConfig($storage, $user);
+    }
+
+    public function constructStorageForUser(IUser $user, StorageConfig $storage) {
+        $this->prepareStorageConfig($storage, $user);
+        return $this->constructStorage($storage);
+    }
+
+    /**
+     * Construct the storage implementation
+     *
+     * @param StorageConfig $storageConfig
+     */
+    private function constructStorage(StorageConfig $storageConfig): IStorage {
+        $class = $storageConfig->getBackend()->getStorageClass();
+        if (!is_a($class, IConstructableStorage::class, true)) {
+            Server::get(LoggerInterface::class)->warning('Building a storage not implementing IConstructableStorage is deprecated since 31.0.0', ['class' => $class]);
+        }
+        $storage = new $class($storageConfig->getBackendOptions());
+
+        // auth mechanism should fire first
+        $storage = $storageConfig->getBackend()->wrapStorage($storage);
+        $storage = $storageConfig->getAuthMechanism()->wrapStorage($storage);
+
+        return $storage;
+    }
+
+    /**
+     * Get all mountpoints applicable for the user
+     *
+     * @return IMountPoint[]
+     */
+    public function getMountsForUser(IUser $user, IStorageFactory $loader) {
+        $this->userStoragesService->setUser($user);
+        $this->userGlobalStoragesService->setUser($user);
+
+        $storageConfigs = $this->userGlobalStoragesService->getAllStoragesForUser();
+
+        $storages = array_map(function (StorageConfig $storageConfig) use ($user) {
+            try {
+                return $this->constructStorageForUser($user, $storageConfig);
+            } catch (\Exception $e) {
+                // propagate exception into filesystem
+                return new FailedStorage(['exception' => $e]);
+            }
+        }, $storageConfigs);
+
+
+        Storage::getGlobalCache()->loadForStorageIds(array_map(function (IStorage $storage) {
+            return $storage->getId();
+        }, $storages));
+
+        $availableStorages = array_map(function (IStorage $storage, StorageConfig $storageConfig): IStorage {
+            try {
+                $availability = $storage->getAvailability();
+                if (!$availability['available'] && !Availability::shouldRecheck($availability)) {
+                    $storage = new FailedStorage([
+                        'exception' => new StorageNotAvailableException('Storage with mount id ' . $storageConfig->getId() . ' is not available'),
+                    ]);
+                }
+            } catch (\Exception $e) {
+                // propagate exception into filesystem
+                $storage = new FailedStorage(['exception' => $e]);
+            }
+            return $storage;
+        }, $storages, $storageConfigs);
+
+        $mounts = array_map(function (StorageConfig $storageConfig, IStorage $storage) use ($user, $loader) {
+            $storage->setOwner($user->getUID());
+            if ($storageConfig->getType() === StorageConfig::MOUNT_TYPE_PERSONAL) {
+                return new PersonalMount(
+                    $this->userStoragesService,
+                    $storageConfig,
+                    $storageConfig->getId(),
+                    new KnownMtime([
+                        'storage' => $storage,
+                        'clock' => $this->clock,
+                    ]),
+                    '/' . $user->getUID() . '/files' . $storageConfig->getMountPoint(),
+                    null,
+                    $loader,
+                    $storageConfig->getMountOptions(),
+                    $storageConfig->getId(),
+                );
+            } else {
+                return new SystemMountPoint(
+                    $storageConfig,
+                    $storage,
+                    '/' . $user->getUID() . '/files' . $storageConfig->getMountPoint(),
+                    null,
+                    $loader,
+                    $storageConfig->getMountOptions(),
+                    $storageConfig->getId(),
+                );
+            }
+        }, $storageConfigs, $availableStorages);
+
+        $this->userStoragesService->resetUser();
+        $this->userGlobalStoragesService->resetUser();
+
+        return $mounts;
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -59,7 +59,7 @@ 
 	 *
 	 * @throws ContainerExceptionInterface
 	 */
-	private function prepareStorageConfig(StorageConfig &$storage, IUser $user): void {
+	private function prepareStorageConfig(StorageConfig & $storage, IUser $user): void {
 		foreach ($storage->getBackendOptions() as $option => $value) {
 			$storage->setBackendOption($option, MountConfig::substitutePlaceholdersInConfig($value, $user->getUID()));
 		}
@@ -109,7 +109,7 @@ 
 
 		$storageConfigs = $this->userGlobalStoragesService->getAllStoragesForUser();
 
-		$storages = array_map(function (StorageConfig $storageConfig) use ($user) {
+		$storages = array_map(function(StorageConfig $storageConfig) use ($user) {
 			try {
 				return $this->constructStorageForUser($user, $storageConfig);
 			} catch (\Exception $e) {
@@ -119,16 +119,16 @@ 
 		}, $storageConfigs);
 
 
-		Storage::getGlobalCache()->loadForStorageIds(array_map(function (IStorage $storage) {
+		Storage::getGlobalCache()->loadForStorageIds(array_map(function(IStorage $storage) {
 			return $storage->getId();
 		}, $storages));
 
-		$availableStorages = array_map(function (IStorage $storage, StorageConfig $storageConfig): IStorage {
+		$availableStorages = array_map(function(IStorage $storage, StorageConfig $storageConfig): IStorage {
 			try {
 				$availability = $storage->getAvailability();
 				if (!$availability['available'] && !Availability::shouldRecheck($availability)) {
 					$storage = new FailedStorage([
-						'exception' => new StorageNotAvailableException('Storage with mount id ' . $storageConfig->getId() . ' is not available'),
+						'exception' => new StorageNotAvailableException('Storage with mount id '.$storageConfig->getId().' is not available'),
 					]);
 				}
 			} catch (\Exception $e) {
@@ -138,7 +138,7 @@ 
 			return $storage;
 		}, $storages, $storageConfigs);
 
-		$mounts = array_map(function (StorageConfig $storageConfig, IStorage $storage) use ($user, $loader) {
+		$mounts = array_map(function(StorageConfig $storageConfig, IStorage $storage) use ($user, $loader) {
 			$storage->setOwner($user->getUID());
 			if ($storageConfig->getType() === StorageConfig::MOUNT_TYPE_PERSONAL) {
 				return new PersonalMount(
@@ -149,7 +149,7 @@ 
 						'storage' => $storage,
 						'clock' => $this->clock,
 					]),
-					'/' . $user->getUID() . '/files' . $storageConfig->getMountPoint(),
+					'/'.$user->getUID().'/files'.$storageConfig->getMountPoint(),
 					null,
 					$loader,
 					$storageConfig->getMountOptions(),
@@ -159,7 +159,7 @@ 
 				return new SystemMountPoint(
 					$storageConfig,
 					$storage,
-					'/' . $user->getUID() . '/files' . $storageConfig->getMountPoint(),
+					'/'.$user->getUID().'/files'.$storageConfig->getMountPoint(),
 					null,
 					$loader,
 					$storageConfig->getMountOptions(),

apps/files_external/lib/AppInfo/Application.php

Indentation +98 added lines, -98 removed lines

@@ -65,102 +65,102 @@
  * @package OCA\Files_External\AppInfo
  */
 class Application extends App implements IBackendProvider, IAuthMechanismProvider, IBootstrap {
-	public const APP_ID = 'files_external';
-
-	/**
-	 * Application constructor.
-	 *
-	 * @throws ContainerExceptionInterface
-	 */
-	public function __construct(array $urlParams = []) {
-		parent::__construct(self::APP_ID, $urlParams);
-	}
-
-	public function register(IRegistrationContext $context): void {
-		$context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
-		$context->registerEventListener(GroupDeletedEvent::class, GroupDeletedListener::class);
-		$context->registerEventListener(LoadAdditionalScriptsEvent::class, LoadAdditionalListener::class);
-		$context->registerEventListener(StorageCreatedEvent::class, MountCacheService::class);
-		$context->registerEventListener(StorageDeletedEvent::class, MountCacheService::class);
-		$context->registerEventListener(StorageUpdatedEvent::class, MountCacheService::class);
-		$context->registerEventListener(BeforeGroupDeletedEvent::class, MountCacheService::class);
-		$context->registerEventListener(UserCreatedEvent::class, MountCacheService::class);
-		$context->registerEventListener(UserAddedEvent::class, MountCacheService::class);
-		$context->registerEventListener(UserRemovedEvent::class, MountCacheService::class);
-		$context->registerEventListener(PostLoginEvent::class, MountCacheService::class);
-
-		$context->registerConfigLexicon(ConfigLexicon::class);
-	}
-
-	public function boot(IBootContext $context): void {
-		$context->injectFn(function (IMountProviderCollection $mountProviderCollection, ConfigAdapter $configAdapter): void {
-			$mountProviderCollection->registerProvider($configAdapter);
-		});
-		$context->injectFn(function (BackendService $backendService, UserPlaceholderHandler $userConfigHandler): void {
-			$backendService->registerBackendProvider($this);
-			$backendService->registerAuthMechanismProvider($this);
-			$backendService->registerConfigHandler('user', function () use ($userConfigHandler) {
-				return $userConfigHandler;
-			});
-		});
-	}
-
-	/**
-	 * @{inheritdoc}
-	 */
-	public function getBackends() {
-		$container = $this->getContainer();
-
-		$backends = [
-			$container->get(Local::class),
-			$container->get(FTP::class),
-			$container->get(DAV::class),
-			$container->get(OwnCloud::class),
-			$container->get(SFTP::class),
-			$container->get(AmazonS3::class),
-			$container->get(Swift::class),
-			$container->get(SFTP_Key::class),
-			$container->get(SMB::class),
-			$container->get(SMB_OC::class),
-		];
-
-		return $backends;
-	}
-
-	/**
-	 * @{inheritdoc}
-	 */
-	public function getAuthMechanisms() {
-		$container = $this->getContainer();
-
-		return [
-			// AuthMechanism::SCHEME_NULL mechanism
-			$container->get(NullMechanism::class),
-
-			// AuthMechanism::SCHEME_BUILTIN mechanism
-			$container->get(Builtin::class),
-
-			// AuthMechanism::SCHEME_PASSWORD mechanisms
-			$container->get(Password::class),
-			$container->get(SessionCredentials::class),
-			$container->get(LoginCredentials::class),
-			$container->get(UserProvided::class),
-			$container->get(GlobalAuth::class),
-			$container->get(UserGlobalAuth::class),
-
-			// AuthMechanism::SCHEME_PUBLICKEY mechanisms
-			$container->get(RSA::class),
-			$container->get(RSAPrivateKey::class),
-
-			// AuthMechanism::SCHEME_OPENSTACK mechanisms
-			$container->get(OpenStackV2::class),
-			$container->get(OpenStackV3::class),
-			$container->get(Rackspace::class),
-
-			// Specialized mechanisms
-			$container->get(AccessKey::class),
-			$container->get(KerberosAuth::class),
-			$container->get(KerberosApacheAuth::class),
-		];
-	}
+    public const APP_ID = 'files_external';
+
+    /**
+     * Application constructor.
+     *
+     * @throws ContainerExceptionInterface
+     */
+    public function __construct(array $urlParams = []) {
+        parent::__construct(self::APP_ID, $urlParams);
+    }
+
+    public function register(IRegistrationContext $context): void {
+        $context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
+        $context->registerEventListener(GroupDeletedEvent::class, GroupDeletedListener::class);
+        $context->registerEventListener(LoadAdditionalScriptsEvent::class, LoadAdditionalListener::class);
+        $context->registerEventListener(StorageCreatedEvent::class, MountCacheService::class);
+        $context->registerEventListener(StorageDeletedEvent::class, MountCacheService::class);
+        $context->registerEventListener(StorageUpdatedEvent::class, MountCacheService::class);
+        $context->registerEventListener(BeforeGroupDeletedEvent::class, MountCacheService::class);
+        $context->registerEventListener(UserCreatedEvent::class, MountCacheService::class);
+        $context->registerEventListener(UserAddedEvent::class, MountCacheService::class);
+        $context->registerEventListener(UserRemovedEvent::class, MountCacheService::class);
+        $context->registerEventListener(PostLoginEvent::class, MountCacheService::class);
+
+        $context->registerConfigLexicon(ConfigLexicon::class);
+    }
+
+    public function boot(IBootContext $context): void {
+        $context->injectFn(function (IMountProviderCollection $mountProviderCollection, ConfigAdapter $configAdapter): void {
+            $mountProviderCollection->registerProvider($configAdapter);
+        });
+        $context->injectFn(function (BackendService $backendService, UserPlaceholderHandler $userConfigHandler): void {
+            $backendService->registerBackendProvider($this);
+            $backendService->registerAuthMechanismProvider($this);
+            $backendService->registerConfigHandler('user', function () use ($userConfigHandler) {
+                return $userConfigHandler;
+            });
+        });
+    }
+
+    /**
+     * @{inheritdoc}
+     */
+    public function getBackends() {
+        $container = $this->getContainer();
+
+        $backends = [
+            $container->get(Local::class),
+            $container->get(FTP::class),
+            $container->get(DAV::class),
+            $container->get(OwnCloud::class),
+            $container->get(SFTP::class),
+            $container->get(AmazonS3::class),
+            $container->get(Swift::class),
+            $container->get(SFTP_Key::class),
+            $container->get(SMB::class),
+            $container->get(SMB_OC::class),
+        ];
+
+        return $backends;
+    }
+
+    /**
+     * @{inheritdoc}
+     */
+    public function getAuthMechanisms() {
+        $container = $this->getContainer();
+
+        return [
+            // AuthMechanism::SCHEME_NULL mechanism
+            $container->get(NullMechanism::class),
+
+            // AuthMechanism::SCHEME_BUILTIN mechanism
+            $container->get(Builtin::class),
+
+            // AuthMechanism::SCHEME_PASSWORD mechanisms
+            $container->get(Password::class),
+            $container->get(SessionCredentials::class),
+            $container->get(LoginCredentials::class),
+            $container->get(UserProvided::class),
+            $container->get(GlobalAuth::class),
+            $container->get(UserGlobalAuth::class),
+
+            // AuthMechanism::SCHEME_PUBLICKEY mechanisms
+            $container->get(RSA::class),
+            $container->get(RSAPrivateKey::class),
+
+            // AuthMechanism::SCHEME_OPENSTACK mechanisms
+            $container->get(OpenStackV2::class),
+            $container->get(OpenStackV3::class),
+            $container->get(Rackspace::class),
+
+            // Specialized mechanisms
+            $container->get(AccessKey::class),
+            $container->get(KerberosAuth::class),
+            $container->get(KerberosApacheAuth::class),
+        ];
+    }
 }

apps/files/lib/Collaboration/Resources/ResourceProvider.php

Indentation +76 added lines, -76 removed lines

@@ -18,91 +18,91 @@
 use OCP\IUser;
 
 class ResourceProvider implements IProvider {
-	public const RESOURCE_TYPE = 'file';
+    public const RESOURCE_TYPE = 'file';
 
-	protected array $nodes = [];
+    protected array $nodes = [];
 
-	public function __construct(
-		protected IRootFolder $rootFolder,
-		private IPreview $preview,
-		private IURLGenerator $urlGenerator,
-	) {
-	}
+    public function __construct(
+        protected IRootFolder $rootFolder,
+        private IPreview $preview,
+        private IURLGenerator $urlGenerator,
+    ) {
+    }
 
-	private function getNode(IResource $resource): ?Node {
-		if (isset($this->nodes[(int)$resource->getId()])) {
-			return $this->nodes[(int)$resource->getId()];
-		}
-		$node = $this->rootFolder->getFirstNodeById((int)$resource->getId());
-		if ($node) {
-			$this->nodes[(int)$resource->getId()] = $node;
-			return $this->nodes[(int)$resource->getId()];
-		}
-		return null;
-	}
+    private function getNode(IResource $resource): ?Node {
+        if (isset($this->nodes[(int)$resource->getId()])) {
+            return $this->nodes[(int)$resource->getId()];
+        }
+        $node = $this->rootFolder->getFirstNodeById((int)$resource->getId());
+        if ($node) {
+            $this->nodes[(int)$resource->getId()] = $node;
+            return $this->nodes[(int)$resource->getId()];
+        }
+        return null;
+    }
 
-	/**
-	 * @param IResource $resource
-	 * @return array
-	 * @since 16.0.0
-	 */
-	public function getResourceRichObject(IResource $resource): array {
-		if (isset($this->nodes[(int)$resource->getId()])) {
-			$node = $this->nodes[(int)$resource->getId()]->getPath();
-		} else {
-			$node = $this->getNode($resource);
-		}
+    /**
+     * @param IResource $resource
+     * @return array
+     * @since 16.0.0
+     */
+    public function getResourceRichObject(IResource $resource): array {
+        if (isset($this->nodes[(int)$resource->getId()])) {
+            $node = $this->nodes[(int)$resource->getId()]->getPath();
+        } else {
+            $node = $this->getNode($resource);
+        }
 
-		if ($node instanceof Node) {
-			$link = $this->urlGenerator->linkToRouteAbsolute(
-				'files.viewcontroller.showFile',
-				['fileid' => $resource->getId()]
-			);
-			return [
-				'type' => 'file',
-				'id' => $resource->getId(),
-				'name' => $node->getName(),
-				'path' => $node->getInternalPath(),
-				'link' => $link,
-				'mimetype' => $node->getMimetype(),
-				'preview-available' => $this->preview->isAvailable($node),
-			];
-		}
+        if ($node instanceof Node) {
+            $link = $this->urlGenerator->linkToRouteAbsolute(
+                'files.viewcontroller.showFile',
+                ['fileid' => $resource->getId()]
+            );
+            return [
+                'type' => 'file',
+                'id' => $resource->getId(),
+                'name' => $node->getName(),
+                'path' => $node->getInternalPath(),
+                'link' => $link,
+                'mimetype' => $node->getMimetype(),
+                'preview-available' => $this->preview->isAvailable($node),
+            ];
+        }
 
-		throw new ResourceException('File not found');
-	}
+        throw new ResourceException('File not found');
+    }
 
-	/**
-	 * Can a user/guest access the collection
-	 *
-	 * @param IResource $resource
-	 * @param IUser $user
-	 * @return bool
-	 * @since 16.0.0
-	 */
-	public function canAccessResource(IResource $resource, ?IUser $user = null): bool {
-		if (!$user instanceof IUser) {
-			return false;
-		}
+    /**
+     * Can a user/guest access the collection
+     *
+     * @param IResource $resource
+     * @param IUser $user
+     * @return bool
+     * @since 16.0.0
+     */
+    public function canAccessResource(IResource $resource, ?IUser $user = null): bool {
+        if (!$user instanceof IUser) {
+            return false;
+        }
 
-		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-		$node = $userFolder->getById((int)$resource->getId());
+        $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+        $node = $userFolder->getById((int)$resource->getId());
 
-		if ($node) {
-			$this->nodes[(int)$resource->getId()] = $node;
-			return true;
-		}
+        if ($node) {
+            $this->nodes[(int)$resource->getId()] = $node;
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * Get the resource type of the provider
-	 *
-	 * @return string
-	 * @since 16.0.0
-	 */
-	public function getType(): string {
-		return self::RESOURCE_TYPE;
-	}
+    /**
+     * Get the resource type of the provider
+     *
+     * @return string
+     * @since 16.0.0
+     */
+    public function getType(): string {
+        return self::RESOURCE_TYPE;
+    }
 }