nextcloud / server

lib/public/IUserManager.php

Indentation +221 added lines, -221 removed lines

@@ -24,225 +24,225 @@
  * @since 8.0.0
  */
 interface IUserManager {
-	/**
-	 * @since 26.0.0
-	 */
-	public const MAX_PASSWORD_LENGTH = 469;
-
-	/**
-	 * register a user backend
-	 *
-	 * @since 8.0.0
-	 * @return void
-	 */
-	public function registerBackend(UserInterface $backend);
-
-	/**
-	 * Get the active backends
-	 * @return UserInterface[]
-	 * @since 8.0.0
-	 */
-	public function getBackends();
-
-	/**
-	 * remove a user backend
-	 *
-	 * @since 8.0.0
-	 * @return void
-	 */
-	public function removeBackend(UserInterface $backend);
-
-	/**
-	 * remove all user backends
-	 * @since 8.0.0
-	 * @return void
-	 */
-	public function clearBackends();
-
-	/**
-	 * get a user by user id
-	 *
-	 * @param string $uid
-	 * @return \OCP\IUser|null Either the user or null if the specified user does not exist
-	 * @since 8.0.0
-	 */
-	public function get($uid);
-
-	/**
-	 * Get the display name of a user
-	 *
-	 * @param string $uid
-	 * @return string|null
-	 * @since 25.0.0
-	 */
-	public function getDisplayName(string $uid): ?string;
-
-	/**
-	 * check if a user exists
-	 *
-	 * @param string $uid
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function userExists($uid);
-
-	/**
-	 * Check if the password is valid for the user
-	 *
-	 * @param string $loginName
-	 * @param string $password
-	 * @return IUser|false the User object on success, false otherwise
-	 * @since 8.0.0
-	 */
-	public function checkPassword($loginName, $password);
-
-	/**
-	 * search by user id
-	 *
-	 * @param string $pattern
-	 * @param int $limit
-	 * @param int $offset
-	 * @return \OCP\IUser[]
-	 * @since 8.0.0
-	 * @deprecated 27.0.0, use searchDisplayName instead
-	 */
-	public function search($pattern, $limit = null, $offset = null);
-
-	/**
-	 * search by displayName
-	 *
-	 * @param string $pattern
-	 * @param int $limit
-	 * @param int $offset
-	 * @return list<IUser>
-	 * @since 8.0.0
-	 */
-	public function searchDisplayName($pattern, $limit = null, $offset = null);
-
-	/**
-	 * @return IUser[]
-	 * @since 28.0.0
-	 * @since 30.0.0 $search parameter added
-	 */
-	public function getDisabledUsers(?int $limit = null, int $offset = 0, string $search = ''): array;
-
-	/**
-	 * Search known users (from phonebook sync) by displayName
-	 *
-	 * @param string $searcher
-	 * @param string $pattern
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @return IUser[]
-	 * @since 21.0.1
-	 */
-	public function searchKnownUsersByDisplayName(string $searcher, string $pattern, ?int $limit = null, ?int $offset = null): array;
-
-	/**
-	 * @param string $uid
-	 * @param string $password
-	 * @throws \InvalidArgumentException
-	 * @return false|\OCP\IUser the created user or false
-	 * @since 8.0.0
-	 */
-	public function createUser($uid, $password);
-
-	/**
-	 * @param string $uid
-	 * @param string $password
-	 * @param UserInterface $backend
-	 * @return IUser|null
-	 * @throws \InvalidArgumentException
-	 * @since 12.0.0
-	 */
-	public function createUserFromBackend($uid, $password, UserInterface $backend);
-
-	/**
-	 * Get how many users per backend exist (if supported by backend)
-	 *
-	 * @return array<string, int> an array of backend class name as key and count number as value
-	 * @since 8.0.0
-	 */
-	public function countUsers();
-
-	/**
-	 * Get how many users exists in total, whithin limit
-	 *
-	 * @param int $limit Limit the count to avoid resource waste. 0 to disable
-	 * @param bool $onlyMappedUsers Count mapped users instead of all users for compatible backends
-	 *
-	 * @since 31.0.0
-	 */
-	public function countUsersTotal(int $limit = 0, bool $onlyMappedUsers = false): int|false;
-
-	/**
-	 * @param \Closure $callback
-	 * @psalm-param \Closure(\OCP\IUser):void $callback
-	 * @param string $search
-	 * @since 9.0.0
-	 */
-	public function callForAllUsers(\Closure $callback, $search = '');
-
-	/**
-	 * returns how many users have logged in once
-	 *
-	 * @return int
-	 * @since 11.0.0
-	 */
-	public function countDisabledUsers();
-
-	/**
-	 * returns how many users have logged in once
-	 *
-	 * @return int
-	 * @since 11.0.0
-	 */
-	public function countSeenUsers();
-
-	/**
-	 * @param \Closure $callback
-	 * @psalm-param \Closure(\OCP\IUser):?bool $callback
-	 * @since 11.0.0
-	 */
-	public function callForSeenUsers(\Closure $callback);
-
-	/**
-	 * returns all users having the provided email set as system email address
-	 *
-	 * @param string $email
-	 * @return IUser[]
-	 * @since 9.1.0
-	 */
-	public function getByEmail($email);
-
-	/**
-	 * @param string $uid The user ID to validate
-	 * @param bool $checkDataDirectory Whether it should be checked if files for the ID exist inside the data directory
-	 * @throws \InvalidArgumentException Message is an already translated string with a reason why the ID is not valid
-	 * @since 26.0.0
-	 */
-	public function validateUserId(string $uid, bool $checkDataDirectory = false): void;
-
-	/**
-	 * Gets the list of users sorted by lastLogin, from most recent to least recent
-	 *
-	 * @param int|null $limit how many records to fetch
-	 * @param int $offset from which offset to fetch
-	 * @param string $search search users based on search params
-	 * @return list<string> list of user IDs
-	 * @since 30.0.0
-	 */
-	public function getLastLoggedInUsers(?int $limit = null, int $offset = 0, string $search = ''): array;
-
-	/**
-	 * Gets the list of users.
-	 * An iterator is returned allowing the caller to stop the iteration at any time.
-	 * The offset argument allows the caller to continue the iteration at a specific offset.
-	 *
-	 * @param int $offset from which offset to fetch
-	 * @param int|null $limit maximum number of records to fetch
-	 * @return \Iterator<IUser> list of IUser object
-	 * @since 32.0.0
-	 */
-	public function getSeenUsers(int $offset = 0, ?int $limit = null): \Iterator;
+    /**
+     * @since 26.0.0
+     */
+    public const MAX_PASSWORD_LENGTH = 469;
+
+    /**
+     * register a user backend
+     *
+     * @since 8.0.0
+     * @return void
+     */
+    public function registerBackend(UserInterface $backend);
+
+    /**
+     * Get the active backends
+     * @return UserInterface[]
+     * @since 8.0.0
+     */
+    public function getBackends();
+
+    /**
+     * remove a user backend
+     *
+     * @since 8.0.0
+     * @return void
+     */
+    public function removeBackend(UserInterface $backend);
+
+    /**
+     * remove all user backends
+     * @since 8.0.0
+     * @return void
+     */
+    public function clearBackends();
+
+    /**
+     * get a user by user id
+     *
+     * @param string $uid
+     * @return \OCP\IUser|null Either the user or null if the specified user does not exist
+     * @since 8.0.0
+     */
+    public function get($uid);
+
+    /**
+     * Get the display name of a user
+     *
+     * @param string $uid
+     * @return string|null
+     * @since 25.0.0
+     */
+    public function getDisplayName(string $uid): ?string;
+
+    /**
+     * check if a user exists
+     *
+     * @param string $uid
+     * @return bool
+     * @since 8.0.0
+     */
+    public function userExists($uid);
+
+    /**
+     * Check if the password is valid for the user
+     *
+     * @param string $loginName
+     * @param string $password
+     * @return IUser|false the User object on success, false otherwise
+     * @since 8.0.0
+     */
+    public function checkPassword($loginName, $password);
+
+    /**
+     * search by user id
+     *
+     * @param string $pattern
+     * @param int $limit
+     * @param int $offset
+     * @return \OCP\IUser[]
+     * @since 8.0.0
+     * @deprecated 27.0.0, use searchDisplayName instead
+     */
+    public function search($pattern, $limit = null, $offset = null);
+
+    /**
+     * search by displayName
+     *
+     * @param string $pattern
+     * @param int $limit
+     * @param int $offset
+     * @return list<IUser>
+     * @since 8.0.0
+     */
+    public function searchDisplayName($pattern, $limit = null, $offset = null);
+
+    /**
+     * @return IUser[]
+     * @since 28.0.0
+     * @since 30.0.0 $search parameter added
+     */
+    public function getDisabledUsers(?int $limit = null, int $offset = 0, string $search = ''): array;
+
+    /**
+     * Search known users (from phonebook sync) by displayName
+     *
+     * @param string $searcher
+     * @param string $pattern
+     * @param int|null $limit
+     * @param int|null $offset
+     * @return IUser[]
+     * @since 21.0.1
+     */
+    public function searchKnownUsersByDisplayName(string $searcher, string $pattern, ?int $limit = null, ?int $offset = null): array;
+
+    /**
+     * @param string $uid
+     * @param string $password
+     * @throws \InvalidArgumentException
+     * @return false|\OCP\IUser the created user or false
+     * @since 8.0.0
+     */
+    public function createUser($uid, $password);
+
+    /**
+     * @param string $uid
+     * @param string $password
+     * @param UserInterface $backend
+     * @return IUser|null
+     * @throws \InvalidArgumentException
+     * @since 12.0.0
+     */
+    public function createUserFromBackend($uid, $password, UserInterface $backend);
+
+    /**
+     * Get how many users per backend exist (if supported by backend)
+     *
+     * @return array<string, int> an array of backend class name as key and count number as value
+     * @since 8.0.0
+     */
+    public function countUsers();
+
+    /**
+     * Get how many users exists in total, whithin limit
+     *
+     * @param int $limit Limit the count to avoid resource waste. 0 to disable
+     * @param bool $onlyMappedUsers Count mapped users instead of all users for compatible backends
+     *
+     * @since 31.0.0
+     */
+    public function countUsersTotal(int $limit = 0, bool $onlyMappedUsers = false): int|false;
+
+    /**
+     * @param \Closure $callback
+     * @psalm-param \Closure(\OCP\IUser):void $callback
+     * @param string $search
+     * @since 9.0.0
+     */
+    public function callForAllUsers(\Closure $callback, $search = '');
+
+    /**
+     * returns how many users have logged in once
+     *
+     * @return int
+     * @since 11.0.0
+     */
+    public function countDisabledUsers();
+
+    /**
+     * returns how many users have logged in once
+     *
+     * @return int
+     * @since 11.0.0
+     */
+    public function countSeenUsers();
+
+    /**
+     * @param \Closure $callback
+     * @psalm-param \Closure(\OCP\IUser):?bool $callback
+     * @since 11.0.0
+     */
+    public function callForSeenUsers(\Closure $callback);
+
+    /**
+     * returns all users having the provided email set as system email address
+     *
+     * @param string $email
+     * @return IUser[]
+     * @since 9.1.0
+     */
+    public function getByEmail($email);
+
+    /**
+     * @param string $uid The user ID to validate
+     * @param bool $checkDataDirectory Whether it should be checked if files for the ID exist inside the data directory
+     * @throws \InvalidArgumentException Message is an already translated string with a reason why the ID is not valid
+     * @since 26.0.0
+     */
+    public function validateUserId(string $uid, bool $checkDataDirectory = false): void;
+
+    /**
+     * Gets the list of users sorted by lastLogin, from most recent to least recent
+     *
+     * @param int|null $limit how many records to fetch
+     * @param int $offset from which offset to fetch
+     * @param string $search search users based on search params
+     * @return list<string> list of user IDs
+     * @since 30.0.0
+     */
+    public function getLastLoggedInUsers(?int $limit = null, int $offset = 0, string $search = ''): array;
+
+    /**
+     * Gets the list of users.
+     * An iterator is returned allowing the caller to stop the iteration at any time.
+     * The offset argument allows the caller to continue the iteration at a specific offset.
+     *
+     * @param int $offset from which offset to fetch
+     * @param int|null $limit maximum number of records to fetch
+     * @return \Iterator<IUser> list of IUser object
+     * @since 32.0.0
+     */
+    public function getSeenUsers(int $offset = 0, ?int $limit = null): \Iterator;
 }

lib/public/IGroupManager.php

Indentation +117 added lines, -117 removed lines

