mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-01 04:17:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix retrieval of credentials for URLs from cache (#6452)

Browse source 
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.
This commit is contained in:
Zanie Blue 2024-08-22 19:00:58 -05:00 • committed by GitHub
parent a535d3b131
commit 34dd8401ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/uv-auth/src/credentials.rs
View file

@ -17,7 +17,7 @@ pub struct Credentials {
password: Option<String>, 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>); pub(crate) struct Username(Option<String>);
impl Username { impl Username {

7
crates/uv-auth/src/middleware.rs
View file

@ -160,6 +160,13 @@ impl Middleware for AuthMiddleware {
request = credentials.authenticate(request); request = credentials.authenticate(request);
// Do not insert already-cached credentials // Do not insert already-cached credentials
None 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 } else if let Some(credentials) = self
.fetch_credentials(Some(&credentials), request.url()) .fetch_credentials(Some(&credentials), request.url())
.await .await