dissect.target 3.9.dev24__py3-none-any.whl → 3.9.dev26__py3-none-any.whl

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/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/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/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/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/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/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/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.dist-info → dissect.target-3.9.dev26.dist-info}/METADATA

@@ -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.dist-info → dissect.target-3.9.dev26.dist-info}/RECORD

@@ -1,8 +1,8 @@
 dissect/target/__init__.py,sha256=Oc7ounTgq2hE4nR6YcNabetc7SQA40ldSa35VEdZcQU,63
-dissect/target/container.py,sha256=PPL9YFQXgKkT7PL1dIwhkg35S7PcupZLDebDt4U1Omk,7665
+dissect/target/container.py,sha256=R8M9EE7DqKq8DeMuekcpR1nxtZ827zuqmTmO4s7PYkg,7730
 dissect/target/exceptions.py,sha256=w3qNa4dtGpxUkOCfmAQtvseQrpQq9qmO9wIbztRlIDQ,2273
 dissect/target/filesystem.py,sha256=YJfuRzd37DIm91cVPlMZK-XjiJ1UCZG93htaYcSUrIk,46276
-dissect/target/loader.py,sha256=74FWz2CC75LmovE38obeOghVyUhys0ttpxgXCNsCBwQ,6985
+dissect/target/loader.py,sha256=Rg4X-4Lr2EtTzBA04WFWtPESF2iR1JNahKccMBImLZ0,7043
 dissect/target/plugin.py,sha256=qF0okKg7TxYfiLVxpCWhb18gvDsNtr9nCYD7kSeaYIU,31955
 dissect/target/report.py,sha256=06uiP4MbNI8cWMVrC1SasNS-Yg6ptjVjckwj8Yhe0Js,7958
 dissect/target/target.py,sha256=TgDY-yAsReOQOG-Phz_m1vdNucdbk9fUI_RMZpMeYG8,28334
@@ -10,6 +10,8 @@ dissect/target/volume.py,sha256=vHBXdDttpiu-Q_oWycNM7fdJ5N8Ob7-i_UBJK9DEs24,1502
 dissect/target/containers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dissect/target/containers/asdf.py,sha256=g8omgyCvXBPd6ZZ1TKmaHNfzfs7W1HqmAsEAdDaXYLk,1398
 dissect/target/containers/ewf.py,sha256=VEzjFH7R5GQB7ywKKyarYn9b9QdrBPxQ667Xh5WNmdQ,1370
+dissect/target/containers/hdd.py,sha256=CenRlMNDmevCqccGPbSzOIPbdKIl0rHCtQ5kThOZQAU,1046
+dissect/target/containers/hds.py,sha256=0nh9qoJ0SH0ADCEykpUrIU2tGt9xsksNAxs7ocILtdA,1175
 dissect/target/containers/qcow2.py,sha256=RWmFeXfxAkU3OMGo7vfnOQTRlcWBH5-96LP37JB2o3o,1159
 dissect/target/containers/raw.py,sha256=7fRHA5zIxBcBuGlACIJWvaSivjH98meNkyVLaR1Mi7k,1064
 dissect/target/containers/split.py,sha256=dYibfeVddm-ux_ORjIAQxhqbWc9LKws3b8gYIXnINj4,2377
@@ -64,6 +66,8 @@ dissect/target/loaders/local.py,sha256=JEZN17wg4Tmw7nxQp2_6z97UuDx8ORxNLsgFs4rQh
 dissect/target/loaders/ovf.py,sha256=3nd9ZinRRH71Qp0_r-lZURafNdXiKjyMw1zsgZRwjgo,924
 dissect/target/loaders/phobos.py,sha256=r9mkITM8iuO60BHzDt-GkPMOFn4YWH0ahPRLSyEXAmA,1864
 dissect/target/loaders/profile.py,sha256=73BlV0zAAPWBYY0tZAaX154kf7TZmwAwZhwCY4E43_A,1633
+dissect/target/loaders/pvm.py,sha256=b-PvHNTbRVdOnf7-OR5dbikbDTCFlW85b-9Z8PEL2Cs,406
+dissect/target/loaders/pvs.py,sha256=dMqdYSBQtH9QLM3tdu0mokLBcn73edg_HUtYtqrdi6E,955
 dissect/target/loaders/raw.py,sha256=03OXVlvkqwR29XYu7WPg3pmGtYd_4QJEGnkAuvIrdPs,355
 dissect/target/loaders/remote.py,sha256=AoI7-RxH2UMjNWnuHbNaieZycApTY3YZmk4wkQAwFt0,8820
 dissect/target/loaders/res.py,sha256=2IAm-f83fvMUeK5J0g5jNVy2-24k8qKYijimcFvZ47I,8832
@@ -135,7 +139,7 @@ dissect/target/plugins/general/scrape.py,sha256=eBcFv6Po4FJ9HV829U3Bc5eWPtsuqFpd
 dissect/target/plugins/general/users.py,sha256=qCXXsNOf3-IBgMUJjeH56RVhFeAsTSkXXaxWX-irYvU,2140
 dissect/target/plugins/os/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dissect/target/plugins/os/unix/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dissect/target/plugins/os/unix/_os.py,sha256=3ZlOoo3Gg3yLq9TDgS6fY66aXI0qNsgWrEJoUQ8xLU0,12132
+dissect/target/plugins/os/unix/_os.py,sha256=VUxsf3DzZlMhBsPrKKn3U5Wd4I4WyrwlEnyTeFoMi5s,12336
 dissect/target/plugins/os/unix/cronjobs.py,sha256=3g2_EoXmRIvqwhASnn6p-iN3c8g70bLMWfzyN38znbA,3508
 dissect/target/plugins/os/unix/datetime.py,sha256=21OyCR1g6wa6q5sGZTK3Kv4Jduoxj3o4A8GsdqK9JDQ,1510
 dissect/target/plugins/os/unix/generic.py,sha256=R9fi1qNDaY5_l5g0XVLuXv1jOSz9wpb6zPVmWY3rczk,1835
@@ -254,12 +258,12 @@ dissect/target/tools/dump/utils.py,sha256=nYcLQvPpDgzckM62hokGBh4z32DNH6d6oA8Kel
 dissect/target/volumes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dissect/target/volumes/bde.py,sha256=gYGg5yF9MNARwNzEkrEfZmKkxyZW4rhLkpdnPJCbhGk,3662
 dissect/target/volumes/disk.py,sha256=95grSsPt1BLVpKwTclwQYzPFGKTkFFqapIk0RoGWf38,968
-dissect/target/volumes/lvm.py,sha256=zXAfszxNR6tOGrKAtAa_E-JhjI-sXQyR4VYLXD-kqCw,1616
+dissect/target/volumes/lvm.py,sha256=_kIB1mdRs1OFhRgoT4VEP5Fv8imQnI7oQ_ie4x710tQ,1814
 dissect/target/volumes/vmfs.py,sha256=mlAJ8278tYaoRjk1u6tFFlCaDQUrVu5ZZE4ikiFvxi8,1707
-dissect.target-3.9.dev24.dist-info/COPYRIGHT,sha256=m-9ih2RVhMiXHI2bf_oNSSgHgkeIvaYRVfKTwFbnJPA,301
-dissect.target-3.9.dev24.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-dissect.target-3.9.dev24.dist-info/METADATA,sha256=vU6b1BQzZW0wqrloCcyyO2P8Yaw8f9PMmJYd3_os_UE,9984
-dissect.target-3.9.dev24.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-dissect.target-3.9.dev24.dist-info/entry_points.txt,sha256=tvFPa-Ap-gakjaPwRc6Fl6mxHzxEZ_arAVU-IUYeo_s,447
-dissect.target-3.9.dev24.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect.target-3.9.dev24.dist-info/RECORD,,
+dissect.target-3.9.dev26.dist-info/COPYRIGHT,sha256=m-9ih2RVhMiXHI2bf_oNSSgHgkeIvaYRVfKTwFbnJPA,301
+dissect.target-3.9.dev26.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+dissect.target-3.9.dev26.dist-info/METADATA,sha256=KCYCb5u-wp6D3lF6nmSnDg9Qudwq5ktMBIs_I4OgxtI,9984
+dissect.target-3.9.dev26.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+dissect.target-3.9.dev26.dist-info/entry_points.txt,sha256=tvFPa-Ap-gakjaPwRc6Fl6mxHzxEZ_arAVU-IUYeo_s,447
+dissect.target-3.9.dev26.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
+dissect.target-3.9.dev26.dist-info/RECORD,,