dissect.hypervisor 3.20.dev2__tar.gz → 3.21.dev2__tar.gz

{dissect_hypervisor-3.20.dev2 → dissect_hypervisor-3.21.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.hypervisor
-Version: 3.20.dev2
+Version: 3.21.dev2
 Summary: A Dissect module implementing parsers for various hypervisor disk, backup and configuration files
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: AGPL-3.0-or-later
@@ -26,6 +26,7 @@ Requires-Dist: dissect.cstruct<5,>=4
 Requires-Dist: dissect.util<4,>=3
 Provides-Extra: full
 Requires-Dist: pycryptodome; extra == "full"
+Requires-Dist: backports.zstd; python_version < "3.14" and extra == "full"
 Provides-Extra: dev
 Requires-Dist: dissect.hypervisor[full]; extra == "dev"
 Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"

{dissect_hypervisor-3.20.dev2 → dissect_hypervisor-3.21.dev2}/dissect/hypervisor/disk/qcow2.py

@@ -3,9 +3,9 @@
 # - https://github.com/qemu/qemu/blob/master/docs/interop/qcow2.txt
 from __future__ import annotations
 
+import sys
 import zlib
 from functools import cached_property, lru_cache
-from io import BytesIO
 from pathlib import Path
 from typing import TYPE_CHECKING, BinaryIO
 
@@ -28,8 +28,10 @@ if TYPE_CHECKING:
     from collections.abc import Iterator
 
 try:
-    import zstandard as zstd
-
+    if sys.version_info >= (3, 14):
+        from compression import zstd  # novermin
+    else:
+        from backports import zstd
     HAS_ZSTD = True
 except ImportError:
     HAS_ZSTD = False
@@ -384,16 +386,8 @@ class QCow2Stream(AlignedStream):
             return dctx.decompress(buf, self.qcow2.cluster_size)
 
         if self.qcow2.compression_type == c_qcow2.QCOW2_COMPRESSION_TYPE_ZSTD:
-            result = []
-
             dctx = zstd.ZstdDecompressor()
-            reader = dctx.stream_reader(BytesIO(buf))
-            while reader.tell() < self.qcow2.cluster_size:
-                chunk = reader.read(self.qcow2.cluster_size - reader.tell())
-                if not chunk:
-                    break
-                result.append(chunk)
-            return b"".join(result)
+            return dctx.decompress(buf, self.qcow2.cluster_size)
 
         raise Error(f"Invalid compression type: {self.qcow2.compression_type}")
 

{dissect_hypervisor-3.20.dev2 → dissect_hypervisor-3.21.dev2}/dissect/hypervisor/disk/vmdk.py

@@ -407,7 +407,7 @@ RE_EXTENT_DESCRIPTOR = re.compile(
     ^
     (?P<access_mode>RW|RDONLY|NOACCESS)\s
     (?P<sectors>\d+)\s
-    (?P<type>SPARSE|ZERO|FLAT|VMFS|VMFSSPARSE|VMFSRDM|VMFSRAW)
+    (?P<type>SESPARSE|SPARSE|ZERO|FLAT|VMFS|VMFSSPARSE|VMFSRDM|VMFSRAW)
     (\s(?P<filename>\".+\"))?
     (\s(?P<start_sector>\d+))?
     (\s(?P<partition_uuid>\S+))?

{dissect_hypervisor-3.20.dev2 → dissect_hypervisor-3.21.dev2}/dissect.hypervisor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.hypervisor
-Version: 3.20.dev2
+Version: 3.21.dev2
 Summary: A Dissect module implementing parsers for various hypervisor disk, backup and configuration files
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: AGPL-3.0-or-later
@@ -26,6 +26,7 @@ Requires-Dist: dissect.cstruct<5,>=4
 Requires-Dist: dissect.util<4,>=3
 Provides-Extra: full
 Requires-Dist: pycryptodome; extra == "full"
+Requires-Dist: backports.zstd; python_version < "3.14" and extra == "full"
 Provides-Extra: dev
 Requires-Dist: dissect.hypervisor[full]; extra == "dev"
 Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"

{dissect_hypervisor-3.20.dev2 → dissect_hypervisor-3.21.dev2}/dissect.hypervisor.egg-info/SOURCES.txt

@@ -66,6 +66,7 @@ tests/_data/disk/hdd/split.hdd/split.hdd.5.{5fbaabe3-6958-40ff-92a7-860e329aab41
 tests/_data/disk/qcow2/backing-chain-1.qcow2.gz
 tests/_data/disk/qcow2/backing-chain-2.qcow2.gz
 tests/_data/disk/qcow2/backing-chain-3.qcow2.gz
+tests/_data/disk/qcow2/basic-zstd.qcow2.gz
 tests/_data/disk/qcow2/basic.qcow2.gz
 tests/_data/disk/qcow2/data-file.bin.gz
 tests/_data/disk/qcow2/data-file.qcow2.gz

{dissect_hypervisor-3.20.dev2 → dissect_hypervisor-3.21.dev2}/dissect.hypervisor.egg-info/requires.txt

@@ -9,3 +9,6 @@ dissect.util<4.0.dev,>=3.0.dev
 
 [full]
 pycryptodome
+
+[full:python_version < "3.14"]
+backports.zstd

{dissect_hypervisor-3.20.dev2 → dissect_hypervisor-3.21.dev2}/pyproject.toml

@@ -39,6 +39,7 @@ repository = "https://github.com/fox-it/dissect.hypervisor"
 [project.optional-dependencies]
 full = [
     "pycryptodome",
+    "backports.zstd; python_version < '3.14'",
 ]
 dev = [
     "dissect.hypervisor[full]",

{dissect_hypervisor-3.20.dev2 → dissect_hypervisor-3.21.dev2}/tests/conftest.py

@@ -89,6 +89,11 @@ def basic_qcow2() -> Iterator[BinaryIO]:
     yield from open_file_gz("_data/disk/qcow2/basic.qcow2.gz")
 
 
+@pytest.fixture
+def basic_zstd_qcow2() -> Iterator[BinaryIO]:
+    yield from open_file_gz("_data/disk/qcow2/basic-zstd.qcow2.gz")
+
+
 @pytest.fixture
 def data_file_qcow2() -> Path:
     return absolute_path("_data/disk/qcow2/data-file.qcow2.gz")

{dissect_hypervisor-3.20.dev2 → dissect_hypervisor-3.21.dev2}/tests/disk/test_qcow2.py

@@ -16,8 +16,9 @@ def mock_open_gz(self: Path, *args, **kwargs) -> BinaryIO:
     return gzip.open(self if self.suffix.lower() == ".gz" else self.with_suffix(self.suffix + ".gz"))
 
 
-def test_basic(basic_qcow2: BinaryIO) -> None:
-    qcow2 = QCow2(basic_qcow2)
+@pytest.mark.parametrize("name", ["basic_qcow2", "basic_zstd_qcow2"])
+def test_basic(name: str, request: pytest.FixtureRequest) -> None:
+    qcow2 = QCow2(request.getfixturevalue(name))
 
     assert qcow2.backing_file is None
     assert qcow2.data_file is qcow2.fh