actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-05-06 12:10:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Support adding root cert via env CARGO_HTTP_CAINFO, SSL_CERT_{FILE, PATH} (#774)

Browse source 
* Support for custom root cert in `binstalk_downloader::remote::Client`
* Support adding root cert via env `CARGO_HTTP_CAINFO`, `SSL_CERT_{FILE, PATH}`

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2023-02-15 09:33:59 +11:00 • committed by GitHub
parent 647f02bb59
commit 9635e05d6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 101 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/binstalk-downloader/src/remote.rs
View file

@ -22,6 +22,9 @@ pub use url::Url;
mod delay_request;
use delay_request::DelayRequest;
mod certificate;
pub use certificate::{Certificate, OpenCertificateError};
const MAX_RETRY_DURATION: Duration = Duration::from_secs(120);
const MAX_RETRY_COUNT: u8 = 3;
const DEFAULT_RETRY_DURATION_FOR_RATE_LIMIT: Duration = Duration::from_millis(200);
@ -66,23 +69,30 @@ impl Client {
min_tls: Option<tls::Version>,
per: Duration,
num_request: NonZeroU64,
certificates: impl IntoIterator<Item = Certificate>,
) -> Result<Self, Error> {
fn inner(
user_agent: &str,
min_tls: Option<tls::Version>,
per: Duration,
num_request: NonZeroU64,
certificates: &mut dyn Iterator<Item = Certificate>,
) -> Result<Client, Error> {
let tls_ver = min_tls
.map(|tls| tls.max(DEFAULT_MIN_TLS))
.unwrap_or(DEFAULT_MIN_TLS);
let client = reqwest::ClientBuilder::new()
let mut builder = reqwest::ClientBuilder::new()
.user_agent(user_agent)
.https_only(true)
.min_tls_version(tls_ver)
.tcp_nodelay(false)
.build()?;
.tcp_nodelay(false);
for certificate in certificates {
builder = builder.add_root_certificate(certificate.0);
}
let client = builder.build()?;
Ok(Client(Arc::new(Inner {
client: client.clone(),
@ -94,7 +104,13 @@ impl Client {
})))
}
inner(user_agent.as_ref(), min_tls, per, num_request)
inner(
user_agent.as_ref(),
min_tls,
per,
num_request,
&mut certificates.into_iter(),
)
}
/// Return inner reqwest client.