dissect.target 3.25.dev40__tar.gz → 3.25.dev42__tar.gz

{dissect_target-3.25.dev40 → dissect_target-3.25.dev42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.target
-Version: 3.25.dev40
+Version: 3.25.dev42
 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-Expression: AGPL-3.0-or-later
@@ -26,7 +26,7 @@ Requires-Dist: dissect.cstruct<5,>=4
 Requires-Dist: dissect.database<2,>=1.1.dev3
 Requires-Dist: dissect.eventlog<4,>=3
 Requires-Dist: dissect.evidence<4,>=3.13.dev2
-Requires-Dist: dissect.hypervisor<4,>=3.20
+Requires-Dist: dissect.hypervisor<4,>=3.21.dev3
 Requires-Dist: dissect.ntfs<4,>=3.16.dev
 Requires-Dist: dissect.regf<4,>=3.13
 Requires-Dist: dissect.util<4,>=3
@@ -79,7 +79,7 @@ Requires-Dist: dissect.extfs[dev]<4.0.dev,>=3.0.dev; extra == "dev"
 Requires-Dist: dissect.fat[dev]<4.0.dev,>=3.0.dev; extra == "dev"
 Requires-Dist: dissect.ffs[dev]<4.0.dev,>=3.0.dev; extra == "dev"
 Requires-Dist: dissect.fve[dev]<5.0.dev,>=4.5.dev; extra == "dev"
-Requires-Dist: dissect.hypervisor[dev]<4.0.dev,>=3.20.dev; extra == "dev"
+Requires-Dist: dissect.hypervisor[dev]<4.0.dev,>=3.21.dev3; extra == "dev"
 Requires-Dist: dissect.jffs[dev]<2.0.dev,>=1.5.dev; extra == "dev"
 Requires-Dist: dissect.ntfs[dev]<4.0.dev,>=3.16.dev; extra == "dev"
 Requires-Dist: dissect.qnxfs[dev]<2.0.dev,>=1.1.dev; extra == "dev"

{dissect_target-3.25.dev40 → dissect_target-3.25.dev42}/dissect/target/loaders/vbox.py

@@ -26,5 +26,5 @@ class VBoxLoader(Loader):
         return path.suffix.lower() == ".vbox"
 
     def map(self, target: Target) -> None:
-        for disk in self.vbox.disks():
-            target.disks.add(container.open(self.base_path.joinpath(disk)))
+        for disk in self.vbox.hardware.disks:
+            target.disks.add(container.open(self.base_path.joinpath(disk.location)))

{dissect_target-3.25.dev40 → dissect_target-3.25.dev42}/dissect/target/plugins/child/virtualbox.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 from defusedxml import ElementTree
-from dissect.hypervisor.descriptor.vbox import VBox
+from dissect.hypervisor.descriptor.vbox import NS
 
 from dissect.target.exceptions import UnsupportedPluginError
 from dissect.target.helpers.record import ChildTargetRecord
@@ -45,7 +45,6 @@ class VirtualBoxChildTargetPlugin(ChildTargetPlugin):
     def find_vms(self) -> Iterator[Path]:
         """Yield Oracle VirtualBox ``.vbox`` file(s) found on the target."""
         seen = set()
-
         for user_details in self.target.user_details.all_with_home():
             # Yield `.vbox` from default locations and add to seen.
             for default_path in self.DEFAULT_PATHS:
@@ -70,7 +69,7 @@ class VirtualBoxChildTargetPlugin(ChildTargetPlugin):
                         continue
 
                     # Parse MachineEntries
-                    for machine in config.findall(f".//{VBox.VBOX_XML_NAMESPACE}MachineEntry"):
+                    for machine in config.findall(f".//{NS}MachineEntry"):
                         if (
                             (src := machine.get("src"))
                             and (src_path := self.target.fs.path(src)).exists()
@@ -80,7 +79,7 @@ class VirtualBoxChildTargetPlugin(ChildTargetPlugin):
                             yield src_path
 
                     # Glob for SystemProperties defaultMachineFolder
-                    for system_properties in config.findall(f".//{VBox.VBOX_XML_NAMESPACE}SystemProperties"):
+                    for system_properties in config.findall(f".//{NS}SystemProperties"):
                         if (folder_str := system_properties.get("defaultMachineFolder")) and (
                             folder_dir := self.target.fs.path(folder_str)
                         ).is_dir():
@@ -97,7 +96,7 @@ class VirtualBoxChildTargetPlugin(ChildTargetPlugin):
         for vbox in self.vboxes:
             try:
                 config = ElementTree.fromstring(vbox.read_bytes())
-                name = config.find(f".//{VBox.VBOX_XML_NAMESPACE}Machine").attrib["name"]
+                name = config.find(f".//{NS}Machine").attrib["name"]
             except Exception as e:
                 self.target.log.error("Failed to parse name from VirtualBox XML: %s", vbox)  # noqa: TRY400
                 self.target.log.debug("", exc_info=e)

{dissect_target-3.25.dev40 → dissect_target-3.25.dev42}/dissect/target/tools/shell.py

@@ -1165,6 +1165,36 @@ class TargetCli(TargetCmd):
         print(f"MD5:\t{md5}\nSHA1:\t{sha1}\nSHA256:\t{sha256}", file=stdout)
         return False
 
+    @arg("path")
+    def cmd_md5sum(self, args: argparse.Namespace, stdout: TextIO) -> bool:
+        """print the MD5 checksum of a file provided by a path"""
+        if not (path := self.check_file(args.path)):
+            return False
+
+        (md5,) = path.get().hash(["md5"])
+        print(f"{md5}  {path!s}", file=stdout)
+        return False
+
+    @arg("path")
+    def cmd_sha1sum(self, args: argparse.Namespace, stdout: TextIO) -> bool:
+        """print the SHA1 checksum of a file provided by a path"""
+        if not (path := self.check_file(args.path)):
+            return False
+
+        (sha1,) = path.get().hash(["sha1"])
+        print(f"{sha1}  {path!s}", file=stdout)
+        return False
+
+    @arg("path")
+    def cmd_sha256sum(self, args: argparse.Namespace, stdout: TextIO) -> bool:
+        """print the SHA256 checksum of a file provided by a path"""
+        if not (path := self.check_file(args.path)):
+            return False
+
+        (sha256,) = path.get().hash(["sha256"])
+        print(f"{sha256}  {path!s}", file=stdout)
+        return False
+
     @arg("path")
     @alias("head")
     @alias("more")
@@ -1482,7 +1512,6 @@ def build_pipe(pipe_parts: list[str], pipe_stdout: int = subprocess.PIPE) -> Ite
     On context exit the generator will close the input stream and wait for
     the subprocessess to finish.
     """
-
     if not pipe_parts:
         raise ValueError("No pipe components provided")
 

{dissect_target-3.25.dev40 → dissect_target-3.25.dev42}/dissect.target.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.target
-Version: 3.25.dev40
+Version: 3.25.dev42
 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-Expression: AGPL-3.0-or-later
@@ -26,7 +26,7 @@ Requires-Dist: dissect.cstruct<5,>=4
 Requires-Dist: dissect.database<2,>=1.1.dev3
 Requires-Dist: dissect.eventlog<4,>=3
 Requires-Dist: dissect.evidence<4,>=3.13.dev2
-Requires-Dist: dissect.hypervisor<4,>=3.20
+Requires-Dist: dissect.hypervisor<4,>=3.21.dev3
 Requires-Dist: dissect.ntfs<4,>=3.16.dev
 Requires-Dist: dissect.regf<4,>=3.13
 Requires-Dist: dissect.util<4,>=3
@@ -79,7 +79,7 @@ Requires-Dist: dissect.extfs[dev]<4.0.dev,>=3.0.dev; extra == "dev"
 Requires-Dist: dissect.fat[dev]<4.0.dev,>=3.0.dev; extra == "dev"
 Requires-Dist: dissect.ffs[dev]<4.0.dev,>=3.0.dev; extra == "dev"
 Requires-Dist: dissect.fve[dev]<5.0.dev,>=4.5.dev; extra == "dev"
-Requires-Dist: dissect.hypervisor[dev]<4.0.dev,>=3.20.dev; extra == "dev"
+Requires-Dist: dissect.hypervisor[dev]<4.0.dev,>=3.21.dev3; extra == "dev"
 Requires-Dist: dissect.jffs[dev]<2.0.dev,>=1.5.dev; extra == "dev"
 Requires-Dist: dissect.ntfs[dev]<4.0.dev,>=3.16.dev; extra == "dev"
 Requires-Dist: dissect.qnxfs[dev]<2.0.dev,>=1.1.dev; extra == "dev"

{dissect_target-3.25.dev40 → dissect_target-3.25.dev42}/dissect.target.egg-info/requires.txt

@@ -3,7 +3,7 @@ dissect.cstruct<5,>=4
 dissect.database<2,>=1.1.dev3
 dissect.eventlog<4,>=3
 dissect.evidence<4,>=3.13.dev2
-dissect.hypervisor<4,>=3.20
+dissect.hypervisor<4,>=3.21.dev3
 dissect.ntfs<4,>=3.16.dev
 dissect.regf<4,>=3.13
 dissect.util<4,>=3
@@ -33,7 +33,7 @@ dissect.extfs[dev]<4.0.dev,>=3.0.dev
 dissect.fat[dev]<4.0.dev,>=3.0.dev
 dissect.ffs[dev]<4.0.dev,>=3.0.dev
 dissect.fve[dev]<5.0.dev,>=4.5.dev
-dissect.hypervisor[dev]<4.0.dev,>=3.20.dev
+dissect.hypervisor[dev]<4.0.dev,>=3.21.dev3
 dissect.jffs[dev]<2.0.dev,>=1.5.dev
 dissect.ntfs[dev]<4.0.dev,>=3.16.dev
 dissect.qnxfs[dev]<2.0.dev,>=1.1.dev

{dissect_target-3.25.dev40 → dissect_target-3.25.dev42}/pyproject.toml

@@ -30,7 +30,7 @@ dependencies = [
     "dissect.database>=1.1.dev3,<2",  # TODO: update on release!
     "dissect.eventlog>=3,<4",
     "dissect.evidence>=3.13.dev2,<4",  # TODO: update on release!
-    "dissect.hypervisor>=3.20,<4",
+    "dissect.hypervisor>=3.21.dev3,<4", # TODO: update on release!
     "dissect.ntfs>=3.16.dev,<4",
     "dissect.regf>=3.13,<4",
     "dissect.util>=3,<4",
@@ -93,7 +93,7 @@ dev = [
     "dissect.fat[dev]>=3.0.dev,<4.0.dev",
     "dissect.ffs[dev]>=3.0.dev,<4.0.dev",
     "dissect.fve[dev]>=4.5.dev,<5.0.dev",
-    "dissect.hypervisor[dev]>=3.20.dev,<4.0.dev",
+    "dissect.hypervisor[dev]>=3.21.dev3,<4.0.dev",  # TODO: update on release!
     "dissect.jffs[dev]>=1.5.dev,<2.0.dev",
     "dissect.ntfs[dev]>=3.16.dev,<4.0.dev",
     "dissect.qnxfs[dev]>=1.1.dev,<2.0.dev",

{dissect_target-3.25.dev40 → dissect_target-3.25.dev42}/tests/loaders/test_vbox.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
-from unittest.mock import patch
+from unittest.mock import Mock, patch
 
 import pytest
 
@@ -32,7 +32,7 @@ def test_target_open(opener: Callable[[str | Path], Target], tmp_path: Path) ->
         patch("dissect.target.target.Target.apply"),
     ):
         mock_vbox.return_value = mock_vbox
-        mock_vbox.disks.return_value = ["mock.vdi"]
+        mock_vbox.hardware.disks = [Mock(location="mock.vdi")]
 
         target = opener(path)
         assert isinstance(target._loader, VBoxLoader)
@@ -48,7 +48,7 @@ def test_loader(tmp_path: Path) -> None:
         patch("dissect.target.container.open") as mock_container_open,
     ):
         mock_vbox.return_value = mock_vbox
-        mock_vbox.disks.return_value = ["mock.vdi"]
+        mock_vbox.hardware.disks = [Mock(location="mock.vdi")]
 
         loader = loader_open(path)
         assert isinstance(loader, VBoxLoader)

{dissect_target-3.25.dev40 → dissect_target-3.25.dev42}/tests/tools/test_shell.py

@@ -257,6 +257,21 @@ def test_redirect_simple_ls(tmp_path: Path, target_win: Target, monkeypatch: pyt
     assert "sysvol" in content
 
 
+def test_target_cli_hash_checksums(target_unix: Target, capsys: pytest.CaptureFixture) -> None:
+    target_unix.fs.map_file_fh("/test-file", BytesIO(b"Hello world!"))
+
+    cli = TargetCli(target_unix)
+
+    cli.onecmd("md5sum /test-file")
+    assert "86fb269d190d2c85f6e0468ceca42a20  /test-file" in capsys.readouterr().out
+
+    cli.onecmd("sha1sum /test-file")
+    assert "d3486ae9136e7856bc42212385ea797094475802  /test-file" in capsys.readouterr().out
+
+    cli.onecmd("sha256sum /test-file")
+    assert "c0535e4be2b79ffd93291305436bf889314e4a3faec05ecffcbb7df31ad9e51a  /test-file" in capsys.readouterr().out
+
+
 @pytest.mark.skipif(platform.system() == "Windows", reason="Unix-specific test")
 def test_redirect_pipe(tmp_path: Path, target_win: Target, monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(fs, "LS_COLORS", {"di": "\033[34m", "fi": "\033[0m"})