@@ -23,121 +23,121 @@
  * @since 8.0.0
  */
 interface IGroupManager {
-	/**
-	 * Checks whether a given backend is used
-	 *
-	 * @param string $backendClass Full classname including complete namespace
-	 * @return bool
-	 * @since 8.1.0
-	 */
-	public function isBackendUsed($backendClass);
-
-	/**
-	 * @param \OCP\GroupInterface $backend
-	 * @since 8.0.0
-	 */
-	public function addBackend($backend);
-
-	/**
-	 * @since 8.0.0
-	 */
-	public function clearBackends();
-
-	/**
-	 * Get the active backends
-	 * @return \OCP\GroupInterface[]
-	 * @since 13.0.0
-	 */
-	public function getBackends();
-
-	/**
-	 * @param string $gid
-	 * @return \OCP\IGroup|null
-	 * @since 8.0.0
-	 */
-	public function get($gid);
-
-	/**
-	 * @param string $gid
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function groupExists($gid);
-
-	/**
-	 * @param string $gid
-	 * @return \OCP\IGroup|null
-	 * @since 8.0.0
-	 */
-	public function createGroup($gid);
-
-	/**
-	 * @param string $search
-	 * @param ?int $limit
-	 * @param ?int $offset
-	 * @return list<IGroup>
-	 * @since 8.0.0
-	 */
-	public function search(string $search, ?int $limit = null, ?int $offset = 0);
-
-	/**
-	 * @param \OCP\IUser|null $user
-	 * @return \OCP\IGroup[]
-	 * @since 8.0.0
-	 */
-	public function getUserGroups(?IUser $user = null);
-
-	/**
-	 * @param \OCP\IUser $user
-	 * @return string[] with group names
-	 * @since 8.0.0
-	 */
-	public function getUserGroupIds(IUser $user): array;
-
-	/**
-	 * get a list of all display names in a group
-	 *
-	 * @param string $gid
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array an array of display names (value) and user ids (key)
-	 * @since 8.0.0
-	 */
-	public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0);
-
-	/**
-	 * Checks if a userId is in the admin group
-	 * @param string $userId
-	 * @return bool if admin
-	 * @since 8.0.0
-	 */
-	public function isAdmin($userId);
-
-	/**
-	 * Checks if a userId is eligible to users administration delegation
-	 * @param string $userId
-	 * @return bool if delegated admin
-	 * @since 30.0.0
-	 */
-	public function isDelegatedAdmin(string $userId): bool;
-
-	/**
-	 * Checks if a userId is in a group
-	 * @param string $userId
-	 * @param string $group
-	 * @return bool if in group
-	 * @since 8.0.0
-	 */
-	public function isInGroup($userId, $group);
-
-	/**
-	 * Get the display name of a Nextcloud group
-	 *
-	 * @param string $groupId
-	 * @return ?string display name, if any
-	 *
-	 * @since 26.0.0
-	 */
-	public function getDisplayName(string $groupId): ?string;
+    /**
+     * Checks whether a given backend is used
+     *
+     * @param string $backendClass Full classname including complete namespace
+     * @return bool
+     * @since 8.1.0
+     */
+    public function isBackendUsed($backendClass);
+
+    /**
+     * @param \OCP\GroupInterface $backend
+     * @since 8.0.0
+     */
+    public function addBackend($backend);
+
+    /**
+     * @since 8.0.0
+     */
+    public function clearBackends();
+
+    /**
+     * Get the active backends
+     * @return \OCP\GroupInterface[]
+     * @since 13.0.0
+     */
+    public function getBackends();
+
+    /**
+     * @param string $gid
+     * @return \OCP\IGroup|null
+     * @since 8.0.0
+     */
+    public function get($gid);
+
+    /**
+     * @param string $gid
+     * @return bool
+     * @since 8.0.0
+     */
+    public function groupExists($gid);
+
+    /**
+     * @param string $gid
+     * @return \OCP\IGroup|null
+     * @since 8.0.0
+     */
+    public function createGroup($gid);
+
+    /**
+     * @param string $search
+     * @param ?int $limit
+     * @param ?int $offset
+     * @return list<IGroup>
+     * @since 8.0.0
+     */
+    public function search(string $search, ?int $limit = null, ?int $offset = 0);
+
+    /**
+     * @param \OCP\IUser|null $user
+     * @return \OCP\IGroup[]
+     * @since 8.0.0
+     */
+    public function getUserGroups(?IUser $user = null);
+
+    /**
+     * @param \OCP\IUser $user
+     * @return string[] with group names
+     * @since 8.0.0
+     */
+    public function getUserGroupIds(IUser $user): array;
+
+    /**
+     * get a list of all display names in a group
+     *
+     * @param string $gid
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return array an array of display names (value) and user ids (key)
+     * @since 8.0.0
+     */
+    public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0);
+
+    /**
+     * Checks if a userId is in the admin group
+     * @param string $userId
+     * @return bool if admin
+     * @since 8.0.0
+     */
+    public function isAdmin($userId);
+
+    /**
+     * Checks if a userId is eligible to users administration delegation
+     * @param string $userId
+     * @return bool if delegated admin
+     * @since 30.0.0
+     */
+    public function isDelegatedAdmin(string $userId): bool;
+
+    /**
+     * Checks if a userId is in a group
+     * @param string $userId
+     * @param string $group
+     * @return bool if in group
+     * @since 8.0.0
+     */
+    public function isInGroup($userId, $group);
+
+    /**
+     * Get the display name of a Nextcloud group
+     *
+     * @param string $groupId
+     * @return ?string display name, if any
+     *
+     * @since 26.0.0
+     */
+    public function getDisplayName(string $groupId): ?string;
 }

lib/private/User/Manager.php

Indentation +768 added lines, -768 removed lines

