dissect.hypervisor 3.22.dev3__py3-none-any.whl → 3.22.dev4__py3-none-any.whl

dissect/hypervisor/util/vmtar.py

@@ -22,9 +22,8 @@ class VisorTarInfo(tarfile.TarInfo):
     fixUpPgs: int | None
 
     @classmethod
-    def frombuf(cls, buf: bytes, encoding: str, errors: str) -> VisorTarInfo:
-        obj = super().frombuf(buf, encoding, errors)
-
+    def _init_visor_attrs(cls, obj: VisorTarInfo, buf: bytes) -> None:
+        """Initialize visor-specific attributes from the raw header buffer."""
         obj.is_visor = buf[257:264] == b"visor  "
         if obj.is_visor:
             obj.offset_data = struct.unpack("<I", buf[496:500])[0]
@@ -35,6 +34,19 @@ class VisorTarInfo(tarfile.TarInfo):
             obj.textPgs = None
             obj.fixUpPgs = None
 
+    @classmethod
+    def frombuf(cls, buf: bytes, encoding: str, errors: str) -> VisorTarInfo:
+        obj = super().frombuf(buf, encoding, errors)
+        cls._init_visor_attrs(obj, buf)
+        return obj
+
+    @classmethod
+    def _frombuf(cls, buf: bytes, encoding: str, errors: str, **kwargs) -> VisorTarInfo:
+        # Python 3.13.13+ refactored tarfile to call _frombuf directly instead of
+        # frombuf in fromtarfile and _proc_gnulong/_proc_pax. We must override _frombuf
+        # to ensure visor-specific attributes are initialized for all code paths.
+        obj = super()._frombuf(buf, encoding, errors, **kwargs)
+        cls._init_visor_attrs(obj, buf)
         return obj
 
     def _proc_member(self, tarfile: tarfile.TarFile) -> VisorTarInfo | tarfile.TarInfo:
@@ -76,6 +88,8 @@ class VisorTarFile(tarfile.TarFile):
         try:
             t = cls.taropen(name, mode, fileobj, **kwargs)
         except Exception:
+            if fileobj is not None:
+                fileobj.seek(0)
             try:
                 fileobj = GzipFile(name, mode + "b", fileobj=fileobj)
             except OSError as e:
@@ -103,10 +117,11 @@ class VisorTarFile(tarfile.TarFile):
             compressed = True
 
         # If we get here, we have a valid visor tar file
-        if fileobj is not None and compressed:
-            # Just read the entire file into memory, it's probably small
+        if fileobj is not None:
             fileobj.seek(0)
-            fileobj = BytesIO(fileobj.read())
+            if compressed:
+                # Read the decompressed data into a BytesIO to make random reads faster
+                fileobj = BytesIO(fileobj.read())
 
         t = cls.taropen(name, mode, fileobj, **kwargs)
 

{dissect_hypervisor-3.22.dev3.dist-info → dissect_hypervisor-3.22.dev4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.hypervisor
-Version: 3.22.dev3
+Version: 3.22.dev4
 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

{dissect_hypervisor-3.22.dev3.dist-info → dissect_hypervisor-3.22.dev4.dist-info}/RECORD

@@ -30,11 +30,11 @@ dissect/hypervisor/tools/envelope.py,sha256=BvaBSoXq3VrZ2GJVrfnL8NB6OLbdp8qD05je
 dissect/hypervisor/tools/vmtar.py,sha256=ArqAAUjSqktDmGCP6m-Bp1ujqWkDtCGC3xKz-WBa4m4,512
 dissect/hypervisor/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dissect/hypervisor/util/envelope.py,sha256=EhZjZh3EezqxkJ84OgqpptHIhpVWPcUkFMjdYU-iAnU,10442
-dissect/hypervisor/util/vmtar.py,sha256=xzc4bd5RnBgP9_dCU9i-ZwXI_0S3N7gCfMzElwwnd5s,4004
-dissect_hypervisor-3.22.dev3.dist-info/licenses/COPYRIGHT,sha256=EOOoIwk_inOMUD4c1ylpzMtYLjGzmc-MLEVAEdLLr20,305
-dissect_hypervisor-3.22.dev3.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-dissect_hypervisor-3.22.dev3.dist-info/METADATA,sha256=vxysX3EN8XSQZHU7i47lA7JID71BH4abIn5zH5yZweg,3470
-dissect_hypervisor-3.22.dev3.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-dissect_hypervisor-3.22.dev3.dist-info/entry_points.txt,sha256=kW36GnJ3G1dSRYFL4r8Bj32Al_CkGqST3bdHvo3pyiY,120
-dissect_hypervisor-3.22.dev3.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect_hypervisor-3.22.dev3.dist-info/RECORD,,
+dissect/hypervisor/util/vmtar.py,sha256=D728bup7WW5ZYFILQ6_jLQ2-fS7Qdr__Z6TJAABTUw0,4791
+dissect_hypervisor-3.22.dev4.dist-info/licenses/COPYRIGHT,sha256=EOOoIwk_inOMUD4c1ylpzMtYLjGzmc-MLEVAEdLLr20,305
+dissect_hypervisor-3.22.dev4.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+dissect_hypervisor-3.22.dev4.dist-info/METADATA,sha256=EiALPqcP_7F6zD3tqNAfg6ky2JSJkqrG6Qr-v-T_jks,3470
+dissect_hypervisor-3.22.dev4.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+dissect_hypervisor-3.22.dev4.dist-info/entry_points.txt,sha256=kW36GnJ3G1dSRYFL4r8Bj32Al_CkGqST3bdHvo3pyiY,120
+dissect_hypervisor-3.22.dev4.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
+dissect_hypervisor-3.22.dev4.dist-info/RECORD,,