mirror of
https://github.com/cargo-bins/cargo-binstall.git
synced 2025-04-22 05:28:42 +00:00

- Fix zip extraction code: Ensure dir is rwx and file is readable for curr user - Add more integration test for `ExtractedFiles` - Fix `bins::infer_bin_dir_template` introduced in #856 Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
312 lines
9.4 KiB
Rust
312 lines
9.4 KiB
Rust
use std::{fmt::Debug, io, marker::PhantomData, path::Path};
|
|
|
|
use binstalk_types::cargo_toml_binstall::PkgFmtDecomposed;
|
|
use digest::{Digest, FixedOutput, HashMarker, Output, OutputSizeUser, Update};
|
|
use futures_lite::stream::StreamExt;
|
|
use thiserror::Error as ThisError;
|
|
use tracing::{debug, instrument};
|
|
|
|
pub use binstalk_types::cargo_toml_binstall::{PkgFmt, TarBasedFmt};
|
|
|
|
use crate::remote::{Client, Error as RemoteError, Url};
|
|
|
|
mod async_extracter;
|
|
use async_extracter::*;
|
|
|
|
mod async_tar_visitor;
|
|
use async_tar_visitor::extract_tar_based_stream_and_visit;
|
|
pub use async_tar_visitor::{TarEntriesVisitor, TarEntry, TarEntryType};
|
|
|
|
mod extracter;
|
|
|
|
mod extracted_files;
|
|
pub use extracted_files::{ExtractedFiles, ExtractedFilesEntry};
|
|
|
|
mod zip_extraction;
|
|
pub use zip_extraction::ZipError;
|
|
|
|
#[derive(Debug, ThisError)]
|
|
#[non_exhaustive]
|
|
pub enum DownloadError {
|
|
#[error("Failed to extract zipfile: {0}")]
|
|
Unzip(#[from] ZipError),
|
|
|
|
#[error("Failed to download from remote: {0}")]
|
|
Remote(#[from] RemoteError),
|
|
|
|
/// A generic I/O error.
|
|
///
|
|
/// - Code: `binstall::io`
|
|
/// - Exit: 74
|
|
#[error("I/O Error: {0}")]
|
|
Io(io::Error),
|
|
}
|
|
|
|
impl From<io::Error> for DownloadError {
|
|
fn from(err: io::Error) -> Self {
|
|
if err.get_ref().is_some() {
|
|
let kind = err.kind();
|
|
|
|
let inner = err
|
|
.into_inner()
|
|
.expect("err.get_ref() returns Some, so err.into_inner() should also return Some");
|
|
|
|
inner
|
|
.downcast()
|
|
.map(|b| *b)
|
|
.unwrap_or_else(|err| DownloadError::Io(io::Error::new(kind, err)))
|
|
} else {
|
|
DownloadError::Io(err)
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<DownloadError> for io::Error {
|
|
fn from(e: DownloadError) -> io::Error {
|
|
match e {
|
|
DownloadError::Io(io_error) => io_error,
|
|
e => io::Error::new(io::ErrorKind::Other, e),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct Download<D: Digest = NoDigest> {
|
|
client: Client,
|
|
url: Url,
|
|
_digest: PhantomData<D>,
|
|
_checksum: Vec<u8>,
|
|
}
|
|
|
|
impl Download {
|
|
pub fn new(client: Client, url: Url) -> Self {
|
|
Self {
|
|
client,
|
|
url,
|
|
_digest: PhantomData::default(),
|
|
_checksum: Vec::new(),
|
|
}
|
|
}
|
|
|
|
/// Download a file from the provided URL and process them in memory.
|
|
///
|
|
/// This does not support verifying a checksum due to the partial extraction
|
|
/// and will ignore one if specified.
|
|
///
|
|
/// NOTE that this API does not support gnu extension sparse file unlike
|
|
/// [`Download::and_extract`].
|
|
#[instrument(skip(visitor))]
|
|
pub async fn and_visit_tar(
|
|
self,
|
|
fmt: TarBasedFmt,
|
|
visitor: &mut dyn TarEntriesVisitor,
|
|
) -> Result<(), DownloadError> {
|
|
let stream = self
|
|
.client
|
|
.get_stream(self.url)
|
|
.await?
|
|
.map(|res| res.map_err(DownloadError::from));
|
|
|
|
debug!("Downloading and extracting then in-memory processing");
|
|
|
|
extract_tar_based_stream_and_visit(stream, fmt, visitor).await?;
|
|
|
|
debug!("Download, extraction and in-memory procession OK");
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Download a file from the provided URL and extract it to the provided path.
|
|
///
|
|
/// NOTE that this would only extract directory and regular files.
|
|
#[instrument(skip(path))]
|
|
pub async fn and_extract(
|
|
self,
|
|
fmt: PkgFmt,
|
|
path: impl AsRef<Path>,
|
|
) -> Result<ExtractedFiles, DownloadError> {
|
|
async fn inner(
|
|
this: Download,
|
|
fmt: PkgFmt,
|
|
path: &Path,
|
|
) -> Result<ExtractedFiles, DownloadError> {
|
|
let stream = this
|
|
.client
|
|
.get_stream(this.url)
|
|
.await?
|
|
.map(|res| res.map_err(DownloadError::from));
|
|
|
|
debug!("Downloading and extracting to: '{}'", path.display());
|
|
|
|
let extracted_files = match fmt.decompose() {
|
|
PkgFmtDecomposed::Tar(fmt) => extract_tar_based_stream(stream, path, fmt).await?,
|
|
PkgFmtDecomposed::Bin => extract_bin(stream, path).await?,
|
|
PkgFmtDecomposed::Zip => extract_zip(stream, path).await?,
|
|
};
|
|
|
|
debug!("Download OK, extracted to: '{}'", path.display());
|
|
|
|
Ok(extracted_files)
|
|
}
|
|
|
|
inner(self, fmt, path.as_ref()).await
|
|
}
|
|
}
|
|
|
|
impl<D: Digest> Download<D> {
|
|
pub fn new_with_checksum(client: Client, url: Url, checksum: Vec<u8>) -> Self {
|
|
Self {
|
|
client,
|
|
url,
|
|
_digest: PhantomData::default(),
|
|
_checksum: checksum,
|
|
}
|
|
}
|
|
|
|
// TODO: implement checking the sum, may involve bringing (parts of) and_extract() back in here
|
|
}
|
|
|
|
#[derive(Clone, Copy, Debug, Default)]
|
|
pub struct NoDigest;
|
|
|
|
impl FixedOutput for NoDigest {
|
|
fn finalize_into(self, _out: &mut Output<Self>) {}
|
|
}
|
|
|
|
impl OutputSizeUser for NoDigest {
|
|
type OutputSize = generic_array::typenum::U0;
|
|
}
|
|
|
|
impl Update for NoDigest {
|
|
fn update(&mut self, _data: &[u8]) {}
|
|
}
|
|
|
|
impl HashMarker for NoDigest {}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
use std::{
|
|
collections::{HashMap, HashSet},
|
|
ffi::OsStr,
|
|
};
|
|
use tempfile::tempdir;
|
|
|
|
#[tokio::test]
|
|
async fn test_and_extract() {
|
|
let client = crate::remote::Client::new(
|
|
concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION")),
|
|
None,
|
|
std::time::Duration::from_millis(10),
|
|
1.try_into().unwrap(),
|
|
[],
|
|
)
|
|
.unwrap();
|
|
|
|
// cargo-binstall
|
|
let cargo_binstall_url = "https://github.com/cargo-bins/cargo-binstall/releases/download/v0.20.1/cargo-binstall-aarch64-unknown-linux-musl.tgz";
|
|
|
|
let extracted_files =
|
|
Download::new(client.clone(), Url::parse(cargo_binstall_url).unwrap())
|
|
.and_extract(PkgFmt::Tgz, tempdir().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
assert!(extracted_files.has_file(Path::new("cargo-binstall")));
|
|
assert!(!extracted_files.has_file(Path::new("1234")));
|
|
|
|
let files = HashSet::from([OsStr::new("cargo-binstall").into()]);
|
|
assert_eq!(extracted_files.get_dir(Path::new(".")).unwrap(), &files);
|
|
|
|
assert_eq!(
|
|
extracted_files.0,
|
|
HashMap::from([
|
|
(
|
|
Path::new("cargo-binstall").into(),
|
|
ExtractedFilesEntry::File
|
|
),
|
|
(
|
|
Path::new(".").into(),
|
|
ExtractedFilesEntry::Dir(Box::new(files))
|
|
)
|
|
])
|
|
);
|
|
|
|
// cargo-watch
|
|
let cargo_watch_url = "https://github.com/watchexec/cargo-watch/releases/download/v8.4.0/cargo-watch-v8.4.0-aarch64-unknown-linux-gnu.tar.xz";
|
|
|
|
let extracted_files = Download::new(client.clone(), Url::parse(cargo_watch_url).unwrap())
|
|
.and_extract(PkgFmt::Txz, tempdir().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
let dir = Path::new("cargo-watch-v8.4.0-aarch64-unknown-linux-gnu");
|
|
|
|
assert_eq!(
|
|
extracted_files.get_dir(Path::new(".")).unwrap(),
|
|
&HashSet::from([dir.as_os_str().into()])
|
|
);
|
|
|
|
assert_eq!(
|
|
extracted_files.get_dir(dir).unwrap(),
|
|
&HashSet::from_iter(
|
|
[
|
|
"README.md",
|
|
"LICENSE",
|
|
"completions",
|
|
"cargo-watch",
|
|
"cargo-watch.1"
|
|
]
|
|
.iter()
|
|
.map(OsStr::new)
|
|
.map(Box::<OsStr>::from)
|
|
),
|
|
);
|
|
|
|
assert_eq!(
|
|
extracted_files.get_dir(&dir.join("completions")).unwrap(),
|
|
&HashSet::from([OsStr::new("zsh").into()]),
|
|
);
|
|
|
|
assert!(extracted_files.has_file(&dir.join("cargo-watch")));
|
|
assert!(extracted_files.has_file(&dir.join("cargo-watch.1")));
|
|
assert!(extracted_files.has_file(&dir.join("LICENSE")));
|
|
assert!(extracted_files.has_file(&dir.join("README.md")));
|
|
|
|
assert!(!extracted_files.has_file(&dir.join("completions")));
|
|
assert!(!extracted_files.has_file(&dir.join("asdfcqwe")));
|
|
|
|
assert!(extracted_files.has_file(&dir.join("completions/zsh")));
|
|
|
|
// sccache, tgz and zip
|
|
let sccache_config = [
|
|
("https://github.com/mozilla/sccache/releases/download/v0.3.3/sccache-v0.3.3-x86_64-pc-windows-msvc.tar.gz", PkgFmt::Tgz),
|
|
("https://github.com/mozilla/sccache/releases/download/v0.3.3/sccache-v0.3.3-x86_64-pc-windows-msvc.zip", PkgFmt::Zip),
|
|
];
|
|
|
|
for (sccache_url, fmt) in sccache_config {
|
|
let extracted_files = Download::new(client.clone(), Url::parse(sccache_url).unwrap())
|
|
.and_extract(fmt, tempdir().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
let dir = Path::new("sccache-v0.3.3-x86_64-pc-windows-msvc");
|
|
|
|
assert_eq!(
|
|
extracted_files.get_dir(Path::new(".")).unwrap(),
|
|
&HashSet::from([dir.as_os_str().into()])
|
|
);
|
|
|
|
assert_eq!(
|
|
extracted_files.get_dir(dir).unwrap(),
|
|
&HashSet::from_iter(
|
|
["README.md", "LICENSE", "sccache.exe"]
|
|
.iter()
|
|
.map(OsStr::new)
|
|
.map(Box::<OsStr>::from)
|
|
),
|
|
);
|
|
}
|
|
}
|
|
}
|