mirror of
https://github.com/cargo-bins/cargo-binstall.git
synced 2025-06-16 15:46:36 +00:00
Download signature in <QuickInstall as Fetcher>::find
So that the signature download can be done in parallel.
This commit is contained in:
parent
9fbd62fe76
commit
0b4cae05f8
1 changed files with 66 additions and 55 deletions
|
@ -1,4 +1,8 @@
|
||||||
use std::{borrow::Cow, path::Path, sync::Arc};
|
use std::{
|
||||||
|
borrow::Cow,
|
||||||
|
path::Path,
|
||||||
|
sync::{Arc, OnceLock},
|
||||||
|
};
|
||||||
|
|
||||||
use binstalk_downloader::remote::Method;
|
use binstalk_downloader::remote::Method;
|
||||||
use binstalk_types::cargo_toml_binstall::{PkgFmt, PkgMeta, PkgSigning};
|
use binstalk_types::cargo_toml_binstall::{PkgFmt, PkgMeta, PkgSigning};
|
||||||
|
@ -61,6 +65,8 @@ pub struct QuickInstall {
|
||||||
signature_policy: SignaturePolicy,
|
signature_policy: SignaturePolicy,
|
||||||
|
|
||||||
target_data: Arc<TargetDataErased>,
|
target_data: Arc<TargetDataErased>,
|
||||||
|
|
||||||
|
signature_verifier: OnceLock<SignatureVerifier>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl QuickInstall {
|
impl QuickInstall {
|
||||||
|
@ -75,6 +81,41 @@ impl QuickInstall {
|
||||||
.await
|
.await
|
||||||
.copied()
|
.copied()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn download_signature(
|
||||||
|
self: Arc<Self>,
|
||||||
|
) -> AutoAbortJoinHandle<Result<SignatureVerifier, FetchError>> {
|
||||||
|
AutoAbortJoinHandle::spawn(async move {
|
||||||
|
if self.signature_policy == SignaturePolicy::Ignore {
|
||||||
|
Ok(SignatureVerifier::Noop)
|
||||||
|
} else {
|
||||||
|
debug!(url=%self.signature_url, "Downloading signature");
|
||||||
|
match Download::new(self.client.clone(), self.signature_url.clone())
|
||||||
|
.into_bytes()
|
||||||
|
.await
|
||||||
|
{
|
||||||
|
Ok(signature) => {
|
||||||
|
trace!(?signature, "got signature contents");
|
||||||
|
let config = PkgSigning {
|
||||||
|
algorithm: SigningAlgorithm::Minisign,
|
||||||
|
pubkey: QUICKINSTALL_SIGN_KEY,
|
||||||
|
file: None,
|
||||||
|
};
|
||||||
|
SignatureVerifier::new(&config, &signature)
|
||||||
|
}
|
||||||
|
Err(err) => {
|
||||||
|
if self.signature_policy == SignaturePolicy::Require {
|
||||||
|
error!("Failed to download signature: {err}");
|
||||||
|
Err(FetchError::MissingSignature)
|
||||||
|
} else {
|
||||||
|
debug!("Failed to download signature, skipping verification: {err}");
|
||||||
|
Ok(SignatureVerifier::Noop)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait::async_trait]
|
#[async_trait::async_trait]
|
||||||
|
@ -109,6 +150,8 @@ impl super::Fetcher for QuickInstall {
|
||||||
signature_policy,
|
signature_policy,
|
||||||
|
|
||||||
target_data,
|
target_data,
|
||||||
|
|
||||||
|
signature_verifier: OnceLock::new(),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -118,35 +161,28 @@ impl super::Fetcher for QuickInstall {
|
||||||
return Ok(false);
|
return Ok(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
let check_signature_policy_task = (self.signature_policy == SignaturePolicy::Require)
|
let download_signature_task = self.clone().download_signature();
|
||||||
.then(|| {
|
|
||||||
let client = self.client.clone();
|
|
||||||
let gh_api_client = self.gh_api_client.clone();
|
|
||||||
let signature_url = self.signature_url.clone();
|
|
||||||
|
|
||||||
AutoAbortJoinHandle::spawn(async move {
|
let is_found = does_url_exist(
|
||||||
match does_url_exist(client, gh_api_client, &signature_url).await {
|
self.client.clone(),
|
||||||
Ok(true) => Ok(()),
|
self.gh_api_client.clone(),
|
||||||
_ => Err(FetchError::MissingSignature),
|
&self.package_url,
|
||||||
}
|
|
||||||
})
|
|
||||||
});
|
|
||||||
|
|
||||||
tokio::try_join!(
|
|
||||||
async {
|
|
||||||
if let Some(task) = check_signature_policy_task {
|
|
||||||
task.flattened_join().await
|
|
||||||
} else {
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
},
|
|
||||||
does_url_exist(
|
|
||||||
self.client.clone(),
|
|
||||||
self.gh_api_client.clone(),
|
|
||||||
&self.package_url,
|
|
||||||
),
|
|
||||||
)
|
)
|
||||||
.map(|(_, res)| res)
|
.await?;
|
||||||
|
|
||||||
|
if !is_found {
|
||||||
|
return Ok(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
if self
|
||||||
|
.signature_verifier
|
||||||
|
.set(download_signature_task.flattened_join().await?)
|
||||||
|
.is_err()
|
||||||
|
{
|
||||||
|
panic!("<QuickInstall as Fetcher>::find is run twice");
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(true)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -173,33 +209,8 @@ by rust officially."#,
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn fetch_and_extract(&self, dst: &Path) -> Result<ExtractedFiles, FetchError> {
|
async fn fetch_and_extract(&self, dst: &Path) -> Result<ExtractedFiles, FetchError> {
|
||||||
let verifier = if self.signature_policy == SignaturePolicy::Ignore {
|
let Some(verifier) = self.signature_verifier.get() else {
|
||||||
SignatureVerifier::Noop
|
panic!("<QuickInstall as Fetcher>::find has not been called yet!")
|
||||||
} else {
|
|
||||||
debug!(url=%self.signature_url, "Downloading signature");
|
|
||||||
match Download::new(self.client.clone(), self.signature_url.clone())
|
|
||||||
.into_bytes()
|
|
||||||
.await
|
|
||||||
{
|
|
||||||
Ok(signature) => {
|
|
||||||
trace!(?signature, "got signature contents");
|
|
||||||
let config = PkgSigning {
|
|
||||||
algorithm: SigningAlgorithm::Minisign,
|
|
||||||
pubkey: QUICKINSTALL_SIGN_KEY,
|
|
||||||
file: None,
|
|
||||||
};
|
|
||||||
SignatureVerifier::new(&config, &signature)?
|
|
||||||
}
|
|
||||||
Err(err) => {
|
|
||||||
if self.signature_policy == SignaturePolicy::Require {
|
|
||||||
error!("Failed to download signature: {err}");
|
|
||||||
return Err(FetchError::MissingSignature);
|
|
||||||
}
|
|
||||||
|
|
||||||
debug!("Failed to download signature, skipping verification: {err}");
|
|
||||||
SignatureVerifier::Noop
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
debug!(url=%self.package_url, "Downloading package");
|
debug!(url=%self.package_url, "Downloading package");
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue