Skip to content

fix: prevent panic in retryDelay when delay overflows or is negative #519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: prevent panic in retryDelay when delay overflows or is negative #519

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions internal/requestconfig/requestconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,18 +362,19 @@ func retryDelay(res *http.Response, retryCount int) time.Duration {
// If the API asks us to wait a certain amount of time (and it's a reasonable amount),
// just do what it says.

if retryAfterDelay, ok := parseRetryAfterHeader(res); ok && 0 <= retryAfterDelay && retryAfterDelay < time.Minute {
return retryAfterDelay
}

maxDelay := 8 * time.Second
delay := time.Duration(0.5 * float64(time.Second) * math.Pow(2, float64(retryCount)))
if delay > maxDelay {

// clamp to safe range
if delay <= 0 || delay > maxDelay {
delay = maxDelay
}

jitter := rand.Int63n(int64(delay / 4))
delay -= time.Duration(jitter)
maxJitter := max(delay / 4, 1 * time.Second)
jitter := time.Duration(rand.Int63n(int64(maxJitter)))

delay -= jitter

return delay
}

Expand Down