dissect.target 3.8.dev33__tar.gz → 3.8.dev35__tar.gz

{dissect.target-3.8.dev33/dissect.target.egg-info → dissect.target-3.8.dev35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.8.dev33
+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.dev33 → dissect.target-3.8.dev35}/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.dev33 → dissect.target-3.8.dev35}/dissect/target/tools/shell.py

@@ -143,6 +143,15 @@ class TargetCmd(cmd.Cmd):
 
         return cmd.Cmd.default(self, line)
 
+    def emptyline(self):
+        """This function forces Python's cmd.Cmd module to behave like a regular shell.
+
+        When entering an empty command, the cmd module will by default repeat the previous command.
+        By defining an empty ``emptyline`` function we make sure no command is executed instead.
+        See https://stackoverflow.com/a/16479030
+        """
+        pass
+
     def _exec(self, func, command_args_str):
         """
         Command execution helper that chains initial command and piped
@@ -720,6 +729,20 @@ class TargetCli(TargetCmd):
             shutil.copyfileobj(fh, stdout)
             stdout.flush()
 
+    @arg("path")
+    def cmd_zcat(self, args, stdout):
+        """print file content from compressed files"""
+        paths = self.resolveglobpath(args.path)
+        stdout = stdout.buffer
+        for path in paths:
+            path = self.checkfile(path)
+            if not path:
+                continue
+
+            fh = fsutil.open_decompress(path)
+            shutil.copyfileobj(fh, stdout)
+            stdout.flush()
+
     @arg("path")
     def cmd_hexdump(self, args, stdout):
         """print a hexdump of the first X bytes"""
@@ -748,6 +771,15 @@ class TargetCli(TargetCmd):
 
         pydoc.pager(path.open("rt", errors="ignore").read(10 * 1024 * 1024))
 
+    @arg("path")
+    def cmd_zless(self, args, stdout):
+        """open the first 10 MB of a compressed file with zless"""
+        path = self.checkfile(args.path)
+        if not path:
+            return
+
+        pydoc.pager(fsutil.open_decompress(path, "rt").read(10 * 1024 * 1024))
+
     @arg("path", nargs="+")
     def cmd_readlink(self, args, stdout):
         """print resolved symbolic links or canonical file names"""

{dissect.target-3.8.dev33 → dissect.target-3.8.dev35/dissect.target.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.8.dev33
+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.dev33 → dissect.target-3.8.dev35}/tests/test_helpers_fsutil.py

@@ -247,15 +247,20 @@ def test_helpers_fsutil_pure_dissect_path__from_parts_no_fs_exception():
         fsutil.PureDissectPath(Mock(), "/some/dir")
 
 
-def test_helpers_fsutil_open_decompress():
+@pytest.mark.parametrize(
+    ("file_name, compressor, content"),
+    [
+        ("plain", lambda x: x, b"plain\ncontent"),
+        ("comp.gz", gzip.compress, b"gzip\ncontent"),
+        ("comp_gz", gzip.compress, b"gzip\ncontent"),
+        ("comp.bz2", bz2.compress, b"bz2\ncontent"),
+        ("comp_bz2", bz2.compress, b"bz2\ncontent"),
+    ],
+)
+def test_helpers_fsutil_open_decompress(file_name, compressor, content):
     vfs = VirtualFilesystem()
-    vfs.map_file_fh("plain", io.BytesIO(b"plain\ncontent"))
-    vfs.map_file_fh("comp.gz", io.BytesIO(gzip.compress(b"gzip\ncontent")))
-    vfs.map_file_fh("comp.bz2", io.BytesIO(bz2.compress(b"bz2\ncontent")))
-
-    fsutil.open_decompress(vfs.path("plain")).read() == b"plain\ncontent"
-    fsutil.open_decompress(vfs.path("comp.gz")).read() == b"gzip\ncontent"
-    fsutil.open_decompress(vfs.path("comp.bz2")).read() == b"bz2\ncontent"
+    vfs.map_file_fh(file_name, io.BytesIO(compressor(content)))
+    assert fsutil.open_decompress(vfs.path(file_name)).read() == content
 
 
 def test_helpers_fsutil_reverse_readlines():