From 34dd8401edd447862b017bdc5cd66678b19d3c2c Mon Sep 17 00:00:00 2001 From: Zanie Blue Date: Thu, 22 Aug 2024 19:00:58 -0500 Subject: [PATCH] Fix retrieval of credentials for URLs from cache (#6452) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While working on https://github.com/astral-sh/uv/pull/6389 I discovered we never checked `cache.get_url` here, which is wrong — though I don't think it had much effect in practice since the realm would typically match first. The main problem is that when we call `get_url` later we hard-code the username to `None` because we assume we checked up here with the username if present. --- crates/uv-auth/src/credentials.rs | 2 +- crates/uv-auth/src/middleware.rs | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/crates/uv-auth/src/credentials.rs b/crates/uv-auth/src/credentials.rs index 7e86715e8..46489be06 100644 --- a/crates/uv-auth/src/credentials.rs +++ b/crates/uv-auth/src/credentials.rs @@ -17,7 +17,7 @@ pub struct Credentials { password: Option, } -#[derive(Clone, Debug, PartialEq, Eq, Ord, PartialOrd, Hash)] +#[derive(Clone, Debug, PartialEq, Eq, Ord, PartialOrd, Hash, Default)] pub(crate) struct Username(Option); impl Username { diff --git a/crates/uv-auth/src/middleware.rs b/crates/uv-auth/src/middleware.rs index 9693b83b8..ec5ce73b0 100644 --- a/crates/uv-auth/src/middleware.rs +++ b/crates/uv-auth/src/middleware.rs @@ -160,6 +160,13 @@ impl Middleware for AuthMiddleware { request = credentials.authenticate(request); // Do not insert already-cached credentials None + } else if let Some(credentials) = self + .cache() + .get_url(request.url(), &credentials.to_username()) + { + request = credentials.authenticate(request); + // Do not insert already-cached credentials + None } else if let Some(credentials) = self .fetch_credentials(Some(&credentials), request.url()) .await