dissect.hypervisor 3.17.dev2__py3-none-any.whl → 3.18.dev1__py3-none-any.whl

dissect/hypervisor/tools/vmtar.py

@@ -0,0 +1,20 @@
+import tarfile
+
+from dissect.hypervisor.util import vmtar
+
+
+def main() -> None:
+    # We just want to run the main function of the tarfile module, but with our VisorTarFile and is_tarfile functions
+    type(tarfile.main)(
+        tarfile.main.__code__,
+        tarfile.main.__globals__
+        | {
+            "TarFile": vmtar.VisorTarFile,
+            "is_tarfile": vmtar.is_tarfile,
+            "open": vmtar.open,
+        },
+    )()
+
+
+if __name__ == "__main__":
+    main()

dissect/hypervisor/util/vmtar.py

@@ -5,6 +5,8 @@ from __future__ import annotations
 
 import struct
 import tarfile
+from io import BytesIO
+from typing import BinaryIO, Final
 
 
 class VisorTarInfo(tarfile.TarInfo):
@@ -49,9 +51,72 @@ class VisorTarInfo(tarfile.TarInfo):
         return super()._proc_member(tarfile)
 
 
-def VisorTarFile(*args, **kwargs) -> tarfile.TarFile:
-    return tarfile.TarFile(*args, **kwargs, tarinfo=VisorTarInfo)
+class VisorTarFile(tarfile.TarFile):
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs, tarinfo=VisorTarInfo)
 
-
-def open(*args, **kwargs) -> tarfile.TarFile:
-    return tarfile.open(*args, **kwargs, tarinfo=VisorTarInfo)
+    @classmethod
+    def visoropen(cls, name: str, mode: str = "r", fileobj: BinaryIO | None = None, **kwargs) -> VisorTarFile:
+        """Open a visor tar file for reading. Supports gzip and lzma compression."""
+        if mode not in ("r",):
+            raise tarfile.TarError("visor currently only supports read mode")
+
+        try:
+            from gzip import GzipFile
+        except ImportError:
+            raise tarfile.CompressionError("gzip module is not available") from None
+
+        try:
+            from lzma import LZMAError, LZMAFile
+        except ImportError:
+            raise tarfile.CompressionError("lzma module is not available") from None
+
+        compressed = False
+
+        try:
+            t = cls.taropen(name, mode, fileobj, **kwargs)
+        except Exception:
+            try:
+                fileobj = GzipFile(name, mode + "b", fileobj=fileobj)
+            except OSError as e:
+                if fileobj is not None and mode == "r":
+                    raise tarfile.ReadError("not a visor file") from e
+                raise
+
+            try:
+                t = cls.taropen(name, mode, fileobj, **kwargs)
+            except Exception:
+                fileobj.seek(0)
+                fileobj = LZMAFile(fileobj or name, mode)  # noqa: SIM115
+
+                try:
+                    t = cls.taropen(name, mode, fileobj, **kwargs)
+                except (LZMAError, EOFError, OSError) as e:
+                    fileobj.close()
+                    if mode == "r":
+                        raise tarfile.ReadError("not a visor file") from e
+                    raise
+                except:
+                    fileobj.close()
+                    raise
+
+            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
+            fileobj.seek(0)
+            fileobj = BytesIO(fileobj.read())
+
+        t = cls.taropen(name, mode, fileobj, **kwargs)
+
+        t._extfileobj = False
+        return t
+
+    # Only allow opening visor tar files
+    OPEN_METH: Final[dict[str, str]] = {"visor": "visoropen"}
+
+
+open = VisorTarFile.open
+
+is_tarfile = type(tarfile.is_tarfile)(tarfile.is_tarfile.__code__, tarfile.is_tarfile.__globals__ | {"open": open})

{dissect.hypervisor-3.17.dev2.dist-info → dissect_hypervisor-3.18.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: dissect.hypervisor
-Version: 3.17.dev2
+Version: 3.18.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
@@ -31,6 +31,7 @@ Provides-Extra: dev
 Requires-Dist: dissect.hypervisor[full]; extra == "dev"
 Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
 Requires-Dist: dissect.util<4.0.dev,>=3.0.dev; extra == "dev"
+Dynamic: license-file
 
 # dissect.hypervisor
 

{dissect.hypervisor-3.17.dev2.dist-info → dissect_hypervisor-3.18.dev1.dist-info}/RECORD

@@ -22,13 +22,14 @@ dissect/hypervisor/disk/vhdx.py,sha256=Yidz57PsH6IGRiN8cpfAnyZiOGt1qApd8ohVdHGF2
 dissect/hypervisor/disk/vmdk.py,sha256=s23a8Gs_kemy4ZKYuJYXYCFckZtYgeZ7Rmrgxpj5W7s,19565
 dissect/hypervisor/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dissect/hypervisor/tools/envelope.py,sha256=BvaBSoXq3VrZ2GJVrfnL8NB6OLbdp8qD05jedxSAKwQ,1024
+dissect/hypervisor/tools/vmtar.py,sha256=bAf_rEhqUmeI8my22p7L9uV3SgB5C_61YQKfD3tNo60,476
 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=kMYhmL6cUBnhPqKfoVE_jn9OZOTM7iW-mm9Dxhl2lD4,1707
-dissect.hypervisor-3.17.dev2.dist-info/COPYRIGHT,sha256=EOOoIwk_inOMUD4c1ylpzMtYLjGzmc-MLEVAEdLLr20,305
-dissect.hypervisor-3.17.dev2.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-dissect.hypervisor-3.17.dev2.dist-info/METADATA,sha256=QKvUKzT3FgMrCqycy4_luvc180C1UdbyG9WLuO840FA,3412
-dissect.hypervisor-3.17.dev2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-dissect.hypervisor-3.17.dev2.dist-info/entry_points.txt,sha256=oM21bFD0YBHKjgCBk-DQ2398PUZdKV2VNR_IWzd1yog,76
-dissect.hypervisor-3.17.dev2.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect.hypervisor-3.17.dev2.dist-info/RECORD,,
+dissect/hypervisor/util/vmtar.py,sha256=xzc4bd5RnBgP9_dCU9i-ZwXI_0S3N7gCfMzElwwnd5s,4004
+dissect_hypervisor-3.18.dev1.dist-info/licenses/COPYRIGHT,sha256=EOOoIwk_inOMUD4c1ylpzMtYLjGzmc-MLEVAEdLLr20,305
+dissect_hypervisor-3.18.dev1.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+dissect_hypervisor-3.18.dev1.dist-info/METADATA,sha256=I1eM8mXEJRNMCt4RfSLZQ1-FU730qvKO5xV6pqcw1WI,3434
+dissect_hypervisor-3.18.dev1.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+dissect_hypervisor-3.18.dev1.dist-info/entry_points.txt,sha256=kW36GnJ3G1dSRYFL4r8Bj32Al_CkGqST3bdHvo3pyiY,120
+dissect_hypervisor-3.18.dev1.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
+dissect_hypervisor-3.18.dev1.dist-info/RECORD,,

{dissect.hypervisor-3.17.dev2.dist-info → dissect_hypervisor-3.18.dev1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{dissect.hypervisor-3.17.dev2.dist-info → dissect_hypervisor-3.18.dev1.dist-info}/entry_points.txt

@@ -1,2 +1,3 @@
 [console_scripts]
 envelope-decrypt = dissect.hypervisor.tools.envelope:main
+vmtar = dissect.hypervisor.tools.vmtar:main