Added failure_path_parameter to mirror target_path_parameter

leevigraham · fabpot · commit d0057d0e643d · 2012-12-06T14:11:05.000+01:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
@@ -43,6 +43,7 @@ abstract class AbstractFactory implements SecurityFactoryInterface
         'failure_path'                   => null,
         'failure_forward'                => false,
         'login_path'                     => '/login',
+        'failure_path_parameter'         => '_failure_path',
     );
 
     public function create(ContainerBuilder $container, $id, $config, $userProviderId, $defaultEntryPointId)
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/config.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/config.yml
@@ -33,6 +33,7 @@ security:
                 check_path: /login_check
                 default_target_path: /profile
                 target_path_parameter: "user_login[_target_path]"
+                failure_path_parameter: "user_login[_failure_path]"
                 username_parameter: "user_login[username]"
                 password_parameter: "user_login[password]"
                 csrf_parameter: "user_login[_token]"
diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php
@@ -50,9 +50,10 @@ public function __construct(HttpKernelInterface $httpKernel, HttpUtils $httpUtil
         $this->logger     = $logger;
 
         $this->options = array_merge(array(
-            'failure_path'    => null,
-            'failure_forward' => false,
-            'login_path'      => '/login',
+            'failure_path'           => null,
+            'failure_forward'        => false,
+            'login_path'             => '/login',
+            'failure_path_parameter' => '_failure_path'
         ), $options);
     }
 
@@ -61,6 +62,10 @@ public function __construct(HttpKernelInterface $httpKernel, HttpUtils $httpUtil
      */
     public function onAuthenticationFailure(Request $request, AuthenticationException $exception)
     {
+        if ($failureUrl = $request->get($this->options['failure_path_parameter'], null, true)) {
+             $this->options['failure_path'] = $failureUrl;
+         }
+
         if (null === $this->options['failure_path']) {
             $this->options['failure_path'] = $this->options['login_path'];
         }
