fix(user): Introduce a public constant for max length of user id

Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/52224/head
Joas Schilling 6 months ago
parent 775ca882f3
commit 1ada9910b1
No known key found for this signature in database
GPG Key ID: F72FA5B49FFA96B0
  1. 5
      lib/private/User/DisplayNameCache.php
  2. 9
      lib/private/User/Manager.php
  3. 5
      lib/public/IUser.php

@ -11,6 +11,7 @@ use OCP\EventDispatcher\Event;
use OCP\EventDispatcher\IEventListener;
use OCP\ICache;
use OCP\ICacheFactory;
use OCP\IUser;
use OCP\IUserManager;
use OCP\User\Events\UserChangedEvent;
use OCP\User\Events\UserDeletedEvent;
@ -24,8 +25,6 @@ use OCP\User\Events\UserDeletedEvent;
* @template-implements IEventListener<UserChangedEvent|UserDeletedEvent>
*/
class DisplayNameCache implements IEventListener {
/** @see \OC\Config\UserConfig::USER_MAX_LENGTH */
public const MAX_USERID_LENGTH = 64;
private array $cache = [];
private ICache $memCache;
private IUserManager $userManager;
@ -40,7 +39,7 @@ class DisplayNameCache implements IEventListener {
return $this->cache[$userId];
}
if (strlen($userId) > self::MAX_USERID_LENGTH) {
if (strlen($userId) > IUser::MAX_USERID_LENGTH) {
return null;
}

@ -53,9 +53,6 @@ use Psr\Log\LoggerInterface;
* @package OC\User
*/
class Manager extends PublicEmitter implements IUserManager {
/** @see \OC\Config\UserConfig::USER_MAX_LENGTH */
public const MAX_USERID_LENGTH = 64;
/**
* @var UserInterface[] $backends
*/
@ -121,7 +118,7 @@ class Manager extends PublicEmitter implements IUserManager {
return $this->cachedUsers[$uid];
}
if (strlen($uid) > self::MAX_USERID_LENGTH) {
if (strlen($uid) > IUser::MAX_USERID_LENGTH) {
return null;
}
@ -184,7 +181,7 @@ class Manager extends PublicEmitter implements IUserManager {
* @return bool
*/
public function userExists($uid) {
if (strlen($uid) > self::MAX_USERID_LENGTH) {
if (strlen($uid) > IUser::MAX_USERID_LENGTH) {
return false;
}
@ -726,7 +723,7 @@ class Manager extends PublicEmitter implements IUserManager {
}
// User ID is too long
if (strlen($uid) > self::MAX_USERID_LENGTH) {
if (strlen($uid) > IUser::MAX_USERID_LENGTH) {
throw new \InvalidArgumentException($l->t('Login is too long'));
}

@ -15,6 +15,11 @@ use InvalidArgumentException;
* @since 8.0.0
*/
interface IUser {
/**
* @since 32.0.0
*/
public const MAX_USERID_LENGTH = 64;
/**
* get the user id
*

Loading…
Cancel
Save