Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9eb3fbb

Browse files
committed
bug#57748 [SecurityBundle] use firewall-specific user checkers when manually logging in users (xabbuh)
This PR was merged into the 6.4 branch.Discussion----------[SecurityBundle] use firewall-specific user checkers when manually logging in users| Q | A| ------------- | ---| Branch? | 6.4| Bug fix? | yes| New feature? | no| Deprecations? | no| Issues |Fix#57706| License | MITCommits-------22a0789 use firewall-specific user checkers when manually logging in users
2 parents169055a +22a0789 commit9eb3fbb

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,9 @@ private function createFirewall(ContainerBuilder $container, string $id, array $
579579

580580
$container->setAlias('security.user_checker.'.$id,newAlias($firewall['user_checker'],false));
581581

582+
$userCheckerLocator =$container->getDefinition('security.user_checker_locator');
583+
$userCheckerLocator->replaceArgument(0,array_merge($userCheckerLocator->getArgument(0), [$id =>newServiceClosureArgument(newReference('security.user_checker.'.$id))]));
584+
582585
foreach ($this->getSortedFactories()as$factory) {
583586
$key =str_replace('-','_',$factory->getKey());
584587
if ('custom_authenticators' !==$key &&\array_key_exists($key,$firewall)) {

‎src/Symfony/Bundle/SecurityBundle/Resources/config/security.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
useSymfony\Bundle\SecurityBundle\Security\FirewallContext;
2020
useSymfony\Bundle\SecurityBundle\Security\FirewallMap;
2121
useSymfony\Bundle\SecurityBundle\Security\LazyFirewallContext;
22+
useSymfony\Component\DependencyInjection\ServiceLocator;
2223
useSymfony\Component\ExpressionLanguage\ExpressionLanguageasBaseExpressionLanguage;
2324
useSymfony\Component\Ldap\Security\LdapUserProvider;
2425
useSymfony\Component\Security\Core\Authentication\AuthenticationTrustResolver;
@@ -88,7 +89,7 @@
8889
'security.authenticator.managers_locator' =>service('security.authenticator.managers_locator')->ignoreOnInvalid(),
8990
'request_stack' =>service('request_stack'),
9091
'security.firewall.map' =>service('security.firewall.map'),
91-
'security.user_checker' =>service('security.user_checker'),
92+
'security.user_checker_locator' =>service('security.user_checker_locator'),
9293
'security.firewall.event_dispatcher_locator' =>service('security.firewall.event_dispatcher_locator'),
9394
'security.csrf.token_manager' =>service('security.csrf.token_manager')->ignoreOnInvalid(),
9495
]),
@@ -124,6 +125,8 @@
124125
->args(['none'])
125126

126127
->set('security.user_checker', InMemoryUserChecker::class)
128+
->set('security.user_checker_locator', ServiceLocator::class)
129+
->args([[]])
127130

128131
->set('security.expression_language', ExpressionLanguage::class)
129132
->args([service('cache.security_expression_language')->nullOnInvalid()])

‎src/Symfony/Bundle/SecurityBundle/Security.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ public function login(UserInterface $user, ?string $authenticatorName = null, ?s
127127

128128
$authenticator =$this->getAuthenticator($authenticatorName,$firewallName);
129129

130-
$this->container->get('security.user_checker')->checkPreAuth($user);
130+
$userCheckerLocator =$this->container->get('security.user_checker_locator');
131+
$userCheckerLocator->get($firewallName)->checkPreAuth($user);
131132

132133
return$this->container->get('security.authenticator.managers_locator')->get($firewallName)->authenticateUser($user,$authenticator,$request,$badges);
133134
}

‎src/Symfony/Bundle/SecurityBundle/Tests/SecurityTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public function testLogin()
142142
['request_stack',$requestStack],
143143
['security.firewall.map',$firewallMap],
144144
['security.authenticator.managers_locator',$this->createContainer('main',$userAuthenticator)],
145-
['security.user_checker',$userChecker],
145+
['security.user_checker_locator',$this->createContainer('main',$userChecker)],
146146
])
147147
;
148148

@@ -188,7 +188,7 @@ public function testLoginReturnsAuthenticatorResponse()
188188
['request_stack',$requestStack],
189189
['security.firewall.map',$firewallMap],
190190
['security.authenticator.managers_locator',$this->createContainer('main',$userAuthenticator)],
191-
['security.user_checker',$userChecker],
191+
['security.user_checker_locator',$this->createContainer('main',$userChecker)],
192192
])
193193
;
194194

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp