bug #38665 [RateLimiter] Allow configuration value "no_limit" (Nyholm)

chalasr · chalasr · commit 58f4e9dfc80e · 2020-10-22T10:35:38.000+02:00
This PR was squashed before being merged into the 5.x branch. Discussion ---------- [RateLimiter] Allow configuration value "no_limit" | Q | A | ------------- | --- | Branch? | 5.x | Bug fix? | maybe? | New feature? | not sure | Deprecations? | | Tickets | | License | MIT | Doc PR | I dont see any reason why we should allow people to configure "no_limit". I assume this was just forgotten. Commits ------- 2b9058d [RateLimiter] Allow configuration value "no_limit"
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1846,7 +1846,7 @@ private function addRateLimiterSection(ArrayNodeDefinition $rootNode)
                                     ->enumNode('strategy')
                                         ->info('The rate limiting algorithm to use for this rate')
                                         ->isRequired()
-                                        ->values(['fixed_window', 'token_bucket', 'sliding_window'])
+                                        ->values(['fixed_window', 'token_bucket', 'sliding_window', 'no_limit'])
                                     ->end()
                                     ->integerNode('limit')
                                         ->info('The maximum allowed hits in a fixed interval or burst')
diff --git a/src/Symfony/Component/RateLimiter/RateLimiter.php b/src/Symfony/Component/RateLimiter/RateLimiter.php
@@ -54,8 +54,11 @@ public function create(?string $key = null): LimiterInterface
             case 'sliding_window':
                 return new SlidingWindowLimiter($id, $this->config['limit'], $this->config['interval'], $this->storage, $lock);
 
+            case 'no_limit':
+                return new NoLimiter();
+
             default:
-                throw new \LogicException(sprintf('Limiter strategy "%s" does not exists, it must be either "token_bucket", "sliding_window" or "fixed_window".', $this->config['strategy']));
+                throw new \LogicException(sprintf('Limiter strategy "%s" does not exists, it must be either "token_bucket", "sliding_window", "fixed_window" or "no_limit".', $this->config['strategy']));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,11 @@ public function create(?string $key = null): LimiterInterface`
`54`	`54`	`case 'sliding_window':`
`55`	`55`	`return new SlidingWindowLimiter($id, $this->config['limit'], $this->config['interval'], $this->storage, $lock);`
`56`	`56`
	`57`	`+ case 'no_limit':`
	`58`	`+ return new NoLimiter();`
	`59`	`+`
`57`	`60`	`default:`
`58`		`- throw new \LogicException(sprintf('Limiter strategy "%s" does not exists, it must be either "token_bucket", "sliding_window" or "fixed_window".', $this->config['strategy']));`
	`61`	`+ throw new \LogicException(sprintf('Limiter strategy "%s" does not exists, it must be either "token_bucket", "sliding_window", "fixed_window" or "no_limit".', $this->config['strategy']));`
`59`	`62`	`}`
`60`	`63`	`}`
`61`	`64`