nextcloud / server

lib/private/User/Manager.php

Indentation +587 added lines, -587 removed lines

@@ -68,591 +68,591 @@
  * @package OC\User
  */
 class Manager extends PublicEmitter implements IUserManager {
-	/**
-	 * @var \OCP\UserInterface[] $backends
-	 */
-	private $backends = [];
-
-	/**
-	 * @var \OC\User\User[] $cachedUsers
-	 */
-	private $cachedUsers = [];
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
-
-	public function __construct(IConfig $config,
-								EventDispatcherInterface $oldDispatcher,
-								IEventDispatcher $eventDispatcher) {
-		$this->config = $config;
-		$this->dispatcher = $oldDispatcher;
-		$cachedUsers = &$this->cachedUsers;
-		$this->listen('\OC\User', 'postDelete', function ($user) use (&$cachedUsers) {
-			/** @var \OC\User\User $user */
-			unset($cachedUsers[$user->getUID()]);
-		});
-		$this->eventDispatcher = $eventDispatcher;
-	}
-
-	/**
-	 * Get the active backends
-	 * @return \OCP\UserInterface[]
-	 */
-	public function getBackends() {
-		return $this->backends;
-	}
-
-	/**
-	 * register a user backend
-	 *
-	 * @param \OCP\UserInterface $backend
-	 */
-	public function registerBackend($backend) {
-		$this->backends[] = $backend;
-	}
-
-	/**
-	 * remove a user backend
-	 *
-	 * @param \OCP\UserInterface $backend
-	 */
-	public function removeBackend($backend) {
-		$this->cachedUsers = [];
-		if (($i = array_search($backend, $this->backends)) !== false) {
-			unset($this->backends[$i]);
-		}
-	}
-
-	/**
-	 * remove all user backends
-	 */
-	public function clearBackends() {
-		$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];
-		}
-		foreach ($this->backends as $backend) {
-			if ($backend->userExists($uid)) {
-				return $this->getUserObject($uid, $backend);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * 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
-	 */
-	protected 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->dispatcher, $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) {
-		$user = $this->get($uid);
-		return ($user !== null);
-	}
-
-	/**
-	 * Check if the password is valid for the user
-	 *
-	 * @param string $loginName
-	 * @param string $password
-	 * @return mixed the User object on success, false otherwise
-	 */
-	public function checkPassword($loginName, $password) {
-		$result = $this->checkPasswordNoLogging($loginName, $password);
-
-		if ($result === false) {
-			\OC::$server->getLogger()->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);
-
-		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(Backend::CHECK_PASSWORD)) {
-				$uid = $backend->checkPassword($loginName, $password);
-				if ($uid !== false) {
-					return $this->getUserObject($uid, $backend);
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * search by user id
-	 *
-	 * @param string $pattern
-	 * @param int $limit
-	 * @param int $offset
-	 * @return \OC\User\User[]
-	 */
-	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] = $this->getUserObject($uid, $backend);
-				}
-			}
-		}
-
-		uasort($users, function ($a, $b) {
-			/**
-			 * @var \OC\User\User $a
-			 * @var \OC\User\User $b
-			 */
-			return strcasecmp($a->getUID(), $b->getUID());
-		});
-		return $users;
-	}
-
-	/**
-	 * search by displayName
-	 *
-	 * @param string $pattern
-	 * @param int $limit
-	 * @param int $offset
-	 * @return \OC\User\User[]
-	 */
-	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[] = $this->getUserObject($uid, $backend);
-				}
-			}
-		}
-
-		usort($users, function ($a, $b) {
-			/**
-			 * @var \OC\User\User $a
-			 * @var \OC\User\User $b
-			 */
-			return strcasecmp($a->getDisplayName(), $b->getDisplayName());
-		});
-		return $users;
-	}
-
-	/**
-	 * @param string $uid
-	 * @param string $password
-	 * @throws \InvalidArgumentException
-	 * @return bool|IUser the created user or false
-	 */
-	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
-		if (\OC::$server->get(IRegistry::class)->delegateIsHardUserLimitReached()) {
-			$l = \OC::$server->getL10N('lib');
-			throw new HintException($l->t('The user limit has been reached and the user was not created.'));
-		}
-
-		$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|null
-	 * @throws \InvalidArgumentException
-	 */
-	public function createUserFromBackend($uid, $password, UserInterface $backend) {
-		$l = \OC::$server->getL10N('lib');
-
-		// Check the name for bad characters
-		// Allowed are: "a-z", "A-Z", "0-9" and "_.@-'"
-		if (preg_match('/[^a-zA-Z0-9 _.@\-\']/', $uid)) {
-			throw new \InvalidArgumentException($l->t('Only the following characters are allowed in a username:'
-				. ' "a-z", "A-Z", "0-9", and "_.@-\'"'));
-		}
-
-		// No empty username
-		if (trim($uid) === '') {
-			throw new \InvalidArgumentException($l->t('A valid username must be provided'));
-		}
-
-		// No whitespace at the beginning or at the end
-		if (trim($uid) !== $uid) {
-			throw new \InvalidArgumentException($l->t('Username contains whitespace at the beginning or at the end'));
-		}
-
-		// Username only consists of 1 or 2 dots (directory traversal)
-		if ($uid === '.' || $uid === '..') {
-			throw new \InvalidArgumentException($l->t('Username must not consist of dots only'));
-		}
-
-		if (!$this->verifyUid($uid)) {
-			throw new \InvalidArgumentException($l->t('Username is invalid because files already exist for this user'));
-		}
-
-		// 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 username 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 user'));
-		}
-		$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;
-	}
-
-	/**
-	 * 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|int an array of backend class as key and count number as value
-	 *                if $hasLoggedIn is true only an int is returned
-	 */
-	public function countUsers($hasLoggedIn = false) {
-		if ($hasLoggedIn) {
-			return $this->countSeenUsers();
-		}
-		$userCountStatistics = [];
-		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(Backend::COUNT_USERS)) {
-				$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;
-	}
-
-	/**
-	 * returns how many users per backend exist in the requested groups (if supported by backend)
-	 *
-	 * @param IGroup[] $groups an array of gid to search in
-	 * @return array|int an array of backend class as key and count number as value
-	 *                if $hasLoggedIn is true only an int is returned
-	 */
-	public function countUsersOfGroups(array $groups) {
-		$users = [];
-		foreach ($groups as $group) {
-			$usersIds = array_map(function ($user) {
-				return $user->getUID();
-			}, $group->getUsers());
-			$users = array_merge($users, $usersIds);
-		}
-		return count(array_unique($users));
-	}
-
-	/**
-	 * The callback is executed for each user on each backend.
-	 * If the callback returns false no further users will be retrieved.
-	 *
-	 * @param \Closure $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->execute();
-		$count = $result->fetchColumn();
-		$result->closeCursor();
-
-		if ($count !== false) {
-			$count = (int)$count;
-		} else {
-			$count = 0;
-		}
-
-		return $count;
-	}
-
-	/**
-	 * returns how many users are disabled in the requested groups
-	 *
-	 * @param array $groups groupids to search
-	 * @return int
-	 * @since 14.0.0
-	 */
-	public function countDisabledUsersOfGroups(array $groups): int {
-		$queryBuilder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-		$queryBuilder->select($queryBuilder->createFunction('COUNT(DISTINCT ' . $queryBuilder->getColumnName('uid') . ')'))
-			->from('preferences', 'p')
-			->innerJoin('p', 'group_user', 'g', $queryBuilder->expr()->eq('p.userid', 'g.uid'))
-			->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))
-			->andWhere($queryBuilder->expr()->in('gid', $queryBuilder->createNamedParameter($groups, IQueryBuilder::PARAM_STR_ARRAY)));
-
-		$result = $queryBuilder->execute();
-		$count = $result->fetchColumn();
-		$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')))
-			->andWhere($queryBuilder->expr()->isNotNull('configvalue'));
-
-		$query = $queryBuilder->execute();
-
-		$result = (int)$query->fetchColumn();
-		$query->closeCursor();
-
-		return $result;
-	}
-
-	/**
-	 * @param \Closure $callback
-	 * @psalm-param \Closure(\OCP\IUser):?bool $callback
-	 * @since 11.0.0
-	 */
-	public function callForSeenUsers(\Closure $callback) {
-		$limit = 1000;
-		$offset = 0;
-		do {
-			$userIds = $this->getSeenUserIds($limit, $offset);
-			$offset += $limit;
-			foreach ($userIds as $userId) {
-				foreach ($this->backends as $backend) {
-					if ($backend->userExists($userId)) {
-						$user = $this->getUserObject($userId, $backend, false);
-						$return = $callback($user);
-						if ($return === false) {
-							return;
-						}
-						break;
-					}
-				}
-			}
-		} while (count($userIds) >= $limit);
-	}
-
-	/**
-	 * Getting all userIds that have a listLogin 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->execute();
-		$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) {
-		$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);
-		}));
-	}
-
-	private function verifyUid(string $uid): bool {
-		$appdata = 'appdata_' . $this->config->getSystemValueString('instanceid');
-
-		if (\in_array($uid, [
-			'.htaccess',
-			'files_external',
-			'.ocdata',
-			'owncloud.log',
-			'nextcloud.log',
-			$appdata], true)) {
-			return false;
-		}
-
-		$dataDirectory = $this->config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data');
-
-		return !file_exists(rtrim($dataDirectory, '/') . '/' . $uid);
-	}
+    /**
+     * @var \OCP\UserInterface[] $backends
+     */
+    private $backends = [];
+
+    /**
+     * @var \OC\User\User[] $cachedUsers
+     */
+    private $cachedUsers = [];
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+
+    /** @var IEventDispatcher */
+    private $eventDispatcher;
+
+    public function __construct(IConfig $config,
+                                EventDispatcherInterface $oldDispatcher,
+                                IEventDispatcher $eventDispatcher) {
+        $this->config = $config;
+        $this->dispatcher = $oldDispatcher;
+        $cachedUsers = &$this->cachedUsers;
+        $this->listen('\OC\User', 'postDelete', function ($user) use (&$cachedUsers) {
+            /** @var \OC\User\User $user */
+            unset($cachedUsers[$user->getUID()]);
+        });
+        $this->eventDispatcher = $eventDispatcher;
+    }
+
+    /**
+     * Get the active backends
+     * @return \OCP\UserInterface[]
+     */
+    public function getBackends() {
+        return $this->backends;
+    }
+
+    /**
+     * register a user backend
+     *
+     * @param \OCP\UserInterface $backend
+     */
+    public function registerBackend($backend) {
+        $this->backends[] = $backend;
+    }
+
+    /**
+     * remove a user backend
+     *
+     * @param \OCP\UserInterface $backend
+     */
+    public function removeBackend($backend) {
+        $this->cachedUsers = [];
+        if (($i = array_search($backend, $this->backends)) !== false) {
+            unset($this->backends[$i]);
+        }
+    }
+
+    /**
+     * remove all user backends
+     */
+    public function clearBackends() {
+        $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];
+        }
+        foreach ($this->backends as $backend) {
+            if ($backend->userExists($uid)) {
+                return $this->getUserObject($uid, $backend);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 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
+     */
+    protected 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->dispatcher, $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) {
+        $user = $this->get($uid);
+        return ($user !== null);
+    }
+
+    /**
+     * Check if the password is valid for the user
+     *
+     * @param string $loginName
+     * @param string $password
+     * @return mixed the User object on success, false otherwise
+     */
+    public function checkPassword($loginName, $password) {
+        $result = $this->checkPasswordNoLogging($loginName, $password);
+
+        if ($result === false) {
+            \OC::$server->getLogger()->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);
+
+        foreach ($this->backends as $backend) {
+            if ($backend->implementsActions(Backend::CHECK_PASSWORD)) {
+                $uid = $backend->checkPassword($loginName, $password);
+                if ($uid !== false) {
+                    return $this->getUserObject($uid, $backend);
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * search by user id
+     *
+     * @param string $pattern
+     * @param int $limit
+     * @param int $offset
+     * @return \OC\User\User[]
+     */
+    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] = $this->getUserObject($uid, $backend);
+                }
+            }
+        }
+
+        uasort($users, function ($a, $b) {
+            /**
+             * @var \OC\User\User $a
+             * @var \OC\User\User $b
+             */
+            return strcasecmp($a->getUID(), $b->getUID());
+        });
+        return $users;
+    }
+
+    /**
+     * search by displayName
+     *
+     * @param string $pattern
+     * @param int $limit
+     * @param int $offset
+     * @return \OC\User\User[]
+     */
+    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[] = $this->getUserObject($uid, $backend);
+                }
+            }
+        }
+
+        usort($users, function ($a, $b) {
+            /**
+             * @var \OC\User\User $a
+             * @var \OC\User\User $b
+             */
+            return strcasecmp($a->getDisplayName(), $b->getDisplayName());
+        });
+        return $users;
+    }
+
+    /**
+     * @param string $uid
+     * @param string $password
+     * @throws \InvalidArgumentException
+     * @return bool|IUser the created user or false
+     */
+    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
+        if (\OC::$server->get(IRegistry::class)->delegateIsHardUserLimitReached()) {
+            $l = \OC::$server->getL10N('lib');
+            throw new HintException($l->t('The user limit has been reached and the user was not created.'));
+        }
+
+        $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|null
+     * @throws \InvalidArgumentException
+     */
+    public function createUserFromBackend($uid, $password, UserInterface $backend) {
+        $l = \OC::$server->getL10N('lib');
+
+        // Check the name for bad characters
+        // Allowed are: "a-z", "A-Z", "0-9" and "_.@-'"
+        if (preg_match('/[^a-zA-Z0-9 _.@\-\']/', $uid)) {
+            throw new \InvalidArgumentException($l->t('Only the following characters are allowed in a username:'
+                . ' "a-z", "A-Z", "0-9", and "_.@-\'"'));
+        }
+
+        // No empty username
+        if (trim($uid) === '') {
+            throw new \InvalidArgumentException($l->t('A valid username must be provided'));
+        }
+
+        // No whitespace at the beginning or at the end
+        if (trim($uid) !== $uid) {
+            throw new \InvalidArgumentException($l->t('Username contains whitespace at the beginning or at the end'));
+        }
+
+        // Username only consists of 1 or 2 dots (directory traversal)
+        if ($uid === '.' || $uid === '..') {
+            throw new \InvalidArgumentException($l->t('Username must not consist of dots only'));
+        }
+
+        if (!$this->verifyUid($uid)) {
+            throw new \InvalidArgumentException($l->t('Username is invalid because files already exist for this user'));
+        }
+
+        // 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 username 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 user'));
+        }
+        $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;
+    }
+
+    /**
+     * 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|int an array of backend class as key and count number as value
+     *                if $hasLoggedIn is true only an int is returned
+     */
+    public function countUsers($hasLoggedIn = false) {
+        if ($hasLoggedIn) {
+            return $this->countSeenUsers();
+        }
+        $userCountStatistics = [];
+        foreach ($this->backends as $backend) {
+            if ($backend->implementsActions(Backend::COUNT_USERS)) {
+                $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;
+    }
+
+    /**
+     * returns how many users per backend exist in the requested groups (if supported by backend)
+     *
+     * @param IGroup[] $groups an array of gid to search in
+     * @return array|int an array of backend class as key and count number as value
+     *                if $hasLoggedIn is true only an int is returned
+     */
+    public function countUsersOfGroups(array $groups) {
+        $users = [];
+        foreach ($groups as $group) {
+            $usersIds = array_map(function ($user) {
+                return $user->getUID();
+            }, $group->getUsers());
+            $users = array_merge($users, $usersIds);
+        }
+        return count(array_unique($users));
+    }
+
+    /**
+     * The callback is executed for each user on each backend.
+     * If the callback returns false no further users will be retrieved.
+     *
+     * @param \Closure $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->execute();
+        $count = $result->fetchColumn();
+        $result->closeCursor();
+
+        if ($count !== false) {
+            $count = (int)$count;
+        } else {
+            $count = 0;
+        }
+
+        return $count;
+    }
+
+    /**
+     * returns how many users are disabled in the requested groups
+     *
+     * @param array $groups groupids to search
+     * @return int
+     * @since 14.0.0
+     */
+    public function countDisabledUsersOfGroups(array $groups): int {
+        $queryBuilder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+        $queryBuilder->select($queryBuilder->createFunction('COUNT(DISTINCT ' . $queryBuilder->getColumnName('uid') . ')'))
+            ->from('preferences', 'p')
+            ->innerJoin('p', 'group_user', 'g', $queryBuilder->expr()->eq('p.userid', 'g.uid'))
+            ->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))
+            ->andWhere($queryBuilder->expr()->in('gid', $queryBuilder->createNamedParameter($groups, IQueryBuilder::PARAM_STR_ARRAY)));
+
+        $result = $queryBuilder->execute();
+        $count = $result->fetchColumn();
+        $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')))
+            ->andWhere($queryBuilder->expr()->isNotNull('configvalue'));
+
+        $query = $queryBuilder->execute();
+
+        $result = (int)$query->fetchColumn();
+        $query->closeCursor();
+
+        return $result;
+    }
+
+    /**
+     * @param \Closure $callback
+     * @psalm-param \Closure(\OCP\IUser):?bool $callback
+     * @since 11.0.0
+     */
+    public function callForSeenUsers(\Closure $callback) {
+        $limit = 1000;
+        $offset = 0;
+        do {
+            $userIds = $this->getSeenUserIds($limit, $offset);
+            $offset += $limit;
+            foreach ($userIds as $userId) {
+                foreach ($this->backends as $backend) {
+                    if ($backend->userExists($userId)) {
+                        $user = $this->getUserObject($userId, $backend, false);
+                        $return = $callback($user);
+                        if ($return === false) {
+                            return;
+                        }
+                        break;
+                    }
+                }
+            }
+        } while (count($userIds) >= $limit);
+    }
+
+    /**
+     * Getting all userIds that have a listLogin 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->execute();
+        $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) {
+        $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);
+        }));
+    }
+
+    private function verifyUid(string $uid): bool {
+        $appdata = 'appdata_' . $this->config->getSystemValueString('instanceid');
+
+        if (\in_array($uid, [
+            '.htaccess',
+            'files_external',
+            '.ocdata',
+            'owncloud.log',
+            'nextcloud.log',
+            $appdata], true)) {
+            return false;
+        }
+
+        $dataDirectory = $this->config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data');
+
+        return !file_exists(rtrim($dataDirectory, '/') . '/' . $uid);
+    }
 }

lib/private/Support/Subscription/Registry.php

Indentation +189 added lines, -189 removed lines

@@ -43,193 +43,193 @@
 
 class Registry implements IRegistry {
 
-	/** @var ISubscription */
-	private $subscription = null;
-
-	/** @var string */
-	private $subscriptionService = null;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IServerContainer */
-	private $container;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var LoggerInterface */
-	private $logger;
-	/** @var IManager */
-	private $notificationManager;
-
-	public function __construct(IConfig $config,
-								IServerContainer $container,
-								IUserManager $userManager,
-								IGroupManager $groupManager,
-								LoggerInterface $logger,
-								IManager $notificationManager) {
-		$this->config = $config;
-		$this->container = $container;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->logger = $logger;
-		$this->notificationManager = $notificationManager;
-	}
-
-	private function getSubscription(): ?ISubscription {
-		if ($this->subscription === null && $this->subscriptionService !== null) {
-			try {
-				$this->subscription = $this->container->query($this->subscriptionService);
-			} catch (QueryException $e) {
-				// Ignore this
-			}
-		}
-
-		return $this->subscription;
-	}
-
-	/**
-	 * Register a subscription instance. In case it is called multiple times the
-	 * first one is used.
-	 *
-	 * @param ISubscription $subscription
-	 * @throws AlreadyRegisteredException
-	 *
-	 * @since 17.0.0
-	 */
-	public function register(ISubscription $subscription): void {
-		if ($this->subscription !== null || $this->subscriptionService !== null) {
-			throw new AlreadyRegisteredException();
-		}
-		$this->subscription = $subscription;
-	}
-
-	public function registerService(string $subscriptionService): void {
-		if ($this->subscription !== null || $this->subscriptionService !== null) {
-			throw new AlreadyRegisteredException();
-		}
-
-		$this->subscriptionService = $subscriptionService;
-	}
-
-
-	/**
-	 * Fetches the list of app IDs that are supported by the subscription
-	 *
-	 * @since 17.0.0
-	 */
-	public function delegateGetSupportedApps(): array {
-		if ($this->getSubscription() instanceof ISupportedApps) {
-			return $this->getSubscription()->getSupportedApps();
-		}
-		return [];
-	}
-
-	/**
-	 * Indicates if a valid subscription is available
-	 *
-	 * @since 17.0.0
-	 */
-	public function delegateHasValidSubscription(): bool {
-		// Allow overwriting this manually for environments where the subscription information cannot be fetched
-		if ($this->config->getSystemValueBool('has_valid_subscription')) {
-			return true;
-		}
-
-		if ($this->getSubscription() instanceof ISubscription) {
-			return $this->getSubscription()->hasValidSubscription();
-		}
-		return false;
-	}
-
-	/**
-	 * Indicates if the subscription has extended support
-	 *
-	 * @since 17.0.0
-	 */
-	public function delegateHasExtendedSupport(): bool {
-		if ($this->getSubscription() instanceof ISubscription) {
-			return $this->getSubscription()->hasExtendedSupport();
-		}
-		return false;
-	}
-
-
-	/**
-	 * Indicates if a hard user limit is reached and no new users should be created
-	 *
-	 * @since 21.0.0
-	 */
-	public function delegateIsHardUserLimitReached(): bool {
-		$subscription = $this->getSubscription();
-		if ($subscription instanceof ISubscription &&
-			$subscription->hasValidSubscription()) {
-			$userLimitReached = $subscription->isHardUserLimitReached();
-			if ($userLimitReached) {
-				$this->notifyAboutReachedUserLimit();
-			}
-			return $userLimitReached;
-		}
-
-		$isOneClickInstance = $this->config->getSystemValueBool('one-click-instance', false);
-
-		if (!$isOneClickInstance) {
-			return false;
-		}
-
-		$userCount = $this->getUserCount();
-		$hardUserLimit = $this->config->getSystemValue('one-click-instance.user-limit', 50);
-
-		$userLimitReached = $userCount >= $hardUserLimit;
-		if ($userLimitReached) {
-			$this->notifyAboutReachedUserLimit();
-		}
-		return $userLimitReached;
-	}
-
-	private function getUserCount(): int {
-		$userCount = 0;
-		$backends = $this->userManager->getBackends();
-		foreach ($backends as $backend) {
-			if ($backend->implementsActions(Backend::COUNT_USERS)) {
-				$backendUsers = $backend->countUsers();
-				if ($backendUsers !== false) {
-					$userCount += $backendUsers;
-				} else {
-					// TODO what if the user count can't be determined?
-					$this->logger->warning('Can not determine user count for ' . get_class($backend), ['app' => 'lib']);
-				}
-			}
-		}
-
-		$disabledUsers = $this->config->getUsersForUserValue('core', 'enabled', 'false');
-		$disabledUsersCount = count($disabledUsers);
-		$userCount = $userCount - $disabledUsersCount;
-
-		if ($userCount < 0) {
-			$userCount = 0;
-
-			// this should never happen
-			$this->logger->warning("Total user count was negative (users: $userCount, disabled: $disabledUsersCount)", ['app' => 'lib']);
-		}
-
-		return $userCount;
-	}
-
-	private function notifyAboutReachedUserLimit() {
-		$admins = $this->groupManager->get('admin')->getUsers();
-		foreach ($admins as $admin) {
-			$notification = $this->notificationManager->createNotification();
-
-			$notification->setApp('core')
-				->setUser($admin->getUID())
-				->setDateTime(new \DateTime())
-				->setObject('user_limit_reached', '1')
-				->setSubject('user_limit_reached');
-			$this->notificationManager->notify($notification);
-		}
-
-		$this->logger->warning('The user limit was reached and the new user was not created', ['app' => 'lib']);
-	}
+    /** @var ISubscription */
+    private $subscription = null;
+
+    /** @var string */
+    private $subscriptionService = null;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IServerContainer */
+    private $container;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var LoggerInterface */
+    private $logger;
+    /** @var IManager */
+    private $notificationManager;
+
+    public function __construct(IConfig $config,
+                                IServerContainer $container,
+                                IUserManager $userManager,
+                                IGroupManager $groupManager,
+                                LoggerInterface $logger,
+                                IManager $notificationManager) {
+        $this->config = $config;
+        $this->container = $container;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->logger = $logger;
+        $this->notificationManager = $notificationManager;
+    }
+
+    private function getSubscription(): ?ISubscription {
+        if ($this->subscription === null && $this->subscriptionService !== null) {
+            try {
+                $this->subscription = $this->container->query($this->subscriptionService);
+            } catch (QueryException $e) {
+                // Ignore this
+            }
+        }
+
+        return $this->subscription;
+    }
+
+    /**
+     * Register a subscription instance. In case it is called multiple times the
+     * first one is used.
+     *
+     * @param ISubscription $subscription
+     * @throws AlreadyRegisteredException
+     *
+     * @since 17.0.0
+     */
+    public function register(ISubscription $subscription): void {
+        if ($this->subscription !== null || $this->subscriptionService !== null) {
+            throw new AlreadyRegisteredException();
+        }
+        $this->subscription = $subscription;
+    }
+
+    public function registerService(string $subscriptionService): void {
+        if ($this->subscription !== null || $this->subscriptionService !== null) {
+            throw new AlreadyRegisteredException();
+        }
+
+        $this->subscriptionService = $subscriptionService;
+    }
+
+
+    /**
+     * Fetches the list of app IDs that are supported by the subscription
+     *
+     * @since 17.0.0
+     */
+    public function delegateGetSupportedApps(): array {
+        if ($this->getSubscription() instanceof ISupportedApps) {
+            return $this->getSubscription()->getSupportedApps();
+        }
+        return [];
+    }
+
+    /**
+     * Indicates if a valid subscription is available
+     *
+     * @since 17.0.0
+     */
+    public function delegateHasValidSubscription(): bool {
+        // Allow overwriting this manually for environments where the subscription information cannot be fetched
+        if ($this->config->getSystemValueBool('has_valid_subscription')) {
+            return true;
+        }
+
+        if ($this->getSubscription() instanceof ISubscription) {
+            return $this->getSubscription()->hasValidSubscription();
+        }
+        return false;
+    }
+
+    /**
+     * Indicates if the subscription has extended support
+     *
+     * @since 17.0.0
+     */
+    public function delegateHasExtendedSupport(): bool {
+        if ($this->getSubscription() instanceof ISubscription) {
+            return $this->getSubscription()->hasExtendedSupport();
+        }
+        return false;
+    }
+
+
+    /**
+     * Indicates if a hard user limit is reached and no new users should be created
+     *
+     * @since 21.0.0
+     */
+    public function delegateIsHardUserLimitReached(): bool {
+        $subscription = $this->getSubscription();
+        if ($subscription instanceof ISubscription &&
+            $subscription->hasValidSubscription()) {
+            $userLimitReached = $subscription->isHardUserLimitReached();
+            if ($userLimitReached) {
+                $this->notifyAboutReachedUserLimit();
+            }
+            return $userLimitReached;
+        }
+
+        $isOneClickInstance = $this->config->getSystemValueBool('one-click-instance', false);
+
+        if (!$isOneClickInstance) {
+            return false;
+        }
+
+        $userCount = $this->getUserCount();
+        $hardUserLimit = $this->config->getSystemValue('one-click-instance.user-limit', 50);
+
+        $userLimitReached = $userCount >= $hardUserLimit;
+        if ($userLimitReached) {
+            $this->notifyAboutReachedUserLimit();
+        }
+        return $userLimitReached;
+    }
+
+    private function getUserCount(): int {
+        $userCount = 0;
+        $backends = $this->userManager->getBackends();
+        foreach ($backends as $backend) {
+            if ($backend->implementsActions(Backend::COUNT_USERS)) {
+                $backendUsers = $backend->countUsers();
+                if ($backendUsers !== false) {
+                    $userCount += $backendUsers;
+                } else {
+                    // TODO what if the user count can't be determined?
+                    $this->logger->warning('Can not determine user count for ' . get_class($backend), ['app' => 'lib']);
+                }
+            }
+        }
+
+        $disabledUsers = $this->config->getUsersForUserValue('core', 'enabled', 'false');
+        $disabledUsersCount = count($disabledUsers);
+        $userCount = $userCount - $disabledUsersCount;
+
+        if ($userCount < 0) {
+            $userCount = 0;
+
+            // this should never happen
+            $this->logger->warning("Total user count was negative (users: $userCount, disabled: $disabledUsersCount)", ['app' => 'lib']);
+        }
+
+        return $userCount;
+    }
+
+    private function notifyAboutReachedUserLimit() {
+        $admins = $this->groupManager->get('admin')->getUsers();
+        foreach ($admins as $admin) {
+            $notification = $this->notificationManager->createNotification();
+
+            $notification->setApp('core')
+                ->setUser($admin->getUID())
+                ->setDateTime(new \DateTime())
+                ->setObject('user_limit_reached', '1')
+                ->setSubject('user_limit_reached');
+            $this->notificationManager->notify($notification);
+        }
+
+        $this->logger->warning('The user limit was reached and the new user was not created', ['app' => 'lib']);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -198,7 +198,7 @@
 					$userCount += $backendUsers;
 				} else {
 					// TODO what if the user count can't be determined?
-					$this->logger->warning('Can not determine user count for ' . get_class($backend), ['app' => 'lib']);
+					$this->logger->warning('Can not determine user count for '.get_class($backend), ['app' => 'lib']);
 				}
 			}
 		}

