mirror of
https://github.com/cargo-bins/cargo-binstall.git
synced 2025-05-02 02:00:03 +00:00
Run artifact discover in sequential instead of in parallel (#1796)
* Perform artifact discovery in sequential Run different `fetcher.find()` in sequential * FuturesResolver: Fallback to other future if one error * Fix typo * Apply cargo fmt * Parallelise `<QuickInstall as Fetcher>::find` Check for signature in parallel to the package * Download signature in `<QuickInstall as Fetcher>::find` So that the signature download can be done in parallel. * Bump msrv for binstalk-fetchers to 1.70 * Update crates/binstalk-fetchers/src/futures_resolver.rs Co-authored-by: Félix Saparelli <felix@passcod.name> Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * cargo fmt Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com> --------- Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com> Co-authored-by: Félix Saparelli <felix@passcod.name>
This commit is contained in:
parent
ebdca1126e
commit
ac7bac651d
7 changed files with 128 additions and 54 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_types::cargo_toml_binstall::{PkgFmt, PkgMeta, PkgSigning};
|
||||
|
@ -61,6 +65,8 @@ pub struct QuickInstall {
|
|||
signature_policy: SignaturePolicy,
|
||||
|
||||
target_data: Arc<TargetDataErased>,
|
||||
|
||||
signature_verifier: OnceLock<SignatureVerifier>,
|
||||
}
|
||||
|
||||
impl QuickInstall {
|
||||
|
@ -75,6 +81,41 @@ impl QuickInstall {
|
|||
.await
|
||||
.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]
|
||||
|
@ -109,6 +150,8 @@ impl super::Fetcher for QuickInstall {
|
|||
signature_policy,
|
||||
|
||||
target_data,
|
||||
|
||||
signature_verifier: OnceLock::new(),
|
||||
})
|
||||
}
|
||||
|
||||
|
@ -118,22 +161,28 @@ impl super::Fetcher for QuickInstall {
|
|||
return Ok(false);
|
||||
}
|
||||
|
||||
if self.signature_policy == SignaturePolicy::Require {
|
||||
does_url_exist(
|
||||
self.client.clone(),
|
||||
self.gh_api_client.clone(),
|
||||
&self.signature_url,
|
||||
)
|
||||
.await
|
||||
.map_err(|_| FetchError::MissingSignature)?;
|
||||
}
|
||||
let download_signature_task = self.clone().download_signature();
|
||||
|
||||
does_url_exist(
|
||||
let is_found = does_url_exist(
|
||||
self.client.clone(),
|
||||
self.gh_api_client.clone(),
|
||||
&self.package_url,
|
||||
)
|
||||
.await
|
||||
.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)
|
||||
})
|
||||
}
|
||||
|
||||
|
@ -160,33 +209,8 @@ by rust officially."#,
|
|||
}
|
||||
|
||||
async fn fetch_and_extract(&self, dst: &Path) -> Result<ExtractedFiles, FetchError> {
|
||||
let verifier = if self.signature_policy == SignaturePolicy::Ignore {
|
||||
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}");
|
||||
return Err(FetchError::MissingSignature);
|
||||
}
|
||||
|
||||
debug!("Failed to download signature, skipping verification: {err}");
|
||||
SignatureVerifier::Noop
|
||||
}
|
||||
}
|
||||
let Some(verifier) = self.signature_verifier.get() else {
|
||||
panic!("<QuickInstall as Fetcher>::find has not been called yet!")
|
||||
};
|
||||
|
||||
debug!(url=%self.package_url, "Downloading package");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue