dissect.hypervisor 3.16.dev2__tar.gz → 3.17.dev1__tar.gz

{dissect_hypervisor-3.16.dev2/dissect.hypervisor.egg-info → dissect_hypervisor-3.17.dev1}/PKG-INFO

@@ -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

{dissect_hypervisor-3.16.dev2 → dissect_hypervisor-3.17.dev1}/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 → dissect_hypervisor-3.17.dev1/dissect.hypervisor.egg-info}/PKG-INFO

@@ -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

dissect_hypervisor-3.17.dev1/tests/test_vmdk.py

@@ -0,0 +1,199 @@
+import pytest
+
+from dissect.hypervisor.disk.c_vmdk import c_vmdk
+from dissect.hypervisor.disk.vmdk import VMDK, DiskDescriptor, ExtentDescriptor
+
+
+def test_vmdk_sesparse(sesparse_vmdk):
+    vmdk = VMDK(sesparse_vmdk)
+
+    disk = vmdk.disks[0]
+
+    assert disk.is_sesparse
+    assert disk._grain_directory_size == 0x20000
+    assert disk._grain_table_size == 0x1000
+    assert disk._grain_entry_type == c_vmdk.uint64
+    assert disk._grain_directory[0] == 0x1000000000000000
+
+    header = disk.header
+    assert header.magic == c_vmdk.SESPARSE_CONST_HEADER_MAGIC
+    assert header.version == 0x200000001
+
+    assert vmdk.read(0x1000000) == b"a" * 0x1000000
+
+
+@pytest.mark.parametrize(
+    "extent_description, expected_extents",
+    [
+        (
+            'RW 123456789 SPARSE "disk.vmdk"',
+            [
+                ExtentDescriptor(
+                    raw='RW 123456789 SPARSE "disk.vmdk"',
+                    access_mode="RW",
+                    sectors=123456789,
+                    type="SPARSE",
+                    filename='"disk.vmdk"',
+                    start_sector=None,
+                    partition_uuid=None,
+                    device_identifier=None,
+                ),
+            ],
+        ),
+        (
+            'RW 123456789 FLAT "disk-flat.vmdk" 0',
+            [
+                ExtentDescriptor(
+                    raw='RW 123456789 FLAT "disk-flat.vmdk" 0',
+                    access_mode="RW",
+                    sectors=123456789,
+                    type="FLAT",
+                    filename='"disk-flat.vmdk"',
+                    start_sector=0,
+                    partition_uuid=None,
+                    device_identifier=None,
+                )
+            ],
+        ),
+        (
+            "RDONLY 0 ZERO",
+            [
+                ExtentDescriptor(
+                    raw="RDONLY 0 ZERO",
+                    access_mode="RDONLY",
+                    sectors=0,
+                    type="ZERO",
+                ),
+            ],
+        ),
+        (
+            'NOACCESS 123456789 SPARSE "disk-sparse.vmdk" 123 partition-uuid device-id',
+            [
+                ExtentDescriptor(
+                    raw='NOACCESS 123456789 SPARSE "disk-sparse.vmdk" 123 partition-uuid device-id',
+                    access_mode="NOACCESS",
+                    sectors=123456789,
+                    type="SPARSE",
+                    filename='"disk-sparse.vmdk"',
+                    start_sector=123,
+                    partition_uuid="partition-uuid",
+                    device_identifier="device-id",
+                ),
+            ],
+        ),
+        ("RW 1234567890", []),
+        ('RDONLY "file.vmdk"', []),
+        ("NOACCESS", []),
+        (
+            'RW 1234567890 SPARSE "disk with spaces.vmdk"',
+            [
+                ExtentDescriptor(
+                    raw='RW 1234567890 SPARSE "disk with spaces.vmdk"',
+                    access_mode="RW",
+                    sectors=1234567890,
+                    type="SPARSE",
+                    filename='"disk with spaces.vmdk"',
+                    start_sector=None,
+                    partition_uuid=None,
+                    device_identifier=None,
+                )
+            ],
+        ),
+        (
+            'RW 1234567890 SPARSE "disk with spaces.vmdk" 123',
+            [
+                ExtentDescriptor(
+                    raw='RW 1234567890 SPARSE "disk with spaces.vmdk" 123',
+                    access_mode="RW",
+                    sectors=1234567890,
+                    type="SPARSE",
+                    filename='"disk with spaces.vmdk"',
+                    start_sector=123,
+                    partition_uuid=None,
+                    device_identifier=None,
+                )
+            ],
+        ),
+        (
+            'RW 1234567890 SPARSE "disk with spaces.vmdk" 123 part-uuid',
+            [
+                ExtentDescriptor(
+                    raw='RW 1234567890 SPARSE "disk with spaces.vmdk" 123 part-uuid',
+                    access_mode="RW",
+                    sectors=1234567890,
+                    type="SPARSE",
+                    filename='"disk with spaces.vmdk"',
+                    start_sector=123,
+                    partition_uuid="part-uuid",
+                    device_identifier=None,
+                )
+            ],
+        ),
+        (
+            'RW 1234567890 SPARSE "disk with spaces.vmdk" 123 part-uuid device-id',
+            [
+                ExtentDescriptor(
+                    raw='RW 1234567890 SPARSE "disk with spaces.vmdk" 123 part-uuid device-id',
+                    access_mode="RW",
+                    sectors=1234567890,
+                    type="SPARSE",
+                    filename='"disk with spaces.vmdk"',
+                    start_sector=123,
+                    partition_uuid="part-uuid",
+                    device_identifier="device-id",
+                )
+            ],
+        ),
+        (
+            r'RW 16777216 SPARSE "this is an example "\' diskëäô:)\\\'`\foo.vmdk" 123',
+            [
+                ExtentDescriptor(
+                    raw=r'RW 16777216 SPARSE "this is an example "\' diskëäô:)\\\'`\foo.vmdk" 123',
+                    access_mode="RW",
+                    sectors=16777216,
+                    type="SPARSE",
+                    filename=r'"this is an example "\' diskëäô:)\\\'`\foo.vmdk"',
+                    start_sector=123,
+                    partition_uuid=None,
+                    device_identifier=None,
+                )
+            ],
+        ),
+        (
+            r'RW 13371337 SPARSE "🦊 🦊 🦊.vmdk"',
+            [
+                ExtentDescriptor(
+                    raw=r'RW 13371337 SPARSE "🦊 🦊 🦊.vmdk"',
+                    access_mode="RW",
+                    sectors=13371337,
+                    type="SPARSE",
+                    filename='"🦊 🦊 🦊.vmdk"',
+                )
+            ],
+        ),
+    ],
+    ids=(
+        "sparse",
+        "flat",
+        "zero",
+        "sparse-ids",
+        "bad-1",
+        "bad-2",
+        "bad-3",
+        "spaces-four-parts",
+        "spaces-five-parts",
+        "spaces-six-parts",
+        "spaces-seven-parts",
+        "specials-five-parts",
+        "emoji-four-parts",
+    ),
+)
+def test_vmdk_extent_description(extent_description: str, expected_extents: list) -> None:
+    """test if we correctly parse VMDK sparse and flat extent descriptions.
+
+    Resources:
+        - https://github.com/libyal/libvmdk/blob/main/documentation/VMWare%20Virtual%20Disk%20Format%20(VMDK).asciidoc#22-extent-descriptions
+    """  # noqa: E501
+
+    descriptor = DiskDescriptor.parse(extent_description)
+    assert descriptor.extents == expected_extents

