dissect.volume 3.14.dev1__tar.gz → 3.14.dev3__tar.gz

dissect_volume-3.14.dev3/.git-blame-ignore-revs

@@ -0,0 +1,6 @@
+# Formatting commits. You can ignore them during git-blame with `--ignore-rev` or `--ignore-revs-file`.
+#
+#   $ git config --add 'blame.ignoreRevsFile' '.git-blame-ignore-revs'
+#
+# Change linter to Ruff (#44)
+8fefd76a54ff43b2fdbedbbb3cd330c27b1a0b14

{dissect_volume-3.14.dev1 → dissect_volume-3.14.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dissect.volume
-Version: 3.14.dev1
+Version: 3.14.dev3
 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: Affero General Public License v3

{dissect_volume-3.14.dev1 → dissect_volume-3.14.dev3}/dissect/volume/lvm/c_lvm2.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dissect.cstruct import cstruct
 
 lvm_def = """

{dissect_volume-3.14.dev1 → dissect_volume-3.14.dev3}/dissect/volume/md/c_md.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dissect.cstruct import cstruct
 
 md_def = """

{dissect_volume-3.14.dev1 → dissect_volume-3.14.dev3}/dissect/volume/md/md.py

@@ -143,14 +143,23 @@ class MDPhysicalDisk(PhysicalDisk):
         super().__init__(fh, self.data_offset * SECTOR_SIZE, self.data_size * SECTOR_SIZE)
 
 
-def find_super_block(fh: BinaryIO) -> tuple[int, int, int]:
-    # Super block can start at a couple of places, depending on version
-    # Just try them all until we find one
+def find_super_block(fh: BinaryIO) -> tuple[int | None, int | None, int | None]:
+    """Find the super block of an MD device.
 
-    size = fh.size if hasattr(fh, "size") else fh.seek(0, io.SEEK_END)
+    Args:
+        fh: The file-like object to search for the super block.
+
+    Returns:
+        A tuple containing the sector, major version, and minor version of the super block, or a
+        tuple of ``None`` if no super block was found.
+    """
+
+    size = fh.size if (hasattr(fh, "size") and fh.size is not None) else fh.seek(0, io.SEEK_END)
     size //= SECTOR_SIZE
 
-    possible_offsets = [
+    # Super block can start at a couple of places, depending on version
+    # Just try them all until we find one
+    possible_sectors = [
         # 0.90.0
         (size & ~(c_md.MD_RESERVED_SECTORS - 1)) - c_md.MD_RESERVED_SECTORS,
         # Major version 1
@@ -162,16 +171,18 @@ def find_super_block(fh: BinaryIO) -> tuple[int, int, int]:
         8,
     ]
 
-    for offset in possible_offsets:
-        fh.seek(offset * SECTOR_SIZE)
+    for sector in possible_sectors:
+        if sector < 0:
+            continue
 
+        fh.seek(sector * SECTOR_SIZE)
         peek = fh.read(12)
         if len(peek) != 12:
             continue
 
         magic, major, minor = struct.unpack("<3I", peek)
         if magic == c_md.MD_SB_MAGIC:
-            return offset, major, minor
+            return sector, major, minor
 
     return None, None, None
 

{dissect_volume-3.14.dev1 → dissect_volume-3.14.dev3}/dissect.volume.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dissect.volume
-Version: 3.14.dev1
+Version: 3.14.dev3
 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: Affero General Public License v3

{dissect_volume-3.14.dev1 → dissect_volume-3.14.dev3}/dissect.volume.egg-info/SOURCES.txt

@@ -1,3 +1,4 @@
+.git-blame-ignore-revs
 .gitattributes
 COPYRIGHT
 LICENSE

{dissect_volume-3.14.dev1 → dissect_volume-3.14.dev3}/tests/test_md.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
 
+from io import BytesIO
 from typing import BinaryIO
 
 import pytest
 
-from dissect.volume.md.md import MD
+from dissect.volume.md.md import MD, find_super_block
 from dissect.volume.raid.stream import RAID0Stream
 
 
@@ -61,3 +62,10 @@ def test_md_raid0_zones(md_raid0: list[BinaryIO]) -> None:
     assert fh.zones[1].zone_end == 5242880
     assert fh.zones[1].dev_start == 1048576
     assert len(fh.zones[1].devices) == 2
+
+
+def test_md_search_sb_none_size() -> None:
+    fh = BytesIO()
+    fh.size = None
+
+    assert find_super_block(fh) == (None, None, None)