dissect.hypervisor 3.16.dev3__py3-none-any.whl → 3.17.dev1__py3-none-any.whl

dissect/hypervisor/disk/vmdk.py

@@ -1,10 +1,14 @@
+from __future__ import annotations
+
 import ctypes
 import io
 import logging
 import os
+import re
 import textwrap
 import zlib
 from bisect import bisect_right
+from dataclasses import dataclass
 from functools import lru_cache
 from pathlib import Path
 
@@ -59,13 +63,13 @@ class VMDK(AlignedStream):
                 if self.descriptor.attr["parentCID"] != "ffffffff":
                     self.parent = open_parent(path.parent, self.descriptor.attr["parentFileNameHint"])
 
-                for _, size, extent_type, filename in self.descriptor.extents:
-                    if extent_type in ["SPARSE", "VMFSSPARSE", "SESPARSE"]:
-                        sdisk_fh = path.with_name(filename).open("rb")
+                for extent in self.descriptor.extents:
+                    if extent.type in ["SPARSE", "VMFSSPARSE", "SESPARSE"]:
+                        sdisk_fh = path.with_name(extent.filename).open("rb")
                         self.disks.append(SparseDisk(sdisk_fh, parent=self.parent))
-                    elif extent_type in ["VMFS", "FLAT"]:
-                        rdisk_fh = path.with_name(filename).open("rb")
-                        self.disks.append(RawDisk(rdisk_fh, size * SECTOR_SIZE))
+                    elif extent.type in ["VMFS", "FLAT"]:
+                        rdisk_fh = path.with_name(extent.filename).open("rb")
+                        self.disks.append(RawDisk(rdisk_fh, extent.sectors * SECTOR_SIZE))
 
             elif magic in (COWD_MAGIC, VMDK_MAGIC, SESPARSE_MAGIC):
                 sparse_disk = SparseDisk(fh)
@@ -398,8 +402,53 @@ class SparseExtentHeader:
         return getattr(self.hdr, attr)
 
 
+RE_EXTENT_DESCRIPTOR = re.compile(
+    r"""
+    ^
+    (?P<access_mode>RW|RDONLY|NOACCESS)\s
+    (?P<sectors>\d+)\s
+    (?P<type>SPARSE|ZERO|FLAT|VMFS|VMFSSPARSE|VMFSRDM|VMFSRAW)
+    (\s(?P<filename>\".+\"))?
+    (\s(?P<start_sector>\d+))?
+    (\s(?P<partition_uuid>\S+))?
+    (\s(?P<device_identifier>\S+))?
+    $
+    """,
+    re.VERBOSE,
+)
+
+
+@dataclass
+class ExtentDescriptor:
+    raw: str
+    access_mode: str
+    sectors: int
+    type: str
+    filename: str | None = None
+    start_sector: int | None = None
+    partition_uuid: str | None = None
+    device_identifier: str | None = None
+
+    def __post_init__(self) -> None:
+        self.sectors = int(self.sectors)
+
+        if self.filename:
+            self.filename = self.filename.strip('"')
+
+        if self.start_sector:
+            self.start_sector = int(self.start_sector)
+
+    def __repr__(self) -> str:
+        return f"<ExtentDescriptor {self.raw}>"
+
+    def __str__(self) -> str:
+        return self.raw
+
+
 class DiskDescriptor:
-    def __init__(self, attr, extents, disk_db, sectors, raw_config=None):
+    def __init__(
+        self, attr: dict, extents: list[ExtentDescriptor], disk_db: dict, sectors: int, raw_config: str | None = None
+    ):
         self.attr = attr
         self.extents = extents
         self.ddb = disk_db
@@ -407,9 +456,15 @@ class DiskDescriptor:
         self.raw = raw_config
 
     @classmethod
-    def parse(cls, vmdk_config):
+    def parse(cls, vmdk_config: str) -> DiskDescriptor:
+        """Return :class:`DiskDescriptor` based on the provided ``vmdk_config``.
+
+        Resources:
+            - https://github.com/libyal/libvmdk/blob/main/documentation/VMWare%20Virtual%20Disk%20Format%20(VMDK).asciidoc
+        """  # noqa: E501
+
         descriptor_settings = {}
-        extents = []
+        extents: list[ExtentDescriptor] = []
         disk_db = {}
         sectors = 0
 
@@ -420,11 +475,15 @@ class DiskDescriptor:
                 continue
 
             if line.startswith("RW ") or line.startswith("RDONLY ") or line.startswith("NOACCESS "):
-                access_type, size, extent_type, filename = line.split(" ", 3)
-                filename = filename.strip('"')
-                size = int(size)
-                sectors += size
-                extents.append([access_type, size, extent_type, filename])
+                match = RE_EXTENT_DESCRIPTOR.search(line)
+
+                if not match:
+                    log.warning("Unexpected ExtentDescriptor format in vmdk config: %s, ignoring", line)
+                    continue
+
+                extent = ExtentDescriptor(raw=line, **match.groupdict())
+                sectors += extent.sectors
+                extents.append(extent)
                 continue
 
             setting, _, value = line.partition("=")
@@ -438,35 +497,33 @@ class DiskDescriptor:
 
         return cls(descriptor_settings, extents, disk_db, sectors, vmdk_config)
 
-    def __str__(self):
-        str_template = """\
-                          # Disk DescriptorFile
-                          version=1
-                          {}
+    def __str__(self) -> str:
+        str_template = textwrap.dedent(
+            """\
+        # Disk DescriptorFile
+        version=1
+        {}
 
-                          # Extent Description
-                          {}
+        # Extent Description
+        {}
 
-                          # The Disk Data Base
-                          #DDB
+        # The Disk Data Base
+        #DDB
+
+        {}"""
+        )
 
-                          {}"""
-        str_template = textwrap.dedent(str_template)
         descriptor_settings = []
         for setting, value in self.attr.items():
