Use a dedicated cache.rate_limiter cache pool

wouterj · wouterj · commit 251c2028745d · 2020-10-01T14:20:45.000+02:00
Fixes #38365
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1808,7 +1808,7 @@ private function addRateLimiterSection(ArrayNodeDefinition $rootNode)
                                     ->end()
                                     ->scalarNode('cache_pool')
                                         ->info('The cache pool to use for storing the current limiter state')
-                                        ->defaultValue('cache.app')
+                                        ->defaultValue('cache.rate_limiter')
                                     ->end()
                                     ->scalarNode('storage_service')
                                         ->info('The service ID of a custom storage implementation, this precedes any configured "cache_pool"')
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2254,6 +2254,9 @@ private function registerRateLimiterConfiguration(array $config, ContainerBuilde
 
     public static function registerRateLimiter(ContainerBuilder $container, string $name, array $limiterConfig)
     {
+        // default configuration (when used by other DI extensions)
+        $limiterConfig += ['lock_factory' => 'lock.factory', 'cache_pool' => 'cache.rate_limiter'];
+
         $limiter = $container->setDefinition($limiterId = 'limiter.'.$name, new ChildDefinition('limiter'));
 
         $limiter->addArgument(new Reference($limiterConfig['lock_factory']));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/rate_limiter.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/rate_limiter.php
@@ -15,6 +15,10 @@
 
 return static function (ContainerConfigurator $container) {
     $container->services()
+        ->set('cache.rate_limiter')
+            ->parent('cache.app')
+            ->tag('cache.pool')
+
         ->set('limiter', Limiter::class)
             ->abstract()
             ->args([
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/LoginThrottlingFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/LoginThrottlingFactory.php
@@ -76,8 +76,6 @@ public function createAuthenticator(ContainerBuilder $container, string $firewal
                 'strategy' => 'fixed_window',
                 'limit' => $config['max_attempts'],
                 'interval' => '1 minute',
-                'lock_factory' => 'lock.factory',
-                'cache_pool' => 'cache.app',
             ];
             FrameworkExtension::registerRateLimiter($container, $localId = '_login_local_'.$firewallName, $limiterOptions);
 

Original file line number	Diff line number	Diff line change
`@@ -2254,6 +2254,9 @@ private function registerRateLimiterConfiguration(array $config, ContainerBuilde`
`2254`	`2254`
`2255`	`2255`	`public static function registerRateLimiter(ContainerBuilder $container, string $name, array $limiterConfig)`
`2256`	`2256`	`{`
	`2257`	`+ // default configuration (when used by other DI extensions)`
	`2258`	`+ $limiterConfig += ['lock_factory' => 'lock.factory', 'cache_pool' => 'cache.rate_limiter'];`
	`2259`	`+`
`2257`	`2260`	`$limiter = $container->setDefinition($limiterId = 'limiter.'.$name, new ChildDefinition('limiter'));`
`2258`	`2261`
`2259`	`2262`	`$limiter->addArgument(new Reference($limiterConfig['lock_factory']));`