lib/public/Support/Subscription/IRegistry.php

Indentation +45 added lines, -45 removed lines

@@ -35,54 +35,54 @@
  */
 interface IRegistry {
 
-	/**
-	 * Register a subscription instance. In case it is called multiple times an
-	 * exception is thrown
-	 *
-	 * @param ISubscription $subscription
-	 * @throws AlreadyRegisteredException
-	 *
-	 * @since 17.0.0
-	 * @deprecated 20.0.0 use registerService
-	 */
-	public function register(ISubscription $subscription): void;
+    /**
+     * Register a subscription instance. In case it is called multiple times an
+     * exception is thrown
+     *
+     * @param ISubscription $subscription
+     * @throws AlreadyRegisteredException
+     *
+     * @since 17.0.0
+     * @deprecated 20.0.0 use registerService
+     */
+    public function register(ISubscription $subscription): void;
 
-	/**
-	 * Register a subscription handler. The service has to implement the ISubscription interface.
-	 * In case this is called multiple times an exception is thrown.
-	 *
-	 * @param string $subscriptionService
-	 * @throws AlreadyRegisteredException
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerService(string $subscriptionService): void;
+    /**
+     * Register a subscription handler. The service has to implement the ISubscription interface.
+     * In case this is called multiple times an exception is thrown.
+     *
+     * @param string $subscriptionService
+     * @throws AlreadyRegisteredException
+     *
+     * @since 20.0.0
+     */
+    public function registerService(string $subscriptionService): void;
 
-	/**
-	 * Fetches the list of app IDs that are supported by the subscription
-	 *
-	 * @since 17.0.0
-	 */
-	public function delegateGetSupportedApps(): array;
+    /**
+     * Fetches the list of app IDs that are supported by the subscription
+     *
+     * @since 17.0.0
+     */
+    public function delegateGetSupportedApps(): array;
 
-	/**
-	 * Indicates if a valid subscription is available
-	 *
-	 * @since 17.0.0
-	 */
-	public function delegateHasValidSubscription(): bool;
+    /**
+     * Indicates if a valid subscription is available
+     *
+     * @since 17.0.0
+     */
+    public function delegateHasValidSubscription(): bool;
 
-	/**
-	 * Indicates if the subscription has extended support
-	 *
-	 * @since 17.0.0
-	 */
-	public function delegateHasExtendedSupport(): bool;
+    /**
+     * Indicates if the subscription has extended support
+     *
+     * @since 17.0.0
+     */
+    public function delegateHasExtendedSupport(): bool;
 
-	/**
-	 * Indicates if a hard user limit is reached and no new users should be created
-	 *
-	 * @since 21.0.0
-	 */
-	public function delegateIsHardUserLimitReached(): bool;
+    /**
+     * Indicates if a hard user limit is reached and no new users should be created
+     *
+     * @since 21.0.0
+     */
+    public function delegateIsHardUserLimitReached(): bool;
 }

