summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu Auger <mail@matthieuauger.com>2013-12-19 23:14:26 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2013-12-20 16:43:18 +0100
commit8f61147b69f8b6289ae94388d8cf523dad446273 (patch)
treeee639699e9bfd980383c1bbfe7be8b0aab29eb6c
parentd195e94d9bdc366116887ee9c5eee04eb9dc1a76 (diff)
downloadsymfony-security-8f61147b69f8b6289ae94388d8cf523dad446273.zip
symfony-security-8f61147b69f8b6289ae94388d8cf523dad446273.tar.gz
symfony-security-8f61147b69f8b6289ae94388d8cf523dad446273.tar.bz2
fix #9356 [Security] Logger should manipulate the user reloaded from provider
-rw-r--r--Http/Firewall/ContextListener.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/Http/Firewall/ContextListener.php b/Http/Firewall/ContextListener.php
index 81ccbdc..60ab3df 100644
--- a/Http/Firewall/ContextListener.php
+++ b/Http/Firewall/ContextListener.php
@@ -156,10 +156,11 @@ class ContextListener implements ListenerInterface
foreach ($this->userProviders as $provider) {
try {
- $token->setUser($provider->refreshUser($user));
+ $refreshedUser = $provider->refreshUser($user);
+ $token->setUser($refreshedUser);
if (null !== $this->logger) {
- $this->logger->debug(sprintf('Username "%s" was reloaded from user provider.', $user->getUsername()));
+ $this->logger->debug(sprintf('Username "%s" was reloaded from user provider.', $refreshedUser->getUsername()));
}
return $token;
@@ -167,7 +168,7 @@ class ContextListener implements ListenerInterface
// let's try the next user provider
} catch (UsernameNotFoundException $notFound) {
if (null !== $this->logger) {
- $this->logger->warning(sprintf('Username "%s" could not be found.', $user->getUsername()));
+ $this->logger->warning(sprintf('Username "%s" could not be found.', $notFound->getUsername()));
}
return null;