dissect_hypervisor-3.16.dev2/tests/test_vmdk.py

@@ -1,93 +0,0 @@
-import pytest
-
-from dissect.hypervisor.disk.c_vmdk import c_vmdk
-from dissect.hypervisor.disk.vmdk import VMDK, DiskDescriptor, ExtentDescriptor
-
-
-def test_vmdk_sesparse(sesparse_vmdk):
-    vmdk = VMDK(sesparse_vmdk)
-
-    disk = vmdk.disks[0]
-
-    assert disk.is_sesparse
-    assert disk._grain_directory_size == 0x20000
-    assert disk._grain_table_size == 0x1000
-    assert disk._grain_entry_type == c_vmdk.uint64
-    assert disk._grain_directory[0] == 0x1000000000000000
-
-    header = disk.header
-    assert header.magic == c_vmdk.SESPARSE_CONST_HEADER_MAGIC
-    assert header.version == 0x200000001
-
-    assert vmdk.read(0x1000000) == b"a" * 0x1000000
-
-
-@pytest.mark.parametrize(
-    "extent_description, expected_extents",
-    [
-        (
-            'RW 123456789 SPARSE "disk.vmdk"',
-            [
-                ExtentDescriptor(
-                    access_mode="RW",
-                    sectors=123456789,
-                    type="SPARSE",
-                    filename="disk.vmdk",
-                    partition_uuid=None,
-                    device_identifier=None,
-                ),
-            ],
-        ),
-        (
-            'RW 123456789 FLAT "disk-flat.vmdk" 0',
-            [
-                ExtentDescriptor(
-                    access_mode="RW",
-                    sectors=123456789,
-                    type="FLAT",
-                    filename="disk-flat.vmdk",
-                    start_sector=0,
-                    partition_uuid=None,
-                    device_identifier=None,
-                )
-            ],
-        ),
-        (
-            "RDONLY 0 ZERO",
-            [
-                ExtentDescriptor(
-                    access_mode="RDONLY",
-                    sectors=0,
-                    type="ZERO",
-                ),
-            ],
-        ),
-        (
-            'NOACCESS 123456789 SPARSE "disk-sparse.vmdk" 123 partition-uuid device-id',
-            [
-                ExtentDescriptor(
-                    access_mode="NOACCESS",
-                    sectors=123456789,
-                    type="SPARSE",
-                    filename="disk-sparse.vmdk",
-                    start_sector=123,
-                    partition_uuid="partition-uuid",
-                    device_identifier="device-id",
-                ),
-            ],
-        ),
-        ("RW 1234567890", []),
-        ('RDONLY "file.vmdk"', []),
-        ("NOACCESS", []),
-    ],
-    ids=("sparse", "flat", "zero", "sparse-ids", "bad-1", "bad-2", "bad-3"),
-)
-def test_vmdk_extent_description(extent_description: str, expected_extents: list) -> None:
-    """test if we correctly parse VMDK sparse and flat extent descriptions.
-
-    Resources:
-        - https://github.com/libyal/libvmdk/blob/main/documentation/VMWare%20Virtual%20Disk%20Format%20(VMDK).asciidoc#22-extent-descriptions
-    """  # noqa: E501
-
-    descriptor = DiskDescriptor.parse(extent_description)
-    assert descriptor.extents == expected_extents