dissect.target 3.9.dev24__tar.gz → 3.9.dev26__tar.gz

{dissect.target-3.9.dev24/dissect.target.egg-info → dissect.target-3.9.dev26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.9.dev24
+Version: 3.9.dev26
 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.9.dev24 → dissect.target-3.9.dev26}/dissect/target/container.py

@@ -183,7 +183,7 @@ def open(item: Union[list, str, BinaryIO, Path], *args, **kwargs):
         first_fh = first
     else:
         first_path = first
-        if first_path.exists():
+        if first_path.is_file():
             first_fh = first.open("rb")
             first_fh_opened = True
 
@@ -213,4 +213,6 @@ register("vhdx", "VhdxContainer")
 register("vhd", "VhdContainer")
 register("qcow2", "QCow2Container")
 register("vdi", "VdiContainer")
+register("hdd", "HddContainer")
+register("hds", "HdsContainer")
 register("split", "SplitContainer")

dissect.target-3.9.dev26/dissect/target/containers/hdd.py

@@ -0,0 +1,37 @@
+import io
+from pathlib import Path
+from typing import BinaryIO, Union
+
+from dissect.hypervisor import hdd
+
+from dissect.target.container import Container
+
+
+class HddContainer(Container):
+    def __init__(self, fh: Path, *args, **kwargs):
+        if hasattr(fh, "read"):
+            raise TypeError("HddContainer can only be opened by path")
+
+        self.hdd = hdd.HDD(fh)
+        self.stream = self.hdd.open()
+        super().__init__(fh, self.stream.size, *args, **kwargs)
+
+    @staticmethod
+    def detect_fh(fh: BinaryIO, original: Union[list, BinaryIO]) -> bool:
+        return False
+
+    @staticmethod
+    def detect_path(path: Path, original: Union[list, BinaryIO]) -> bool:
+        return path.suffix.lower() == ".hdd"
+
+    def read(self, length: int) -> bytes:
+        return self.stream.read(length)
+
+    def seek(self, offset: int, whence: int = io.SEEK_SET) -> int:
+        return self.stream.seek(offset, whence)
+
+    def tell(self) -> int:
+        return self.stream.tell()
+
+    def close(self) -> None:
+        self.stream.close()

dissect.target-3.9.dev26/dissect/target/containers/hds.py

@@ -0,0 +1,41 @@
+import io
+from pathlib import Path
+from typing import BinaryIO, Union
+
+from dissect.hypervisor.disk import hdd
+from dissect.hypervisor.disk.c_hdd import c_hdd
+
+from dissect.target.container import Container
+
+
+class HdsContainer(Container):
+    def __init__(self, fh: Union[BinaryIO, Path], *args, **kwargs):
+        f = fh
+        if not hasattr(fh, "read"):
+            f = fh.open("rb")
+
+        self.hds = hdd.HDS(f)
+        super().__init__(fh, self.hds.size, *args, **kwargs)
+
+    @staticmethod
+    def detect_fh(fh: BinaryIO, original: Union[list, BinaryIO]) -> bool:
+        sig = fh.read(16)
+        fh.seek(-16, io.SEEK_CUR)
+
+        return sig in (c_hdd.SIGNATURE_STRUCTURED_DISK_V1, c_hdd.SIGNATURE_STRUCTURED_DISK_V2)
+
+    @staticmethod
+    def detect_path(path: Path, original: Union[list, BinaryIO]) -> bool:
+        return path.suffix.lower() == ".hds"
+
+    def read(self, length: int) -> bytes:
+        return self.hds.read(length)
+
+    def seek(self, offset: int, whence: int = io.SEEK_SET) -> int:
+        return self.hds.seek(offset, whence)
+
+    def tell(self) -> int:
+        return self.hds.tell()
+
+    def close(self) -> None:
+        self.hds.close()

{dissect.target-3.9.dev24 → dissect.target-3.9.dev26}/dissect/target/loader.py

@@ -182,6 +182,8 @@ register("tar", "TarLoader")
 register("vmx", "VmxLoader")
 register("vmwarevm", "VmwarevmLoader")
 register("hyperv", "HyperVLoader")
+register("pvs", "PvsLoader")
+register("pvm", "PvmLoader")
 register("ovf", "OvfLoader")
 register("vbox", "VBoxLoader")
 register("ewf", "EwfLoader")

dissect.target-3.9.dev26/dissect/target/loaders/pvm.py

