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

dissect/hypervisor/disk/vmdk.py

@@ -4,6 +4,7 @@ import ctypes
 import io
 import logging
 import os
+import re
 import textwrap
 import zlib
 from bisect import bisect_right
@@ -401,8 +402,25 @@ 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
@@ -412,7 +430,6 @@ class ExtentDescriptor:
     device_identifier: str | None = None
 
     def __post_init__(self) -> None:
-        self._raw = " ".join(map(str, [v for v in self.__dict__.values() if v is not None]))
         self.sectors = int(self.sectors)
 
         if self.filename:
@@ -422,10 +439,10 @@ class ExtentDescriptor:
             self.start_sector = int(self.start_sector)
 
     def __repr__(self) -> str:
-        return f"<ExtentDescriptor {self._raw}>"
+        return f"<ExtentDescriptor {self.raw}>"
 
     def __str__(self) -> str:
-        return self._raw
+        return self.raw
 
 
 class DiskDescriptor:
@@ -458,14 +475,13 @@ class DiskDescriptor:
                 continue
 
             if line.startswith("RW ") or line.startswith("RDONLY ") or line.startswith("NOACCESS "):
-                # Extent descriptors can have up to seven values according to libvmdk documentation.
-                parts = line.split(" ", maxsplit=6)
+                match = RE_EXTENT_DESCRIPTOR.search(line)
 
-                if len(parts) < 3:
+                if not match:
                     log.warning("Unexpected ExtentDescriptor format in vmdk config: %s, ignoring", line)
                     continue
 
-                extent = ExtentDescriptor(*parts)
+                extent = ExtentDescriptor(raw=line, **match.groupdict())
                 sectors += extent.sectors
                 extents.append(extent)
                 continue

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.hypervisor
-Version: 3.16.dev2
+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.dev2.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=nXDWHziwbN1dxD-ehasuFG98mmhrf1Y9rNil0nAcUtI,19104
+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.dev2.dist-info/COPYRIGHT,sha256=EOOoIwk_inOMUD4c1ylpzMtYLjGzmc-MLEVAEdLLr20,305
-dissect.hypervisor-3.16.dev2.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-dissect.hypervisor-3.16.dev2.dist-info/METADATA,sha256=GXm75ZMxlXG4RfswMFCG2Mgflmpt0TMIfOdrxrIf7wA,3420
-dissect.hypervisor-3.16.dev2.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-dissect.hypervisor-3.16.dev2.dist-info/entry_points.txt,sha256=oM21bFD0YBHKjgCBk-DQ2398PUZdKV2VNR_IWzd1yog,76
-dissect.hypervisor-3.16.dev2.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect.hypervisor-3.16.dev2.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.dev2.dist-info → dissect.hypervisor-3.17.dev1.dist-info}/WHEEL

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