fixup! feat(handler): add multi-part gzip handler.

onekey-sec · Jan 4, 2024 · a9e7598 · a9e7598
1 parent f970fd7
commit a9e7598
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 20 deletions.
diff --git a/tests/integration/compression/gzip/__input__/multi-volume-split-then-gzip.tar b/tests/integration/compression/gzip/__input__/multi-volume-split-then-gzip.tar
diff --git a/...ration/compression/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.aa b/...ration/compression/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.aa
diff --git a/...gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.aa_extract/one.txt.aa b/...gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.aa_extract/one.txt.aa
diff --git a/...ration/compression/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.ab b/...ration/compression/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.ab
diff --git a/...gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.ab_extract/one.txt.ab b/...gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.ab_extract/one.txt.ab
diff --git a/...ration/compression/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.ac b/...ration/compression/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.ac
diff --git a/...gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.ac_extract/one.txt.ac b/...gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz.ac_extract/one.txt.ac
diff --git a/...ssion/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz_extract/one.txt b/...ssion/gzip/__output__/multi-volume-split-then-gzip.tar_extract/one.txt.gz_extract/one.txt
diff --git a/unblob/handlers/compression/gzip.py b/unblob/handlers/compression/gzip.py
@@ -174,11 +174,7 @@ def calculate_multifile(self, file: Path) -> Optional[MultiFile]:
         if file != paths[0]:
             return None
 
-        valid_gzips = sum([self.is_valid_gzip(path) for path in paths])
-
-        # the presence of multiple valid gzips with the same stem would mean each volume
-        # is independently compressed.
-        if valid_gzips == 1:
+        if self.is_valid_gzip(file):
             files_size = sum(path.stat().st_size for path in paths)
             logger.debug(
                 "Multi-volume files", paths=paths, files_size=files_size, _verbosity=2