Skip to content

Commit 160acbd

Browse files
authored
fix: stop Retry-After HTTP dates without a zone or out of range from crashing the retry (#143)
1 parent 60d340a commit 160acbd

2 files changed

Lines changed: 25 additions & 1 deletion

File tree

‎src/httpware/middleware/resilience/retry.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,10 @@ def _parse_retry_after(value: str) -> float | None:
7272
pass
7373
try:
7474
parsed = email.utils.parsedate_to_datetime(value)
75-
except (TypeError, ValueError):
75+
except (TypeError, ValueError, OverflowError):
7676
return None
77+
if parsed.tzinfo is None:
78+
parsed = parsed.replace(tzinfo=datetime.UTC)
7779
now = datetime.datetime.now(datetime.UTC)
7880
delta = (parsed - now).total_seconds()
7981
return max(0.0, delta)

‎tests/test_retry_policy.py‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
path is random, so it is asserted by bounds; the Retry-After path by exact value.
77
"""
88

9+
import datetime
10+
911
import httpx2
1012
import pytest
1113

@@ -31,6 +33,7 @@
3133
_MAX_DELAY = 5.0
3234
_RETRY_AFTER_HEADER = "2"
3335
_RETRY_AFTER_SECONDS = 2.0
36+
_DATE_AHEAD_SECONDS = 3.0
3437

3538

3639
def _policy(
@@ -163,6 +166,25 @@ def test_respect_retry_after_false_ignores_header() -> None:
163166
assert delay <= _BASE_DELAY # jitter, not the 2.0 header value
164167

165168

169+
@pytest.mark.parametrize("zone", ["-0000", "", "XYZ"])
170+
def test_retry_after_date_without_a_usable_zone_is_read_as_gmt(zone: str) -> None:
171+
future = datetime.datetime.now(datetime.UTC) + datetime.timedelta(seconds=_DATE_AHEAD_SECONDS)
172+
header = f"{future:%a, %d %b %Y %H:%M:%S} {zone}".rstrip()
173+
request = _request("PUT")
174+
delay = _policy().decide(attempt=0, request=request, exc=_status_exc(503, request, retry_after=header))
175+
assert _DATE_AHEAD_SECONDS - 2 < delay <= _DATE_AHEAD_SECONDS
176+
177+
178+
@pytest.mark.parametrize(
179+
"header",
180+
["Wed, 21 Oct 99999999999999999999 07:28:00 GMT", "Wed, 21 Oct 2015 07:28:00 +99999999999999999999"],
181+
)
182+
def test_retry_after_date_out_of_range_falls_back_to_backoff(header: str) -> None:
183+
request = _request("PUT")
184+
delay = _policy().decide(attempt=0, request=request, exc=_status_exc(503, request, retry_after=header))
185+
assert delay <= _BASE_DELAY
186+
187+
166188
# ---- budget refusal
167189

168190

0 commit comments

Comments
 (0)