bug #49446 [SecurityBundle] Fix Security::login() on specific firewall (chalasr)

nicolas-grekas · nicolas-grekas · commit 0eb0ae5ae29f · 2023-02-21T13:32:54.000+01:00
This PR was merged into the 6.2 branch. Discussion ---------- [SecurityBundle] Fix `Security::login()` on specific firewall | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #49444 | License | MIT | Doc PR | - Commits ------- f7043db [SecurityBundle] Fix `Security::login()` on specific firewall
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.php b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.php
@@ -83,7 +83,7 @@
                 service_locator([
                     'security.token_storage' => service('security.token_storage'),
                     'security.authorization_checker' => service('security.authorization_checker'),
-                    'security.user_authenticator' => service('security.user_authenticator')->ignoreOnInvalid(),
+                    'security.authenticator.managers_locator' => service('security.authenticator.managers_locator')->ignoreOnInvalid(),
                     'request_stack' => service('request_stack'),
                     'security.firewall.map' => service('security.firewall.map'),
                     'security.user_checker' => service('security.user_checker'),
diff --git a/src/Symfony/Bundle/SecurityBundle/Security.php b/src/Symfony/Bundle/SecurityBundle/Security.php
@@ -69,7 +69,7 @@ public function login(UserInterface $user, string $authenticatorName = null, str
         $authenticator = $this->getAuthenticator($authenticatorName, $firewallName);
 
         $this->container->get('security.user_checker')->checkPreAuth($user);
-        $this->container->get('security.user_authenticator')->authenticateUser($user, $authenticator, $request);
+        $this->container->get('security.authenticator.managers_locator')->get($firewallName)->authenticateUser($user, $authenticator, $request);
     }
 
     /**
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/SecurityHelper/config.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/SecurityHelper/config.yml
@@ -40,7 +40,16 @@ security:
             custom_authenticators:
                 - 'Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\AuthenticatorBundle\ApiAuthenticator'
             provider: main
+        second:
+            pattern: ^/second
+            form_login:
+                check_path: /second/login/check
+            custom_authenticators:
+                - 'Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\AuthenticatorBundle\ApiAuthenticator'
+            provider: main
 
     access_control:
         - { path: '^/main/login/check$', roles: IS_AUTHENTICATED_FULLY }
         - { path: '^/main/logged-in$', roles: IS_AUTHENTICATED_FULLY }
+        - { path: '^/second/login/check$', roles: IS_AUTHENTICATED_FULLY }
+        - { path: '^/second/logged-in$', roles: IS_AUTHENTICATED_FULLY }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/SecurityHelper/routing.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/SecurityHelper/routing.yml
@@ -9,3 +9,11 @@ logged-in:
 force-logout:
     path: /main/force-logout
     controller: Symfony\Bundle\SecurityBundle\Tests\Functional\LogoutController::logout
+
+second-force-login:
+    path: /second/force-login
+    controller: Symfony\Bundle\SecurityBundle\Tests\Functional\ForceLoginController::welcome
+
+second-logged-in:
+    path: /second/logged-in
+    controller: Symfony\Bundle\SecurityBundle\Tests\Functional\LoggedInController
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/SecurityTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/SecurityTest.php
@@ -141,7 +141,7 @@ public function testLogin()
             ->willReturnMap([
                 ['request_stack', $requestStack],
                 ['security.firewall.map', $firewallMap],
-                ['security.user_authenticator', $userAuthenticator],
+                ['security.authenticator.managers_locator', new ServiceLocator(['main' => fn () => $userAuthenticator])],
                 ['security.user_checker', $userChecker],
             ])
         ;

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function login(UserInterface $user, string $authenticatorName = null, str`
`69`	`69`	`$authenticator = $this->getAuthenticator($authenticatorName, $firewallName);`
`70`	`70`
`71`	`71`	`$this->container->get('security.user_checker')->checkPreAuth($user);`
`72`		`- $this->container->get('security.user_authenticator')->authenticateUser($user, $authenticator, $request);`
	`72`	`+ $this->container->get('security.authenticator.managers_locator')->get($firewallName)->authenticateUser($user, $authenticator, $request);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public function testLogin()`
`141`	`141`	`->willReturnMap([`
`142`	`142`	`['request_stack', $requestStack],`
`143`	`143`	`['security.firewall.map', $firewallMap],`
`144`		`- ['security.user_authenticator', $userAuthenticator],`
	`144`	`+ ['security.authenticator.managers_locator', new ServiceLocator(['main' => fn () => $userAuthenticator])],`
`145`	`145`	`['security.user_checker', $userChecker],`
`146`	`146`	`])`
`147`	`147`	`;`