Merge pull request #130 from CosmicHorrorDev/bad-central

fix(rc-zip): temporarily ignore info-zip old unix extra field

Author: fasterthanlime

rc-zip/src/corpus/mod.rs

@@ -207,6 +207,14 @@ pub fn test_cases() -> Vec<Case> {
             files: Files::NumFiles(11372),
             ..Default::default()
         },
+        Case {
+            name: "info-zip-unix-extra.zip",
+            files: Files::ExhaustiveList(vec![CaseFile {
+                name: "bun-darwin-x64/",
+                ..Default::default()
+            }]),
+            ..Default::default()
+        },
         #[cfg(feature = "lzma")]
         Case {
             name: "found-me-lzma.zip",
@@ -261,11 +269,18 @@ pub fn test_cases() -> Vec<Case> {
 }
 
 pub fn streaming_test_cases() -> Vec<Case> {
-    vec![Case {
-        name: "meta.zip",
-        files: Files::NumFiles(0),
-        ..Default::default()
-    }]
+    vec![
+        Case {
+            name: "meta.zip",
+            files: Files::NumFiles(0),
+            ..Default::default()
+        },
+        Case {
+            name: "info-zip-unix-extra.zip",
+            files: Files::NumFiles(0),
+            ..Default::default()
+        },
+    ]
 }
 
 pub fn check_case(case: &Case, archive: Result<&Archive, &Error>) {

rc-zip/src/parse/extra_field.rs

@@ -99,7 +99,7 @@ impl<'a> ExtraField<'a> {
                 ExtraNtfsField::TAG => {
                     opt(ExtraNtfsField::parser.map(EF::Ntfs)).parse_next(payload)?
                 }
-                ExtraUnixField::TAG | ExtraUnixField::TAG_INFOZIP => {
+                ExtraUnixField::TAG => {
                     opt(ExtraUnixField::parser.map(EF::Unix)).parse_next(payload)?
                 }
                 ExtraNewUnixField::TAG => {
@@ -201,7 +201,11 @@ pub struct ExtraUnixField<'a> {
 
 impl<'a> ExtraUnixField<'a> {
     const TAG: u16 = 0x000d;
-    const TAG_INFOZIP: u16 = 0x5855;
+    // FIXME(cosmic): add support after `ExtraUnixField`'s structure accounts for info-zip storing
+    // less information than with `::TAG`. the smaller variant stores just atime and mtime while
+    // the larger additionally store a `uid` and `gid` as well. the variant is determined based off
+    // of `t_size`, with no additional variable data
+    const _TAG_INFOZIP: u16 = 0x5855;
 
     fn parser(i: &mut Partial<&'a [u8]>) -> PResult<Self> {
         let t_size = le_u16.parse_next(i)?;