merged branch snc/issue-1798-sf21 (PR #2598)

fabpot · fabpot · commit 47b09f791b83 · 2011-11-10T10:55:51.000+01:00
Commits ------- 4d80ebd Remove security token if user was deleted, is disabled or locked to prevent infinite redirect loops to the login path (fixes #1798). Discussion ---------- [2.1] Fix for issue 1798 Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: #1798 This is a simplified PR of #2528 for the master branch.
diff --git a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
@@ -160,10 +160,9 @@ private function startAuthentication(Request $request, AuthenticationException $
 
         $this->setTargetPath($request);
 
-        if ($authException instanceof AccountStatusException && ($token = $this->context->getToken()) instanceof UsernamePasswordToken) {
+        if ($authException instanceof AccountStatusException) {
             // remove the security token to prevent infinite redirect loops
             $this->context->setToken(null);
-            $request->getSession()->remove('_security_' . $token->getProviderKey());
         }
 
         return $this->authenticationEntryPoint->start($request, $authException);

Original file line number	Diff line number	Diff line change
`@@ -160,10 +160,9 @@ private function startAuthentication(Request $request, AuthenticationException $`
`160`	`160`
`161`	`161`	`$this->setTargetPath($request);`
`162`	`162`
`163`		`- if ($authException instanceof AccountStatusException && ($token = $this->context->getToken()) instanceof UsernamePasswordToken) {`
	`163`	`+ if ($authException instanceof AccountStatusException) {`
`164`	`164`	`// remove the security token to prevent infinite redirect loops`
`165`	`165`	`$this->context->setToken(null);`
`166`		`- $request->getSession()->remove('_security_' . $token->getProviderKey());`
`167`	`166`	`}`
`168`	`167`
`169`	`168`	`return $this->authenticationEntryPoint->start($request, $authException);`