lib/public/Support/Subscription/ISubscription.php

Indentation +18 added lines, -18 removed lines

@@ -32,24 +32,24 @@
  */
 interface ISubscription {
 
-	/**
-	 * Indicates if a valid subscription is available
-	 *
-	 * @since 17.0.0
-	 */
-	public function hasValidSubscription(): bool;
+    /**
+     * Indicates if a valid subscription is available
+     *
+     * @since 17.0.0
+     */
+    public function hasValidSubscription(): bool;
 
-	/**
-	 * Indicates if the subscription has extended support
-	 *
-	 * @since 17.0.0
-	 */
-	public function hasExtendedSupport(): bool;
+    /**
+     * Indicates if the subscription has extended support
+     *
+     * @since 17.0.0
+     */
+    public function hasExtendedSupport(): bool;
 
-	/**
-	 * Indicates if a hard user limit is reached and no new users should be created
-	 *
-	 * @since 21.0.0
-	 */
-	public function isHardUserLimitReached(): bool;
+    /**
+     * Indicates if a hard user limit is reached and no new users should be created
+     *
+     * @since 21.0.0
+     */
+    public function isHardUserLimitReached(): bool;
 }

core/Notification/CoreNotifier.php

Indentation +42 added lines, -42 removed lines

@@ -34,53 +34,53 @@
 use OCP\Notification\INotifier;
 
 class CoreNotifier implements INotifier {
-	/** @var IFactory */
-	private $l10nFactory;
+    /** @var IFactory */
+    private $l10nFactory;
 
-	public function __construct(IFactory $factory) {
-		$this->l10nFactory = $factory;
-	}
+    public function __construct(IFactory $factory) {
+        $this->l10nFactory = $factory;
+    }
 
-	/**
-	 * Identifier of the notifier, only use [a-z0-9_]
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getID(): string {
-		return 'core';
-	}
+    /**
+     * Identifier of the notifier, only use [a-z0-9_]
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getID(): string {
+        return 'core';
+    }
 
-	/**
-	 * Human readable name describing the notifier
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getName(): string {
-		return $this->l10nFactory->get('core')->t('Nextcloud Server');
-	}
+    /**
+     * Human readable name describing the notifier
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getName(): string {
+        return $this->l10nFactory->get('core')->t('Nextcloud Server');
+    }
 
-	public function prepare(INotification $notification, string $languageCode): INotification {
-		if ($notification->getApp() !== 'core') {
-			throw new \InvalidArgumentException();
-		}
-		$l = $this->l10nFactory->get('core', $languageCode);
+    public function prepare(INotification $notification, string $languageCode): INotification {
+        if ($notification->getApp() !== 'core') {
+            throw new \InvalidArgumentException();
+        }
+        $l = $this->l10nFactory->get('core', $languageCode);
 
-		if ($notification->getSubject() === 'repair_exposing_links') {
-			$notification->setParsedSubject($l->t('Some of your link shares have been removed'));
-			$notification->setParsedMessage($l->t('Due to a security bug we had to remove some of your link shares. Please see the link for more information.'));
-			$notification->setLink('https://nextcloud.com/security/advisory/?id=NC-SA-2019-003');
-			return $notification;
-		}
+        if ($notification->getSubject() === 'repair_exposing_links') {
+            $notification->setParsedSubject($l->t('Some of your link shares have been removed'));
+            $notification->setParsedMessage($l->t('Due to a security bug we had to remove some of your link shares. Please see the link for more information.'));
+            $notification->setLink('https://nextcloud.com/security/advisory/?id=NC-SA-2019-003');
+            return $notification;
+        }
 
-		if ($notification->getSubject() === 'user_limit_reached') {
-			$notification->setParsedSubject($l->t('The user limit of this instance is reached.'));
-			$notification->setParsedMessage($l->t('Add a subscription key to increase the user limit of this instance. For more information have a look at the Enterprise subscription page.'));
-			$notification->setLink('https://nextcloud.com/enterprise/order/');
-			return $notification;
-		}
+        if ($notification->getSubject() === 'user_limit_reached') {
+            $notification->setParsedSubject($l->t('The user limit of this instance is reached.'));
+            $notification->setParsedMessage($l->t('Add a subscription key to increase the user limit of this instance. For more information have a look at the Enterprise subscription page.'));
+            $notification->setLink('https://nextcloud.com/enterprise/order/');
+            return $notification;
+        }
 
-		throw new \InvalidArgumentException('Invalid subject');
-	}
+        throw new \InvalidArgumentException('Invalid subject');
+    }
 }

core/Application.php

Indentation +208 added lines, -208 removed lines

@@ -57,212 +57,212 @@
  * @package OC\Core
  */
 class Application extends App {
-	public function __construct() {
-		parent::__construct('core');
-
-		$container = $this->getContainer();
-
-		$container->registerService('defaultMailAddress', function () {
-			return Util::getDefaultEmailAddress('lostpassword-noreply');
-		});
-
-		$server = $container->getServer();
-		/** @var IEventDispatcher $eventDispatcher */
-		$eventDispatcher = $server->query(IEventDispatcher::class);
-
-		$notificationManager = $server->getNotificationManager();
-		$notificationManager->registerNotifierService(CoreNotifier::class);
-		$notificationManager->registerNotifierService(AuthenticationNotifier::class);
-
-		$oldEventDispatcher = $server->getEventDispatcher();
-
-		$oldEventDispatcher->addListener(IDBConnection::CHECK_MISSING_INDEXES_EVENT,
-			function (GenericEvent $event) use ($container) {
-				/** @var MissingIndexInformation $subject */
-				$subject = $event->getSubject();
-
-				$schema = new SchemaWrapper($container->query(IDBConnection::class));
-
-				if ($schema->hasTable('share')) {
-					$table = $schema->getTable('share');
-
-					if (!$table->hasIndex('share_with_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'share_with_index');
-					}
-					if (!$table->hasIndex('parent_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'parent_index');
-					}
-					if (!$table->hasIndex('owner_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'owner_index');
-					}
-					if (!$table->hasIndex('initiator_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'initiator_index');
-					}
-				}
-
-				if ($schema->hasTable('filecache')) {
-					$table = $schema->getTable('filecache');
-
-					if (!$table->hasIndex('fs_mtime')) {
-						$subject->addHintForMissingSubject($table->getName(), 'fs_mtime');
-					}
-
-					if (!$table->hasIndex('fs_size')) {
-						$subject->addHintForMissingSubject($table->getName(), 'fs_size');
-					}
-				}
-
-				if ($schema->hasTable('twofactor_providers')) {
-					$table = $schema->getTable('twofactor_providers');
-
-					if (!$table->hasIndex('twofactor_providers_uid')) {
-						$subject->addHintForMissingSubject($table->getName(), 'twofactor_providers_uid');
-					}
-				}
-
-				if ($schema->hasTable('login_flow_v2')) {
-					$table = $schema->getTable('login_flow_v2');
-
-					if (!$table->hasIndex('poll_token')) {
-						$subject->addHintForMissingSubject($table->getName(), 'poll_token');
-					}
-					if (!$table->hasIndex('login_token')) {
-						$subject->addHintForMissingSubject($table->getName(), 'login_token');
-					}
-					if (!$table->hasIndex('timestamp')) {
-						$subject->addHintForMissingSubject($table->getName(), 'timestamp');
-					}
-				}
-
-				if ($schema->hasTable('whats_new')) {
-					$table = $schema->getTable('whats_new');
-
-					if (!$table->hasIndex('version')) {
-						$subject->addHintForMissingSubject($table->getName(), 'version');
-					}
-				}
-
-				if ($schema->hasTable('cards')) {
-					$table = $schema->getTable('cards');
-
-					if (!$table->hasIndex('cards_abid')) {
-						$subject->addHintForMissingSubject($table->getName(), 'cards_abid');
-					}
-				}
-
-				if ($schema->hasTable('cards_properties')) {
-					$table = $schema->getTable('cards_properties');
-
-					if (!$table->hasIndex('cards_prop_abid')) {
-						$subject->addHintForMissingSubject($table->getName(), 'cards_prop_abid');
-					}
-				}
-
-				if ($schema->hasTable('calendarobjects_props')) {
-					$table = $schema->getTable('calendarobjects_props');
-
-					if (!$table->hasIndex('calendarobject_calid_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'calendarobject_calid_index');
-					}
-				}
-
-				if ($schema->hasTable('schedulingobjects')) {
-					$table = $schema->getTable('schedulingobjects');
-					if (!$table->hasIndex('schedulobj_principuri_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'schedulobj_principuri_index');
-					}
-				}
-
-				if ($schema->hasTable('properties')) {
-					$table = $schema->getTable('properties');
-					if (!$table->hasIndex('properties_path_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'properties_path_index');
-					}
-				}
-			}
-		);
-
-		$oldEventDispatcher->addListener(IDBConnection::CHECK_MISSING_PRIMARY_KEYS_EVENT,
-			function (GenericEvent $event) use ($container) {
-				/** @var MissingPrimaryKeyInformation $subject */
-				$subject = $event->getSubject();
-
-				$schema = new SchemaWrapper($container->query(IDBConnection::class));
-
-				if ($schema->hasTable('federated_reshares')) {
-					$table = $schema->getTable('federated_reshares');
-
-					if (!$table->hasPrimaryKey()) {
-						$subject->addHintForMissingSubject($table->getName());
-					}
-				}
-
-				if ($schema->hasTable('systemtag_object_mapping')) {
-					$table = $schema->getTable('systemtag_object_mapping');
-
-					if (!$table->hasPrimaryKey()) {
-						$subject->addHintForMissingSubject($table->getName());
-					}
-				}
-
-				if ($schema->hasTable('comments_read_markers')) {
-					$table = $schema->getTable('comments_read_markers');
-
-					if (!$table->hasPrimaryKey()) {
-						$subject->addHintForMissingSubject($table->getName());
-					}
-				}
-
-				if ($schema->hasTable('collres_resources')) {
-					$table = $schema->getTable('collres_resources');
-
-					if (!$table->hasPrimaryKey()) {
-						$subject->addHintForMissingSubject($table->getName());
-					}
-				}
-
-				if ($schema->hasTable('collres_accesscache')) {
-					$table = $schema->getTable('collres_accesscache');
-
-					if (!$table->hasPrimaryKey()) {
-						$subject->addHintForMissingSubject($table->getName());
-					}
-				}
-
-				if ($schema->hasTable('filecache_extended')) {
-					$table = $schema->getTable('filecache_extended');
-
-					if (!$table->hasPrimaryKey()) {
-						$subject->addHintForMissingSubject($table->getName());
-					}
-				}
-			}
-		);
-
-		$oldEventDispatcher->addListener(IDBConnection::CHECK_MISSING_COLUMNS_EVENT,
-			function (GenericEvent $event) use ($container) {
-				/** @var MissingColumnInformation $subject */
-				$subject = $event->getSubject();
-
-				$schema = new SchemaWrapper($container->query(IDBConnection::class));
-
-				if ($schema->hasTable('comments')) {
-					$table = $schema->getTable('comments');
-
-					if (!$table->hasColumn('reference_id')) {
-						$subject->addHintForMissingColumn($table->getName(), 'reference_id');
-					}
-				}
-			}
-		);
-
-		$eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeActivityListener::class);
-		$eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeNotificationsListener::class);
-		$eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeEmailListener::class);
-		$eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeActivityListener::class);
-		$eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeNotificationsListener::class);
-		$eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeEmailListener::class);
-		$eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedStoreCleanupListener::class);
-		$eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedTokenCleanupListener::class);
-	}
+    public function __construct() {
+        parent::__construct('core');
+
+        $container = $this->getContainer();
+
+        $container->registerService('defaultMailAddress', function () {
+            return Util::getDefaultEmailAddress('lostpassword-noreply');
+        });
+
+        $server = $container->getServer();
+        /** @var IEventDispatcher $eventDispatcher */
+        $eventDispatcher = $server->query(IEventDispatcher::class);
+
+        $notificationManager = $server->getNotificationManager();
+        $notificationManager->registerNotifierService(CoreNotifier::class);
+        $notificationManager->registerNotifierService(AuthenticationNotifier::class);
+
+        $oldEventDispatcher = $server->getEventDispatcher();
+
+        $oldEventDispatcher->addListener(IDBConnection::CHECK_MISSING_INDEXES_EVENT,
+            function (GenericEvent $event) use ($container) {
+                /** @var MissingIndexInformation $subject */
+                $subject = $event->getSubject();
+
+                $schema = new SchemaWrapper($container->query(IDBConnection::class));
+
+                if ($schema->hasTable('share')) {
+                    $table = $schema->getTable('share');
+
+                    if (!$table->hasIndex('share_with_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'share_with_index');
+                    }
+                    if (!$table->hasIndex('parent_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'parent_index');
+                    }
+                    if (!$table->hasIndex('owner_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'owner_index');
+                    }
+                    if (!$table->hasIndex('initiator_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'initiator_index');
+                    }
+                }
+
+                if ($schema->hasTable('filecache')) {
+                    $table = $schema->getTable('filecache');
+
+                    if (!$table->hasIndex('fs_mtime')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'fs_mtime');
+                    }
+
+                    if (!$table->hasIndex('fs_size')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'fs_size');
+                    }
+                }
+
+                if ($schema->hasTable('twofactor_providers')) {
+                    $table = $schema->getTable('twofactor_providers');
+
+                    if (!$table->hasIndex('twofactor_providers_uid')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'twofactor_providers_uid');
+                    }
+                }
+
+                if ($schema->hasTable('login_flow_v2')) {
+                    $table = $schema->getTable('login_flow_v2');
+
+                    if (!$table->hasIndex('poll_token')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'poll_token');
+                    }
+                    if (!$table->hasIndex('login_token')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'login_token');
+                    }
+                    if (!$table->hasIndex('timestamp')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'timestamp');
+                    }
+                }
+
+                if ($schema->hasTable('whats_new')) {
+                    $table = $schema->getTable('whats_new');
+
+                    if (!$table->hasIndex('version')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'version');
+                    }
+                }
+
+                if ($schema->hasTable('cards')) {
+                    $table = $schema->getTable('cards');
+
+                    if (!$table->hasIndex('cards_abid')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'cards_abid');
+                    }
+                }
+
+                if ($schema->hasTable('cards_properties')) {
+                    $table = $schema->getTable('cards_properties');
+
+                    if (!$table->hasIndex('cards_prop_abid')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'cards_prop_abid');
+                    }
+                }
+
+                if ($schema->hasTable('calendarobjects_props')) {
+                    $table = $schema->getTable('calendarobjects_props');
+
+                    if (!$table->hasIndex('calendarobject_calid_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'calendarobject_calid_index');
+                    }
+                }
+
+                if ($schema->hasTable('schedulingobjects')) {
+                    $table = $schema->getTable('schedulingobjects');
+                    if (!$table->hasIndex('schedulobj_principuri_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'schedulobj_principuri_index');
+                    }
+                }
+
+                if ($schema->hasTable('properties')) {
+                    $table = $schema->getTable('properties');
+                    if (!$table->hasIndex('properties_path_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'properties_path_index');
+                    }
+                }
+            }
+        );
+
+        $oldEventDispatcher->addListener(IDBConnection::CHECK_MISSING_PRIMARY_KEYS_EVENT,
+            function (GenericEvent $event) use ($container) {
+                /** @var MissingPrimaryKeyInformation $subject */
+                $subject = $event->getSubject();
+
+                $schema = new SchemaWrapper($container->query(IDBConnection::class));
+
+                if ($schema->hasTable('federated_reshares')) {
+                    $table = $schema->getTable('federated_reshares');
+
+                    if (!$table->hasPrimaryKey()) {
+                        $subject->addHintForMissingSubject($table->getName());
+                    }
+                }
+
+                if ($schema->hasTable('systemtag_object_mapping')) {
+                    $table = $schema->getTable('systemtag_object_mapping');
+
+                    if (!$table->hasPrimaryKey()) {
+                        $subject->addHintForMissingSubject($table->getName());
+                    }
+                }
+
+                if ($schema->hasTable('comments_read_markers')) {
+                    $table = $schema->getTable('comments_read_markers');
+
+                    if (!$table->hasPrimaryKey()) {
+                        $subject->addHintForMissingSubject($table->getName());
+                    }
+                }
+
+                if ($schema->hasTable('collres_resources')) {
+                    $table = $schema->getTable('collres_resources');
+
+                    if (!$table->hasPrimaryKey()) {
+                        $subject->addHintForMissingSubject($table->getName());
+                    }
+                }
+
+                if ($schema->hasTable('collres_accesscache')) {
+                    $table = $schema->getTable('collres_accesscache');
+
+                    if (!$table->hasPrimaryKey()) {
+                        $subject->addHintForMissingSubject($table->getName());
+                    }
+                }
+
+                if ($schema->hasTable('filecache_extended')) {
+                    $table = $schema->getTable('filecache_extended');
+
+                    if (!$table->hasPrimaryKey()) {
+                        $subject->addHintForMissingSubject($table->getName());
+                    }
+                }
+            }
+        );
+
+        $oldEventDispatcher->addListener(IDBConnection::CHECK_MISSING_COLUMNS_EVENT,
+            function (GenericEvent $event) use ($container) {
+                /** @var MissingColumnInformation $subject */
+                $subject = $event->getSubject();
+
+                $schema = new SchemaWrapper($container->query(IDBConnection::class));
+
+                if ($schema->hasTable('comments')) {
+                    $table = $schema->getTable('comments');
+
+                    if (!$table->hasColumn('reference_id')) {
+                        $subject->addHintForMissingColumn($table->getName(), 'reference_id');
+                    }
+                }
+            }
+        );
+
+        $eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeActivityListener::class);
+        $eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeNotificationsListener::class);
+        $eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeEmailListener::class);
+        $eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeActivityListener::class);
+        $eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeNotificationsListener::class);
+        $eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeEmailListener::class);
+        $eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedStoreCleanupListener::class);
+        $eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedTokenCleanupListener::class);
+    }
 }