-            if setting == "version":
-                continue
-            descriptor_settings.append("{}={}".format(setting, value))
+            if setting != "version":
+                descriptor_settings.append(f"{setting}={value}")
         descriptor_settings = "\n".join(descriptor_settings)
 
-        extents = []
-        for access_type, size, extent_type, filename in self.extents:
-            extents.append('{} {} {} "{}"'.format(access_type, size, extent_type, filename))
-        extents = "\n".join(extents)
+        extents = "\n".join(map(str, self.extents))
 
         disk_db = []
         for setting, value in self.ddb.items():
-            disk_db.append('{} = "{}"'.format(setting, value))
+            disk_db.append(f'{setting} = "{value}"')
         disk_db = "\n".join(disk_db)
 
         return str_template.format(descriptor_settings, extents, disk_db)

{dissect.hypervisor-3.16.dev3.dist-info → dissect.hypervisor-3.17.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.hypervisor
-Version: 3.16.dev3
+Version: 3.17.dev1
 Summary: A Dissect module implementing parsers for various hypervisor disk, backup and configuration files
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3
@@ -23,14 +23,14 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: COPYRIGHT
 Requires-Dist: defusedxml
-Requires-Dist: dissect.cstruct <5,>=4
-Requires-Dist: dissect.util <4,>=3
-Provides-Extra: dev
-Requires-Dist: dissect.hypervisor[full] ; extra == 'dev'
-Requires-Dist: dissect.cstruct <5.0.dev,>=4.0.dev ; extra == 'dev'
-Requires-Dist: dissect.util <4.0.dev,>=3.0.dev ; extra == 'dev'
+Requires-Dist: dissect.cstruct<5,>=4
+Requires-Dist: dissect.util<4,>=3
 Provides-Extra: full
-Requires-Dist: pycryptodome ; extra == 'full'
+Requires-Dist: pycryptodome; extra == "full"
+Provides-Extra: dev
+Requires-Dist: dissect.hypervisor[full]; extra == "dev"
+Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
+Requires-Dist: dissect.util<4.0.dev,>=3.0.dev; extra == "dev"
 
 # dissect.hypervisor
 

{dissect.hypervisor-3.16.dev3.dist-info → dissect.hypervisor-3.17.dev1.dist-info}/RECORD

@@ -19,16 +19,16 @@ dissect/hypervisor/disk/qcow2.py,sha256=K4zstjte7SxX2psSbAj4YqwGeplfIvfbq5ScP4mz
 dissect/hypervisor/disk/vdi.py,sha256=_kX7ZGOVo_98ckMaiaDEmw4VjNgM57cY4YUSYrk2JGs,1851
 dissect/hypervisor/disk/vhd.py,sha256=OqSdEO2NGMI5DjgxWFbtZp8bPjSon7moMJn_5152MbI,3660
 dissect/hypervisor/disk/vhdx.py,sha256=FVGTY5mUKFb7oRNKNiLGd5ngGfaGvERtFCGhAlyZD_k,12631
-dissect/hypervisor/disk/vmdk.py,sha256=KSz_76X_QcInImHNGfCJdN6nF4TmUZ7vqsbZtuUMgbg,18126
+dissect/hypervisor/disk/vmdk.py,sha256=CNA2zCWZYKl6G3jWF23_ToJCqHkPR_GngtAH5rGWY30,19298
 dissect/hypervisor/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dissect/hypervisor/tools/envelope.py,sha256=6_RLtKmFnZ69fx8HlvFgsjDjNrfnXD73dgszpG1mYQE,967
 dissect/hypervisor/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dissect/hypervisor/util/envelope.py,sha256=6nEJfgsxj696qxaLOQ2k5MrVWA2uLkbB5zxxRAvboF4,10405
 dissect/hypervisor/util/vmtar.py,sha256=oNJ-qTvQVOl7al_vExpg_T4LnGyE72O9hjOmQBiTKSA,1469
-dissect.hypervisor-3.16.dev3.dist-info/COPYRIGHT,sha256=EOOoIwk_inOMUD4c1ylpzMtYLjGzmc-MLEVAEdLLr20,305
-dissect.hypervisor-3.16.dev3.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-dissect.hypervisor-3.16.dev3.dist-info/METADATA,sha256=kNdewiPG4XwfRU8k2lRLqAbPL5QWlTnRi4SJCmtILlQ,3420
-dissect.hypervisor-3.16.dev3.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-dissect.hypervisor-3.16.dev3.dist-info/entry_points.txt,sha256=oM21bFD0YBHKjgCBk-DQ2398PUZdKV2VNR_IWzd1yog,76
-dissect.hypervisor-3.16.dev3.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect.hypervisor-3.16.dev3.dist-info/RECORD,,
+dissect.hypervisor-3.17.dev1.dist-info/COPYRIGHT,sha256=EOOoIwk_inOMUD4c1ylpzMtYLjGzmc-MLEVAEdLLr20,305
+dissect.hypervisor-3.17.dev1.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+dissect.hypervisor-3.17.dev1.dist-info/METADATA,sha256=eNMw0l3Ej2zgY_n-4RvjtpkMdopxd598cH04W6KvlTw,3412
+dissect.hypervisor-3.17.dev1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+dissect.hypervisor-3.17.dev1.dist-info/entry_points.txt,sha256=oM21bFD0YBHKjgCBk-DQ2398PUZdKV2VNR_IWzd1yog,76
+dissect.hypervisor-3.17.dev1.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
+dissect.hypervisor-3.17.dev1.dist-info/RECORD,,

{dissect.hypervisor-3.16.dev3.dist-info → dissect.hypervisor-3.17.dev1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.5.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any