From e1ef3fc65c2364ed520114d7ba185096c6ebf173 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Mon, 6 May 2024 10:52:52 -0700 Subject: [PATCH 1/6] fix: file paths shouldn't start with slashes (#102) --- src/spec.rs | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/src/spec.rs b/src/spec.rs index 997ea264..2abc4e42 100644 --- a/src/spec.rs +++ b/src/spec.rs @@ -217,7 +217,7 @@ impl Zip64CentralDirectoryEnd { } /// Converts a path to the ZIP format (forward-slash-delimited and normalized). -pub(crate) fn path_to_string>(path: T) -> String { +pub(crate) fn path_to_string>(path: T) -> Box { let mut maybe_original = None; if let Some(original) = path.as_ref().to_str() { if (MAIN_SEPARATOR == '/' || !original[1..].contains(MAIN_SEPARATOR)) @@ -238,9 +238,6 @@ pub(crate) fn path_to_string>(path: T) -> String { let mut recreate = maybe_original.is_none(); let mut normalized_components = Vec::new(); - // Empty element ensures the path has a leading slash, with no extra allocation after the join - normalized_components.push(Cow::Borrowed("")); - for component in path.as_ref().components() { match component { Component::Normal(os_str) => match os_str.to_str() { @@ -252,9 +249,7 @@ pub(crate) fn path_to_string>(path: T) -> String { }, Component::ParentDir => { recreate = true; - if normalized_components.len() > 1 { - normalized_components.pop(); - } + normalized_components.pop(); } _ => { recreate = true; @@ -262,17 +257,8 @@ pub(crate) fn path_to_string>(path: T) -> String { } } if recreate { - normalized_components.join("/") + normalized_components.join("/").into() } else { - drop(normalized_components); - let original = maybe_original.unwrap(); - if !original.starts_with('/') { - let mut slash_original = String::with_capacity(original.len() + 1); - slash_original.push('/'); - slash_original.push_str(original); - slash_original - } else { - original.to_string() - } + maybe_original.unwrap().into() } } From c2fe20741c523828e13c62f484b957e43f4df566 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Mon, 6 May 2024 11:16:16 -0700 Subject: [PATCH 2/6] fix: version_needed was wrong when e.g. cfg(bzip2) but current file wasn't bzip2 (#100) --- src/types.rs | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/src/types.rs b/src/types.rs index 1b794cdd..6f58009c 100644 --- a/src/types.rs +++ b/src/types.rs @@ -50,6 +50,8 @@ use crate::extra_fields::ExtraField; use crate::result::DateTimeRangeError; #[cfg(feature = "time")] use time::{error::ComponentRange, Date, Month, OffsetDateTime, PrimitiveDateTime, Time}; +use crate::CompressionMethod; +use crate::types::ffi::S_IFDIR; #[derive(Clone, Copy, Debug, PartialEq, Eq, FromPrimitive, IntoPrimitive)] #[repr(u8)] @@ -369,6 +371,7 @@ pub struct ZipFileData { } impl ZipFileData { + pub fn file_name_sanitized(&self) -> PathBuf { let no_null_filename = match self.file_name.find('\0') { Some(index) => &self.file_name[0..index], @@ -446,12 +449,34 @@ impl ZipFileData { pub const fn version_needed(&self) -> u16 { // higher versions matched first - match (self.zip64_extension(), self.compression_method) { + let compression_version: u16 = match self.compression_method { + CompressionMethod::Stored => 10, + #[cfg(feature = "_deflate-any")] + CompressionMethod::Deflated => 20, #[cfg(feature = "bzip2")] - (_, crate::compression::CompressionMethod::Bzip2) => 46, - (true, _) => 45, - _ => 20, - } + CompressionMethod::Bzip2 => 46, + #[cfg(feature = "deflate64")] + CompressionMethod::Deflate64 => 21, + #[cfg(feature = "lzma")] + CompressionMethod::Lzma => 63, + _ => DEFAULT_VERSION as u16 + }; + let crypto_version: u16 = if self.aes_mode.is_some() { + 51 + } else if self.encrypted { + 20 + } else { + 10 + }; + let misc_feature_version: u16 = if self.large_file { + 45 + } else if self.unix_mode().is_some_and(|mode| mode & S_IFDIR == S_IFDIR) { + // file is directory + 20 + } else { + 10 + }; + compression_version.max(crypto_version).max(misc_feature_version) } #[inline(always)] pub(crate) fn extra_field_len(&self) -> usize { From 51ef4f0f30470f803af4def79aee2abeb154f08a Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Mon, 6 May 2024 11:17:21 -0700 Subject: [PATCH 3/6] test: Update test_path_normalization to match corrected requirements --- src/write.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/write.rs b/src/write.rs index 4a26d9a4..d2c9863f 100644 --- a/src/write.rs +++ b/src/write.rs @@ -1902,7 +1902,7 @@ mod test { .start_file_from_path(path, SimpleFileOptions::default()) .unwrap(); let archive = ZipArchive::new(writer.finish().unwrap()).unwrap(); - assert_eq!(Some("/foo/example.txt"), archive.name_for_index(0)); + assert_eq!(Some("foo/example.txt"), archive.name_for_index(0)); } #[test] From 61d56318bf57ddf3e8bf699a672e3dbe27e20440 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Mon, 6 May 2024 11:24:46 -0700 Subject: [PATCH 4/6] style: Fix fmt and clippy warnings --- src/types.rs | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/types.rs b/src/types.rs index 6f58009c..c9644d25 100644 --- a/src/types.rs +++ b/src/types.rs @@ -48,10 +48,10 @@ mod atomic { use crate::extra_fields::ExtraField; use crate::result::DateTimeRangeError; +use crate::types::ffi::S_IFDIR; +use crate::CompressionMethod; #[cfg(feature = "time")] use time::{error::ComponentRange, Date, Month, OffsetDateTime, PrimitiveDateTime, Time}; -use crate::CompressionMethod; -use crate::types::ffi::S_IFDIR; #[derive(Clone, Copy, Debug, PartialEq, Eq, FromPrimitive, IntoPrimitive)] #[repr(u8)] @@ -371,7 +371,6 @@ pub struct ZipFileData { } impl ZipFileData { - pub fn file_name_sanitized(&self) -> PathBuf { let no_null_filename = match self.file_name.find('\0') { Some(index) => &self.file_name[0..index], @@ -441,14 +440,8 @@ impl ZipFileData { } } - pub const fn zip64_extension(&self) -> bool { - self.uncompressed_size > 0xFFFFFFFF - || self.compressed_size > 0xFFFFFFFF - || self.header_start > 0xFFFFFFFF - } - - pub const fn version_needed(&self) -> u16 { - // higher versions matched first + /// PKZIP version needed to open this file (from APPNOTE 4.4.3.2). + pub fn version_needed(&self) -> u16 { let compression_version: u16 = match self.compression_method { CompressionMethod::Stored => 10, #[cfg(feature = "_deflate-any")] @@ -459,7 +452,8 @@ impl ZipFileData { CompressionMethod::Deflate64 => 21, #[cfg(feature = "lzma")] CompressionMethod::Lzma => 63, - _ => DEFAULT_VERSION as u16 + // APPNOTE doesn't specify a version for Zstandard + _ => DEFAULT_VERSION as u16, }; let crypto_version: u16 = if self.aes_mode.is_some() { 51 @@ -470,13 +464,18 @@ impl ZipFileData { }; let misc_feature_version: u16 = if self.large_file { 45 - } else if self.unix_mode().is_some_and(|mode| mode & S_IFDIR == S_IFDIR) { + } else if self + .unix_mode() + .is_some_and(|mode| mode & S_IFDIR == S_IFDIR) + { // file is directory 20 } else { 10 }; - compression_version.max(crypto_version).max(misc_feature_version) + compression_version + .max(crypto_version) + .max(misc_feature_version) } #[inline(always)] pub(crate) fn extra_field_len(&self) -> usize { From ad292ffbd2ee506002dc9d38cd389b8bcfcf0033 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Mon, 6 May 2024 11:34:25 -0700 Subject: [PATCH 5/6] test: Update reference version-needed-to-open in unit tests --- src/write.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/write.rs b/src/write.rs index d2c9863f..c272b7ee 100644 --- a/src/write.rs +++ b/src/write.rs @@ -1882,7 +1882,7 @@ mod test { &[ 80u8, 75, 3, 4, 20, 0, 0, 0, 0, 0, 163, 165, 15, 77, 252, 47, 111, 70, 6, 0, 0, 0, 6, 0, 0, 0, 4, 0, 0, 0, 110, 97, 109, 101, 116, 97, 114, 103, 101, 116, 80, 75, 1, - 2, 46, 3, 20, 0, 0, 0, 0, 0, 163, 165, 15, 77, 252, 47, 111, 70, 6, 0, 0, 0, 6, 0, + 2, 46, 3, 10, 0, 0, 0, 0, 0, 163, 165, 15, 77, 252, 47, 111, 70, 6, 0, 0, 0, 6, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 161, 0, 0, 0, 0, 110, 97, 109, 101, 80, 75, 5, 6, 0, 0, 0, 0, 1, 0, 1, 0, 50, 0, 0, 0, 40, 0, 0, 0, 0, 0 ] as &[u8], @@ -1929,7 +1929,7 @@ mod test { 36, 0, 0, 0, 14, 0, 0, 0, 100, 105, 114, 101, 99, 116, 111, 114, 121, 92, 108, 105, 110, 107, 47, 97, 98, 115, 111, 108, 117, 116, 101, 47, 115, 121, 109, 108, 105, 110, 107, 92, 119, 105, 116, 104, 92, 109, 105, 120, 101, 100, 47, 115, 108, 97, - 115, 104, 101, 115, 80, 75, 1, 2, 46, 3, 20, 0, 0, 0, 0, 0, 163, 165, 15, 77, 95, + 115, 104, 101, 115, 80, 75, 1, 2, 46, 3, 10, 0, 0, 0, 0, 0, 163, 165, 15, 77, 95, 41, 81, 245, 36, 0, 0, 0, 36, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 161, 0, 0, 0, 0, 100, 105, 114, 101, 99, 116, 111, 114, 121, 92, 108, 105, 110, 107, 80, 75, 5, 6, 0, 0, 0, 0, 1, 0, 1, 0, 60, 0, 0, 0, 80, 0, 0, 0, 0, 0 From 2cff4ec936c8df85a16192bf8ae333eb71b220f3 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Mon, 6 May 2024 11:43:01 -0700 Subject: [PATCH 6/6] test: Update reference version-needed-to-open in unit tests (cont'd) --- src/write.rs | 4 ++-- tests/data/mimetype.zip | Bin 153 -> 153 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/write.rs b/src/write.rs index c272b7ee..87d163db 100644 --- a/src/write.rs +++ b/src/write.rs @@ -1880,7 +1880,7 @@ mod test { assert_eq!( *result.get_ref(), &[ - 80u8, 75, 3, 4, 20, 0, 0, 0, 0, 0, 163, 165, 15, 77, 252, 47, 111, 70, 6, 0, 0, 0, + 80u8, 75, 3, 4, 10, 0, 0, 0, 0, 0, 163, 165, 15, 77, 252, 47, 111, 70, 6, 0, 0, 0, 6, 0, 0, 0, 4, 0, 0, 0, 110, 97, 109, 101, 116, 97, 114, 103, 101, 116, 80, 75, 1, 2, 46, 3, 10, 0, 0, 0, 0, 0, 163, 165, 15, 77, 252, 47, 111, 70, 6, 0, 0, 0, 6, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 161, 0, 0, 0, 0, 110, 97, 109, 101, @@ -1925,7 +1925,7 @@ mod test { assert_eq!( *result.get_ref(), &[ - 80u8, 75, 3, 4, 20, 0, 0, 0, 0, 0, 163, 165, 15, 77, 95, 41, 81, 245, 36, 0, 0, 0, + 80u8, 75, 3, 4, 10, 0, 0, 0, 0, 0, 163, 165, 15, 77, 95, 41, 81, 245, 36, 0, 0, 0, 36, 0, 0, 0, 14, 0, 0, 0, 100, 105, 114, 101, 99, 116, 111, 114, 121, 92, 108, 105, 110, 107, 47, 97, 98, 115, 111, 108, 117, 116, 101, 47, 115, 121, 109, 108, 105, 110, 107, 92, 119, 105, 116, 104, 92, 109, 105, 120, 101, 100, 47, 115, 108, 97, diff --git a/tests/data/mimetype.zip b/tests/data/mimetype.zip index 2d651cbeb35f66322568234766b6b933f651dadc..c2f821322cb9443782689bc14de0cbcf2446e341 100644 GIT binary patch delta 18 ZcmbQqIFpezz?+$cYa**3BiF