Commitd5db9d8

committed

fix(security): user login programmatically with dedicated user checker on a firewall

1 parentbf1ffd3 commitd5db9d8Copy full SHA for d5db9d8

File tree

+21

-1

lines changed

+21

-1

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -424,6 +424,14 @@ private function createFirewall(ContainerBuilder $container, string $id, array $`
`424`	`424`	`$container->register('security.user_checker.chain.'.$id, ChainUserChecker::class)`
`425`	`425`	`->addArgument(newTaggedIteratorArgument('security.user_checker.'.$id));`
`426`	`426`
	`427`	`+// Register Firewall-specific user checker for 'security.helper' login()`
	`428`	`+$securityUserCheckerLocator =$container->getDefinition('security.user_checker_locator');`
	`429`	`+$securityUserCheckerLocator`
	`430`	`+ ->replaceArgument(0,array_merge($securityUserCheckerLocator->getArgument(0), [`
	`431`	`+'security.user_checker.'.$id =>newServiceClosureArgument(newReference('security.user_checker.'.$id)),`
	`432`	`+ ]))`
	`433`	`+ ;`
	`434`	`+`
`427`	`435`	`// Register listeners`
`428`	`436`	`$listeners = [];`
`429`	`437`	`$listenerKeys = [];`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`useSymfony\Bundle\SecurityBundle\Security\FirewallContext;`
`20`	`20`	`useSymfony\Bundle\SecurityBundle\Security\FirewallMap;`
`21`	`21`	`useSymfony\Bundle\SecurityBundle\Security\LazyFirewallContext;`
	`22`	`+useSymfony\Component\DependencyInjection\ServiceLocator;`
`22`	`23`	`useSymfony\Component\ExpressionLanguage\ExpressionLanguageasBaseExpressionLanguage;`
`23`	`24`	`useSymfony\Component\Ldap\Security\LdapUserProvider;`
`24`	`25`	`useSymfony\Component\Security\Core\Authentication\AuthenticationTrustResolver;`
`@@ -80,6 +81,9 @@`
`80`	`81`
`81`	`82`	`->set('security.untracked_token_storage', TokenStorage::class)`
`82`	`83`
	`84`	`+ ->set('security.user_checker_locator', ServiceLocator::class)`
	`85`	`+ ->args([[]])`
	`86`	`+`
`83`	`87`	`->set('security.helper', Security::class)`
`84`	`88`	`->args([`
`85`	`89`	`service_locator([`
`@@ -89,6 +93,7 @@`
`89`	`93`	`'request_stack' =>service('request_stack'),`
`90`	`94`	`'security.firewall.map' =>service('security.firewall.map'),`
`91`	`95`	`'security.user_checker' =>service('security.user_checker'),`
	`96`	`+'security.user_checker_locator' =>service('security.user_checker_locator'),`
`92`	`97`	`'security.firewall.event_dispatcher_locator' =>service('security.firewall.event_dispatcher_locator'),`
`93`	`98`	`'security.csrf.token_manager' =>service('security.csrf.token_manager')->ignoreOnInvalid(),`
`94`	`99`	`]),`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,11 @@ public function login(UserInterface $user, ?string $authenticatorName = null, ?s`
`127`	`127`
`128`	`128`	`$authenticator =$this->getAuthenticator($authenticatorName,$firewallName);`
`129`	`129`
`130`		`-$this->container->get('security.user_checker')->checkPreAuth($user);`
	`130`	`+if ($this->container->get('security.user_checker_locator')->has('security.user_checker.'.$firewallName)) {`
	`131`	`+$this->container->get('security.user_checker_locator')->get('security.user_checker.'.$firewallName)->checkPreAuth($user);`
	`132`	`+ }else {`
	`133`	`+$this->container->get('security.user_checker')->checkPreAuth($user);`
	`134`	`+ }`
`131`	`135`
`132`	`136`	`return$this->container->get('security.authenticator.managers_locator')->get($firewallName)->authenticateUser($user,$authenticator,$request,$badges);`
`133`	`137`	`}`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ public function testLogin()`
`143`	`143`	`['security.firewall.map',$firewallMap],`
`144`	`144`	`['security.authenticator.managers_locator',$this->createContainer('main',$userAuthenticator)],`
`145`	`145`	`['security.user_checker',$userChecker],`
	`146`	`+ ['security.user_checker_locator',$this->createContainer('security.user_checker.main',$userChecker)],`
`146`	`147`	`])`
`147`	`148`	`;`
`148`	`149`
`@@ -189,6 +190,7 @@ public function testLoginReturnsAuthenticatorResponse()`
`189`	`190`	`['security.firewall.map',$firewallMap],`
`190`	`191`	`['security.authenticator.managers_locator',$this->createContainer('main',$userAuthenticator)],`
`191`	`192`	`['security.user_checker',$userChecker],`
	`193`	`+ ['security.user_checker_locator',$this->createContainer('security.user_checker.main',$userChecker)],`
`192`	`194`	`])`
`193`	`195`	`;`
`194`	`196`
`@@ -238,6 +240,7 @@ public function testLoginWithoutAuthenticatorThrows()`
`238`	`240`	`['request_stack',$requestStack],`
`239`	`241`	`['security.firewall.map',$firewallMap],`
`240`	`242`	`['security.user_checker',$userChecker],`
	`243`	`+ ['security.user_checker_locator',$this->createContainer('security.user_checker.main',$userChecker)],`
`241`	`244`	`])`
`242`	`245`	`;`
`243`	`246`

Comments

(0)