diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SecurityBundle] Fix the session listener registration under the new authentication manager

This commit is contained in:
John VanDeWeghe 2020-06-06 23:14:49 -05:00 committed by Fabien Potencier
parent 5de548b60e
commit 936ae9df75
3 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
View File

@ -168,14 +168,6 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
$container->getDefinition('security.authentication.guard_handler')
->replaceArgument(2, $this->statelessFirewallKeys);
if ($this->authenticatorManagerEnabled) {
foreach ($this->statelessFirewallKeys as $statelessFirewallId) {
$container
->setDefinition('security.listener.session.'.$statelessFirewallId, new ChildDefinition('security.listener.session'))
->addTag('kernel.event_subscriber', ['dispatcher' => 'security.event_dispatcher.'.$statelessFirewallId]);
}
}
if ($config['encoders']) {
$this->createEncoders($config['encoders'], $container);
}
@ -373,6 +365,12 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
$contextKey = $firewall['context'] ?? $id;
$listeners[] = new Reference($contextListenerId = $this->createContextListener($container, $contextKey));
$sessionStrategyId = 'security.authentication.session_strategy';
if ($this->authenticatorManagerEnabled) {
$container
->setDefinition('security.listener.session.'.$id, new ChildDefinition('security.listener.session'))
->addTag('kernel.event_subscriber', ['dispatcher' => $firewallEventDispatcherId]);
}
} else {
$this->statelessFirewallKeys[] = $id;
$sessionStrategyId = 'security.authentication.session_strategy_noop';

1
src/Symfony/Bundle/SecurityBundle/Resources/config/security_authenticator.xml
View File

@ -63,7 +63,6 @@
class="Symfony\Component\Security\Http\EventListener\SessionStrategyListener"
abstract="true">
<argument type="service" id="security.authentication.session_strategy" />
<argument type="abstract">stateless firewall keys</argument>
</service>
<service id="security.listener.remember_me"

42
src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
View File

@ -559,6 +559,48 @@ class SecurityExtensionTest extends TestCase
];
}
public function testCompilesWithoutSessionListenerWithStatelessFirewallWithAuthenticationManager()
{
$container = $this->getRawContainer();
$firewallId = 'stateless_firewall';
$container->loadFromExtension('security', [
'enable_authenticator_manager' => true,
'firewalls' => [
$firewallId => [
'pattern' => '/.*',
'stateless' => true,
'http_basic' => null,
],
],
]);
$container->compile();
$this->assertFalse($container->has('security.listener.session.'.$firewallId));
}
public function testCompilesWithSessionListenerWithStatefulllFirewallWithAuthenticationManager()
{
$container = $this->getRawContainer();
$firewallId = 'statefull_firewall';
$container->loadFromExtension('security', [
'enable_authenticator_manager' => true,
'firewalls' => [
$firewallId => [
'pattern' => '/.*',
'stateless' => false,
'http_basic' => null,
],
],
]);
$container->compile();
$this->assertTrue($container->has('security.listener.session.'.$firewallId));
}
protected function getRawContainer()
{
$container = new ContainerBuilder();