diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug symfony/symfony#39878 [doctrine-bridge] Add username to UserNameNotFoundException

Browse Source
This commit is contained in:
Gerben Oolbekkink 2021-01-18 17:47:55 +01:00
parent 6af444607c
commit ee5b51af78
4 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php
View File

@ -62,7 +62,10 @@ class EntityUserProvider implements UserProviderInterface, PasswordUpgraderInter
}
if (null === $user) {
throw new UsernameNotFoundException(sprintf('User "%s" not found.', $username));
$e = new UsernameNotFoundException(sprintf('User "%s" not found.', $username));
$e->setUsername($username);
throw $e;
}
return $user;
@ -92,7 +95,10 @@ class EntityUserProvider implements UserProviderInterface, PasswordUpgraderInter
$refreshedUser = $repository->find($id);
if (null === $refreshedUser) {
throw new UsernameNotFoundException('User with id '.json_encode($id).' not found.');
$e = new UsernameNotFoundException('User with id '.json_encode($id).' not found.');
$e->setUsername(json_encode($id));
throw $e;
}
}

5
src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/SecuredPageBundle/Security/Core/User/ArrayUserProvider.php
View File

@ -34,7 +34,10 @@ class ArrayUserProvider implements UserProviderInterface
$user = $this->getUser($username);
if (null === $user) {
throw new UsernameNotFoundException(sprintf('User "%s" not found.', $username));
$e = new UsernameNotFoundException(sprintf('User "%s" not found.', $username));
$e->setUsername($username);
throw $e;
}
return $user;

15
src/Symfony/Component/Ldap/Security/LdapUserProvider.php
View File

@ -73,18 +73,27 @@ class LdapUserProvider implements UserProviderInterface, PasswordUpgraderInterfa
$query = str_replace('{username}', $username, $this->defaultSearch);
$search = $this->ldap->query($this->baseDn, $query);
} catch (ConnectionException $e) {
throw new UsernameNotFoundException(sprintf('User "%s" not found.', $username), 0, $e);
$e = new UsernameNotFoundException(sprintf('User "%s" not found.', $username), 0, $e);
$e->setUsername($username);
throw $e;
}
$entries = $search->execute();
$count = \count($entries);
if (!$count) {
throw new UsernameNotFoundException(sprintf('User "%s" not found.', $username));
$e = new UsernameNotFoundException(sprintf('User "%s" not found.', $username));
$e->setUsername($username);
throw $e;
}
if ($count > 1) {
throw new UsernameNotFoundException('More than one user found.');
$e = new UsernameNotFoundException('More than one user found.');
$e->setUsername($username);
throw $e;
}
$entry = $entries[0];

5
src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php
View File

@ -105,7 +105,10 @@ class GuardAuthenticationProvider implements AuthenticationProviderInterface
$user = $guardAuthenticator->getUser($token->getCredentials(), $this->userProvider);
if (null === $user) {
throw new UsernameNotFoundException(sprintf('Null returned from "%s::getUser()".', \get_class($guardAuthenticator)));
$e = new UsernameNotFoundException(sprintf('Null returned from "%s::getUser()".', \get_class($guardAuthenticator)));
$e->setUsername($token->getUsername());
throw $e;
}
if (!$user instanceof UserInterface) {