dissect.hypervisor 3.14.dev3__tar.gz → 3.15__tar.gz

{dissect_hypervisor-3.14.dev3/dissect.hypervisor.egg-info → dissect_hypervisor-3.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.hypervisor
-Version: 3.14.dev3
+Version: 3.15
 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

dissect_hypervisor-3.15/dissect/hypervisor/descriptor/vbox.py

@@ -0,0 +1,17 @@
+from typing import IO, Iterator
+from xml.etree.ElementTree import Element
+
+from defusedxml import ElementTree
+
+
+class VBox:
+    VBOX_XML_NAMESPACE = "{http://www.virtualbox.org/}"
+
+    def __init__(self, fh: IO):
+        self._xml: Element = ElementTree.fromstring(fh.read())
+
+    def disks(self) -> Iterator[str]:
+        for hdd_elem in self._xml.findall(f".//{self.VBOX_XML_NAMESPACE}HardDisk[@location][@type='Normal']"):
+            # Allow format specifier to be case-insensitive (i.e. VDI, vdi)
+            if (format := hdd_elem.get("format")) and format.lower() == "vdi":
+                yield hdd_elem.attrib["location"]

{dissect_hypervisor-3.14.dev3 → dissect_hypervisor-3.15}/dissect/hypervisor/util/envelope.py

@@ -103,8 +103,9 @@ EnvelopeAttribute = namedtuple("EnvelopeAttribute", ("type", "flag", "value"))
 class Envelope:
     """Implements an encryption envelope as used within ESXi."""
 
-    def __init__(self, fh: BinaryIO):
+    def __init__(self, fh: BinaryIO, verify: bool = True):
         self.fh = fh
+        self.verify = verify
 
         header_buf = io.BytesIO(self.fh.read(ENVELOPE_BLOCK_SIZE))
         self.header = c_envelope.EnvelopeFileHeader(header_buf)
@@ -190,7 +191,8 @@ class Envelope:
         footer = c_envelope.DataTransformCryptoFooter(bytes(decrypted[-512:]))
         decrypted = decrypted[: -4096 - footer.padding]
 
-        cipher.verify(self.digest)
+        if self.verify:
+            cipher.verify(self.digest)
 
         return bytes(decrypted)
 

{dissect_hypervisor-3.14.dev3 → dissect_hypervisor-3.15/dissect.hypervisor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.hypervisor
-Version: 3.14.dev3
+Version: 3.15
 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

{dissect_hypervisor-3.14.dev3 → dissect_hypervisor-3.15}/pyproject.toml

@@ -66,4 +66,3 @@ license-files = ["LICENSE", "COPYRIGHT"]
 include = ["dissect.*"]
 
 [tool.setuptools_scm]
-local_scheme = "no-local-version"

dissect_hypervisor-3.15/tests/test_vbox.py

@@ -0,0 +1,41 @@
+from io import StringIO
+
+from dissect.hypervisor.descriptor.vbox import VBox
+
+
+def test_vbox() -> None:
+    xml = """
+    <?xml version="1.0"?>
+    <VirtualBox xmlns="http://www.virtualbox.org/">
+        <Machine>
+            <MediaRegistry>
+                <HardDisks>
+                    <HardDisk location="os2warp4.vdi" format="VDI" type="Normal" />
+                </HardDisks>
+            </MediaRegistry>
+        </Machine>
+    </VirtualBox>
+    """
+
+    with StringIO(xml.strip()) as fh:
+        vbox = VBox(fh)
+        assert next(vbox.disks()) == "os2warp4.vdi"
+
+
+def test_vbox_lowercase_disk_format() -> None:
+    xml = """
+    <?xml version="1.0"?>
+    <VirtualBox xmlns="http://www.virtualbox.org/">
+        <Machine>
+            <MediaRegistry>
+                <HardDisks>
+                    <HardDisk location="WinDev2407Eval-disk001.vdi" format="vdi" type="Normal" />
+                </HardDisks>
+            </MediaRegistry>
+        </Machine>
+    </VirtualBox>
+    """
+
+    with StringIO(xml.strip()) as fh:
+        vbox = VBox(fh)
+        assert next(vbox.disks()) == "WinDev2407Eval-disk001.vdi"

dissect_hypervisor-3.14.dev3/dissect/hypervisor/descriptor/vbox.py

@@ -1,17 +0,0 @@
-from typing import IO, Iterator
-from xml.etree.ElementTree import Element
-
-from defusedxml import ElementTree
-
-
-class VBox:
-    VBOX_XML_NAMESPACE = "{http://www.virtualbox.org/}"
-
-    def __init__(self, fh: IO):
-        self._xml: Element = ElementTree.fromstring(fh.read())
-
-    def disks(self) -> Iterator[str]:
-        for hdd_elem in self._xml.findall(
-            f".//{self.VBOX_XML_NAMESPACE}HardDisk[@location][@format='VDI'][@type='Normal']"
-        ):
-            yield hdd_elem.attrib["location"]

dissect_hypervisor-3.14.dev3/tests/test_vbox.py

@@ -1,22 +0,0 @@
-from io import StringIO
-
-from dissect.hypervisor.descriptor.vbox import VBox
-
-
-def test_vbox():
-    xml = """
-    <?xml version="1.0"?>
-    <VirtualBox xmlns="http://www.virtualbox.org/">
-        <Machine>
-            <MediaRegistry>
-                <HardDisks>
-                    <HardDisk location="os2warp4.vdi" format="VDI" type="Normal" />
-                </HardDisks>
-            </MediaRegistry>
-        </Machine>
-    </VirtualBox>
-    """
-
-    with StringIO(xml.strip()) as fh:
-        vbox = VBox(fh)
-        assert next(vbox.disks()) == "os2warp4.vdi"