From 7b83591f2675354ac26c1ecf9b5d00dede94dc31 Mon Sep 17 00:00:00 2001 From: jkasari Date: Thu, 19 Jan 2023 18:37:50 -0800 Subject: [PATCH 1/4] Add units to the size documentation. The documentation did not list what it meant by "size". I changed it to specify that it is returning the size in bytes. --- src/read.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/read.rs b/src/read.rs index bdfbb0c3..9c40e656 100644 --- a/src/read.rs +++ b/src/read.rs @@ -920,12 +920,12 @@ impl<'a> ZipFile<'a> { self.data.compression_method } - /// Get the size of the file in the archive + /// Get the size of the file, in bytes, in the archive pub fn compressed_size(&self) -> u64 { self.data.compressed_size } - /// Get the size of the file when uncompressed + /// Get the size of the file, in bytes, when uncompressed pub fn size(&self) -> u64 { self.data.uncompressed_size } From 3fc54cf68c653b596f239fbfb0181f4a8df57475 Mon Sep 17 00:00:00 2001 From: Mikael Pettersson Date: Mon, 30 Jan 2023 11:13:01 +0100 Subject: [PATCH 2/4] feat: Detect insufficient Dir record size - Per zip spec 4.4.1.4 (https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT) - If a CentralDirectoryEnd record field cannot hold the required data, a ZIP64 record must exist and the field will be set to -1(0xFFFF || 0xFFFFFFFF) - Previously these archives were incorrectly detected as multi-disk --- src/read.rs | 6 ++++-- src/spec.rs | 12 ++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/read.rs b/src/read.rs index 9c40e656..dad20c26 100644 --- a/src/read.rs +++ b/src/read.rs @@ -348,7 +348,9 @@ impl ZipArchive { Some(locator64) => { // If we got here, this is indeed a ZIP64 file. - if footer.disk_number as u32 != locator64.disk_with_central_directory { + if !footer.record_too_small() + && footer.disk_number as u32 != locator64.disk_with_central_directory + { return unsupported_zip_error( "Support for multi-disk files is not implemented", ); @@ -401,7 +403,7 @@ impl ZipArchive { pub fn new(mut reader: R) -> ZipResult> { let (footer, cde_start_pos) = spec::CentralDirectoryEnd::find_and_parse(&mut reader)?; - if footer.disk_number != footer.disk_with_central_directory { + if !footer.record_too_small() && footer.disk_number != footer.disk_with_central_directory { return unsupported_zip_error("Support for multi-disk files is not implemented"); } diff --git a/src/spec.rs b/src/spec.rs index 2ed051b1..1d8cb0a6 100644 --- a/src/spec.rs +++ b/src/spec.rs @@ -23,6 +23,18 @@ pub struct CentralDirectoryEnd { } impl CentralDirectoryEnd { + // Per spec 4.4.1.4 - a CentralDirectoryEnd field might be insufficient to hold the + // required data. In this case the file SHOULD contain a ZIP64 format record + // and the field of this record will be set to -1 + pub(crate) fn record_too_small(&self) -> bool { + self.disk_number == 0xFFFF + || self.disk_with_central_directory == 0xFFFF + || self.number_of_files_on_this_disk == 0xFFFF + || self.number_of_files == 0xFFFF + || self.central_directory_size == 0xFFFFFFFF + || self.central_directory_offset == 0xFFFFFFFF + } + pub fn parse(reader: &mut T) -> ZipResult { let magic = reader.read_u32::()?; if magic != CENTRAL_DIRECTORY_END_SIGNATURE { From f4cad8adb42e29e1623b16171c2c067ebb1b2a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Tue, 3 Jan 2023 16:48:07 +0200 Subject: [PATCH 3/4] Disable time features --- Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index fdeb9e76..d122af46 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ flate2 = { version = "1.0.23", default-features = false, optional = true } hmac = { version = "0.12.1", optional = true, features = ["reset"] } pbkdf2 = {version = "0.11.0", optional = true } sha1 = {version = "0.10.1", optional = true } -time = { version = "0.3.7", features = ["formatting", "macros" ], optional = true } +time = { version = "0.3.7", optional = true, default-features = false, features = ["std"] } zstd = { version = "0.11.2", optional = true } [target.'cfg(any(all(target_arch = "arm", target_pointer_width = "32"), target_arch = "mips", target_arch = "powerpc"))'.dependencies] @@ -30,6 +30,7 @@ crossbeam-utils = "0.8.8" bencher = "0.1.5" getrandom = "0.2.5" walkdir = "2.3.2" +time = { version = "0.3.7", features = ["formatting", "macros"] } [features] aes-crypto = [ "aes", "constant_time_eq", "hmac", "pbkdf2", "sha1" ] From 94b183b023d2b24b5bbfd6b0090fb0a3ab96ddde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Mon, 30 Jan 2023 21:14:24 +0200 Subject: [PATCH 4/4] Add a changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..f8491470 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,8 @@ +# Changelog + +## [0.6.4] - unreleased + +### Changed + + - [#333](https://github.com/zip-rs/zip/pull/333): disabled the default features of the `time` dependency, and also `formatting` and `macros`, as they were enabled by mistake. + \ No newline at end of file