From ee044c2a3cee55efb88f99c4e12f79e4a6d9cf3d Mon Sep 17 00:00:00 2001 From: Brett Simons Date: Tue, 2 Jan 2024 21:20:13 -0500 Subject: [PATCH 01/12] Fix directory check in extract function The directory check is not robust and fails if the path uses the Windows style path separator and not the unix style. A function "is_dir" already exists and accounts for this so this change switches to using that function instead. --- src/read.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/read.rs b/src/read.rs index b702b4f2..33d48e00 100644 --- a/src/read.rs +++ b/src/read.rs @@ -456,7 +456,7 @@ impl ZipArchive { let outpath = directory.as_ref().join(filepath); - if file.name().ends_with('/') { + if file.is_dir() { fs::create_dir_all(&outpath)?; } else { if let Some(p) = outpath.parent() { From 3e84dee4399ee4fe04c3b9ed1ffa2ed6ea115465 Mon Sep 17 00:00:00 2001 From: Brett Simons Date: Wed, 13 Mar 2024 09:51:38 -0400 Subject: [PATCH 02/12] Update stream.rs to use the is_dir function instead of explicitly checking ZipFile name --- src/read/stream.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/read/stream.rs b/src/read/stream.rs index 5a01b23f..41a48b91 100644 --- a/src/read/stream.rs +++ b/src/read/stream.rs @@ -67,7 +67,7 @@ impl ZipStreamReader { let outpath = self.0.join(filepath); - if file.name().ends_with('/') { + if file.is_dir() { fs::create_dir_all(&outpath)?; } else { if let Some(p) = outpath.parent() { From 686f6f1abfa8b297386e7f57106ca37a8ee7e404 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Mon, 29 Apr 2024 19:16:31 -0700 Subject: [PATCH 03/12] feat: Improve ErrorKind in ZipError to io::Error conversion (previously https://github.com/zip-rs/zip-old/pull/421) --- src/build.rs | 2 +- src/result.rs | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/build.rs b/src/build.rs index c9feaa0a..8ec1aeab 100644 --- a/src/build.rs +++ b/src/build.rs @@ -4,4 +4,4 @@ fn main() { if var("CARGO_FEATURE_DEFLATE_MINIZ").is_ok() { println!("cargo:warning=Feature `deflate-miniz` is deprecated; replace it with `deflate`"); } -} \ No newline at end of file +} diff --git a/src/result.rs b/src/result.rs index 98d9943d..f2bb4609 100644 --- a/src/result.rs +++ b/src/result.rs @@ -79,7 +79,15 @@ impl ZipError { impl From for io::Error { fn from(err: ZipError) -> io::Error { - io::Error::new(io::ErrorKind::Other, err) + let kind = match &err { + ZipError::Io(err) => err.kind(), + ZipError::InvalidArchive(_) => io::ErrorKind::InvalidData, + ZipError::UnsupportedArchive(_) => io::ErrorKind::Unsupported, + ZipError::FileNotFound => io::ErrorKind::NotFound, + ZipError::InvalidPassword => io::ErrorKind::InvalidInput, + }; + + io::Error::new(kind, err) } } From ab47bb798ca7c5c714aa75466d6c0f202de38b38 Mon Sep 17 00:00:00 2001 From: anatawa12 Date: Tue, 30 Apr 2024 11:58:09 +0900 Subject: [PATCH 04/12] fix repo link in readme Signed-off-by: anatawa12 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c417c39f..7ce92832 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Info A zip library for rust which supports reading and writing of simple ZIP files. Formerly hosted at -https://github.com/zip-rs/zip. +https://github.com/zip-rs/zip2. Supported compression formats: From 722234711f7b62b71f4ffaa0ceed6f58391a7949 Mon Sep 17 00:00:00 2001 From: Brett Simons Date: Tue, 2 Jan 2024 21:20:13 -0500 Subject: [PATCH 05/12] Fix directory check in extract function The directory check is not robust and fails if the path uses the Windows style path separator and not the unix style. A function "is_dir" already exists and accounts for this so this change switches to using that function instead. --- src/read.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/read.rs b/src/read.rs index b1cb0300..0a39faef 100644 --- a/src/read.rs +++ b/src/read.rs @@ -558,7 +558,7 @@ impl ZipArchive { let outpath = directory.as_ref().join(filepath); - if file.name().ends_with('/') { + if file.is_dir() { fs::create_dir_all(&outpath)?; } else { if let Some(p) = outpath.parent() { From 24f4b98ae4b27dbe641835c4de235bd41e25044d Mon Sep 17 00:00:00 2001 From: Brett Simons Date: Wed, 13 Mar 2024 09:51:38 -0400 Subject: [PATCH 06/12] Update stream.rs to use the is_dir function instead of explicitly checking ZipFile name --- src/read/stream.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/read/stream.rs b/src/read/stream.rs index 80496bcb..f99a0e5a 100644 --- a/src/read/stream.rs +++ b/src/read/stream.rs @@ -67,7 +67,7 @@ impl ZipStreamReader { let outpath = self.0.join(filepath); - if file.name().ends_with('/') { + if file.is_dir() { fs::create_dir_all(&outpath)?; } else { if let Some(p) = outpath.parent() { From 3bf825a8de0dd340fffa3d5f7db3c7cc5c92ca50 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Tue, 30 Apr 2024 09:02:10 -0700 Subject: [PATCH 07/12] ci: Wait for unit tests to pass before starting fuzz tests --- .github/workflows/ci.yaml | 42 +++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5c1c416e..e9b25650 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -57,7 +57,7 @@ jobs: command: test args: --all --no-default-features - clippy: + style_and_docs: runs-on: ubuntu-latest steps: @@ -68,34 +68,22 @@ jobs: profile: minimal toolchain: nightly override: true - components: clippy - + components: rustfmt, clippy + - name: fmt + run: cargo fmt --all -- --check - name: clippy uses: actions-rs/cargo@v1 with: command: clippy args: --all-targets --all-features -- -D warnings - - check_fmt_and_docs: - name: Checking fmt and docs - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@master - - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - components: rustfmt, clippy - override: true - - - name: fmt - run: cargo fmt --all -- --check - - - name: Docs - run: cargo doc --no-deps + - name: Docs + run: cargo doc --no-deps fuzz_read: runs-on: ubuntu-latest - + needs: + - build_and_test + - style_and_docs steps: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 @@ -140,7 +128,9 @@ jobs: fuzz_read_with_no_features: runs-on: ubuntu-latest - + needs: + - build_and_test + - style_and_docs steps: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 @@ -185,7 +175,9 @@ jobs: fuzz_write: runs-on: ubuntu-latest - + needs: + - build_and_test + - style_and_docs steps: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 @@ -230,7 +222,9 @@ jobs: fuzz_write_with_no_features: runs-on: ubuntu-latest - + needs: + - build_and_test + - style_and_docs steps: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 From 2156d8833416e94cb2746d0dce3ed0252d0b12b1 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Tue, 30 Apr 2024 09:26:54 -0700 Subject: [PATCH 08/12] Bump version number Signed-off-by: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index b1085f29..d0164f57 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zip" -version = "1.1.2" +version = "1.1.3" authors = [ "Mathijs van de Nes ", "Marli Frost ", From b6b150fa9e79466eda53cbee8402bb8a8fd728e0 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Tue, 30 Apr 2024 17:17:57 -0700 Subject: [PATCH 09/12] Increase fuzz timeouts Signed-off-by: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> --- .github/workflows/ci.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e9b25650..1ecd44e1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -101,7 +101,7 @@ jobs: command: fuzz args: build --all-features fuzz_read - name: run fuzz - timeout-minutes: 181 + timeout-minutes: 331 uses: actions-rs/cargo@v1 with: command: fuzz @@ -148,7 +148,7 @@ jobs: command: fuzz args: build --no-default-features fuzz_read - name: run fuzz - timeout-minutes: 181 + timeout-minutes: 331 uses: actions-rs/cargo@v1 with: command: fuzz @@ -195,7 +195,7 @@ jobs: command: fuzz args: build --all-features fuzz_write - name: run fuzz - timeout-minutes: 181 + timeout-minutes: 331 uses: actions-rs/cargo@v1 with: command: fuzz @@ -242,7 +242,7 @@ jobs: command: fuzz args: build --no-default-features fuzz_write - name: run fuzz - timeout-minutes: 181 + timeout-minutes: 331 uses: actions-rs/cargo@v1 with: command: fuzz From 505cf01ea79e87f811620e278a4b5ae9679d17e0 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Tue, 30 Apr 2024 17:48:55 -0700 Subject: [PATCH 10/12] ci: Eliminate some redundant CI runs based on https://wildwolf.name/github-actions-how-to-avoid-running-the-same-workflow-multiple-times/ --- .github/workflows/ci.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1ecd44e1..5c980486 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,7 +7,6 @@ on: push: branches-ignore: - 'release-plz-**' - - 'dependabot/**' workflow_dispatch: merge_group: types: [checks_requested] @@ -17,6 +16,7 @@ env: jobs: build_and_test: + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] @@ -58,6 +58,7 @@ jobs: args: --all --no-default-features style_and_docs: + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name runs-on: ubuntu-latest steps: From dae3b668c83cabbeb3947d624a928a465e709f86 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Tue, 30 Apr 2024 17:58:49 -0700 Subject: [PATCH 11/12] ci: Eliminate redundant builds on merge-queue branches --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5c980486..f56c40ac 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,6 +7,7 @@ on: push: branches-ignore: - 'release-plz-**' + - 'gh-readonly-queue/**' workflow_dispatch: merge_group: types: [checks_requested] From 934806323a1821aef2b3050a7d5723948c73e0fa Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Tue, 30 Apr 2024 21:16:37 -0700 Subject: [PATCH 12/12] ci: Reduce iterations for fuzz_read_no_features by 20% --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f56c40ac..674a3b37 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -154,7 +154,7 @@ jobs: uses: actions-rs/cargo@v1 with: command: fuzz - args: run --no-default-features fuzz_read -- fuzz/corpus/seed -timeout=10s -fork=2 -runs=50000000 -max_total_time=19800 -max_len=16384 -len_control=0 -dict=fuzz/fuzz.dict + args: run --no-default-features fuzz_read -- fuzz/corpus/seed -timeout=10s -fork=2 -runs=40000000 -max_total_time=19800 -max_len=16384 -len_control=0 -dict=fuzz/fuzz.dict - name: Upload any failure inputs if: always() uses: actions/upload-artifact@v4