bug #57933 [Messenger] Prevent waiting time to overflow when using long delays (alexandre-daubois)

nicolas-grekas · nicolas-grekas · commit 6e7fe3e29794 · 2024-08-08T11:33:13.000+02:00
This PR was merged into the 7.1 branch. Discussion ---------- [Messenger] Prevent waiting time to overflow when using long delays | Q | A | ------------- | --- | Branch? | 7.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #57779 | License | MIT There are two places where integers can overflow, thus the limiting to `PHP_INT_MAX`. Commits ------- 9609e23 [Messenger] Prevent waiting time to overflow when using long delays
diff --git a/src/Symfony/Component/Messenger/Retry/MultiplierRetryStrategy.php b/src/Symfony/Component/Messenger/Retry/MultiplierRetryStrategy.php
@@ -83,14 +83,14 @@ public function getWaitingTime(Envelope $message, ?\Throwable $throwable = null)
         $delay = $this->delayMilliseconds * $this->multiplier ** $retries;
 
         if ($this->jitter > 0) {
-            $randomness = (int) ($delay * $this->jitter);
+            $randomness = (int) min(\PHP_INT_MAX, $delay * $this->jitter);
             $delay += random_int(-$randomness, +$randomness);
         }
 
         if ($delay > $this->maxDelayMilliseconds && 0 !== $this->maxDelayMilliseconds) {
             return $this->maxDelayMilliseconds;
         }
 
-        return (int) ceil($delay);
+        return (int) min(\PHP_INT_MAX, ceil($delay));
     }
 }
diff --git a/src/Symfony/Component/Messenger/Tests/Retry/MultiplierRetryStrategyTest.php b/src/Symfony/Component/Messenger/Tests/Retry/MultiplierRetryStrategyTest.php
@@ -60,6 +60,14 @@ public function testGetWaitTime(int $delay, float $multiplier, int $maxDelay, in
         $this->assertSame($expectedDelay, $strategy->getWaitingTime($envelope));
     }
 
+    public function testGetWaitTimeWithOverflowingDelay()
+    {
+        $strategy = new MultiplierRetryStrategy(512, \PHP_INT_MAX, 2, 0, 1);
+        $envelope = new Envelope(new \stdClass(), [new RedeliveryStamp(10)]);
+
+        $this->assertSame(\PHP_INT_MAX, $strategy->getWaitingTime($envelope));
+    }
+
     public static function getWaitTimeTests(): iterable
     {
         // delay, multiplier, maxDelay, retries, expectedDelay

Original file line number	Diff line number	Diff line change
`@@ -83,14 +83,14 @@ public function getWaitingTime(Envelope $message, ?\Throwable $throwable = null)`
`83`	`83`	`$delay = $this->delayMilliseconds * $this->multiplier ** $retries;`
`84`	`84`
`85`	`85`	`if ($this->jitter > 0) {`
`86`		`- $randomness = (int) ($delay * $this->jitter);`
	`86`	`+ $randomness = (int) min(\PHP_INT_MAX, $delay * $this->jitter);`
`87`	`87`	`$delay += random_int(-$randomness, +$randomness);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`if ($delay > $this->maxDelayMilliseconds && 0 !== $this->maxDelayMilliseconds) {`
`91`	`91`	`return $this->maxDelayMilliseconds;`
`92`	`92`	`}`
`93`	`93`
`94`		`- return (int) ceil($delay);`
	`94`	`+ return (int) min(\PHP_INT_MAX, ceil($delay));`
`95`	`95`	`}`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,14 @@ public function testGetWaitTime(int $delay, float $multiplier, int $maxDelay, in`
`60`	`60`	`$this->assertSame($expectedDelay, $strategy->getWaitingTime($envelope));`
`61`	`61`	`}`
`62`	`62`
	`63`	`+ public function testGetWaitTimeWithOverflowingDelay()`
	`64`	`+ {`
	`65`	`+ $strategy = new MultiplierRetryStrategy(512, \PHP_INT_MAX, 2, 0, 1);`
	`66`	`+ $envelope = new Envelope(new \stdClass(), [new RedeliveryStamp(10)]);`
	`67`	`+`
	`68`	`+ $this->assertSame(\PHP_INT_MAX, $strategy->getWaitingTime($envelope));`
	`69`	`+ }`
	`70`	`+`
`63`	`71`	`public static function getWaitTimeTests(): iterable`
`64`	`72`	`{`
`65`	`73`	`// delay, multiplier, maxDelay, retries, expectedDelay`