dissect.target 3.8.dev34__py3-none-any.whl → 3.8.dev35__py3-none-any.whl

dissect/target/helpers/fsutil.py

@@ -5,8 +5,10 @@ Also contains some other filesystem related utilities.
 
 from __future__ import annotations
 
+import bz2
 import errno
 import fnmatch
+import gzip
 import hashlib
 import io
 import logging
@@ -973,7 +975,12 @@ def resolve_link(
 def open_decompress(path: TargetPath, mode: str = "rb") -> Union[BinaryIO, TextIO]:
     """Open and decompress a file. Handles gz and bz2 files. Uncompressed files are opened as-is.
 
-    Assumes that the ``path`` exists.
+    Args:
+        path: The path to the file to open and decompress. It is assumed this path exists.
+        mode: The mode in which to open the file.
+
+    Returns:
+        An binary or text IO stream, depending on the mode with which the file was opened.
 
     Example:
         bytes_buf = open_decompress(Path("/dir/file.gz")).read()
@@ -981,16 +988,17 @@ def open_decompress(path: TargetPath, mode: str = "rb") -> Union[BinaryIO, TextI
         for line in open_decompress(Path("/dir/file.gz"), "rt"):
             print(line)
     """
-
-    if path.suffix == ".gz":
-        import gzip
-
-        return gzip.open(path.open(), mode)
-    elif path.suffix == ".bz2":
-        import bz2
-
-        return bz2.open(path.open(), mode)
+    file = path.open()
+    magic = file.read(4)
+    file.seek(0)
+
+    if magic[:2] == b"\x1f\x8b":
+        return gzip.open(file, mode)
+    # In a valid bz2 header the 4th byte is in the range b'1' ... b'9'.
+    elif magic[:3] == b"BZh" and 0x31 <= magic[3] <= 0x39:
+        return bz2.open(file, mode)
     else:
+        file.close()
         return path.open(mode)
 
 

{dissect.target-3.8.dev34.dist-info → dissect.target-3.8.dev35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.8.dev34
+Version: 3.8.dev35
 Summary: This module ties all other Dissect modules together, it provides a programming API and command line tools which allow easy access to various data sources inside disk images or file collections (a.k.a. targets)
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3

{dissect.target-3.8.dev34.dist-info → dissect.target-3.8.dev35.dist-info}/RECORD

@@ -37,7 +37,7 @@ dissect/target/helpers/cache.py,sha256=3_akK2L4-aWhRJh_TxP8Eks3jY-PwpWBi-0R6MjAZ
 dissect/target/helpers/config.py,sha256=7YCHHQfwlWuIAQHTqLVjdFSVYAB_xABiZYRPxXU6_Qw,1188
 dissect/target/helpers/descriptor_extensions.py,sha256=uT8GwznfDAiIgMM7JKKOY0PXKMv2c0GCqJTCkWFgops,2605
 dissect/target/helpers/docs.py,sha256=wxrhQKaV6F--Q4L69QwaXl-2EOZMp6POVnZ3_-9GeQE,4834
-dissect/target/helpers/fsutil.py,sha256=2LsEP6p6QvV2wJTj_PQYS9Jg3kazuUaB1t8gLGTH9PQ,31320
+dissect/target/helpers/fsutil.py,sha256=LFSUF6X1JGw7LFT0h7lTEbEny6cjmiI8zE509Z_Dd-w,31695
 dissect/target/helpers/hashutil.py,sha256=SSLl5BCAxiyanjEfDex0wSVu7D3uEbRKK3sRzRPePYY,2059
 dissect/target/helpers/keychain.py,sha256=O4zYovoBhCZzaHxJy31Qf4qaosM82khdtHm0khybNfs,3099
 dissect/target/helpers/lazy.py,sha256=4VnF-fUKor1K77Z09F4YnLpxM9PMHULzS9SJwVOnUS0,1799
@@ -251,10 +251,10 @@ dissect/target/volumes/bde.py,sha256=gYGg5yF9MNARwNzEkrEfZmKkxyZW4rhLkpdnPJCbhGk
 dissect/target/volumes/disk.py,sha256=95grSsPt1BLVpKwTclwQYzPFGKTkFFqapIk0RoGWf38,968
 dissect/target/volumes/lvm.py,sha256=zXAfszxNR6tOGrKAtAa_E-JhjI-sXQyR4VYLXD-kqCw,1616
 dissect/target/volumes/vmfs.py,sha256=mlAJ8278tYaoRjk1u6tFFlCaDQUrVu5ZZE4ikiFvxi8,1707
-dissect.target-3.8.dev34.dist-info/COPYRIGHT,sha256=m-9ih2RVhMiXHI2bf_oNSSgHgkeIvaYRVfKTwFbnJPA,301
-dissect.target-3.8.dev34.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-dissect.target-3.8.dev34.dist-info/METADATA,sha256=w87iqHAzoUqr5rasT7zTj2DHOnBqHTJK0SFJctHj9l8,9752
-dissect.target-3.8.dev34.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-dissect.target-3.8.dev34.dist-info/entry_points.txt,sha256=tvFPa-Ap-gakjaPwRc6Fl6mxHzxEZ_arAVU-IUYeo_s,447
-dissect.target-3.8.dev34.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect.target-3.8.dev34.dist-info/RECORD,,
+dissect.target-3.8.dev35.dist-info/COPYRIGHT,sha256=m-9ih2RVhMiXHI2bf_oNSSgHgkeIvaYRVfKTwFbnJPA,301
+dissect.target-3.8.dev35.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+dissect.target-3.8.dev35.dist-info/METADATA,sha256=S4ko-GsgaonoytojPJM2DGAbtTSRxXCzZMxGVkxDk1Y,9752
+dissect.target-3.8.dev35.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+dissect.target-3.8.dev35.dist-info/entry_points.txt,sha256=tvFPa-Ap-gakjaPwRc6Fl6mxHzxEZ_arAVU-IUYeo_s,447
+dissect.target-3.8.dev35.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
+dissect.target-3.8.dev35.dist-info/RECORD,,