From b7fe3f6e4f500873c7ec79cdf0c4dbaa98a76c06 Mon Sep 17 00:00:00 2001
From: Chris Hennick <hennickc@amazon.com>
Date: Thu, 11 Apr 2024 13:14:34 -0700
Subject: [PATCH] Add tests and update fuzzing dictionary/corpus for LZMA

---
 Cargo.toml                |   2 +-
 fuzz/corpus/seed/lzma.zip | Bin 0 -> 164 bytes
 fuzz/fuzz.dict            |   3 ++-
 src/lib.rs                |   1 +
 tests/data/lzma.zip       | Bin 0 -> 164 bytes
 tests/lzma.rs             |  21 +++++++++++++++++++++
 6 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 fuzz/corpus/seed/lzma.zip
 create mode 100644 tests/data/lzma.zip
 create mode 100644 tests/lzma.rs

diff --git a/Cargo.toml b/Cargo.toml
index 7e8ecf36..302c3474 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ rust-version = "1.67.0"
 Library to support the reading and writing of zip files.
 """
 edition = "2021"
-exclude = ["tests/**", "examples/**", ".github/**"]
+exclude = ["tests/**", "examples/**", ".github/**", "fuzz/**"]
 
 [dependencies]
 aes = { version = "0.8.4", optional = true }
diff --git a/fuzz/corpus/seed/lzma.zip b/fuzz/corpus/seed/lzma.zip
new file mode 100644
index 0000000000000000000000000000000000000000..c8e7fd01a60e063215f25185bc1e881e5f628461
GIT binary patch
literal 164
zcmWIWW@h1HU}9ikIFr#GarJ@ab{-%bggJpYBQ+-{U$3O1!~?`oD9<m-N#P3cW@NHw
z#-&LGs0{=Z8kRJIXt)tv3<@AV10#b3gP^_HF7KXOj9>vIBEXxK4WfpTAsWaq2Fn2e
DaEKi<

literal 0
HcmV?d00001

diff --git a/fuzz/fuzz.dict b/fuzz/fuzz.dict
index c586acc4..456fcd1a 100644
--- a/fuzz/fuzz.dict
+++ b/fuzz/fuzz.dict
@@ -13,7 +13,8 @@ central_directory_header_signature_le="\x02\x01KP"
 compression_method_store="\x00\x00"
 compression_method_deflate="\x07\x00"
 compression_method_deflate64="\x09\x00"
-compression_method_bzip2="\x0E\x00"
+compression_method_bzip2="\x0C\x00"
+compression_method_lzma="\x0E\x00"
 compression_method_zstd="]\x00"
 compression_method_aes="C\x00"
 compression_method_unsupported="\xFF\x00"
diff --git a/src/lib.rs b/src/lib.rs
index b2bb2cf8..ee3374e0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -20,6 +20,7 @@
 //! | Deflate | ✅ [->](`crate::ZipArchive::by_name`)      | ✅ [->](`crate::write::FileOptions::compression_method`) |
 //! | Deflate64 | ✅ | |
 //! | Bzip2 | ✅ | ✅ |
+//! | LZMA | ✅ | |
 //! | AES encryption | ✅ | ✅ |
 //! | ZipCrypto deprecated encryption | ✅ | ✅ |
 //!
diff --git a/tests/data/lzma.zip b/tests/data/lzma.zip
new file mode 100644
index 0000000000000000000000000000000000000000..c8e7fd01a60e063215f25185bc1e881e5f628461
GIT binary patch
literal 164
zcmWIWW@h1HU}9ikIFr#GarJ@ab{-%bggJpYBQ+-{U$3O1!~?`oD9<m-N#P3cW@NHw
z#-&LGs0{=Z8kRJIXt)tv3<@AV10#b3gP^_HF7KXOj9>vIBEXxK4WfpTAsWaq2Fn2e
DaEKi<

literal 0
HcmV?d00001

diff --git a/tests/lzma.rs b/tests/lzma.rs
new file mode 100644
index 00000000..f7c747a0
--- /dev/null
+++ b/tests/lzma.rs
@@ -0,0 +1,21 @@
+#![cfg(feature = "lzma")]
+
+use std::io::{self, Read};
+use zip_next::ZipArchive;
+
+#[test]
+fn decompress_lzma() {
+    let mut v = Vec::new();
+    v.extend_from_slice(include_bytes!("data/lzma.zip"));
+    let mut archive = ZipArchive::new(io::Cursor::new(v)).expect("couldn't open test zip file");
+
+    let mut file = archive
+        .by_name("hello.txt")
+        .expect("couldn't find file in archive");
+    assert_eq!("hello.txt", file.name());
+
+    let mut content = Vec::new();
+    file.read_to_end(&mut content)
+        .expect("couldn't read encrypted and compressed file");
+    assert_eq!("Hello world\n", String::from_utf8(content).unwrap());
+}
\ No newline at end of file