mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-07-07 21:35:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Improve error messages during HTTP redirect parsing

Browse source
This commit is contained in:
Zanie Blue 2025-04-21 22:03:18 -05:00
parent 66a44cc6e0
commit fd5da46a83
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/uv-client/src/base_client.rs
View file

@ -548,29 +548,32 @@ impl RedirectClientWithMiddleware {
}; };
// Handle redirect if we receive a 301, 302, 307, or 308. // Handle redirect if we receive a 301, 302, 307, or 308.
let status = response.status();
if matches!( if matches!(
response.status(), status,
StatusCode::MOVED_PERMANENTLY StatusCode::MOVED_PERMANENTLY
| StatusCode::FOUND | StatusCode::FOUND
| StatusCode::TEMPORARY_REDIRECT | StatusCode::TEMPORARY_REDIRECT
| StatusCode::PERMANENT_REDIRECT | StatusCode::PERMANENT_REDIRECT
) { ) {
let location_str = response let location = response
.headers() .headers()
.get("location") .get("location")
.ok_or(reqwest_middleware::Error::Middleware(anyhow!( .ok_or(reqwest_middleware::Error::Middleware(anyhow!(
"Missing 302 location header" "Missing expected HTTP {status} 'Location' header"
)))? )))?
.to_str() .to_str()
.map_err(|_| { .map_err(|_| {
reqwest_middleware::Error::Middleware(anyhow!( reqwest_middleware::Error::Middleware(anyhow!(
"Invalid 302 location header" "Invalid HTTP {status} 'Location' value: must only contain visible ascii characters"
)) ))
})?; })?;
let redirect_url = Url::parse(location_str).map_err(|_| { let redirect_url = Url::parse(location).map_err(|err| {
reqwest_middleware::Error::Middleware(anyhow!("Invalid 302 location URL")) reqwest_middleware::Error::Middleware(anyhow!(
"Invalid HTTP {status} 'Location' value `{location}`: {err}"
))
})?; })?;
debug!("Received 302 redirect to {redirect_url}"); debug!("Received HTTP {status} to {redirect_url}");
*request.url_mut() = redirect_url; *request.url_mut() = redirect_url;
redirects += 1; redirects += 1;
continue; continue;