@@ -53,772 +53,772 @@
  * @package OC\User
  */
 class Manager extends PublicEmitter implements IUserManager {
-	/**
-	 * @var UserInterface[] $backends
-	 */
-	private array $backends = [];
-
-	/**
-	 * @var array<string,\OC\User\User> $cachedUsers
-	 */
-	private array $cachedUsers = [];
-
-	private ICache $cache;
-
-	private DisplayNameCache $displayNameCache;
-
-	public function __construct(
-		private IConfig $config,
-		ICacheFactory $cacheFactory,
-		private IEventDispatcher $eventDispatcher,
-		private LoggerInterface $logger,
-	) {
-		$this->cache = new WithLocalCache($cacheFactory->createDistributed('user_backend_map'));
-		$this->listen('\OC\User', 'postDelete', function (IUser $user): void {
-			unset($this->cachedUsers[$user->getUID()]);
-		});
-		$this->displayNameCache = new DisplayNameCache($cacheFactory, $this);
-	}
-
-	/**
-	 * Get the active backends
-	 * @return UserInterface[]
-	 */
-	public function getBackends(): array {
-		return $this->backends;
-	}
-
-	public function registerBackend(UserInterface $backend): void {
-		$this->backends[] = $backend;
-	}
-
-	public function removeBackend(UserInterface $backend): void {
-		$this->cachedUsers = [];
-		if (($i = array_search($backend, $this->backends)) !== false) {
-			unset($this->backends[$i]);
-		}
-	}
-
-	public function clearBackends(): void {
-		$this->cachedUsers = [];
-		$this->backends = [];
-	}
-
-	/**
-	 * get a user by user id
-	 *
-	 * @param string $uid
-	 * @return \OC\User\User|null Either the user or null if the specified user does not exist
-	 */
-	public function get($uid) {
-		if (is_null($uid) || $uid === '' || $uid === false) {
-			return null;
-		}
-		if (isset($this->cachedUsers[$uid])) { //check the cache first to prevent having to loop over the backends
-			return $this->cachedUsers[$uid];
-		}
-
-		if (strlen($uid) > IUser::MAX_USERID_LENGTH) {
-			return null;
-		}
-
-		$cachedBackend = $this->cache->get(sha1($uid));
-		if ($cachedBackend !== null && isset($this->backends[$cachedBackend])) {
-			// Cache has the info of the user backend already, so ask that one directly
-			$backend = $this->backends[$cachedBackend];
-			if ($backend->userExists($uid)) {
-				return $this->getUserObject($uid, $backend);
-			}
-		}
-
-		foreach ($this->backends as $i => $backend) {
-			if ($i === $cachedBackend) {
-				// Tried that one already
-				continue;
-			}
-
-			if ($backend->userExists($uid)) {
-				// Hash $uid to ensure that only valid characters are used for the cache key
-				$this->cache->set(sha1($uid), $i, 300);
-				return $this->getUserObject($uid, $backend);
-			}
-		}
-		return null;
-	}
-
-	public function getDisplayName(string $uid): ?string {
-		return $this->displayNameCache->getDisplayName($uid);
-	}
-
-	/**
-	 * get or construct the user object
-	 *
-	 * @param string $uid
-	 * @param \OCP\UserInterface $backend
-	 * @param bool $cacheUser If false the newly created user object will not be cached
-	 * @return \OC\User\User
-	 */
-	public function getUserObject($uid, $backend, $cacheUser = true) {
-		if ($backend instanceof IGetRealUIDBackend) {
-			$uid = $backend->getRealUID($uid);
-		}
-
-		if (isset($this->cachedUsers[$uid])) {
-			return $this->cachedUsers[$uid];
-		}
-
-		$user = new User($uid, $backend, $this->eventDispatcher, $this, $this->config);
-		if ($cacheUser) {
-			$this->cachedUsers[$uid] = $user;
-		}
-		return $user;
-	}
-
-	/**
-	 * check if a user exists
-	 *
-	 * @param string $uid
-	 * @return bool
-	 */
-	public function userExists($uid) {
-		if (strlen($uid) > IUser::MAX_USERID_LENGTH) {
-			return false;
-		}
-
-		$user = $this->get($uid);
-		return ($user !== null);
-	}
-
-	/**
-	 * Check if the password is valid for the user
-	 *
-	 * @param string $loginName
-	 * @param string $password
-	 * @return IUser|false the User object on success, false otherwise
-	 */
-	public function checkPassword($loginName, $password) {
-		$result = $this->checkPasswordNoLogging($loginName, $password);
-
-		if ($result === false) {
-			$this->logger->warning('Login failed: \'' . $loginName . '\' (Remote IP: \'' . \OC::$server->getRequest()->getRemoteAddress() . '\')', ['app' => 'core']);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Check if the password is valid for the user
-	 *
-	 * @internal
-	 * @param string $loginName
-	 * @param string $password
-	 * @return IUser|false the User object on success, false otherwise
-	 */
-	public function checkPasswordNoLogging($loginName, $password) {
-		$loginName = str_replace("\0", '', $loginName);
-		$password = str_replace("\0", '', $password);
-
-		$cachedBackend = $this->cache->get($loginName);
-		if ($cachedBackend !== null && isset($this->backends[$cachedBackend])) {
-			$backends = [$this->backends[$cachedBackend]];
-		} else {
-			$backends = $this->backends;
-		}
-		foreach ($backends as $backend) {
-			if ($backend instanceof ICheckPasswordBackend || $backend->implementsActions(Backend::CHECK_PASSWORD)) {
-				/** @var ICheckPasswordBackend $backend */
-				$uid = $backend->checkPassword($loginName, $password);
-				if ($uid !== false) {
-					return $this->getUserObject($uid, $backend);
-				}
-			}
-		}
-
-		// since http basic auth doesn't provide a standard way of handling non ascii password we allow password to be urlencoded
-		// we only do this decoding after using the plain password fails to maintain compatibility with any password that happens
-		// to contain urlencoded patterns by "accident".
-		$password = urldecode($password);
-
-		foreach ($backends as $backend) {
-			if ($backend instanceof ICheckPasswordBackend || $backend->implementsActions(Backend::CHECK_PASSWORD)) {
-				/** @var ICheckPasswordBackend|UserInterface $backend */
-				$uid = $backend->checkPassword($loginName, $password);
-				if ($uid !== false) {
-					return $this->getUserObject($uid, $backend);
-				}
-			}
-		}
-
-		return false;
-	}
-
-	public function search($pattern, $limit = null, $offset = null) {
-		$users = [];
-		foreach ($this->backends as $backend) {
-			$backendUsers = $backend->getUsers($pattern, $limit, $offset);
-			if (is_array($backendUsers)) {
-				foreach ($backendUsers as $uid) {
-					$users[$uid] = new LazyUser($uid, $this, null, $backend);
-				}
-			}
-		}
-
-		uasort($users, function (IUser $a, IUser $b) {
-			return strcasecmp($a->getUID(), $b->getUID());
-		});
-		return $users;
-	}
-
-	public function searchDisplayName($pattern, $limit = null, $offset = null) {
-		$users = [];
-		foreach ($this->backends as $backend) {
-			$backendUsers = $backend->getDisplayNames($pattern, $limit, $offset);
-			if (is_array($backendUsers)) {
-				foreach ($backendUsers as $uid => $displayName) {
-					$users[] = new LazyUser($uid, $this, $displayName, $backend);
-				}
-			}
-		}
-
-		usort($users, function (IUser $a, IUser $b) {
-			return strcasecmp($a->getDisplayName(), $b->getDisplayName());
-		});
-		return $users;
-	}
-
-	/**
-	 * @return IUser[]
-	 */
-	public function getDisabledUsers(?int $limit = null, int $offset = 0, string $search = ''): array {
-		$users = $this->config->getUsersForUserValue('core', 'enabled', 'false');
-		$users = array_combine(
-			$users,
-			array_map(
-				fn (string $uid): IUser => new LazyUser($uid, $this),
-				$users
-			)
-		);
-		if ($search !== '') {
-			$users = array_filter(
-				$users,
-				function (IUser $user) use ($search): bool {
-					try {
-						return mb_stripos($user->getUID(), $search) !== false
-						|| mb_stripos($user->getDisplayName(), $search) !== false
-						|| mb_stripos($user->getEMailAddress() ?? '', $search) !== false;
-					} catch (NoUserException $ex) {
-						$this->logger->error('Error while filtering disabled users', ['exception' => $ex, 'userUID' => $user->getUID()]);
-						return false;
-					}
-				});
-		}
-
-		$tempLimit = ($limit === null ? null : $limit + $offset);
-		foreach ($this->backends as $backend) {
-			if (($tempLimit !== null) && (count($users) >= $tempLimit)) {
-				break;
-			}
-			if ($backend instanceof IProvideEnabledStateBackend) {
-				$backendUsers = $backend->getDisabledUserList(($tempLimit === null ? null : $tempLimit - count($users)), 0, $search);
-				foreach ($backendUsers as $uid) {
-					$users[$uid] = new LazyUser($uid, $this, null, $backend);
-				}
-			}
-		}
-
-		return array_slice($users, $offset, $limit);
-	}
-
-	/**
-	 * Search known users (from phonebook sync) by displayName
-	 *
-	 * @param string $searcher
-	 * @param string $pattern
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @return IUser[]
-	 */
-	public function searchKnownUsersByDisplayName(string $searcher, string $pattern, ?int $limit = null, ?int $offset = null): array {
-		$users = [];
-		foreach ($this->backends as $backend) {
-			if ($backend instanceof ISearchKnownUsersBackend) {
-				$backendUsers = $backend->searchKnownUsersByDisplayName($searcher, $pattern, $limit, $offset);
-			} else {
-				// Better than nothing, but filtering after pagination can remove lots of results.
-				$backendUsers = $backend->getDisplayNames($pattern, $limit, $offset);
-			}
-			if (is_array($backendUsers)) {
-				foreach ($backendUsers as $uid => $displayName) {
-					$users[] = $this->getUserObject($uid, $backend);
-				}
-			}
-		}
-
-		usort($users, function ($a, $b) {
-			/**
-			 * @var IUser $a
-			 * @var IUser $b
-			 */
-			return strcasecmp($a->getDisplayName(), $b->getDisplayName());
-		});
-		return $users;
-	}
-
-	/**
-	 * @param string $uid
-	 * @param string $password
-	 * @return false|IUser the created user or false
-	 * @throws \InvalidArgumentException
-	 * @throws HintException
-	 */
-	public function createUser($uid, $password) {
-		// DI injection is not used here as IRegistry needs the user manager itself for user count and thus it would create a cyclic dependency
-		/** @var IAssertion $assertion */
-		$assertion = \OC::$server->get(IAssertion::class);
-		$assertion->createUserIsLegit();
-
-		$localBackends = [];
-		foreach ($this->backends as $backend) {
-			if ($backend instanceof Database) {
-				// First check if there is another user backend
-				$localBackends[] = $backend;
-				continue;
-			}
-
-			if ($backend->implementsActions(Backend::CREATE_USER)) {
-				return $this->createUserFromBackend($uid, $password, $backend);
-			}
-		}
-
-		foreach ($localBackends as $backend) {
-			if ($backend->implementsActions(Backend::CREATE_USER)) {
-				return $this->createUserFromBackend($uid, $password, $backend);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * @param string $uid
-	 * @param string $password
-	 * @param UserInterface $backend
-	 * @return IUser|false
-	 * @throws \InvalidArgumentException
-	 */
-	public function createUserFromBackend($uid, $password, UserInterface $backend) {
-		$l = \OCP\Util::getL10N('lib');
-
-		$this->validateUserId($uid, true);
-
-		// No empty password
-		if (trim($password) === '') {
-			throw new \InvalidArgumentException($l->t('A valid password must be provided'));
-		}
-
-		// Check if user already exists
-		if ($this->userExists($uid)) {
-			throw new \InvalidArgumentException($l->t('The Login is already being used'));
-		}
-
-		/** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
-		$this->emit('\OC\User', 'preCreateUser', [$uid, $password]);
-		$this->eventDispatcher->dispatchTyped(new BeforeUserCreatedEvent($uid, $password));
-		$state = $backend->createUser($uid, $password);
-		if ($state === false) {
-			throw new \InvalidArgumentException($l->t('Could not create account'));
-		}
-		$user = $this->getUserObject($uid, $backend);
-		if ($user instanceof IUser) {
-			/** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
-			$this->emit('\OC\User', 'postCreateUser', [$user, $password]);
-			$this->eventDispatcher->dispatchTyped(new UserCreatedEvent($user, $password));
-			return $user;
-		}
-		return false;
-	}
-
-	/**
-	 * returns how many users per backend exist (if supported by backend)
-	 *
-	 * @param boolean $hasLoggedIn when true only users that have a lastLogin
-	 *                             entry in the preferences table will be affected
-	 * @return array<string, int> an array of backend class as key and count number as value
-	 */
-	public function countUsers() {
-		$userCountStatistics = [];
-		foreach ($this->backends as $backend) {
-			if ($backend instanceof ICountUsersBackend || $backend->implementsActions(Backend::COUNT_USERS)) {
-				/** @var ICountUsersBackend|IUserBackend $backend */
-				$backendUsers = $backend->countUsers();
-				if ($backendUsers !== false) {
-					if ($backend instanceof IUserBackend) {
-						$name = $backend->getBackendName();
-					} else {
-						$name = get_class($backend);
-					}
-					if (isset($userCountStatistics[$name])) {
-						$userCountStatistics[$name] += $backendUsers;
-					} else {
-						$userCountStatistics[$name] = $backendUsers;
-					}
-				}
-			}
-		}
-		return $userCountStatistics;
-	}
-
-	public function countUsersTotal(int $limit = 0, bool $onlyMappedUsers = false): int|false {
-		$userCount = false;
-
-		foreach ($this->backends as $backend) {
-			if ($onlyMappedUsers && $backend instanceof ICountMappedUsersBackend) {
-				$backendUsers = $backend->countMappedUsers();
-			} elseif ($backend instanceof ILimitAwareCountUsersBackend) {
-				$backendUsers = $backend->countUsers($limit);
-			} elseif ($backend instanceof ICountUsersBackend || $backend->implementsActions(Backend::COUNT_USERS)) {
-				/** @var ICountUsersBackend $backend */
-				$backendUsers = $backend->countUsers();
-			} else {
-				$this->logger->debug('Skip backend for user count: ' . get_class($backend));
-				continue;
-			}
-			if ($backendUsers !== false) {
-				$userCount = (int)$userCount + $backendUsers;
-				if ($limit > 0) {
-					if ($userCount >= $limit) {
-						break;
-					}
-					$limit -= $userCount;
-				}
-			} else {
-				$this->logger->warning('Can not determine user count for ' . get_class($backend));
-			}
-		}
-		return $userCount;
-	}
-
-	/**
-	 * returns how many users per backend exist in the requested groups (if supported by backend)
-	 *
-	 * @param IGroup[] $groups an array of groups to search in
-	 * @param int $limit limit to stop counting
-	 * @return array{int,int} total number of users, and number of disabled users in the given groups, below $limit. If limit is reached, -1 is returned for number of disabled users
-	 */
-	public function countUsersAndDisabledUsersOfGroups(array $groups, int $limit): array {
-		$users = [];
-		$disabled = [];
-		foreach ($groups as $group) {
-			foreach ($group->getUsers() as $user) {
-				$users[$user->getUID()] = 1;
-				if (!$user->isEnabled()) {
-					$disabled[$user->getUID()] = 1;
-				}
-				if (count($users) >= $limit) {
-					return [count($users),-1];
-				}
-			}
-		}
-		return [count($users),count($disabled)];
-	}
-
-	/**
-	 * The callback is executed for each user on each backend.
-	 * If the callback returns false no further users will be retrieved.
-	 *
-	 * @psalm-param \Closure(\OCP\IUser):?bool $callback
-	 * @param string $search
-	 * @param boolean $onlySeen when true only users that have a lastLogin entry
-	 *                          in the preferences table will be affected
-	 * @since 9.0.0
-	 */
-	public function callForAllUsers(\Closure $callback, $search = '', $onlySeen = false) {
-		if ($onlySeen) {
-			$this->callForSeenUsers($callback);
-		} else {
-			foreach ($this->getBackends() as $backend) {
-				$limit = 500;
-				$offset = 0;
-				do {
-					$users = $backend->getUsers($search, $limit, $offset);
-					foreach ($users as $uid) {
-						if (!$backend->userExists($uid)) {
-							continue;
-						}
-						$user = $this->getUserObject($uid, $backend, false);
-						$return = $callback($user);
-						if ($return === false) {
-							break;
-						}
-					}
-					$offset += $limit;
-				} while (count($users) >= $limit);
-			}
-		}
-	}
-
-	/**
-	 * returns how many users are disabled
-	 *
-	 * @return int
-	 * @since 12.0.0
-	 */
-	public function countDisabledUsers(): int {
-		$queryBuilder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-		$queryBuilder->select($queryBuilder->func()->count('*'))
-			->from('preferences')
-			->where($queryBuilder->expr()->eq('appid', $queryBuilder->createNamedParameter('core')))
-			->andWhere($queryBuilder->expr()->eq('configkey', $queryBuilder->createNamedParameter('enabled')))
-			->andWhere($queryBuilder->expr()->eq('configvalue', $queryBuilder->createNamedParameter('false'), IQueryBuilder::PARAM_STR));
-
-
-		$result = $queryBuilder->executeQuery();
-		$count = $result->fetchOne();
-		$result->closeCursor();
-
-		if ($count !== false) {
-			$count = (int)$count;
-		} else {
-			$count = 0;
-		}
-
-		return $count;
-	}
-
-	/**
-	 * returns how many users have logged in once
-	 *
-	 * @return int
-	 * @since 11.0.0
-	 */
-	public function countSeenUsers() {
-		$queryBuilder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-		$queryBuilder->select($queryBuilder->func()->count('*'))
-			->from('preferences')
-			->where($queryBuilder->expr()->eq('appid', $queryBuilder->createNamedParameter('login')))
-			->andWhere($queryBuilder->expr()->eq('configkey', $queryBuilder->createNamedParameter('lastLogin')));
-
-		$query = $queryBuilder->executeQuery();
-
-		$result = (int)$query->fetchOne();
-		$query->closeCursor();
-
-		return $result;
-	}
-
-	public function callForSeenUsers(\Closure $callback) {
-		$users = $this->getSeenUsers();
-		foreach ($users as $user) {
-			$return = $callback($user);
-			if ($return === false) {
-				return;
-			}
-		}
-	}
-
-	/**
-	 * Getting all userIds that have a lastLogin value requires checking the
-	 * value in php because on oracle you cannot use a clob in a where clause,
-	 * preventing us from doing a not null or length(value) > 0 check.
-	 *
-	 * @param int $limit
-	 * @param int $offset
-	 * @return string[] with user ids
-	 */
-	private function getSeenUserIds($limit = null, $offset = null) {
-		$queryBuilder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-		$queryBuilder->select(['userid'])
-			->from('preferences')
-			->where($queryBuilder->expr()->eq(
-				'appid', $queryBuilder->createNamedParameter('login'))
-			)
-			->andWhere($queryBuilder->expr()->eq(
-				'configkey', $queryBuilder->createNamedParameter('lastLogin'))
-			)
-			->andWhere($queryBuilder->expr()->isNotNull('configvalue')
-			);
-
-		if ($limit !== null) {
-			$queryBuilder->setMaxResults($limit);
-		}
-		if ($offset !== null) {
-			$queryBuilder->setFirstResult($offset);
-		}
-		$query = $queryBuilder->executeQuery();
-		$result = [];
-
-		while ($row = $query->fetch()) {
-			$result[] = $row['userid'];
-		}
-
-		$query->closeCursor();
-
-		return $result;
-	}
-
-	/**
-	 * @param string $email
-	 * @return IUser[]
-	 * @since 9.1.0
-	 */
-	public function getByEmail($email) {
-		// looking for 'email' only (and not primary_mail) is intentional
-		$userIds = $this->config->getUsersForUserValueCaseInsensitive('settings', 'email', $email);
-
-		$users = array_map(function ($uid) {
-			return $this->get($uid);
-		}, $userIds);
-
-		return array_values(array_filter($users, function ($u) {
-			return ($u instanceof IUser);
-		}));
-	}
-
-	/**
-	 * @param string $uid
-	 * @param bool $checkDataDirectory
-	 * @throws \InvalidArgumentException Message is an already translated string with a reason why the id is not valid
-	 * @since 26.0.0
-	 */
-	public function validateUserId(string $uid, bool $checkDataDirectory = false): void {
-		$l = Server::get(IFactory::class)->get('lib');
-
-		// Check the ID for bad characters
-		// Allowed are: "a-z", "A-Z", "0-9", spaces and "_.@-'"
-		if (preg_match('/[^a-zA-Z0-9 _.@\-\']/', $uid)) {
-			throw new \InvalidArgumentException($l->t('Only the following characters are allowed in an Login:'
-				. ' "a-z", "A-Z", "0-9", spaces and "_.@-\'"'));
-		}
-
-		// No empty user ID
-		if (trim($uid) === '') {
-			throw new \InvalidArgumentException($l->t('A valid Login must be provided'));
-		}
-
-		// No whitespace at the beginning or at the end
-		if (trim($uid) !== $uid) {
-			throw new \InvalidArgumentException($l->t('Login contains whitespace at the beginning or at the end'));
-		}
-
-		// User ID only consists of 1 or 2 dots (directory traversal)
-		if ($uid === '.' || $uid === '..') {
-			throw new \InvalidArgumentException($l->t('Login must not consist of dots only'));
-		}
-
-		// User ID is too long
-		if (strlen($uid) > IUser::MAX_USERID_LENGTH) {
-			// TRANSLATORS User ID is too long
-			throw new \InvalidArgumentException($l->t('Username is too long'));
-		}
-
-		if (!$this->verifyUid($uid, $checkDataDirectory)) {
-			throw new \InvalidArgumentException($l->t('Login is invalid because files already exist for this user'));
-		}
-	}
-
-	/**
-	 * Gets the list of user ids sorted by lastLogin, from most recent to least recent
-	 *
-	 * @param int|null $limit how many users to fetch (default: 25, max: 100)
-	 * @param int $offset from which offset to fetch
-	 * @param string $search search users based on search params
-	 * @return list<string> list of user IDs
-	 */
-	public function getLastLoggedInUsers(?int $limit = null, int $offset = 0, string $search = ''): array {
-		// We can't load all users who already logged in
-		$limit = min(100, $limit ?: 25);
-
-		$connection = \OC::$server->getDatabaseConnection();
-		$queryBuilder = $connection->getQueryBuilder();
-		$queryBuilder->select('pref_login.userid')
-			->from('preferences', 'pref_login')
-			->where($queryBuilder->expr()->eq('pref_login.appid', $queryBuilder->expr()->literal('login')))
-			->andWhere($queryBuilder->expr()->eq('pref_login.configkey', $queryBuilder->expr()->literal('lastLogin')))
-			->setFirstResult($offset)
-			->setMaxResults($limit)
-		;
-
-		// Oracle don't want to run ORDER BY on CLOB column
-		$loginOrder = $connection->getDatabasePlatform() instanceof OraclePlatform
-			? $queryBuilder->expr()->castColumn('pref_login.configvalue', IQueryBuilder::PARAM_INT)
-			: 'pref_login.configvalue';
-		$queryBuilder
-			->orderBy($loginOrder, 'DESC')
-			->addOrderBy($queryBuilder->func()->lower('pref_login.userid'), 'ASC');
-
-		if ($search !== '') {
-			$displayNameMatches = $this->searchDisplayName($search);
-			$matchedUids = array_map(static fn (IUser $u): string => $u->getUID(), $displayNameMatches);
-
-			$queryBuilder
-				->leftJoin('pref_login', 'preferences', 'pref_email', $queryBuilder->expr()->andX(
-					$queryBuilder->expr()->eq('pref_login.userid', 'pref_email.userid'),
-					$queryBuilder->expr()->eq('pref_email.appid', $queryBuilder->expr()->literal('settings')),
-					$queryBuilder->expr()->eq('pref_email.configkey', $queryBuilder->expr()->literal('email')),
-				))
-				->andWhere($queryBuilder->expr()->orX(
-					$queryBuilder->expr()->in('pref_login.userid', $queryBuilder->createNamedParameter($matchedUids, IQueryBuilder::PARAM_STR_ARRAY)),
-				));
-		}
-
-		/** @var list<string> */
-		$list = $queryBuilder->executeQuery()->fetchAll(\PDO::FETCH_COLUMN);
-
-		return $list;
-	}
-
-	private function verifyUid(string $uid, bool $checkDataDirectory = false): bool {
-		$appdata = 'appdata_' . $this->config->getSystemValueString('instanceid');
-
-		if (\in_array($uid, [
-			'.htaccess',
-			'files_external',
-			'__groupfolders',
-			'.ncdata',
-			'owncloud.log',
-			'nextcloud.log',
-			'updater.log',
-			'audit.log',
-			$appdata], true)) {
-			return false;
-		}
-
-		if (!$checkDataDirectory) {
-			return true;
-		}
-
-		$dataDirectory = $this->config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data');
-
-		return !file_exists(rtrim($dataDirectory, '/') . '/' . $uid);
-	}
-
-	public function getDisplayNameCache(): DisplayNameCache {
-		return $this->displayNameCache;
-	}
-
-	public function getSeenUsers(int $offset = 0, ?int $limit = null): \Iterator {
-		$maxBatchSize = 1000;
-
-		do {
-			if ($limit !== null) {
-				$batchSize = min($limit, $maxBatchSize);
-				$limit -= $batchSize;
-			} else {
-				$batchSize = $maxBatchSize;
-			}
-
-			$userIds = $this->getSeenUserIds($batchSize, $offset);
-			$offset += $batchSize;
-
-			foreach ($userIds as $userId) {
-				foreach ($this->backends as $backend) {
-					if ($backend->userExists($userId)) {
-						$user = new LazyUser($userId, $this, null, $backend);
-						yield $user;
-						break;
-					}
-				}
-			}
-		} while (count($userIds) === $batchSize && $limit !== 0);
-	}
+    /**
+     * @var UserInterface[] $backends
+     */
+    private array $backends = [];
+
+    /**
+     * @var array<string,\OC\User\User> $cachedUsers
+     */
+    private array $cachedUsers = [];
+
+    private ICache $cache;
+
+    private DisplayNameCache $displayNameCache;
+
+    public function __construct(
+        private IConfig $config,
+        ICacheFactory $cacheFactory,
+        private IEventDispatcher $eventDispatcher,
+        private LoggerInterface $logger,
+    ) {
+        $this->cache = new WithLocalCache($cacheFactory->createDistributed('user_backend_map'));
+        $this->listen('\OC\User', 'postDelete', function (IUser $user): void {
+            unset($this->cachedUsers[$user->getUID()]);
+        });
+        $this->displayNameCache = new DisplayNameCache($cacheFactory, $this);
+    }
+
+    /**
+     * Get the active backends
+     * @return UserInterface[]
+     */
+    public function getBackends(): array {
+        return $this->backends;
+    }
+
+    public function registerBackend(UserInterface $backend): void {
+        $this->backends[] = $backend;
+    }
+
+    public function removeBackend(UserInterface $backend): void {
+        $this->cachedUsers = [];
+        if (($i = array_search($backend, $this->backends)) !== false) {
+            unset($this->backends[$i]);
+        }
+    }
+
+    public function clearBackends(): void {
+        $this->cachedUsers = [];
+        $this->backends = [];
+    }
+
+    /**
+     * get a user by user id
+     *
+     * @param string $uid
+     * @return \OC\User\User|null Either the user or null if the specified user does not exist
+     */
+    public function get($uid) {
+        if (is_null($uid) || $uid === '' || $uid === false) {
+            return null;
+        }
+        if (isset($this->cachedUsers[$uid])) { //check the cache first to prevent having to loop over the backends
+            return $this->cachedUsers[$uid];
+        }
+
+        if (strlen($uid) > IUser::MAX_USERID_LENGTH) {
+            return null;
+        }
+
+        $cachedBackend = $this->cache->get(sha1($uid));
+        if ($cachedBackend !== null && isset($this->backends[$cachedBackend])) {
+            // Cache has the info of the user backend already, so ask that one directly
+            $backend = $this->backends[$cachedBackend];
+            if ($backend->userExists($uid)) {
+                return $this->getUserObject($uid, $backend);
+            }
+        }
+
+        foreach ($this->backends as $i => $backend) {
+            if ($i === $cachedBackend) {
+                // Tried that one already
+                continue;
+            }
+
+            if ($backend->userExists($uid)) {
+                // Hash $uid to ensure that only valid characters are used for the cache key
+                $this->cache->set(sha1($uid), $i, 300);
+                return $this->getUserObject($uid, $backend);
+            }
+        }
+        return null;
+    }
+
+    public function getDisplayName(string $uid): ?string {
+        return $this->displayNameCache->getDisplayName($uid);
+    }
+
+    /**
+     * get or construct the user object
+     *
+     * @param string $uid
+     * @param \OCP\UserInterface $backend
+     * @param bool $cacheUser If false the newly created user object will not be cached
+     * @return \OC\User\User
+     */
+    public function getUserObject($uid, $backend, $cacheUser = true) {
+        if ($backend instanceof IGetRealUIDBackend) {
+            $uid = $backend->getRealUID($uid);
+        }
+
+        if (isset($this->cachedUsers[$uid])) {
+            return $this->cachedUsers[$uid];
+        }
+
+        $user = new User($uid, $backend, $this->eventDispatcher, $this, $this->config);
+        if ($cacheUser) {
+            $this->cachedUsers[$uid] = $user;
+        }
+        return $user;
+    }
+
+    /**
+     * check if a user exists
+     *
+     * @param string $uid
+     * @return bool
+     */
+    public function userExists($uid) {
+        if (strlen($uid) > IUser::MAX_USERID_LENGTH) {
+            return false;
+        }
+
+        $user = $this->get($uid);
+        return ($user !== null);
+    }
+
+    /**
+     * Check if the password is valid for the user
+     *
+     * @param string $loginName
+     * @param string $password
+     * @return IUser|false the User object on success, false otherwise
+     */
+    public function checkPassword($loginName, $password) {
+        $result = $this->checkPasswordNoLogging($loginName, $password);
+
+        if ($result === false) {
+            $this->logger->warning('Login failed: \'' . $loginName . '\' (Remote IP: \'' . \OC::$server->getRequest()->getRemoteAddress() . '\')', ['app' => 'core']);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Check if the password is valid for the user
+     *
+     * @internal
+     * @param string $loginName
+     * @param string $password
+     * @return IUser|false the User object on success, false otherwise
+     */
+    public function checkPasswordNoLogging($loginName, $password) {
+        $loginName = str_replace("\0", '', $loginName);
+        $password = str_replace("\0", '', $password);
+
+        $cachedBackend = $this->cache->get($loginName);
+        if ($cachedBackend !== null && isset($this->backends[$cachedBackend])) {
+            $backends = [$this->backends[$cachedBackend]];
+        } else {
+            $backends = $this->backends;
+        }
+        foreach ($backends as $backend) {
+            if ($backend instanceof ICheckPasswordBackend || $backend->implementsActions(Backend::CHECK_PASSWORD)) {
+                /** @var ICheckPasswordBackend $backend */
+                $uid = $backend->checkPassword($loginName, $password);
+                if ($uid !== false) {
+                    return $this->getUserObject($uid, $backend);
+                }
+            }
+        }
+
+        // since http basic auth doesn't provide a standard way of handling non ascii password we allow password to be urlencoded
+        // we only do this decoding after using the plain password fails to maintain compatibility with any password that happens
+        // to contain urlencoded patterns by "accident".
+        $password = urldecode($password);
+
+        foreach ($backends as $backend) {
+            if ($backend instanceof ICheckPasswordBackend || $backend->implementsActions(Backend::CHECK_PASSWORD)) {
+                /** @var ICheckPasswordBackend|UserInterface $backend */
+                $uid = $backend->checkPassword($loginName, $password);
+                if ($uid !== false) {
+                    return $this->getUserObject($uid, $backend);
+                }
+            }
+        }
+
+        return false;
+    }
+
+    public function search($pattern, $limit = null, $offset = null) {
+        $users = [];
+        foreach ($this->backends as $backend) {
+            $backendUsers = $backend->getUsers($pattern, $limit, $offset);
+            if (is_array($backendUsers)) {
+                foreach ($backendUsers as $uid) {
+                    $users[$uid] = new LazyUser($uid, $this, null, $backend);
+                }
+            }
+        }
+
+        uasort($users, function (IUser $a, IUser $b) {
+            return strcasecmp($a->getUID(), $b->getUID());
+        });
+        return $users;
+    }
+
+    public function searchDisplayName($pattern, $limit = null, $offset = null) {
+        $users = [];
+        foreach ($this->backends as $backend) {
+            $backendUsers = $backend->getDisplayNames($pattern, $limit, $offset);
+            if (is_array($backendUsers)) {
+                foreach ($backendUsers as $uid => $displayName) {
+                    $users[] = new LazyUser($uid, $this, $displayName, $backend);
+                }
+            }
+        }
+
+        usort($users, function (IUser $a, IUser $b) {
+            return strcasecmp($a->getDisplayName(), $b->getDisplayName());
+        });
+        return $users;
+    }
+
+    /**
+     * @return IUser[]
+     */
+    public function getDisabledUsers(?int $limit = null, int $offset = 0, string $search = ''): array {
+        $users = $this->config->getUsersForUserValue('core', 'enabled', 'false');
+        $users = array_combine(
+            $users,
+            array_map(
+                fn (string $uid): IUser => new LazyUser($uid, $this),
+                $users
+            )
+        );
+        if ($search !== '') {
+            $users = array_filter(
+                $users,
+                function (IUser $user) use ($search): bool {
+                    try {
+                        return mb_stripos($user->getUID(), $search) !== false
+                        || mb_stripos($user->getDisplayName(), $search) !== false
+                        || mb_stripos($user->getEMailAddress() ?? '', $search) !== false;
+                    } catch (NoUserException $ex) {
+                        $this->logger->error('Error while filtering disabled users', ['exception' => $ex, 'userUID' => $user->getUID()]);
+                        return false;
+                    }
+                });
+        }
+
+        $tempLimit = ($limit === null ? null : $limit + $offset);
+        foreach ($this->backends as $backend) {
+            if (($tempLimit !== null) && (count($users) >= $tempLimit)) {
+                break;
+            }
+            if ($backend instanceof IProvideEnabledStateBackend) {
+                $backendUsers = $backend->getDisabledUserList(($tempLimit === null ? null : $tempLimit - count($users)), 0, $search);
+                foreach ($backendUsers as $uid) {
+                    $users[$uid] = new LazyUser($uid, $this, null, $backend);
+                }
+            }
+        }
+
+        return array_slice($users, $offset, $limit);
+    }
+
+    /**
+     * Search known users (from phonebook sync) by displayName
+     *
+     * @param string $searcher
+     * @param string $pattern
+     * @param int|null $limit
+     * @param int|null $offset
+     * @return IUser[]
+     */
+    public function searchKnownUsersByDisplayName(string $searcher, string $pattern, ?int $limit = null, ?int $offset = null): array {
+        $users = [];
+        foreach ($this->backends as $backend) {
+            if ($backend instanceof ISearchKnownUsersBackend) {
+                $backendUsers = $backend->searchKnownUsersByDisplayName($searcher, $pattern, $limit, $offset);
+            } else {
+                // Better than nothing, but filtering after pagination can remove lots of results.
+                $backendUsers = $backend->getDisplayNames($pattern, $limit, $offset);
+            }
+            if (is_array($backendUsers)) {
+                foreach ($backendUsers as $uid => $displayName) {
+                    $users[] = $this->getUserObject($uid, $backend);
+                }
+            }
+        }
+
+        usort($users, function ($a, $b) {
+            /**
+             * @var IUser $a
+             * @var IUser $b
+             */
+            return strcasecmp($a->getDisplayName(), $b->getDisplayName());
+        });
+        return $users;
+    }
+
+    /**
+     * @param string $uid
+     * @param string $password
+     * @return false|IUser the created user or false
+     * @throws \InvalidArgumentException
+     * @throws HintException
+     */
+    public function createUser($uid, $password) {
+        // DI injection is not used here as IRegistry needs the user manager itself for user count and thus it would create a cyclic dependency
+        /** @var IAssertion $assertion */
+        $assertion = \OC::$server->get(IAssertion::class);
+        $assertion->createUserIsLegit();
+
+        $localBackends = [];
+        foreach ($this->backends as $backend) {
+            if ($backend instanceof Database) {
+                // First check if there is another user backend
+                $localBackends[] = $backend;
+                continue;
+            }
+
+            if ($backend->implementsActions(Backend::CREATE_USER)) {
+                return $this->createUserFromBackend($uid, $password, $backend);
+            }
+        }
+
+        foreach ($localBackends as $backend) {
+            if ($backend->implementsActions(Backend::CREATE_USER)) {
+                return $this->createUserFromBackend($uid, $password, $backend);
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $uid
+     * @param string $password
+     * @param UserInterface $backend
+     * @return IUser|false
+     * @throws \InvalidArgumentException
+     */
+    public function createUserFromBackend($uid, $password, UserInterface $backend) {
+        $l = \OCP\Util::getL10N('lib');
+
+        $this->validateUserId($uid, true);
+
+        // No empty password
+        if (trim($password) === '') {
+            throw new \InvalidArgumentException($l->t('A valid password must be provided'));
+        }
+
+        // Check if user already exists
+        if ($this->userExists($uid)) {
+            throw new \InvalidArgumentException($l->t('The Login is already being used'));
+        }
+
+        /** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
+        $this->emit('\OC\User', 'preCreateUser', [$uid, $password]);
+        $this->eventDispatcher->dispatchTyped(new BeforeUserCreatedEvent($uid, $password));
+        $state = $backend->createUser($uid, $password);
+        if ($state === false) {
+            throw new \InvalidArgumentException($l->t('Could not create account'));
+        }
+        $user = $this->getUserObject($uid, $backend);
+        if ($user instanceof IUser) {
+            /** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
+            $this->emit('\OC\User', 'postCreateUser', [$user, $password]);
+            $this->eventDispatcher->dispatchTyped(new UserCreatedEvent($user, $password));
+            return $user;
+        }
+        return false;
+    }
+
+    /**
+     * returns how many users per backend exist (if supported by backend)
+     *
+     * @param boolean $hasLoggedIn when true only users that have a lastLogin
+     *                             entry in the preferences table will be affected
+     * @return array<string, int> an array of backend class as key and count number as value
+     */
+    public function countUsers() {
+        $userCountStatistics = [];
+        foreach ($this->backends as $backend) {
+            if ($backend instanceof ICountUsersBackend || $backend->implementsActions(Backend::COUNT_USERS)) {
+                /** @var ICountUsersBackend|IUserBackend $backend */
+                $backendUsers = $backend->countUsers();
+                if ($backendUsers !== false) {
+                    if ($backend instanceof IUserBackend) {
+                        $name = $backend->getBackendName();
+                    } else {
+                        $name = get_class($backend);
+                    }
+                    if (isset($userCountStatistics[$name])) {
+                        $userCountStatistics[$name] += $backendUsers;
+                    } else {
+                        $userCountStatistics[$name] = $backendUsers;
+                    }
+                }
+            }
+        }
+        return $userCountStatistics;
+    }
+
+    public function countUsersTotal(int $limit = 0, bool $onlyMappedUsers = false): int|false {
+        $userCount = false;
+
+        foreach ($this->backends as $backend) {
+            if ($onlyMappedUsers && $backend instanceof ICountMappedUsersBackend) {
+                $backendUsers = $backend->countMappedUsers();
+            } elseif ($backend instanceof ILimitAwareCountUsersBackend) {
+                $backendUsers = $backend->countUsers($limit);
+            } elseif ($backend instanceof ICountUsersBackend || $backend->implementsActions(Backend::COUNT_USERS)) {
+                /** @var ICountUsersBackend $backend */
+                $backendUsers = $backend->countUsers();
+            } else {
+                $this->logger->debug('Skip backend for user count: ' . get_class($backend));
+                continue;
+            }
+            if ($backendUsers !== false) {
+                $userCount = (int)$userCount + $backendUsers;
+                if ($limit > 0) {
+                    if ($userCount >= $limit) {
+                        break;
+                    }
+                    $limit -= $userCount;
+                }
+            } else {
+                $this->logger->warning('Can not determine user count for ' . get_class($backend));
+            }
+        }
+        return $userCount;
+    }
+
+    /**
+     * returns how many users per backend exist in the requested groups (if supported by backend)
+     *
+     * @param IGroup[] $groups an array of groups to search in
+     * @param int $limit limit to stop counting
+     * @return array{int,int} total number of users, and number of disabled users in the given groups, below $limit. If limit is reached, -1 is returned for number of disabled users
+     */
+    public function countUsersAndDisabledUsersOfGroups(array $groups, int $limit): array {
+        $users = [];
+        $disabled = [];
+        foreach ($groups as $group) {
+            foreach ($group->getUsers() as $user) {
+                $users[$user->getUID()] = 1;
+                if (!$user->isEnabled()) {
+                    $disabled[$user->getUID()] = 1;
+                }
+                if (count($users) >= $limit) {
+                    return [count($users),-1];
+                }
+            }
+        }
+        return [count($users),count($disabled)];
+    }
+
+    /**
+     * The callback is executed for each user on each backend.
+     * If the callback returns false no further users will be retrieved.
+     *
+     * @psalm-param \Closure(\OCP\IUser):?bool $callback
+     * @param string $search
+     * @param boolean $onlySeen when true only users that have a lastLogin entry
+     *                          in the preferences table will be affected
+     * @since 9.0.0
+     */
+    public function callForAllUsers(\Closure $callback, $search = '', $onlySeen = false) {
+        if ($onlySeen) {
+            $this->callForSeenUsers($callback);
+        } else {
+            foreach ($this->getBackends() as $backend) {
+                $limit = 500;
+                $offset = 0;
+                do {
+                    $users = $backend->getUsers($search, $limit, $offset);
+                    foreach ($users as $uid) {
+                        if (!$backend->userExists($uid)) {
+                            continue;
+                        }
+                        $user = $this->getUserObject($uid, $backend, false);
+                        $return = $callback($user);
+                        if ($return === false) {
+                            break;
+                        }
+                    }
+                    $offset += $limit;
+                } while (count($users) >= $limit);
+            }
+        }
+    }
+
+    /**
+     * returns how many users are disabled
+     *
+     * @return int
+     * @since 12.0.0
+     */
+    public function countDisabledUsers(): int {
+        $queryBuilder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+        $queryBuilder->select($queryBuilder->func()->count('*'))
+            ->from('preferences')
+            ->where($queryBuilder->expr()->eq('appid', $queryBuilder->createNamedParameter('core')))
+            ->andWhere($queryBuilder->expr()->eq('configkey', $queryBuilder->createNamedParameter('enabled')))
+            ->andWhere($queryBuilder->expr()->eq('configvalue', $queryBuilder->createNamedParameter('false'), IQueryBuilder::PARAM_STR));
+
+
+        $result = $queryBuilder->executeQuery();
+        $count = $result->fetchOne();
+        $result->closeCursor();
+
+        if ($count !== false) {
+            $count = (int)$count;
+        } else {
+            $count = 0;
+        }
+
+        return $count;
+    }
+
+    /**
+     * returns how many users have logged in once
+     *
+     * @return int
+     * @since 11.0.0
+     */
+    public function countSeenUsers() {
+        $queryBuilder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+        $queryBuilder->select($queryBuilder->func()->count('*'))
+            ->from('preferences')
+            ->where($queryBuilder->expr()->eq('appid', $queryBuilder->createNamedParameter('login')))
+            ->andWhere($queryBuilder->expr()->eq('configkey', $queryBuilder->createNamedParameter('lastLogin')));
+
+        $query = $queryBuilder->executeQuery();
+
+        $result = (int)$query->fetchOne();
+        $query->closeCursor();
+
+        return $result;
+    }
+
+    public function callForSeenUsers(\Closure $callback) {
+        $users = $this->getSeenUsers();
+        foreach ($users as $user) {
+            $return = $callback($user);
+            if ($return === false) {
+                return;
+            }
+        }
+    }
+
+    /**
+     * Getting all userIds that have a lastLogin value requires checking the
+     * value in php because on oracle you cannot use a clob in a where clause,
+     * preventing us from doing a not null or length(value) > 0 check.
+     *
+     * @param int $limit
+     * @param int $offset
+     * @return string[] with user ids
+     */
+    private function getSeenUserIds($limit = null, $offset = null) {
+        $queryBuilder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+        $queryBuilder->select(['userid'])
+            ->from('preferences')
+            ->where($queryBuilder->expr()->eq(
+                'appid', $queryBuilder->createNamedParameter('login'))
+            )
+            ->andWhere($queryBuilder->expr()->eq(
+                'configkey', $queryBuilder->createNamedParameter('lastLogin'))
+            )
+            ->andWhere($queryBuilder->expr()->isNotNull('configvalue')
+            );
+
+        if ($limit !== null) {
+            $queryBuilder->setMaxResults($limit);
+        }
+        if ($offset !== null) {
+            $queryBuilder->setFirstResult($offset);
+        }
+        $query = $queryBuilder->executeQuery();
+        $result = [];
+
+        while ($row = $query->fetch()) {
+            $result[] = $row['userid'];
+        }
+
+        $query->closeCursor();
+
+        return $result;
+    }
+
+    /**
+     * @param string $email
+     * @return IUser[]
+     * @since 9.1.0
+     */
+    public function getByEmail($email) {
+        // looking for 'email' only (and not primary_mail) is intentional
+        $userIds = $this->config->getUsersForUserValueCaseInsensitive('settings', 'email', $email);
+
+        $users = array_map(function ($uid) {
+            return $this->get($uid);
+        }, $userIds);
+
+        return array_values(array_filter($users, function ($u) {
+            return ($u instanceof IUser);
+        }));
+    }
+
+    /**
+     * @param string $uid
+     * @param bool $checkDataDirectory
+     * @throws \InvalidArgumentException Message is an already translated string with a reason why the id is not valid
+     * @since 26.0.0
+     */
+    public function validateUserId(string $uid, bool $checkDataDirectory = false): void {
+        $l = Server::get(IFactory::class)->get('lib');
+
+        // Check the ID for bad characters
+        // Allowed are: "a-z", "A-Z", "0-9", spaces and "_.@-'"
+        if (preg_match('/[^a-zA-Z0-9 _.@\-\']/', $uid)) {
+            throw new \InvalidArgumentException($l->t('Only the following characters are allowed in an Login:'
+                . ' "a-z", "A-Z", "0-9", spaces and "_.@-\'"'));
+        }
+
+        // No empty user ID
+        if (trim($uid) === '') {
+            throw new \InvalidArgumentException($l->t('A valid Login must be provided'));
+        }
+
+        // No whitespace at the beginning or at the end
+        if (trim($uid) !== $uid) {
+            throw new \InvalidArgumentException($l->t('Login contains whitespace at the beginning or at the end'));
+        }
+
+        // User ID only consists of 1 or 2 dots (directory traversal)
+        if ($uid === '.' || $uid === '..') {
+            throw new \InvalidArgumentException($l->t('Login must not consist of dots only'));
+        }
+
+        // User ID is too long
+        if (strlen($uid) > IUser::MAX_USERID_LENGTH) {
+            // TRANSLATORS User ID is too long
+            throw new \InvalidArgumentException($l->t('Username is too long'));
+        }
+
+        if (!$this->verifyUid($uid, $checkDataDirectory)) {
+            throw new \InvalidArgumentException($l->t('Login is invalid because files already exist for this user'));
+        }
+    }
+
+    /**
+     * Gets the list of user ids sorted by lastLogin, from most recent to least recent
+     *
+     * @param int|null $limit how many users to fetch (default: 25, max: 100)
+     * @param int $offset from which offset to fetch
+     * @param string $search search users based on search params
+     * @return list<string> list of user IDs
+     */
+    public function getLastLoggedInUsers(?int $limit = null, int $offset = 0, string $search = ''): array {
+        // We can't load all users who already logged in
+        $limit = min(100, $limit ?: 25);
+
+        $connection = \OC::$server->getDatabaseConnection();
+        $queryBuilder = $connection->getQueryBuilder();
+        $queryBuilder->select('pref_login.userid')
+            ->from('preferences', 'pref_login')
+            ->where($queryBuilder->expr()->eq('pref_login.appid', $queryBuilder->expr()->literal('login')))
+            ->andWhere($queryBuilder->expr()->eq('pref_login.configkey', $queryBuilder->expr()->literal('lastLogin')))
+            ->setFirstResult($offset)
+            ->setMaxResults($limit)
+        ;
+
+        // Oracle don't want to run ORDER BY on CLOB column
+        $loginOrder = $connection->getDatabasePlatform() instanceof OraclePlatform
+            ? $queryBuilder->expr()->castColumn('pref_login.configvalue', IQueryBuilder::PARAM_INT)
+            : 'pref_login.configvalue';
+        $queryBuilder
+            ->orderBy($loginOrder, 'DESC')
+            ->addOrderBy($queryBuilder->func()->lower('pref_login.userid'), 'ASC');
+
+        if ($search !== '') {
+            $displayNameMatches = $this->searchDisplayName($search);
+            $matchedUids = array_map(static fn (IUser $u): string => $u->getUID(), $displayNameMatches);
+
+            $queryBuilder
+                ->leftJoin('pref_login', 'preferences', 'pref_email', $queryBuilder->expr()->andX(
+                    $queryBuilder->expr()->eq('pref_login.userid', 'pref_email.userid'),
+                    $queryBuilder->expr()->eq('pref_email.appid', $queryBuilder->expr()->literal('settings')),
+                    $queryBuilder->expr()->eq('pref_email.configkey', $queryBuilder->expr()->literal('email')),
+                ))
+                ->andWhere($queryBuilder->expr()->orX(
+                    $queryBuilder->expr()->in('pref_login.userid', $queryBuilder->createNamedParameter($matchedUids, IQueryBuilder::PARAM_STR_ARRAY)),
+                ));
+        }
+
+        /** @var list<string> */
+        $list = $queryBuilder->executeQuery()->fetchAll(\PDO::FETCH_COLUMN);
+
+        return $list;
+    }
+
+    private function verifyUid(string $uid, bool $checkDataDirectory = false): bool {
+        $appdata = 'appdata_' . $this->config->getSystemValueString('instanceid');
+
+        if (\in_array($uid, [
+            '.htaccess',
+            'files_external',
+            '__groupfolders',
+            '.ncdata',
+            'owncloud.log',
+            'nextcloud.log',
+            'updater.log',
+            'audit.log',
+            $appdata], true)) {
+            return false;
+        }
+
+        if (!$checkDataDirectory) {
+            return true;
+        }
+
+        $dataDirectory = $this->config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data');
+
+        return !file_exists(rtrim($dataDirectory, '/') . '/' . $uid);
+    }
+
+    public function getDisplayNameCache(): DisplayNameCache {
+        return $this->displayNameCache;
+    }
+
+    public function getSeenUsers(int $offset = 0, ?int $limit = null): \Iterator {
+        $maxBatchSize = 1000;
+
+        do {
+            if ($limit !== null) {
+                $batchSize = min($limit, $maxBatchSize);
+                $limit -= $batchSize;
+            } else {
+                $batchSize = $maxBatchSize;
+            }
+
+            $userIds = $this->getSeenUserIds($batchSize, $offset);
+            $offset += $batchSize;
+
+            foreach ($userIds as $userId) {
+                foreach ($this->backends as $backend) {
+                    if ($backend->userExists($userId)) {
+                        $user = new LazyUser($userId, $this, null, $backend);
+                        yield $user;
+                        break;
+                    }
+                }
+            }
+        } while (count($userIds) === $batchSize && $limit !== 0);
+    }
 }

lib/private/Group/Manager.php

Indentation +426 added lines, -426 removed lines

@@ -40,430 +40,430 @@
  * @package OC\Group
  */
 class Manager extends PublicEmitter implements IGroupManager {
-	/** @var GroupInterface[] */
-	private $backends = [];
-
-	/** @var array<string, IGroup> */
-	private $cachedGroups = [];
-
-	/** @var array<string, list<string>> */
-	private $cachedUserGroups = [];
-
-	/** @var \OC\SubAdmin */
-	private $subAdmin = null;
-
-	private DisplayNameCache $displayNameCache;
-
-	private const MAX_GROUP_LENGTH = 255;
-
-	public function __construct(
-		private \OC\User\Manager $userManager,
-		private IEventDispatcher $dispatcher,
-		private LoggerInterface $logger,
-		ICacheFactory $cacheFactory,
-		private IRemoteAddress $remoteAddress,
-	) {
-		$this->displayNameCache = new DisplayNameCache($cacheFactory, $this);
-
-		$this->listen('\OC\Group', 'postDelete', function (IGroup $group): void {
-			unset($this->cachedGroups[$group->getGID()]);
-			$this->cachedUserGroups = [];
-		});
-		$this->listen('\OC\Group', 'postAddUser', function (IGroup $group): void {
-			$this->cachedUserGroups = [];
-		});
-		$this->listen('\OC\Group', 'postRemoveUser', function (IGroup $group): void {
-			$this->cachedUserGroups = [];
-		});
-	}
-
-	/**
-	 * Checks whether a given backend is used
-	 *
-	 * @param string $backendClass Full classname including complete namespace
-	 * @return bool
-	 */
-	public function isBackendUsed($backendClass) {
-		$backendClass = strtolower(ltrim($backendClass, '\\'));
-
-		foreach ($this->backends as $backend) {
-			if (strtolower(get_class($backend)) === $backendClass) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * @param \OCP\GroupInterface $backend
-	 */
-	public function addBackend($backend) {
-		$this->backends[] = $backend;
-		$this->clearCaches();
-	}
-
-	public function clearBackends() {
-		$this->backends = [];
-		$this->clearCaches();
-	}
-
-	/**
-	 * Get the active backends
-	 *
-	 * @return \OCP\GroupInterface[]
-	 */
-	public function getBackends() {
-		return $this->backends;
-	}
-
-
-	protected function clearCaches() {
-		$this->cachedGroups = [];
-		$this->cachedUserGroups = [];
-	}
-
-	/**
-	 * @param string $gid
-	 * @return IGroup|null
-	 */
-	public function get($gid) {
-		if (isset($this->cachedGroups[$gid])) {
-			return $this->cachedGroups[$gid];
-		}
-		return $this->getGroupObject($gid);
-	}
-
-	/**
-	 * @param string $gid
-	 * @param string $displayName
-	 * @return \OCP\IGroup|null
-	 */
-	protected function getGroupObject($gid, $displayName = null) {
-		$backends = [];
-		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(Backend::GROUP_DETAILS)) {
-				$groupData = $backend->getGroupDetails($gid);
-				if (is_array($groupData) && !empty($groupData)) {
-					// take the display name from the last backend that has a non-null one
-					if (is_null($displayName) && isset($groupData['displayName'])) {
-						$displayName = $groupData['displayName'];
-					}
-					$backends[] = $backend;
-				}
-			} elseif ($backend->groupExists($gid)) {
-				$backends[] = $backend;
-			}
-		}
-		if (count($backends) === 0) {
-			return null;
-		}
-		/** @var GroupInterface[] $backends */
-		$this->cachedGroups[$gid] = new Group($gid, $backends, $this->dispatcher, $this->userManager, $this, $displayName);
-		return $this->cachedGroups[$gid];
-	}
-
-	/**
-	 * @brief Batch method to create group objects
-	 *
-	 * @param list<string> $gids List of groupIds for which we want to create a IGroup object
-	 * @param array<string, string> $displayNames Array containing already know display name for a groupId
-	 * @return array<string, IGroup>
-	 */
-	protected function getGroupsObjects(array $gids, array $displayNames = []): array {
-		$backends = [];
-		$groups = [];
-		foreach ($gids as $gid) {
-			$backends[$gid] = [];
-			if (!isset($displayNames[$gid])) {
-				$displayNames[$gid] = null;
-			}
-		}
-		foreach ($this->backends as $backend) {
-			if ($backend instanceof IGroupDetailsBackend || $backend->implementsActions(GroupInterface::GROUP_DETAILS)) {
-				/** @var IGroupDetailsBackend $backend */
-				if ($backend instanceof IBatchMethodsBackend) {
-					$groupDatas = $backend->getGroupsDetails($gids);
-				} else {
-					$groupDatas = [];
-					foreach ($gids as $gid) {
-						$groupDatas[$gid] = $backend->getGroupDetails($gid);
-					}
-				}
-				foreach ($groupDatas as $gid => $groupData) {
-					if (!empty($groupData)) {
-						// take the display name from the last backend that has a non-null one
-						if (isset($groupData['displayName'])) {
-							$displayNames[$gid] = $groupData['displayName'];
-						}
-						$backends[$gid][] = $backend;
-					}
-				}
-			} else {
-				if ($backend instanceof IBatchMethodsBackend) {
-					$existingGroups = $backend->groupsExists($gids);
-				} else {
-					$existingGroups = array_filter($gids, fn (string $gid): bool => $backend->groupExists($gid));
-				}
-				foreach ($existingGroups as $group) {
-					$backends[$group][] = $backend;
-				}
-			}
-		}
-		foreach ($gids as $gid) {
-			if (count($backends[$gid]) === 0) {
-				continue;
-			}
-			$this->cachedGroups[$gid] = new Group($gid, $backends[$gid], $this->dispatcher, $this->userManager, $this, $displayNames[$gid]);
-			$groups[$gid] = $this->cachedGroups[$gid];
-		}
-		return $groups;
-	}
-
-	/**
-	 * @param string $gid
-	 * @return bool
-	 */
-	public function groupExists($gid) {
-		return $this->get($gid) instanceof IGroup;
-	}
-
-	/**
-	 * @param string $gid
-	 * @return IGroup|null
-	 */
-	public function createGroup($gid) {
-		if ($gid === '' || $gid === null) {
-			return null;
-		} elseif ($group = $this->get($gid)) {
-			return $group;
-		} elseif (mb_strlen($gid) > self::MAX_GROUP_LENGTH) {
-			throw new \Exception('Group name is limited to ' . self::MAX_GROUP_LENGTH . ' characters');
-		} else {
-			$this->dispatcher->dispatchTyped(new BeforeGroupCreatedEvent($gid));
-			$this->emit('\OC\Group', 'preCreate', [$gid]);
-			foreach ($this->backends as $backend) {
-				if ($backend->implementsActions(Backend::CREATE_GROUP)) {
-					if ($backend instanceof ICreateNamedGroupBackend) {
-						$groupName = $gid;
-						if (($gid = $backend->createGroup($groupName)) !== null) {
-							$group = $this->getGroupObject($gid);
-							$this->dispatcher->dispatchTyped(new GroupCreatedEvent($group));
-							$this->emit('\OC\Group', 'postCreate', [$group]);
-							return $group;
-						}
-					} elseif ($backend->createGroup($gid)) {
-						$group = $this->getGroupObject($gid);
-						$this->dispatcher->dispatchTyped(new GroupCreatedEvent($group));
-						$this->emit('\OC\Group', 'postCreate', [$group]);
-						return $group;
-					}
-				}
-			}
-			return null;
-		}
-	}
-
-	public function search(string $search, ?int $limit = null, ?int $offset = 0) {
-		$groups = [];
-		foreach ($this->backends as $backend) {
-			$groupIds = $backend->getGroups($search, $limit ?? -1, $offset ?? 0);
-			$newGroups = $this->getGroupsObjects($groupIds);
-			foreach ($newGroups as $groupId => $group) {
-				$groups[$groupId] = $group;
-			}
-			if (!is_null($limit) && $limit <= 0) {
-				return array_values($groups);
-			}
-		}
-		return array_values($groups);
-	}
-
-	/**
-	 * @param IUser|null $user
-	 * @return \OC\Group\Group[]
-	 */
-	public function getUserGroups(?IUser $user = null) {
-		if (!$user instanceof IUser) {
-			return [];
-		}
-		return $this->getUserIdGroups($user->getUID());
-	}
-
-	/**
-	 * @param string $uid the user id
-	 * @return \OC\Group\Group[]
-	 */
-	public function getUserIdGroups(string $uid): array {
-		$groups = [];
-
-		foreach ($this->getUserIdGroupIds($uid) as $groupId) {
-			$aGroup = $this->get($groupId);
-			if ($aGroup instanceof IGroup) {
-				$groups[$groupId] = $aGroup;
-			} else {
-				$this->logger->debug('User "' . $uid . '" belongs to deleted group: "' . $groupId . '"', ['app' => 'core']);
-			}
-		}
-
-		return $groups;
-	}
-
-	/**
-	 * Checks if a userId is in the admin group
-	 *
-	 * @param string $userId
-	 * @return bool if admin
-	 */
-	public function isAdmin($userId) {
-		if (!$this->remoteAddress->allowsAdminActions()) {
-			return false;
-		}
-
-		foreach ($this->backends as $backend) {
-			if (is_string($userId) && $backend->implementsActions(Backend::IS_ADMIN) && $backend->isAdmin($userId)) {
-				return true;
-			}
-		}
-		return $this->isInGroup($userId, 'admin');
-	}
-
-	public function isDelegatedAdmin(string $userId): bool {
-		if (!$this->remoteAddress->allowsAdminActions()) {
-			return false;
-		}
-
-		// Check if the user as admin delegation for users listing
-		$authorizedGroupMapper = \OCP\Server::get(AuthorizedGroupMapper::class);
-		$user = $this->userManager->get($userId);
-		$authorizedClasses = $authorizedGroupMapper->findAllClassesForUser($user);
-		return in_array(\OCA\Settings\Settings\Admin\Users::class, $authorizedClasses, true);
-	}
-
-	/**
-	 * Checks if a userId is in a group
-	 *
-	 * @param string $userId
-	 * @param string $group
-	 * @return bool if in group
-	 */
-	public function isInGroup($userId, $group) {
-		return in_array($group, $this->getUserIdGroupIds($userId));
-	}
-
-	/**
-	 * get a list of group ids for a user
-	 *
-	 * @param IUser $user
-	 * @return list<string> with group ids
-	 */
-	public function getUserGroupIds(IUser $user): array {
-		return $this->getUserIdGroupIds($user->getUID());
-	}
-
-	/**
-	 * @param string $uid the user id
-	 * @return list<string>
-	 */
-	private function getUserIdGroupIds(string $uid): array {
-		if (!isset($this->cachedUserGroups[$uid])) {
-			$groups = [];
-			foreach ($this->backends as $backend) {
-				if ($groupIds = $backend->getUserGroups($uid)) {
-					$groups = array_merge($groups, $groupIds);
-				}
-			}
-			$this->cachedUserGroups[$uid] = $groups;
-		}
-
-		return $this->cachedUserGroups[$uid];
-	}
-
-	/**
-	 * @param string $groupId
-	 * @return ?string
-	 */
-	public function getDisplayName(string $groupId): ?string {
-		return $this->displayNameCache->getDisplayName($groupId);
-	}
-
-	/**
-	 * get an array of groupid and displayName for a user
-	 *
-	 * @param IUser $user
-	 * @return array ['displayName' => displayname]
-	 */
-	public function getUserGroupNames(IUser $user) {
-		return array_map(function ($group) {
-			return ['displayName' => $this->displayNameCache->getDisplayName($group->getGID())];
-		}, $this->getUserGroups($user));
-	}
-
-	/**
-	 * get a list of all display names in a group
-	 *
-	 * @param string $gid
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array an array of display names (value) and user ids (key)
-	 */
-	public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
-		$group = $this->get($gid);
-		if (is_null($group)) {
-			return [];
-		}
-
-		$search = trim($search);
-		$groupUsers = [];
-
-		if (!empty($search)) {
-			// only user backends have the capability to do a complex search for users
-			$searchOffset = 0;
-			$searchLimit = $limit * 100;
-			if ($limit === -1) {
-				$searchLimit = 500;
-			}
-
-			do {
-				$filteredUsers = $this->userManager->searchDisplayName($search, $searchLimit, $searchOffset);
-				foreach ($filteredUsers as $filteredUser) {
-					if ($group->inGroup($filteredUser)) {
-						$groupUsers[] = $filteredUser;
-					}
-				}
-				$searchOffset += $searchLimit;
-			} while (count($groupUsers) < $searchLimit + $offset && count($filteredUsers) >= $searchLimit);
-
-			if ($limit === -1) {
-				$groupUsers = array_slice($groupUsers, $offset);
-			} else {
-				$groupUsers = array_slice($groupUsers, $offset, $limit);
-			}
-		} else {
-			$groupUsers = $group->searchUsers('', $limit, $offset);
-		}
-
-		$matchingUsers = [];
-		foreach ($groupUsers as $groupUser) {
-			$matchingUsers[(string)$groupUser->getUID()] = $groupUser->getDisplayName();
-		}
-		return $matchingUsers;
-	}
-
-	/**
-	 * @return \OC\SubAdmin
-	 */
-	public function getSubAdmin() {
-		if (!$this->subAdmin) {
-			$this->subAdmin = new \OC\SubAdmin(
-				$this->userManager,
-				$this,
-				\OC::$server->getDatabaseConnection(),
-				$this->dispatcher
-			);
-		}
-
-		return $this->subAdmin;
-	}
+    /** @var GroupInterface[] */
+    private $backends = [];
+
+    /** @var array<string, IGroup> */
+    private $cachedGroups = [];
+
+    /** @var array<string, list<string>> */
+    private $cachedUserGroups = [];
+
+    /** @var \OC\SubAdmin */
+    private $subAdmin = null;
+
+    private DisplayNameCache $displayNameCache;
+
+    private const MAX_GROUP_LENGTH = 255;
+
+    public function __construct(
+        private \OC\User\Manager $userManager,
+        private IEventDispatcher $dispatcher,
+        private LoggerInterface $logger,
+        ICacheFactory $cacheFactory,
+        private IRemoteAddress $remoteAddress,
+    ) {
+        $this->displayNameCache = new DisplayNameCache($cacheFactory, $this);
+
+        $this->listen('\OC\Group', 'postDelete', function (IGroup $group): void {
+            unset($this->cachedGroups[$group->getGID()]);
+            $this->cachedUserGroups = [];
+        });
+        $this->listen('\OC\Group', 'postAddUser', function (IGroup $group): void {
+            $this->cachedUserGroups = [];
+        });
+        $this->listen('\OC\Group', 'postRemoveUser', function (IGroup $group): void {
+            $this->cachedUserGroups = [];
+        });
+    }
+
+    /**
+     * Checks whether a given backend is used
+     *
+     * @param string $backendClass Full classname including complete namespace
+     * @return bool
+     */
+    public function isBackendUsed($backendClass) {
+        $backendClass = strtolower(ltrim($backendClass, '\\'));
+
+        foreach ($this->backends as $backend) {
+            if (strtolower(get_class($backend)) === $backendClass) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param \OCP\GroupInterface $backend
+     */
+    public function addBackend($backend) {
+        $this->backends[] = $backend;
+        $this->clearCaches();
+    }
+
+    public function clearBackends() {
+        $this->backends = [];
+        $this->clearCaches();
+    }
+
+    /**
+     * Get the active backends
+     *
+     * @return \OCP\GroupInterface[]
+     */
+    public function getBackends() {
+        return $this->backends;
+    }
+
+
+    protected function clearCaches() {
+        $this->cachedGroups = [];
+        $this->cachedUserGroups = [];
+    }
+
+    /**
+     * @param string $gid
+     * @return IGroup|null
+     */
+    public function get($gid) {
+        if (isset($this->cachedGroups[$gid])) {
+            return $this->cachedGroups[$gid];
+        }
+        return $this->getGroupObject($gid);
+    }
+
+    /**
+     * @param string $gid
+     * @param string $displayName
+     * @return \OCP\IGroup|null
+     */
+    protected function getGroupObject($gid, $displayName = null) {
+        $backends = [];
+        foreach ($this->backends as $backend) {
+            if ($backend->implementsActions(Backend::GROUP_DETAILS)) {
+                $groupData = $backend->getGroupDetails($gid);
+                if (is_array($groupData) && !empty($groupData)) {
+                    // take the display name from the last backend that has a non-null one
+                    if (is_null($displayName) && isset($groupData['displayName'])) {
+                        $displayName = $groupData['displayName'];
+                    }
+                    $backends[] = $backend;
+                }
+            } elseif ($backend->groupExists($gid)) {
+                $backends[] = $backend;
+            }
+        }
+        if (count($backends) === 0) {
+            return null;
+        }
+        /** @var GroupInterface[] $backends */
+        $this->cachedGroups[$gid] = new Group($gid, $backends, $this->dispatcher, $this->userManager, $this, $displayName);
+        return $this->cachedGroups[$gid];
+    }
+
+    /**
+     * @brief Batch method to create group objects
+     *
+     * @param list<string> $gids List of groupIds for which we want to create a IGroup object
+     * @param array<string, string> $displayNames Array containing already know display name for a groupId
+     * @return array<string, IGroup>
+     */
+    protected function getGroupsObjects(array $gids, array $displayNames = []): array {
+        $backends = [];
+        $groups = [];
+        foreach ($gids as $gid) {
+            $backends[$gid] = [];
+            if (!isset($displayNames[$gid])) {
+                $displayNames[$gid] = null;
+            }
+        }
+        foreach ($this->backends as $backend) {
+            if ($backend instanceof IGroupDetailsBackend || $backend->implementsActions(GroupInterface::GROUP_DETAILS)) {
+                /** @var IGroupDetailsBackend $backend */
+                if ($backend instanceof IBatchMethodsBackend) {
+                    $groupDatas = $backend->getGroupsDetails($gids);
+                } else {
+                    $groupDatas = [];
+                    foreach ($gids as $gid) {
+                        $groupDatas[$gid] = $backend->getGroupDetails($gid);
+                    }
+                }
+                foreach ($groupDatas as $gid => $groupData) {
+                    if (!empty($groupData)) {
+                        // take the display name from the last backend that has a non-null one
+                        if (isset($groupData['displayName'])) {
+                            $displayNames[$gid] = $groupData['displayName'];
+                        }
+                        $backends[$gid][] = $backend;
+                    }
+                }
+            } else {
+                if ($backend instanceof IBatchMethodsBackend) {
+                    $existingGroups = $backend->groupsExists($gids);
+                } else {
+                    $existingGroups = array_filter($gids, fn (string $gid): bool => $backend->groupExists($gid));
+                }
+                foreach ($existingGroups as $group) {
+                    $backends[$group][] = $backend;
+                }
+            }
+        }
+        foreach ($gids as $gid) {
+            if (count($backends[$gid]) === 0) {
+                continue;
+            }
+            $this->cachedGroups[$gid] = new Group($gid, $backends[$gid], $this->dispatcher, $this->userManager, $this, $displayNames[$gid]);
+            $groups[$gid] = $this->cachedGroups[$gid];
+        }
+        return $groups;
+    }
+
+    /**
+     * @param string $gid
+     * @return bool
+     */
+    public function groupExists($gid) {
+        return $this->get($gid) instanceof IGroup;
+    }
+
+    /**
+     * @param string $gid
+     * @return IGroup|null
+     */
+    public function createGroup($gid) {
+        if ($gid === '' || $gid === null) {
+            return null;
+        } elseif ($group = $this->get($gid)) {
+            return $group;
+        } elseif (mb_strlen($gid) > self::MAX_GROUP_LENGTH) {
+            throw new \Exception('Group name is limited to ' . self::MAX_GROUP_LENGTH . ' characters');
+        } else {
+            $this->dispatcher->dispatchTyped(new BeforeGroupCreatedEvent($gid));
+            $this->emit('\OC\Group', 'preCreate', [$gid]);
+            foreach ($this->backends as $backend) {
+                if ($backend->implementsActions(Backend::CREATE_GROUP)) {
+                    if ($backend instanceof ICreateNamedGroupBackend) {
+                        $groupName = $gid;
+                        if (($gid = $backend->createGroup($groupName)) !== null) {
+                            $group = $this->getGroupObject($gid);
+                            $this->dispatcher->dispatchTyped(new GroupCreatedEvent($group));
+                            $this->emit('\OC\Group', 'postCreate', [$group]);
+                            return $group;
+                        }
+                    } elseif ($backend->createGroup($gid)) {
+                        $group = $this->getGroupObject($gid);
+                        $this->dispatcher->dispatchTyped(new GroupCreatedEvent($group));
+                        $this->emit('\OC\Group', 'postCreate', [$group]);
+                        return $group;
+                    }
+                }
+            }
+            return null;
+        }
+    }
+
+    public function search(string $search, ?int $limit = null, ?int $offset = 0) {
+        $groups = [];
+        foreach ($this->backends as $backend) {
+            $groupIds = $backend->getGroups($search, $limit ?? -1, $offset ?? 0);
+            $newGroups = $this->getGroupsObjects($groupIds);
+            foreach ($newGroups as $groupId => $group) {
+                $groups[$groupId] = $group;
+            }
+            if (!is_null($limit) && $limit <= 0) {
+                return array_values($groups);
+            }
+        }
+        return array_values($groups);
+    }
+
+    /**
+     * @param IUser|null $user
+     * @return \OC\Group\Group[]
+     */
+    public function getUserGroups(?IUser $user = null) {
+        if (!$user instanceof IUser) {
+            return [];
+        }
+        return $this->getUserIdGroups($user->getUID());
+    }
+
+    /**
+     * @param string $uid the user id
+     * @return \OC\Group\Group[]
+     */
+    public function getUserIdGroups(string $uid): array {
+        $groups = [];
+
+        foreach ($this->getUserIdGroupIds($uid) as $groupId) {
+            $aGroup = $this->get($groupId);
+            if ($aGroup instanceof IGroup) {
+                $groups[$groupId] = $aGroup;
+            } else {
+                $this->logger->debug('User "' . $uid . '" belongs to deleted group: "' . $groupId . '"', ['app' => 'core']);
+            }
+        }
+
+        return $groups;
+    }
+
+    /**
+     * Checks if a userId is in the admin group
+     *
+     * @param string $userId
+     * @return bool if admin
+     */
+    public function isAdmin($userId) {
+        if (!$this->remoteAddress->allowsAdminActions()) {
+            return false;
+        }
+
+        foreach ($this->backends as $backend) {
+            if (is_string($userId) && $backend->implementsActions(Backend::IS_ADMIN) && $backend->isAdmin($userId)) {
+                return true;
+            }
+        }
+        return $this->isInGroup($userId, 'admin');
+    }
+
+    public function isDelegatedAdmin(string $userId): bool {
+        if (!$this->remoteAddress->allowsAdminActions()) {
+            return false;
+        }
+
+        // Check if the user as admin delegation for users listing
+        $authorizedGroupMapper = \OCP\Server::get(AuthorizedGroupMapper::class);
+        $user = $this->userManager->get($userId);
+        $authorizedClasses = $authorizedGroupMapper->findAllClassesForUser($user);
+        return in_array(\OCA\Settings\Settings\Admin\Users::class, $authorizedClasses, true);
+    }
+
+    /**
+     * Checks if a userId is in a group
+     *
+     * @param string $userId
+     * @param string $group
+     * @return bool if in group
+     */
+    public function isInGroup($userId, $group) {
+        return in_array($group, $this->getUserIdGroupIds($userId));
+    }
+
+    /**
+     * get a list of group ids for a user
+     *
+     * @param IUser $user
+     * @return list<string> with group ids
+     */
+    public function getUserGroupIds(IUser $user): array {
+        return $this->getUserIdGroupIds($user->getUID());
+    }
+
+    /**
+     * @param string $uid the user id
+     * @return list<string>
+     */
+    private function getUserIdGroupIds(string $uid): array {
+        if (!isset($this->cachedUserGroups[$uid])) {
+            $groups = [];
+            foreach ($this->backends as $backend) {
+                if ($groupIds = $backend->getUserGroups($uid)) {
+                    $groups = array_merge($groups, $groupIds);
+                }
+            }
+            $this->cachedUserGroups[$uid] = $groups;
+        }
+
+        return $this->cachedUserGroups[$uid];
+    }
+
+    /**
+     * @param string $groupId
+     * @return ?string
+     */
+    public function getDisplayName(string $groupId): ?string {
+        return $this->displayNameCache->getDisplayName($groupId);
+    }
+
+    /**
+     * get an array of groupid and displayName for a user
+     *
+     * @param IUser $user
+     * @return array ['displayName' => displayname]
+     */
+    public function getUserGroupNames(IUser $user) {
+        return array_map(function ($group) {
+            return ['displayName' => $this->displayNameCache->getDisplayName($group->getGID())];
+        }, $this->getUserGroups($user));
+    }
+
+    /**
+     * get a list of all display names in a group
+     *
+     * @param string $gid
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return array an array of display names (value) and user ids (key)
+     */
+    public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
+        $group = $this->get($gid);
+        if (is_null($group)) {
+            return [];
+        }
+
+        $search = trim($search);
+        $groupUsers = [];
+
+        if (!empty($search)) {
+            // only user backends have the capability to do a complex search for users
+            $searchOffset = 0;
+            $searchLimit = $limit * 100;
+            if ($limit === -1) {
+                $searchLimit = 500;
+            }
+
+            do {
+                $filteredUsers = $this->userManager->searchDisplayName($search, $searchLimit, $searchOffset);
+                foreach ($filteredUsers as $filteredUser) {
+                    if ($group->inGroup($filteredUser)) {
+                        $groupUsers[] = $filteredUser;
+                    }
+                }
+                $searchOffset += $searchLimit;
+            } while (count($groupUsers) < $searchLimit + $offset && count($filteredUsers) >= $searchLimit);
+
+            if ($limit === -1) {
+                $groupUsers = array_slice($groupUsers, $offset);
+            } else {
+                $groupUsers = array_slice($groupUsers, $offset, $limit);
+            }
+        } else {
+            $groupUsers = $group->searchUsers('', $limit, $offset);
+        }
+
+        $matchingUsers = [];
+        foreach ($groupUsers as $groupUser) {
+            $matchingUsers[(string)$groupUser->getUID()] = $groupUser->getDisplayName();
+        }
+        return $matchingUsers;
+    }
+
+    /**
+     * @return \OC\SubAdmin
+     */
+    public function getSubAdmin() {
+        if (!$this->subAdmin) {
+            $this->subAdmin = new \OC\SubAdmin(
+                $this->userManager,
+                $this,
+                \OC::$server->getDatabaseConnection(),
+                $this->dispatcher
+            );
+        }
+
+        return $this->subAdmin;
+    }
 }

apps/provisioning_api/lib/Controller/GroupsController.php

Indentation +287 added lines, -287 removed lines

@@ -39,316 +39,316 @@
  */
 class GroupsController extends AUserDataOCSController {
 
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		IUserManager $userManager,
-		IConfig $config,
-		IGroupManager $groupManager,
-		IUserSession $userSession,
-		IAccountManager $accountManager,
-		ISubAdmin $subAdminManager,
-		IFactory $l10nFactory,
-		IRootFolder $rootFolder,
-		private LoggerInterface $logger,
-	) {
-		parent::__construct($appName,
-			$request,
-			$userManager,
-			$config,
-			$groupManager,
-			$userSession,
-			$accountManager,
-			$subAdminManager,
-			$l10nFactory,
-			$rootFolder,
-		);
-	}
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        IUserManager $userManager,
+        IConfig $config,
+        IGroupManager $groupManager,
+        IUserSession $userSession,
+        IAccountManager $accountManager,
+        ISubAdmin $subAdminManager,
+        IFactory $l10nFactory,
+        IRootFolder $rootFolder,
+        private LoggerInterface $logger,
+    ) {
+        parent::__construct($appName,
+            $request,
+            $userManager,
+            $config,
+            $groupManager,
+            $userSession,
+            $accountManager,
+            $subAdminManager,
+            $l10nFactory,
+            $rootFolder,
+        );
+    }
 
-	/**
-	 * Get a list of groups
-	 *
-	 * @param string $search Text to search for
-	 * @param ?int $limit Limit the amount of groups returned
-	 * @param int $offset Offset for searching for groups
-	 * @return DataResponse<Http::STATUS_OK, array{groups: list<string>}, array{}>
-	 *
-	 * 200: Groups returned
-	 */
-	#[NoAdminRequired]
-	public function getGroups(string $search = '', ?int $limit = null, int $offset = 0): DataResponse {
-		$groups = $this->groupManager->search($search, $limit, $offset);
-		$groups = array_map(function ($group) {
-			/** @var IGroup $group */
-			return $group->getGID();
-		}, $groups);
+    /**
+     * Get a list of groups
+     *
+     * @param string $search Text to search for
+     * @param ?int $limit Limit the amount of groups returned
+     * @param int $offset Offset for searching for groups
+     * @return DataResponse<Http::STATUS_OK, array{groups: list<string>}, array{}>
+     *
+     * 200: Groups returned
+     */
+    #[NoAdminRequired]
+    public function getGroups(string $search = '', ?int $limit = null, int $offset = 0): DataResponse {
+        $groups = $this->groupManager->search($search, $limit, $offset);
+        $groups = array_map(function ($group) {
+            /** @var IGroup $group */
+            return $group->getGID();
+        }, $groups);
 
-		return new DataResponse(['groups' => $groups]);
-	}
+        return new DataResponse(['groups' => $groups]);
+    }
 
-	/**
-	 * Get a list of groups details
-	 *
-	 * @param string $search Text to search for
-	 * @param ?int $limit Limit the amount of groups returned
-	 * @param int $offset Offset for searching for groups
-	 * @return DataResponse<Http::STATUS_OK, array{groups: list<Provisioning_APIGroupDetails>}, array{}>
-	 *
-	 * 200: Groups details returned
-	 */
-	#[NoAdminRequired]
-	#[AuthorizedAdminSetting(settings: Sharing::class)]
-	#[AuthorizedAdminSetting(settings: Users::class)]
-	public function getGroupsDetails(string $search = '', ?int $limit = null, int $offset = 0): DataResponse {
-		$groups = $this->groupManager->search($search, $limit, $offset);
-		$groups = array_map(function ($group) {
-			/** @var IGroup $group */
-			return [
-				'id' => $group->getGID(),
-				'displayname' => $group->getDisplayName(),
-				'usercount' => $group->count(),
-				'disabled' => $group->countDisabled(),
-				'canAdd' => $group->canAddUser(),
-				'canRemove' => $group->canRemoveUser(),
-			];
-		}, $groups);
+    /**
+     * Get a list of groups details
+     *
+     * @param string $search Text to search for
+     * @param ?int $limit Limit the amount of groups returned
+     * @param int $offset Offset for searching for groups
+     * @return DataResponse<Http::STATUS_OK, array{groups: list<Provisioning_APIGroupDetails>}, array{}>
+     *
+     * 200: Groups details returned
+     */
+    #[NoAdminRequired]
+    #[AuthorizedAdminSetting(settings: Sharing::class)]
+    #[AuthorizedAdminSetting(settings: Users::class)]
+    public function getGroupsDetails(string $search = '', ?int $limit = null, int $offset = 0): DataResponse {
+        $groups = $this->groupManager->search($search, $limit, $offset);
+        $groups = array_map(function ($group) {
+            /** @var IGroup $group */
+            return [
+                'id' => $group->getGID(),
+                'displayname' => $group->getDisplayName(),
+                'usercount' => $group->count(),
+                'disabled' => $group->countDisabled(),
+                'canAdd' => $group->canAddUser(),
+                'canRemove' => $group->canRemoveUser(),
+            ];
+        }, $groups);
 
-		return new DataResponse(['groups' => $groups]);
-	}
+        return new DataResponse(['groups' => $groups]);
+    }
 
-	/**
-	 * Get a list of users in the specified group
-	 *
-	 * @param string $groupId ID of the group
-	 * @return DataResponse<Http::STATUS_OK, array{users: list<string>}, array{}>
-	 * @throws OCSException
-	 *
-	 * @deprecated 14 Use getGroupUsers
-	 *
-	 * 200: Group users returned
-	 */
-	#[NoAdminRequired]
-	public function getGroup(string $groupId): DataResponse {
-		return $this->getGroupUsers($groupId);
-	}
+    /**
+     * Get a list of users in the specified group
+     *
+     * @param string $groupId ID of the group
+     * @return DataResponse<Http::STATUS_OK, array{users: list<string>}, array{}>
+     * @throws OCSException
+     *
+     * @deprecated 14 Use getGroupUsers
+     *
+     * 200: Group users returned
+     */
+    #[NoAdminRequired]
+    public function getGroup(string $groupId): DataResponse {
+        return $this->getGroupUsers($groupId);
+    }
 
-	/**
-	 * @NoSubAdminRequired
-	 *
-	 * Get a list of users in the specified group
-	 *
-	 * @param string $groupId ID of the group
-	 * @return DataResponse<Http::STATUS_OK, array{users: list<string>}, array{}>
-	 * @throws OCSException
-	 * @throws OCSNotFoundException Group not found
-	 * @throws OCSForbiddenException Missing permissions to get users in the group
-	 *
-	 * 200: User IDs returned
-	 */
-	#[NoAdminRequired]
-	public function getGroupUsers(string $groupId): DataResponse {
-		$groupId = urldecode($groupId);
+    /**
+     * @NoSubAdminRequired
+     *
+     * Get a list of users in the specified group
+     *
+     * @param string $groupId ID of the group
+     * @return DataResponse<Http::STATUS_OK, array{users: list<string>}, array{}>
+     * @throws OCSException
+     * @throws OCSNotFoundException Group not found
+     * @throws OCSForbiddenException Missing permissions to get users in the group
+     *
+     * 200: User IDs returned
+     */
+    #[NoAdminRequired]
+    public function getGroupUsers(string $groupId): DataResponse {
+        $groupId = urldecode($groupId);
 
-		$user = $this->userSession->getUser();
-		$isSubadminOfGroup = false;
+        $user = $this->userSession->getUser();
+        $isSubadminOfGroup = false;
 
-		// Check the group exists
-		$group = $this->groupManager->get($groupId);
-		if ($group !== null) {
-			$isSubadminOfGroup = $this->groupManager->getSubAdmin()->isSubAdminOfGroup($user, $group);
-			$isMember = $this->groupManager->isInGroup($user->getUID(), $group->getGID());
-		} else {
-			throw new OCSNotFoundException('The requested group could not be found');
-		}
+        // Check the group exists
+        $group = $this->groupManager->get($groupId);
+        if ($group !== null) {
+            $isSubadminOfGroup = $this->groupManager->getSubAdmin()->isSubAdminOfGroup($user, $group);
+            $isMember = $this->groupManager->isInGroup($user->getUID(), $group->getGID());
+        } else {
+            throw new OCSNotFoundException('The requested group could not be found');
+        }
 
-		// Check subadmin has access to this group
-		$isAdmin = $this->groupManager->isAdmin($user->getUID());
-		$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($user->getUID());
-		if ($isAdmin || $isDelegatedAdmin || $isSubadminOfGroup || $isMember) {
-			$users = $this->groupManager->get($groupId)->getUsers();
-			$users = array_map(function ($user) {
-				/** @var IUser $user */
-				return $user->getUID();
-			}, $users);
-			/** @var list<string> $users */
-			$users = array_values($users);
-			return new DataResponse(['users' => $users]);
-		}
+        // Check subadmin has access to this group
+        $isAdmin = $this->groupManager->isAdmin($user->getUID());
+        $isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($user->getUID());
+        if ($isAdmin || $isDelegatedAdmin || $isSubadminOfGroup || $isMember) {
+            $users = $this->groupManager->get($groupId)->getUsers();
+            $users = array_map(function ($user) {
+                /** @var IUser $user */
+                return $user->getUID();
+            }, $users);
+            /** @var list<string> $users */
+            $users = array_values($users);
+            return new DataResponse(['users' => $users]);
+        }
 
-		throw new OCSForbiddenException();
-	}
+        throw new OCSForbiddenException();
+    }
 
-	/**
-	 * Get a list of users details in the specified group
-	 *
-	 * @param string $groupId ID of the group
-	 * @param string $search Text to search for
-	 * @param int|null $limit Limit the amount of groups returned
-	 * @param int $offset Offset for searching for groups
-	 *
-	 * @return DataResponse<Http::STATUS_OK, array{users: array<string, Provisioning_APIUserDetails|array{id: string}>}, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: Group users details returned
-	 */
-	#[NoAdminRequired]
-	public function getGroupUsersDetails(string $groupId, string $search = '', ?int $limit = null, int $offset = 0): DataResponse {
-		$groupId = urldecode($groupId);
-		$currentUser = $this->userSession->getUser();
+    /**
+     * Get a list of users details in the specified group
+     *
+     * @param string $groupId ID of the group
+     * @param string $search Text to search for
+     * @param int|null $limit Limit the amount of groups returned
+     * @param int $offset Offset for searching for groups
+     *
+     * @return DataResponse<Http::STATUS_OK, array{users: array<string, Provisioning_APIUserDetails|array{id: string}>}, array{}>
+     * @throws OCSException
+     *
+     * 200: Group users details returned
+     */
+    #[NoAdminRequired]
+    public function getGroupUsersDetails(string $groupId, string $search = '', ?int $limit = null, int $offset = 0): DataResponse {
+        $groupId = urldecode($groupId);
+        $currentUser = $this->userSession->getUser();
 
-		// Check the group exists
-		$group = $this->groupManager->get($groupId);
-		if ($group !== null) {
-			$isSubadminOfGroup = $this->groupManager->getSubAdmin()->isSubAdminOfGroup($currentUser, $group);
-		} else {
-			throw new OCSException('The requested group could not be found', OCSController::RESPOND_NOT_FOUND);
-		}
+        // Check the group exists
+        $group = $this->groupManager->get($groupId);
+        if ($group !== null) {
+            $isSubadminOfGroup = $this->groupManager->getSubAdmin()->isSubAdminOfGroup($currentUser, $group);
+        } else {
+            throw new OCSException('The requested group could not be found', OCSController::RESPOND_NOT_FOUND);
+        }
 
-		// Check subadmin has access to this group
-		$isAdmin = $this->groupManager->isAdmin($currentUser->getUID());
-		$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($currentUser->getUID());
-		if ($isAdmin || $isDelegatedAdmin || $isSubadminOfGroup) {
-			$users = $group->searchUsers($search, $limit, $offset);
+        // Check subadmin has access to this group
+        $isAdmin = $this->groupManager->isAdmin($currentUser->getUID());
+        $isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($currentUser->getUID());
+        if ($isAdmin || $isDelegatedAdmin || $isSubadminOfGroup) {
+            $users = $group->searchUsers($search, $limit, $offset);
 
-			// Extract required number
-			$usersDetails = [];
-			foreach ($users as $user) {
-				try {
-					/** @var IUser $user */
-					$userId = (string)$user->getUID();
-					$userData = $this->getUserData($userId);
-					// Do not insert empty entry
-					if ($userData !== null) {
-						$usersDetails[$userId] = $userData;
-					} else {
-						// Logged user does not have permissions to see this user
-						// only showing its id
-						$usersDetails[$userId] = ['id' => $userId];
-					}
-				} catch (OCSNotFoundException $e) {
-					// continue if a users ceased to exist.
-				}
-			}
-			return new DataResponse(['users' => $usersDetails]);
-		}
+            // Extract required number
+            $usersDetails = [];
+            foreach ($users as $user) {
+                try {
+                    /** @var IUser $user */
+                    $userId = (string)$user->getUID();
+                    $userData = $this->getUserData($userId);
+                    // Do not insert empty entry
+                    if ($userData !== null) {
+                        $usersDetails[$userId] = $userData;
+                    } else {
+                        // Logged user does not have permissions to see this user
+                        // only showing its id
+                        $usersDetails[$userId] = ['id' => $userId];
+                    }
+                } catch (OCSNotFoundException $e) {
+                    // continue if a users ceased to exist.
+                }
+            }
+            return new DataResponse(['users' => $usersDetails]);
+        }
 
-		throw new OCSException('The requested group could not be found', OCSController::RESPOND_NOT_FOUND);
-	}
+        throw new OCSException('The requested group could not be found', OCSController::RESPOND_NOT_FOUND);
+    }
 
-	/**
-	 * Create a new group
-	 *
-	 * @param string $groupid ID of the group
-	 * @param string $displayname Display name of the group
-	 * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: Group created successfully
-	 */
-	#[AuthorizedAdminSetting(settings:Users::class)]
-	#[PasswordConfirmationRequired]
-	public function addGroup(string $groupid, string $displayname = ''): DataResponse {
-		// Validate name
-		if (empty($groupid)) {
-			$this->logger->error('Group name not supplied', ['app' => 'provisioning_api']);
-			throw new OCSException('Invalid group name', 101);
-		}
-		// Check if it exists
-		if ($this->groupManager->groupExists($groupid)) {
-			throw new OCSException('group exists', 102);
-		}
-		$group = $this->groupManager->createGroup($groupid);
-		if ($group === null) {
-			throw new OCSException('Not supported by backend', 103);
-		}
-		if ($displayname !== '') {
-			$group->setDisplayName($displayname);
-		}
-		return new DataResponse();
-	}
+    /**
+     * Create a new group
+     *
+     * @param string $groupid ID of the group
+     * @param string $displayname Display name of the group
+     * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
+     * @throws OCSException
+     *
+     * 200: Group created successfully
+     */
+    #[AuthorizedAdminSetting(settings:Users::class)]
+    #[PasswordConfirmationRequired]
+    public function addGroup(string $groupid, string $displayname = ''): DataResponse {
+        // Validate name
+        if (empty($groupid)) {
+            $this->logger->error('Group name not supplied', ['app' => 'provisioning_api']);
+            throw new OCSException('Invalid group name', 101);
+        }
+        // Check if it exists
+        if ($this->groupManager->groupExists($groupid)) {
+            throw new OCSException('group exists', 102);
+        }
+        $group = $this->groupManager->createGroup($groupid);
+        if ($group === null) {
+            throw new OCSException('Not supported by backend', 103);
+        }
+        if ($displayname !== '') {
+            $group->setDisplayName($displayname);
+        }
+        return new DataResponse();
+    }
 
-	/**
-	 * Update a group
-	 *
-	 * @param string $groupId ID of the group
-	 * @param string $key Key to update, only 'displayname'
-	 * @param string $value New value for the key
-	 * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: Group updated successfully
-	 */
-	#[AuthorizedAdminSetting(settings:Users::class)]
-	#[PasswordConfirmationRequired]
-	public function updateGroup(string $groupId, string $key, string $value): DataResponse {
-		$groupId = urldecode($groupId);
+    /**
+     * Update a group
+     *
+     * @param string $groupId ID of the group
+     * @param string $key Key to update, only 'displayname'
+     * @param string $value New value for the key
+     * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
+     * @throws OCSException
+     *
+     * 200: Group updated successfully
+     */
+    #[AuthorizedAdminSetting(settings:Users::class)]
+    #[PasswordConfirmationRequired]
+    public function updateGroup(string $groupId, string $key, string $value): DataResponse {
+        $groupId = urldecode($groupId);
 
-		if ($key === 'displayname') {
-			$group = $this->groupManager->get($groupId);
-			if ($group === null) {
-				throw new OCSException('Group does not exist', OCSController::RESPOND_NOT_FOUND);
-			}
-			if ($group->setDisplayName($value)) {
-				return new DataResponse();
-			}
+        if ($key === 'displayname') {
+            $group = $this->groupManager->get($groupId);
+            if ($group === null) {
+                throw new OCSException('Group does not exist', OCSController::RESPOND_NOT_FOUND);
+            }
+            if ($group->setDisplayName($value)) {
+                return new DataResponse();
+            }
 
-			throw new OCSException('Not supported by backend', 101);
-		} else {
-			throw new OCSException('', OCSController::RESPOND_UNKNOWN_ERROR);
-		}
-	}
+            throw new OCSException('Not supported by backend', 101);
+        } else {
+            throw new OCSException('', OCSController::RESPOND_UNKNOWN_ERROR);
+        }
+    }
 
-	/**
-	 * Delete a group
-	 *
-	 * @param string $groupId ID of the group
-	 * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: Group deleted successfully
-	 */
-	#[AuthorizedAdminSetting(settings:Users::class)]
-	#[PasswordConfirmationRequired]
-	public function deleteGroup(string $groupId): DataResponse {
-		$groupId = urldecode($groupId);
+    /**
+     * Delete a group
+     *
+     * @param string $groupId ID of the group
+     * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
+     * @throws OCSException
+     *
+     * 200: Group deleted successfully
+     */
+    #[AuthorizedAdminSetting(settings:Users::class)]
+    #[PasswordConfirmationRequired]
+    public function deleteGroup(string $groupId): DataResponse {
+        $groupId = urldecode($groupId);
 
-		// Check it exists
-		if (!$this->groupManager->groupExists($groupId)) {
-			throw new OCSException('', 101);
-		} elseif ($groupId === 'admin' || !$this->groupManager->get($groupId)->delete()) {
-			// Cannot delete admin group
-			throw new OCSException('', 102);
-		}
+        // Check it exists
+        if (!$this->groupManager->groupExists($groupId)) {
+            throw new OCSException('', 101);
+        } elseif ($groupId === 'admin' || !$this->groupManager->get($groupId)->delete()) {
+            // Cannot delete admin group
+            throw new OCSException('', 102);
+        }
 
-		return new DataResponse();
-	}
+        return new DataResponse();
+    }
 
-	/**
-	 * Get the list of user IDs that are a subadmin of the group
-	 *
-	 * @param string $groupId ID of the group
-	 * @return DataResponse<Http::STATUS_OK, list<string>, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: Sub admins returned
-	 */
-	#[AuthorizedAdminSetting(settings:Users::class)]
-	public function getSubAdminsOfGroup(string $groupId): DataResponse {
-		// Check group exists
-		$targetGroup = $this->groupManager->get($groupId);
-		if ($targetGroup === null) {
-			throw new OCSException('Group does not exist', 101);
-		}
+    /**
+     * Get the list of user IDs that are a subadmin of the group
+     *
+     * @param string $groupId ID of the group
+     * @return DataResponse<Http::STATUS_OK, list<string>, array{}>
+     * @throws OCSException
+     *
+     * 200: Sub admins returned
+     */
+    #[AuthorizedAdminSetting(settings:Users::class)]
+    public function getSubAdminsOfGroup(string $groupId): DataResponse {
+        // Check group exists
+        $targetGroup = $this->groupManager->get($groupId);
+        if ($targetGroup === null) {
+            throw new OCSException('Group does not exist', 101);
+        }
 
-		/** @var IUser[] $subadmins */
-		$subadmins = $this->groupManager->getSubAdmin()->getGroupsSubAdmins($targetGroup);
-		// New class returns IUser[] so convert back
-		/** @var list<string> $uids */
-		$uids = [];
-		foreach ($subadmins as $user) {
-			$uids[] = $user->getUID();
-		}
+        /** @var IUser[] $subadmins */
+        $subadmins = $this->groupManager->getSubAdmin()->getGroupsSubAdmins($targetGroup);
+        // New class returns IUser[] so convert back
+        /** @var list<string> $uids */
+        $uids = [];
+        foreach ($subadmins as $user) {
+            $uids[] = $user->getUID();
+        }
 
-		return new DataResponse($uids);
-	}
+        return new DataResponse($uids);
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -78,7 +78,7 @@ 
 	#[NoAdminRequired]
 	public function getGroups(string $search = '', ?int $limit = null, int $offset = 0): DataResponse {
 		$groups = $this->groupManager->search($search, $limit, $offset);
-		$groups = array_map(function ($group) {
+		$groups = array_map(function($group) {
 			/** @var IGroup $group */
 			return $group->getGID();
 		}, $groups);
@@ -101,7 +101,7 @@ 
 	#[AuthorizedAdminSetting(settings: Users::class)]
 	public function getGroupsDetails(string $search = '', ?int $limit = null, int $offset = 0): DataResponse {
 		$groups = $this->groupManager->search($search, $limit, $offset);
-		$groups = array_map(function ($group) {
+		$groups = array_map(function($group) {
 			/** @var IGroup $group */
 			return [
 				'id' => $group->getGID(),
@@ -166,7 +166,7 @@ 
 		$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($user->getUID());
 		if ($isAdmin || $isDelegatedAdmin || $isSubadminOfGroup || $isMember) {
 			$users = $this->groupManager->get($groupId)->getUsers();
-			$users = array_map(function ($user) {
+			$users = array_map(function($user) {
 				/** @var IUser $user */
 				return $user->getUID();
 			}, $users);
@@ -215,7 +215,7 @@ 
 			foreach ($users as $user) {
 				try {
 					/** @var IUser $user */
-					$userId = (string)$user->getUID();
+					$userId = (string) $user->getUID();
 					$userData = $this->getUserData($userId);
 					// Do not insert empty entry
 					if ($userData !== null) {