summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2013-05-05 18:35:57 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2013-05-05 18:38:27 +0200
commitb4ee7b37ddc38e65dde39b8c8a6b7b78fae6959b (patch)
tree11d082cbeab61e58e1d7e86806bffd83987477cf
parent4d179b80d3dbefbbf1d7553703a4b04f5a363126 (diff)
downloadsymfony-security-b4ee7b37ddc38e65dde39b8c8a6b7b78fae6959b.zip
symfony-security-b4ee7b37ddc38e65dde39b8c8a6b7b78fae6959b.tar.gz
symfony-security-b4ee7b37ddc38e65dde39b8c8a6b7b78fae6959b.tar.bz2
added a missing check for the provider keyv2.1.10
-rw-r--r--Http/Firewall/AbstractPreAuthenticatedListener.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/Http/Firewall/AbstractPreAuthenticatedListener.php b/Http/Firewall/AbstractPreAuthenticatedListener.php
index 66041be..1a0999e 100644
--- a/Http/Firewall/AbstractPreAuthenticatedListener.php
+++ b/Http/Firewall/AbstractPreAuthenticatedListener.php
@@ -47,7 +47,7 @@ abstract class AbstractPreAuthenticatedListener implements ListenerInterface
}
/**
- * Handles X509 authentication.
+ * Handles pre-authentication.
*
* @param GetResponseEvent $event A GetResponseEvent instance
*/
@@ -62,7 +62,7 @@ abstract class AbstractPreAuthenticatedListener implements ListenerInterface
list($user, $credentials) = $this->getPreAuthenticatedData($request);
if (null !== $token = $this->securityContext->getToken()) {
- if ($token instanceof PreAuthenticatedToken && $token->isAuthenticated() && $token->getUsername() === $user) {
+ if ($token instanceof PreAuthenticatedToken && $this->providerKey == $token->getProviderKey() && $token->isAuthenticated() && $token->getUsername() === $user) {
return;
}
}