Skip to content

Place a bound on how many auth attempts will be tried #485

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

Merged
jklukas merged 1 commit into from
Jan 29, 2025
Merged

Place a bound on how many auth attempts will be tried #485

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
9 changes: 8 additions & 1 deletion src/registry/http/http_cli/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use http::Uri;

use hyper::{Body, Client};
use tokio::sync::Mutex;
use std::cmp::max;

use crate::registry::DockerAuthenticationHelper;

Expand Down Expand Up @@ -55,6 +56,8 @@ impl HttpCli {
{
let mut uri = uri.clone();
let mut attempt = 0;
let mut auth_attempt = 0;
let auth_retries = max(retries, 3);
let error = loop {
match run_single_request(
self.auth_info.clone(),
Expand All @@ -67,7 +70,7 @@ impl HttpCli {
{
Ok(o) => return Ok(o),
Err(err) => {
if attempt > retries {
if attempt > retries || auth_attempt > auth_retries {
break err;
}
attempt += 1;
Expand Down Expand Up @@ -108,7 +111,11 @@ impl HttpCli {
let mut ai = self.auth_info.lock().await;
*ai = Some(auth_info);
drop(ai);
// We need to retry the request after we have the new auth info, so this
// shouldn't count as an attempt, but we separately track auth attempts
// to prevent going into an infinite auth loop if access is denied.
attempt -= 1;
auth_attempt += 1;
continue;
}
}
Expand Down