Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions atlassian/rest_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import logging
import random
import math
import time
from datetime import datetime, timezone
from email.utils import parsedate_to_datetime
Expand Down Expand Up @@ -324,6 +325,10 @@ def _parse_retry_after_header(self, header_value: Optional[str]) -> Optional[flo
if delay_seconds is None:
return None

if not math.isfinite(delay_seconds):
log.debug("Retry-After value is not finite; clamping to max_backoff_seconds")
delay_seconds = float(self.max_backoff_seconds)

delay_seconds = max(0.0, delay_seconds)
if delay_seconds > self.max_backoff_seconds:
log.debug(
Expand Down
21 changes: 21 additions & 0 deletions tests/test_rest_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,27 @@ def fake_sleep(delay):
assert handler(response) is True
assert captured["delay"] == 5

def test_retry_handler_clamps_non_finite_retry_after(self, monkeypatch):
"""Ensure non-finite Retry-After headers are clamped to max_backoff_seconds."""
captured = {}

def fake_sleep(delay):
captured["delay"] = delay

monkeypatch.setattr("atlassian.rest_client.time.sleep", fake_sleep)

api = AtlassianRestAPI(
url=f"{mockup_server()}/test",
retry_with_header=True,
max_backoff_seconds=7,
)

handler = api._retry_handler()
response = SimpleNamespace(headers={"Retry-After": "1e309"}, status_code=429)

assert handler(response) is True
assert captured["delay"] == 7

def test_retry_handler_parses_http_date(self, monkeypatch):
"""Ensure HTTP-date Retry-After headers are converted to delta seconds."""
captured = {}
Expand Down