Add support for zip v8

Author: Sytten

CHANGELOG.md

@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Browser process no longer inherits stdout
 - Update reqwest to 0.13
 - Update thiserror to 2
+- Add support for zip8 and make it default
 
 ### Added
 

chromiumoxide_fetcher/Cargo.toml

@@ -31,15 +31,20 @@ anyhow = "1"
 directories = "6"
 serde = { version = "1", features = ["derive"] }
 tracing = "0.1"
-zip = { version = "0.6", default-features = false, features = ["deflate"] }
+zip-0_2 = { package = "zip", version = "0.6", default-features = false, features = [
+  "deflate",
+], optional = true }
+zip-8 = { package = "zip", version = "8", default-features = false, features = [
+  "deflate-flate2-zlib-rs",
+], optional = true }
 tokio = { version = "1", features = ["fs", "io-util"] }
 reqwest = { version = "0.13", default-features = false, features = ["json"] }
 
 [target.'cfg(target_os = "windows")'.dependencies]
 windows-version = "0.1"
 
 [features]
-default = ["rustls"]
+default = ["rustls", "zip-8"]
 
 rustls = ["reqwest/rustls"]
 native-tls = ["reqwest/native-tls"]

chromiumoxide_fetcher/src/runtime/zip/mod.rs

@@ -0,0 +1,9 @@
+#[cfg(feature = "zip-0_2")]
+mod zip_0_2;
+#[cfg(feature = "zip-0_2")]
+pub use zip_0_2::ZipArchive;
+
+#[cfg(feature = "zip-8")]
+mod zip_8;
+#[cfg(feature = "zip-8")]
+pub use zip_8::ZipArchive;

chromiumoxide_fetcher/src/runtime/zip.rs …oxide_fetcher/src/runtime/zip/zip_0_6.rschromiumoxide_fetcher/src/runtime/zip.rs renamed to chromiumoxide_fetcher/src/runtime/zip/zip_0_6.rs chromiumoxide_fetcher/src/runtime/zip.rs renamed to chromiumoxide_fetcher/src/runtime/zip/zip_0_6.rs

@@ -102,7 +102,7 @@ fn create_symlink(link_target: Vec<u8>, link_path: &Path) -> ZipResult<()> {
 fn create_symlink(link_target: Vec<u8>, link_path: &Path) -> ZipResult<()> {
     // Only supports UTF-8 paths which is enough for our usecase
     let link_target = String::from_utf8(link_target)
-        .map_err(|_| ZipError::InvalidArchive("Invalid synmlink target name"))?;
+        .map_err(|_| ZipError::InvalidArchive("Invalid symlink target name"))?;
     std::os::windows::fs::symlink_file(link_target, link_path)?;
 
     Ok(())

chromiumoxide_fetcher/src/runtime/zip/zip_8.rs

@@ -0,0 +1,111 @@
+use std::fs;
+use std::io::{self, Read, Seek};
+use std::ops::{Deref, DerefMut};
+use std::path::Path;
+
+use zip_8::{
+    read::ZipFile,
+    result::{ZipError, ZipResult},
+};
+
+#[derive(Clone, Debug)]
+pub struct ZipArchive<R: Read + Seek>(zip_8::ZipArchive<R>);
+
+impl<R: Read + Seek> Deref for ZipArchive<R> {
+    type Target = zip_8::ZipArchive<R>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl<R: Read + Seek> DerefMut for ZipArchive<R> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+impl<R: Read + Seek> ZipArchive<R> {
+    pub fn new(reader: R) -> ZipResult<Self> {
+        zip_8::ZipArchive::new(reader).map(Self)
+    }
+
+    /// We need this custom extract function to support symlinks.
+    /// This is based on https://github.com/zip-rs/zip/pull/213.
+    ///
+    /// We must be careful with this implementation since it is not
+    /// protected against malicious symlinks, but we trust the binaries
+    /// provided by chromium.
+    pub fn extract<P: AsRef<Path>>(&mut self, directory: P) -> ZipResult<()> {
+        for i in 0..self.len() {
+            let mut file = self.by_index(i)?;
+
+            let filepath = file
+                .enclosed_name()
+                .ok_or(ZipError::InvalidArchive("Invalid file path".into()))?;
+            let outpath = directory.as_ref().join(filepath);
+
+            if file.is_dir() {
+                fs::create_dir_all(&outpath)?;
+            } else {
+                if let Some(p) = outpath.parent() {
+                    if !p.exists() {
+                        fs::create_dir_all(p)?;
+                    }
+                }
+
+                match read_symlink(&mut file)? {
+                    Some(target) => {
+                        create_symlink(target, &outpath)?;
+                    }
+                    None => {
+                        let mut outfile = fs::File::create(&outpath)?;
+                        io::copy(&mut file, &mut outfile)?;
+
+                        // Get and Set permissions
+                        #[cfg(unix)]
+                        {
+                            use std::os::unix::fs::PermissionsExt;
+                            if let Some(mode) = file.unix_mode() {
+                                fs::set_permissions(&outpath, fs::Permissions::from_mode(mode))?;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+}
+
+fn read_symlink<R: Read + Seek>(entry: &mut ZipFile<'_, R>) -> ZipResult<Option<Vec<u8>>> {
+    if let Some(mode) = entry.unix_mode() {
+        const S_IFLNK: u32 = 0o120000; // symbolic link
+        if mode & S_IFLNK == S_IFLNK {
+            let mut contents = Vec::new();
+            entry.read_to_end(&mut contents)?;
+            return Ok(Some(contents));
+        }
+    }
+    Ok(None)
+}
+
+#[cfg(target_family = "unix")]
+fn create_symlink(link_target: Vec<u8>, link_path: &Path) -> ZipResult<()> {
+    use std::os::unix::ffi::OsStringExt as _;
+
+    let link_target = std::ffi::OsString::from_vec(link_target);
+    std::os::unix::fs::symlink(link_target, link_path)?;
+
+    Ok(())
+}
+
+#[cfg(target_family = "windows")]
+fn create_symlink(link_target: Vec<u8>, link_path: &Path) -> ZipResult<()> {
+    // Only supports UTF-8 paths which is enough for our usecase
+    let link_target = String::from_utf8(link_target)
+        .map_err(|_| ZipError::InvalidArchive("Invalid symlink target name".into()))?;
+    std::os::windows::fs::symlink_file(link_target, link_path)?;
+
+    Ok(())
+}