mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-09-29 13:34:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Retain authentication when making range requests (#1902)

Browse source 
Needs https://github.com/prefix-dev/async_http_range_reader/pull/9
Closes https://github.com/astral-sh/uv/issues/1709
This commit is contained in:
Zanie Blue 2024-02-23 09:21:10 -06:00 • committed by GitHub
parent bd59076b18
commit fe1847561c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -203,9 +203,9 @@ dependencies = [
[[package]] [[package]]
name = "async_http_range_reader" name = "async_http_range_reader"
version = "0.6.1" version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5143aaae4ec035a5d7cfda666eab896fe5428a2a8ab09ca651a2dce3a8f06912" checksum = "cf8eeab30c68da4dc2c51f3afc4327ab06fe0f3f028ca423f7ca398c7ed8c5e7"
dependencies = [ dependencies = [
"bisection", "bisection",
"futures", "futures",

2
Cargo.toml
View file

@ -21,7 +21,7 @@ anstream = { version = "0.6.5" }
anyhow = { version = "1.0.79" } anyhow = { version = "1.0.79" }
async-compression = { version = "0.4.6" } async-compression = { version = "0.4.6" }
async-trait = { version = "0.1.77" } async-trait = { version = "0.1.77" }
async_http_range_reader = { version = "0.6.1" } async_http_range_reader = { version = "0.7.0" }
async_zip = { git = "https://github.com/charliermarsh/rs-async-zip", rev = "d76801da0943de985254fc6255c0e476b57c5836", features = ["deflate"] } async_zip = { git = "https://github.com/charliermarsh/rs-async-zip", rev = "d76801da0943de985254fc6255c0e476b57c5836", features = ["deflate"] }
base64 = { version = "0.21.7" } base64 = { version = "0.21.7" }
cachedir = { version = "0.3.1" } cachedir = { version = "0.3.1" }

25
crates/uv-client/src/registry_client.rs
View file

@ -7,6 +7,7 @@ use std::str::FromStr;
use async_http_range_reader::AsyncHttpRangeReader; use async_http_range_reader::AsyncHttpRangeReader;
use futures::{FutureExt, TryStreamExt}; use futures::{FutureExt, TryStreamExt};
use http::HeaderMap;
use reqwest::{Client, ClientBuilder, Response, StatusCode}; use reqwest::{Client, ClientBuilder, Response, StatusCode};
use reqwest_retry::policies::ExponentialBackoff; use reqwest_retry::policies::ExponentialBackoff;
use reqwest_retry::RetryTransientMiddleware; use reqwest_retry::RetryTransientMiddleware;
@ -440,12 +441,26 @@ impl RegistryClient {
Connectivity::Offline => CacheControl::AllowStale, Connectivity::Offline => CacheControl::AllowStale,
}; };
let client = self.client_raw.clone();
let req = self
.client
.uncached()
.head(url.clone())
.build()
.map_err(ErrorKind::RequestError)?;
// Copy authorization headers from the HEAD request to subsequent requests
let mut headers = HeaderMap::default();
if let Some(authorization) = req.headers().get("authorization") {
headers.append("authorization", authorization.clone());
}
// This response callback is special, we actually make a number of subsequent requests to // This response callback is special, we actually make a number of subsequent requests to
// fetch the file from the remote zip. // fetch the file from the remote zip.
let client = self.client_raw.clone();
let read_metadata_range_request = |response: Response| { let read_metadata_range_request = |response: Response| {
async { async {
let mut reader = AsyncHttpRangeReader::from_head_response(client, response) let mut reader =
AsyncHttpRangeReader::from_head_response(client, response, headers)
.await .await
.map_err(ErrorKind::AsyncHttpRangeReader)?; .map_err(ErrorKind::AsyncHttpRangeReader)?;
trace!("Getting metadata for {filename} by range request"); trace!("Getting metadata for {filename} by range request");
@ -463,12 +478,6 @@ impl RegistryClient {
.instrument(info_span!("read_metadata_range_request", wheel = %filename)) .instrument(info_span!("read_metadata_range_request", wheel = %filename))
}; };
let req = self
.client
.uncached()
.head(url.clone())
.build()
.map_err(ErrorKind::RequestError)?;
let result = self let result = self
.client .client
.get_serde( .get_serde(