@@ -0,0 +1,14 @@
+from pathlib import Path
+
+from dissect.target.loaders.pvs import PvsLoader
+
+
+class PvmLoader(PvsLoader):
+    """Parallels VM directory (.pvm)."""
+
+    def __init__(self, path: Path, **kwargs):
+        super().__init__(path.joinpath("config.pvs"))
+
+    @staticmethod
+    def detect(path: Path) -> bool:
+        return path.is_dir() and path.suffix.lower() == ".pvm" and path.joinpath("config.pvs").exists()

dissect.target-3.9.dev26/dissect/target/loaders/pvs.py

@@ -0,0 +1,35 @@
+from __future__ import annotations
+
+from pathlib import Path
+from typing import TYPE_CHECKING
+
+from dissect.hypervisor import pvs
+
+from dissect.target.containers.hdd import HddContainer
+from dissect.target.loader import Loader
+
+if TYPE_CHECKING:
+    from dissect.target import Target
+
+
+class PvsLoader(Loader):
+    """Parallels VM configuration file (config.pvs)."""
+
+    def __init__(self, path: Path, **kwargs):
+        path = path.resolve()
+
+        super().__init__(path)
+        self.pvs = pvs.PVS(path.open("rt"))
+        self.base_dir = path.parent
+
+    @staticmethod
+    def detect(path: Path) -> bool:
+        return path.suffix.lower() == ".pvs"
+
+    def map(self, target: Target) -> None:
+        for disk in self.pvs.disks():
+            path = self.base_dir.joinpath(disk)
+            try:
+                target.disks.add(HddContainer(path))
+            except Exception:
+                target.log.exception("Failed to load HDD: %s", disk)

{dissect.target-3.9.dev24 → dissect.target-3.9.dev26}/dissect/target/plugins/os/unix/_os.py

@@ -4,7 +4,7 @@ import logging
 import re
 import uuid
 from struct import unpack
-from typing import Iterator, Optional, Tuple, Union
+from typing import Iterator, Optional, Union
 
 from dissect.target.filesystem import Filesystem
 from dissect.target.helpers.fsutil import TargetPath
@@ -277,7 +277,7 @@ class UnixPlugin(OSPlugin):
 def parse_fstab(
     fstab: TargetPath,
     log: logging.Logger = log,
-) -> Iterator[Tuple[Union[uuid.UUID, str], str, str, str]]:
+) -> Iterator[tuple[Union[uuid.UUID, str], str, str, str]]:
     """Parse fstab file and return a generator that streams the details of entries,
     with unsupported FS types and block devices filtered away.
     """
