Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bug #37047 [SecurityBundle] Only register CSRF protection listener if…
… CSRF is available (wouterj) This PR was merged into the 5.1 branch. Discussion ---------- [SecurityBundle] Only register CSRF protection listener if CSRF is available | Q | A | ------------- | --- | Branch? | 5.1 | Bug fix? | yes | New feature? | no | Deprecations? | yes | Tickets | Fix #37033 | License | MIT | Doc PR | - I know we're not allowed to add new deprecations in already released versions. However, I don't think anyone is using SecurityBundle's compiler passes except from Symfony itself - so I don't think anyone is affected by this deprecation. The alternatives would be: * Add a new compiler pass in 5.1 that conditionally registers the CSRF listener * Do this exact change in 5.2 and... * accept a `null` argument in the listener for 5.1 * or add this to the `RegisterCsrfTokenClearingLogoutHandlerPass` class in 5.1 Commits ------- 2d738b3 Only register CSRF protection listener if CSRF is available
- Loading branch information
Showing
4 changed files
with
76 additions
and
24 deletions.
There are no files selected for viewing
68 changes: 68 additions & 0 deletions
68
src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterCsrfFeaturesPass.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the Symfony package. | ||
* | ||
* (c) Fabien Potencier <fabien@symfony.com> | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler; | ||
|
||
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; | ||
use Symfony\Component\DependencyInjection\ContainerBuilder; | ||
use Symfony\Component\DependencyInjection\Reference; | ||
use Symfony\Component\Security\Http\EventListener\CsrfProtectionListener; | ||
use Symfony\Component\Security\Http\EventListener\CsrfTokenClearingLogoutListener; | ||
|
||
/** | ||
* @author Christian Flothmann <christian.flothmann@sensiolabs.de> | ||
* @author Wouter de Jong <wouter@wouterj.nl> | ||
* | ||
* @internal | ||
*/ | ||
class RegisterCsrfFeaturesPass implements CompilerPassInterface | ||
{ | ||
public function process(ContainerBuilder $container) | ||
{ | ||
if (!$container->has('security.csrf.token_storage')) { | ||
return; | ||
} | ||
|
||
$this->registerCsrfProtectionListener($container); | ||
$this->registerLogoutHandler($container); | ||
} | ||
|
||
private function registerCsrfProtectionListener(ContainerBuilder $container) | ||
{ | ||
if (!$container->has('security.authenticator.manager')) { | ||
return; | ||
} | ||
|
||
$container->register('security.listener.csrf_protection', CsrfProtectionListener::class) | ||
->addArgument(new Reference('security.csrf.token_storage')) | ||
->addTag('kernel.event_subscriber') | ||
->setPublic(false); | ||
} | ||
|
||
protected function registerLogoutHandler(ContainerBuilder $container) | ||
{ | ||
if (!$container->has('security.logout_listener')) { | ||
return; | ||
} | ||
|
||
$csrfTokenStorage = $container->findDefinition('security.csrf.token_storage'); | ||
$csrfTokenStorageClass = $container->getParameterBag()->resolveValue($csrfTokenStorage->getClass()); | ||
|
||
if (!is_subclass_of($csrfTokenStorageClass, 'Symfony\Component\Security\Csrf\TokenStorage\ClearableTokenStorageInterface')) { | ||
return; | ||
} | ||
|
||
$container->register('security.logout.listener.csrf_token_clearing', CsrfTokenClearingLogoutListener::class) | ||
->addArgument(new Reference('security.csrf.token_storage')) | ||
->addTag('kernel.event_subscriber') | ||
->setPublic(false); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters