dissect.volume 3.17.dev1__tar.gz → 3.17.dev2__tar.gz

{dissect_volume-3.17.dev1 → dissect_volume-3.17.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.volume
-Version: 3.17.dev1
+Version: 3.17.dev2
 Summary: A Dissect module implementing a parser for different disk volume and partition systems, for example LVM2, GPT and MBR
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: AGPL-3.0-or-later

{dissect_volume-3.17.dev1 → dissect_volume-3.17.dev2}/dissect/volume/disk/disk.py

@@ -13,7 +13,7 @@ class Disk:
     def __init__(self, fh: BinaryIO, sector_size: int = 512):
         self.fh = fh
         self.sector_size = sector_size
-        self.scheme = None
+        self.scheme: APM | GPT | MBR | BSD = None
         self.partitions: list[Partition] = []
 
         start = fh.tell()

{dissect_volume-3.17.dev1 → dissect_volume-3.17.dev2}/dissect/volume/disk/partition.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, BinaryIO
+from typing import TYPE_CHECKING, BinaryIO
 from uuid import UUID
 
 from dissect.util.stream import RangeStream
@@ -8,6 +8,9 @@ from dissect.util.stream import RangeStream
 if TYPE_CHECKING:
     from dissect.cstruct import Structure
 
+    from dissect.volume.disk.schemes import APM, BSD, GPT, MBR
+
+
 PARTITION_TYPES = {
     0x00: "Empty",
     0x01: "FAT12,CHS",
@@ -178,47 +181,64 @@ PARTITION_TYPES = {
 
 
 class Partition:
+    """A partition on a disk.
+
+    Args:
+        disk: The disk the partition is on.
+        number: The partition number (1-indexed).
+        offset: The offset of the partition in bytes.
+        size: The size of the partition in bytes.
+        type: The partition type. This is either an integer (MBR, BSD), a string (APM),
+              or a UUID object (GPT).
+        name: The partition name (if available).
+        flags: The partition flags (if available).
+        guid: The partition GUID (if available).
+        type_str: The partition type as a string (if available).
+        raw: The raw partition structure (if available).
+    """
+
     def __init__(
         self,
-        disk: Any,
+        disk: APM | BSD | GPT | MBR,
         number: int,
         offset: int,
         size: int,
-        vtype: int | UUID,
-        name: str,
+        type: int | str | UUID,
+        name: str | None = None,
         flags: int | None = None,
         guid: UUID | None = None,
-        vtype_str: str | None = None,
+        type_str: str | None = None,
         raw: Structure = None,
     ):
         self.disk = disk
         self.number = number
         self.offset = offset
         self.size = size
-        self.type = vtype
+        self.type = type
         self.name = name
         self.flags = flags
         self.guid = guid
-        self.type_str = vtype_str
+        self.type_str = type_str
         self.raw = raw
 
     def __repr__(self) -> str:
-        vtype_str = self.type_str
+        type_str = self.type_str
 
         if isinstance(self.type, int):
-            vtype = hex(self.type)
-            vtype_key = self.type
+            type = hex(self.type)
+            type_key = self.type
         elif isinstance(self.type, bytes):
-            vtype = UUID(bytes_le=self.type)
-            vtype_key = vtype
+            type = UUID(bytes_le=self.type)
+            type_key = type
         elif isinstance(self.type, str):
-            vtype_str = self.type
+            type_str = self.type
 
-        vtype_str = vtype_str or f"{vtype} ({PARTITION_TYPES.get(vtype_key, 'Unknown')})"
+        type_str = type_str or f"{type} ({PARTITION_TYPES.get(type_key, 'Unknown')})"
         return (
             f"<Partition number={self.number} offset=0x{self.offset:x} "
-            f"size=0x{self.size:x} type={vtype_str} name={self.name!r}>"
+            f"size=0x{self.size:x} type={type_str} name={self.name!r}>"
         )
 
     def open(self) -> BinaryIO:
+        """Open a stream to the partition."""
         return RangeStream(self.disk.fh, offset=self.offset, size=self.size)

{dissect_volume-3.17.dev1 → dissect_volume-3.17.dev2}/dissect/volume/disk/schemes/apm.py

@@ -66,7 +66,7 @@ class APM:
                 number=i + 1,  # partitions are 1-indexed
                 offset=p.partition_start * self.sector_size,
                 size=p.partition_size * self.sector_size,
-                vtype=p.partition_type.rstrip(b"\x00").decode(),
+                type=p.partition_type.rstrip(b"\x00").decode(),
                 name=p.partition_name.rstrip(b"\x00").decode(),
                 raw=p,
             )

{dissect_volume-3.17.dev1 → dissect_volume-3.17.dev2}/dissect/volume/disk/schemes/bsd.py

@@ -284,11 +284,11 @@ class BSD:
         # MBR DragonFlyBSD
         0x6C,
         # GPT DragonFlyBSD disklabel32
-        UUID("9D087404-1CA5-11DC-8817-01301BB8A9F5").bytes_le,
+        UUID("9D087404-1CA5-11DC-8817-01301BB8A9F5"),
         # GPT DragonFlyBSD disklabel64
-        UUID("3D48CE54-1D16-11DC-8696-01301BB8A9F5").bytes_le,
+        UUID("3D48CE54-1D16-11DC-8696-01301BB8A9F5"),
         # GPT FreeBSD disklabel
-        UUID("516E7CB4-6ECF-11D6-8FF8-00022D09712B").bytes_le,
+        UUID("516E7CB4-6ECF-11D6-8FF8-00022D09712B"),
     )
 
     def __init__(self, fh: BinaryIO, sector_size: int = 512):
@@ -358,16 +358,15 @@ class BSD:
 
                 offset = partition.p_boffset
                 size = partition.p_bsize
-                guid = partition.p_stor_uuid
+                guid = UUID(bytes_le=partition.p_stor_uuid)
 
             yield Partition(
                 disk=self,
                 number=i + 1,  # partitions are 1-indexed
                 offset=offset,
                 size=size,
-                vtype=partition.p_fstype,
-                name=None,
+                type=partition.p_fstype,
                 guid=guid,
-                vtype_str=FS_NAMES.get(partition.p_fstype, "?"),
+                type_str=FS_NAMES.get(partition.p_fstype, "?"),
                 raw=partition,
             )

{dissect_volume-3.17.dev1 → dissect_volume-3.17.dev2}/dissect/volume/disk/schemes/gpt.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from typing import TYPE_CHECKING, BinaryIO
+from uuid import UUID
 
 from dissect.cstruct import cstruct
 
@@ -108,10 +109,10 @@ class GPT:
                         number=part_num + 1,  # partitions are 1-indexed
                         offset=partition.first_lba * self.sector_size,
                         size=(partition.last_lba - partition.first_lba) * self.sector_size,
-                        vtype=partition.type_guid,
+                        type=UUID(bytes_le=partition.type_guid),
                         name=name,
                         flags=partition.attribute_flags,
-                        guid=partition.partition_guid,
+                        guid=UUID(bytes_le=partition.partition_guid),
                         raw=partition,
                     )
 

{dissect_volume-3.17.dev1 → dissect_volume-3.17.dev2}/dissect/volume/disk/schemes/mbr.py

@@ -83,8 +83,7 @@ class MBR:
                 number=num_start + num + 1,  # partitions are 1-indexed
                 offset=part_offset,
                 size=partition.sector_size * self.sector_size,
-                vtype=partition.type,
-                name=None,
+                type=partition.type,
                 flags=partition.bootable,
                 raw=partition,
             )

{dissect_volume-3.17.dev1 → dissect_volume-3.17.dev2}/dissect.volume.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.volume
-Version: 3.17.dev1
+Version: 3.17.dev2
 Summary: A Dissect module implementing a parser for different disk volume and partition systems, for example LVM2, GPT and MBR
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: AGPL-3.0-or-later

{dissect_volume-3.17.dev1 → dissect_volume-3.17.dev2}/dissect.volume.egg-info/SOURCES.txt

@@ -47,16 +47,6 @@ dissect/volume/vinum/config.py
 dissect/volume/vinum/vinum.py
 tests/__init__.py
 tests/conftest.py
-tests/test_apm.py
-tests/test_bsd.py
-tests/test_ddf.py
-tests/test_dm.py
-tests/test_gpt.py
-tests/test_lvm.py
-tests/test_mbr.py
-tests/test_md.py
-tests/test_vinum.py
-tests/test_vinum_config.py
 tests/_data/ddf/ddf-raid0-1.bin.gz
 tests/_data/ddf/ddf-raid0-2.bin.gz
 tests/_data/ddf/ddf-raid0-3.bin.gz
@@ -134,4 +124,20 @@ tests/_data/vinum/vinum-stripedmirror_diskd.bin.gz
 tests/_docs/Makefile
 tests/_docs/__init__.py
 tests/_docs/conf.py
-tests/_docs/index.rst
+tests/_docs/index.rst
+tests/ddf/__init__.py
+tests/ddf/test_ddf.py
+tests/disk/__init__.py
+tests/disk/test_apm.py
+tests/disk/test_bsd.py
+tests/disk/test_gpt.py
+tests/disk/test_mbr.py
+tests/dm/__init__.py
+tests/dm/test_dm.py
+tests/lvm/__init__.py
+tests/lvm/test_lvm.py
+tests/md/__init__.py
+tests/md/test_md.py
+tests/vinum/__init__.py
+tests/vinum/test_config.py
+tests/vinum/test_vinum.py

{dissect_volume-3.17.dev1/tests → dissect_volume-3.17.dev2/tests/disk}/test_bsd.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from typing import BinaryIO
+from uuid import UUID
 
 from dissect.volume import disk
 from dissect.volume.disk.schemes import BSD
@@ -15,18 +16,21 @@ def test_bsd(bsd: BinaryIO) -> None:
     assert vs.partitions[0].offset == 0x800
     assert vs.partitions[0].size == 0x200
     assert vs.partitions[0].type == 7
+    assert vs.partitions[0].guid is None
     assert vs.partitions[0].open().read() == b"\x01" * 512
 
     assert vs.partitions[1].number == 2
     assert vs.partitions[1].offset == 0xC00
     assert vs.partitions[1].size == 0x200
     assert vs.partitions[1].type == 1
+    assert vs.partitions[1].guid is None
     assert vs.partitions[1].open().read() == b"\x02" * 512
 
     assert vs.partitions[2].number == 5
     assert vs.partitions[2].offset == 0x1000
     assert vs.partitions[2].size == 0x200
     assert vs.partitions[2].type == 27
+    assert vs.partitions[2].guid is None
     assert vs.partitions[2].open().read() == b"\x05" * 512
 
 
@@ -42,16 +46,19 @@ def test_bsd64(bsd64: BinaryIO) -> None:
     assert d.partitions[1].offset == 0x100000
     assert d.partitions[1].size == 0x1000
     assert d.partitions[1].type == 7
+    assert d.partitions[1].guid == UUID("c3ce50a4-61bd-11ed-9048-010c29feac9a")
     assert d.partitions[1].open().read(512) == b"\x01" * 512
 
     assert d.partitions[2].number == 2
     assert d.partitions[2].offset == 0x101000
     assert d.partitions[2].size == 0x1000
     assert d.partitions[2].type == 7
+    assert d.partitions[2].guid == UUID("eebaf645-61bd-11ed-9048-010c29feac9a")
     assert d.partitions[2].open().read(512) == b"\x02" * 512
 
     assert d.partitions[3].number == 5
     assert d.partitions[3].offset == 0x102000
     assert d.partitions[3].size == 0x1000
     assert d.partitions[3].type == 7
+    assert d.partitions[3].guid == UUID("eebaf650-61bd-11ed-9048-010c29feac9a")
     assert d.partitions[3].open().read(512) == b"\x05" * 512

{dissect_volume-3.17.dev1/tests → dissect_volume-3.17.dev2/tests/disk}/test_gpt.py

@@ -1,7 +1,9 @@
 from __future__ import annotations
 
 import io
+import re
 from typing import BinaryIO
+from uuid import UUID
 
 import pytest
 
@@ -20,13 +22,15 @@ def test_gpt(gpt: BinaryIO) -> None:
     assert d.partitions[0].number == 1
     assert d.partitions[0].offset == 20480
     assert d.partitions[0].size == 0xC7FFE00
-    assert d.partitions[0].type == b"\x28\x73\x2a\xc1\x1f\xf8\xd2\x11\xba\x4b\x00\xa0\xc9\x3e\xc9\x3b"
+    assert d.partitions[0].type == UUID("c12a7328-f81f-11d2-ba4b-00a0c93ec93b")
+    assert d.partitions[0].guid == UUID("27d920bc-e414-45e0-9503-2606de7a1056")
     assert d.partitions[0].name == "EFI System Partition"
 
     assert d.partitions[1].number == 2
     assert d.partitions[1].offset == 0xC900000
     assert d.partitions[1].size == 0x7465FFE00
-    assert d.partitions[1].type == b"\xa2\xa0\xd0\xeb\xe5\xb9\x33\x44\x87\xc0\x68\xb6\xb7\x26\x99\xc7"
+    assert d.partitions[1].type == UUID("ebd0a0a2-b9e5-4433-87c0-68b6b72699c7")
+    assert d.partitions[1].guid == UUID("a14cecf3-b364-4d6d-a540-e245e6df9d11")
     assert d.partitions[1].name == ""
 
 
@@ -48,39 +52,44 @@ def test_hybrid_gpt(gpt_hybrid: BinaryIO) -> None:
     assert d.partitions[0].offset == 0x100000
     assert d.partitions[0].size == 0x80200
     assert d.partitions[0].type == 0x83
+    assert d.partitions[0].guid is None
     assert d.partitions[0].name is None
 
     assert d.partitions[1].number == 2
     assert d.partitions[1].offset == 0x180200
     assert d.partitions[1].size == 0x7BC00
     assert d.partitions[1].type == 0x83
+    assert d.partitions[1].guid is None
     assert d.partitions[1].name is None
 
     assert d.partitions[2].number == 1
     assert d.partitions[2].offset == 0x100000
     assert d.partitions[2].size == 0x80000
-    assert d.partitions[2].type == b"\xaf\x3d\xc6\x0f\x83\x84\x72\x47\x8e\x79\x3d\x69\xd8\x47\x7d\xe4"
+    assert d.partitions[2].type == UUID("0fc63daf-8483-4772-8e79-3d69d8477de4")
+    assert d.partitions[2].guid == UUID("44eea528-8489-4bbc-a480-56bd208cd233")
     assert d.partitions[2].name == "Linux filesystem"
 
     assert d.partitions[3].number == 2
     assert d.partitions[3].offset == 0x4400
     assert d.partitions[3].size == 0xFBA00
-    assert d.partitions[3].type == b"\xaf\x3d\xc6\x0f\x83\x84\x72\x47\x8e\x79\x3d\x69\xd8\x47\x7d\xe4"
+    assert d.partitions[3].type == UUID("0fc63daf-8483-4772-8e79-3d69d8477de4")
+    assert d.partitions[3].guid == UUID("8f4bcd34-d9d4-4060-a683-6f75c90b795b")
     assert d.partitions[3].name == "Linux filesystem"
 
     assert d.partitions[4].number == 3
     assert d.partitions[4].offset == 0x180200
     assert d.partitions[4].size == 0x7BA00
-    assert d.partitions[4].type == b"\xaf\x3d\xc6\x0f\x83\x84\x72\x47\x8e\x79\x3d\x69\xd8\x47\x7d\xe4"
+    assert d.partitions[4].type == UUID("0fc63daf-8483-4772-8e79-3d69d8477de4")
+    assert d.partitions[4].guid == UUID("b6aa0017-3abb-4c2b-b00c-5189e66d9896")
     assert d.partitions[4].name == "Linux filesystem"
 
 
 def test_gpt_4k(gpt_4k: BinaryIO) -> None:
-    with pytest.raises(disk.DiskError) as e:
+    with pytest.raises(
+        disk.DiskError, match=re.escape("Found GPT type partition, but MBR scheme detected. Maybe 4K sector size.")
+    ):
         disk.Disk(gpt_4k)
 
-    assert str(e.value) == "Found GPT type partition, but MBR scheme detected. Maybe 4K sector size."
-
     gpt_4k.seek(0)
     d = disk.Disk(gpt_4k, sector_size=4096)
 
@@ -90,19 +99,22 @@ def test_gpt_4k(gpt_4k: BinaryIO) -> None:
     assert d.partitions[0].number == 1
     assert d.partitions[0].offset == 0x100000
     assert d.partitions[0].size == 0x100000
-    assert d.partitions[0].type == b"\xaf\x3d\xc6\x0f\x83\x84\x72\x47\x8e\x79\x3d\x69\xd8\x47\x7d\xe4"
+    assert d.partitions[0].type == UUID("0fc63daf-8483-4772-8e79-3d69d8477de4")
+    assert d.partitions[0].guid == UUID("21b90a6e-0918-4e72-aa1a-85f8ba8ef8cc")
     assert d.partitions[0].name == "Linux filesystem"
 
     assert d.partitions[1].number == 2
     assert d.partitions[1].offset == 0x300000
     assert d.partitions[1].size == 0x100000
-    assert d.partitions[1].type == b"\xaf\x3d\xc6\x0f\x83\x84\x72\x47\x8e\x79\x3d\x69\xd8\x47\x7d\xe4"
+    assert d.partitions[1].type == UUID("0fc63daf-8483-4772-8e79-3d69d8477de4")
+    assert d.partitions[1].guid == UUID("c6f4ad42-4652-448d-89d7-7cfa7710abe7")
     assert d.partitions[1].name == "Linux filesystem"
 
     assert d.partitions[2].number == 3
     assert d.partitions[2].offset == 0x500000
     assert d.partitions[2].size == 0xB5A000
-    assert d.partitions[2].type == b"\xaf\x3d\xc6\x0f\x83\x84\x72\x47\x8e\x79\x3d\x69\xd8\x47\x7d\xe4"
+    assert d.partitions[2].type == UUID("0fc63daf-8483-4772-8e79-3d69d8477de4")
+    assert d.partitions[2].guid == UUID("b7230707-dcaa-4483-823b-06f9b718ee55")
     assert d.partitions[2].name == "Linux filesystem"
 
 
@@ -115,31 +127,36 @@ def test_gpt_esxi(gpt_esxi: BinaryIO) -> None:
     assert d.partitions[0].number == 1
     assert d.partitions[0].offset == 0x8000
     assert d.partitions[0].size == 0x63FFE00
-    assert d.partitions[0].type == b"\x28\x73\x2a\xc1\x1f\xf8\xd2\x11\xba\x4b\x00\xa0\xc9\x3e\xc9\x3b"
+    assert d.partitions[0].type == UUID("c12a7328-f81f-11d2-ba4b-00a0c93ec93b")
+    assert d.partitions[0].guid == UUID("0f7a6017-09ed-474c-b4b2-b377059d593a")
     assert d.partitions[0].name == "BOOT"
 
     assert d.partitions[1].number == 5
     assert d.partitions[1].offset == 0x6600000
     assert d.partitions[1].size == 0xFFEFFE00
-    assert d.partitions[1].type == b"\xa2\xa0\xd0\xeb\xe5\xb9\x33\x44\x87\xc0\x68\xb6\xb7\x26\x99\xc7"
+    assert d.partitions[1].type == UUID("ebd0a0a2-b9e5-4433-87c0-68b6b72699c7")
+    assert d.partitions[1].guid == UUID("cc02273b-7b9b-4075-9e93-b1755f07dca5")
     assert d.partitions[1].name == "BOOTBANK1"
 
     assert d.partitions[2].number == 6
     assert d.partitions[2].offset == 0x106600000
     assert d.partitions[2].size == 0xFFEFFE00
-    assert d.partitions[2].type == b"\xa2\xa0\xd0\xeb\xe5\xb9\x33\x44\x87\xc0\x68\xb6\xb7\x26\x99\xc7"
+    assert d.partitions[2].type == UUID("ebd0a0a2-b9e5-4433-87c0-68b6b72699c7")
+    assert d.partitions[2].guid == UUID("ec9f58a6-4b6c-45f8-a703-f212e8c28a0a")
     assert d.partitions[2].name == "BOOTBANK2"
 
     assert d.partitions[3].number == 7
     assert d.partitions[3].offset == 0x206600000
     assert d.partitions[3].size == 0x1DF99FFE00
-    assert d.partitions[3].type == b"\x39\xea\xb2\x4e\x55\x78\x90\x47\xa7\x9e\xfa\xe4\x95\xe2\x1f\x8d"
+    assert d.partitions[3].type == UUID("4eb2ea39-7855-4790-a79e-fae495e21f8d")
+    assert d.partitions[3].guid == UUID("fc7f0906-62a5-47b2-8f40-98d9427fefe0")
     assert d.partitions[3].name == "OSDATA"
 
     assert d.partitions[4].number == 8
     assert d.partitions[4].offset == 0x2000100000
     assert d.partitions[4].size == 0x37FEFBC00
-    assert d.partitions[4].type == b"\x2a\xe0\x31\xaa\x0f\x40\xdb\x11\x95\x90\x00\x0c\x29\x11\xd1\xb8"
+    assert d.partitions[4].type == UUID("aa31e02a-400f-11db-9590-000c2911d1b8")
+    assert d.partitions[4].guid == UUID("327aa3da-0d50-4e97-b28f-014d92724aab")
     assert d.partitions[4].name == "datastore1"