Prevent accepted rate limits with no remaining token to be preferred over denied ones

MatTheCat · MatTheCat · commit 462eb1def648 · 2022-08-15T19:09:15.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/RateLimiter/AbstractRequestRateLimiter.php b/src/Symfony/Component/HttpFoundation/RateLimiter/AbstractRequestRateLimiter.php
@@ -35,7 +35,7 @@ public function consume(Request $request): RateLimit
         foreach ($limiters as $limiter) {
             $rateLimit = $limiter->consume(1);
 
-            if (null === $minimalRateLimit || $rateLimit->getRemainingTokens() < $minimalRateLimit->getRemainingTokens()) {
+            if (null === $minimalRateLimit || $rateLimit->getRemainingTokens() < $minimalRateLimit->getRemainingTokens() || !$rateLimit->isAccepted()) {
                 $minimalRateLimit = $rateLimit;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function consume(Request $request): RateLimit`
`35`	`35 6D54`	`foreach ($limiters as $limiter) {`
`36`	`36`	`$rateLimit = $limiter->consume(1);`
`37`	`37`
`38`		`- if (null === $minimalRateLimit \|\| $rateLimit->getRemainingTokens() < $minimalRateLimit->getRemainingTokens()) {`
	`38`	`+ if (null === $minimalRateLimit \|\| $rateLimit->getRemainingTokens() < $minimalRateLimit->getRemainingTokens() \|\| !$rateLimit->isAccepted()) {`
`39`	`39`	`$minimalRateLimit = $rateLimit;`
`40`	`40`	`}`
`41`	`41`	`}`