Fix retrieval of credentials for URLs from cache

astral-sh · Aug 22, 2024 · 6beba98 · 6beba98
1 parent fa34466
commit 6beba98
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/crates/uv-auth/src/credentials.rs b/crates/uv-auth/src/credentials.rs
@@ -17,7 +17,7 @@ pub struct Credentials {
     password: Option<String>,
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Debug, PartialEq, Eq, Ord, PartialOrd, Hash, Default)]
 pub(crate) struct Username(Option<String>);
 
 impl Username {

diff --git a/crates/uv-auth/src/middleware.rs b/crates/uv-auth/src/middleware.rs
@@ -4,7 +4,7 @@ use http::{Extensions, StatusCode};
 use url::Url;
 
 use crate::{
-    credentials::{Credentials, Username},
+    credentials::{self, Credentials, Username},
     realm::Realm,
     CredentialsCache, KeyringProvider, CREDENTIALS_CACHE,
 };
@@ -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