@@ -315,7 +315,9 @@ def parse_fstab(
         if dev.startswith(("/dev/mapper", "/dev/gpt")):
             volume_name = dev.rsplit("/")[-1]
         elif dev.startswith("/dev/") and dev.count("/") == 3:
-            volume_name = "-".join(dev.rsplit("/")[-2:])
+            # When composing a vg-lv name, LVM2 replaces hyphens with double hyphens in the vg and lv names
+            # Emulate that here when combining the vg and lv names
+            volume_name = "-".join(part.replace("-", "--") for part in dev.rsplit("/")[-2:])
         elif dev.startswith("UUID="):
             dev_id = dev.split("=")[1]
             try:

{dissect.target-3.9.dev24 → dissect.target-3.9.dev26}/dissect/target/volumes/lvm.py

@@ -48,5 +48,7 @@ class LvmVolumeSystem(LogicalVolumeSystem):
 
     def _volumes(self) -> Iterator[Volume]:
         for num, lv in enumerate(self.lvm.volume_group.logical_volumes):
-            name = f"{lv.vg.name}-{lv.metadata.name}"
+            # When composing a vg-lv name, LVM2 replaces hyphens with double hyphens in the vg and lv names
+            # Emulate that here for the volume name
+            name = f"{lv.vg.name.replace('-', '--')}-{lv.metadata.name.replace('-', '--')}"
             yield Volume(lv, num, None, lv.size, None, name, raw=lv, vs=self)

{dissect.target-3.9.dev24 → dissect.target-3.9.dev26/dissect.target.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.9.dev24
+Version: 3.9.dev26
 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.9.dev24 → dissect.target-3.9.dev26}/dissect.target.egg-info/SOURCES.txt

@@ -22,6 +22,8 @@ dissect/target/volume.py
 dissect/target/containers/__init__.py
 dissect/target/containers/asdf.py
 dissect/target/containers/ewf.py
+dissect/target/containers/hdd.py
+dissect/target/containers/hds.py
 dissect/target/containers/qcow2.py
 dissect/target/containers/raw.py
 dissect/target/containers/split.py
@@ -76,6 +78,8 @@ dissect/target/loaders/local.py
 dissect/target/loaders/ovf.py
 dissect/target/loaders/phobos.py
 dissect/target/loaders/profile.py
+dissect/target/loaders/pvm.py
+dissect/target/loaders/pvs.py
 dissect/target/loaders/raw.py
 dissect/target/loaders/remote.py
 dissect/target/loaders/res.py
@@ -293,6 +297,8 @@ tests/test_loaders_dir.py
 tests/test_loaders_hyperv.py
 tests/test_loaders_kape.py
 tests/test_loaders_local.py
+tests/test_loaders_pvm.py
+tests/test_loaders_pvs.py
 tests/test_loaders_remote.py
 tests/test_loaders_tanium.py
 tests/test_loaders_tar.py

dissect.target-3.9.dev26/tests/test_loaders_pvm.py

@@ -0,0 +1,22 @@
+from unittest.mock import call, patch
+
+from dissect.target.loaders.pvm import PvmLoader
+
+from ._utils import mkdirs
+
+
+@patch("dissect.target.loaders.pvs.HddContainer")
+@patch("dissect.target.loaders.pvs.pvs.PVS")
+def test_pvm_loader(PVS, HddContainer, mock_target, tmp_path):
+    mkdirs(tmp_path, ["Test.pvm"])
+    (tmp_path / "Test.pvm" / "config.pvs").touch()
+
+    PVS.return_value = PVS
+    PVS.disks.return_value = ["mock.hdd"]
+    HddContainer.return_value = HddContainer
+
+    pvm_loader = PvmLoader(tmp_path / "Test.pvm")
+    pvm_loader.map(mock_target)
+
+    assert len(mock_target.disks) == 1
+    assert HddContainer.mock_calls == [call(tmp_path.resolve() / "Test.pvm" / "mock.hdd")]

dissect.target-3.9.dev26/tests/test_loaders_pvs.py

@@ -0,0 +1,20 @@
+from unittest.mock import call, patch
+
+from dissect.target.loaders.pvs import PvsLoader
+
+
+@patch("pathlib.Path")
+@patch("dissect.target.loaders.pvs.HddContainer")
+@patch("dissect.target.loaders.pvs.pvs.PVS")
+def test_pvs_loader(PVS, HddContainer, Path, mock_target):
+    PVS.return_value = PVS
+    PVS.disks.return_value = ["mock.hdd"]
+    HddContainer.return_value = HddContainer
+
+    pvs_loader = PvsLoader(Path("/mock.pvs"))
+    pvs_loader.map(mock_target)
+
+    expected = [call.disks()]
+    del PVS.mock_calls[0]
+    assert expected == PVS.mock_calls
+    assert len(mock_target.disks) == 1

{dissect.target-3.9.dev24 → dissect.target-3.9.dev26}/tests/test_plugins_os_unix.py

@@ -28,6 +28,10 @@ UUID=28a25297-9825-4f87-ac41-f9c20cd5db4f /boot        ext4    defaults
 UUID=F631-BECA                            /boot/efi    vfat    defaults,discard,umask=0077   0    0
 
 /dev/disk/cloud/azure_resource-part1      /mnt         auto    defaults,nofail,x-systemd.requires=cloud-init.service,comment=cloudconfig   0   2
+
+/dev/mapper/vg--main-lv--var              /var         auto    default             0    2
+
+/dev/vg-main/lv-data                      /data        auto    default             0    2
 """  # noqa
 
 
@@ -41,14 +45,16 @@ def test_parse_fstab():
 
         records = list(parse_fstab(fs.path("/etc/fstab")))
 
-    # 8 input records minus
+    # 10 input records minus
     #   2 unsupported mount devices (proc, /dev/disk/cloud/azure_resource-part1)
     #   2 swap partitions
     #   1 root partition
-    # = 3 expected results
+    # = 5 expected results
 
     assert set(records) == {
         (UUID("5d1f1508-069b-4274-9bfa-ae2bf7ffb5e0"), None, "ext4", "/home"),
         (UUID("28a25297-9825-4f87-ac41-f9c20cd5db4f"), None, "ext4", "/boot"),
         ("F631-BECA", None, "vfat", "/boot/efi"),
+        (None, "vg--main-lv--var", "auto", "/var"),
+        (None, "vg--main-lv--data", "auto", "/data"),
     }