dissect.target 3.23.dev40__tar.gz → 3.23.dev42__tar.gz

{dissect_target-3.23.dev40 → dissect_target-3.23.dev42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.target
-Version: 3.23.dev40
+Version: 3.23.dev42
 Summary: This module ties all other Dissect modules together, it provides a programming API and command line tools which allow easy access to various data sources inside disk images or file collections (a.k.a. targets)
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3
@@ -50,7 +50,7 @@ Requires-Dist: dissect.ole<4,>=3; extra == "full"
 Requires-Dist: dissect.qnxfs<2,>=1; extra == "full"
 Requires-Dist: dissect.shellitem<4,>=3; extra == "full"
 Requires-Dist: dissect.squashfs<2,>=1; extra == "full"
-Requires-Dist: dissect.sql<4,>=3; extra == "full"
+Requires-Dist: dissect.sql<4,>=3.12.dev4; extra == "full"
 Requires-Dist: dissect.thumbcache<2,>=1; extra == "full"
 Requires-Dist: dissect.vmfs<4,>=3; extra == "full"
 Requires-Dist: dissect.xfs<4,>=3; extra == "full"

{dissect_target-3.23.dev40 → dissect_target-3.23.dev42}/dissect/target/plugins/apps/browser/browser.py

@@ -62,11 +62,11 @@ GENERIC_HISTORY_RECORD_FIELDS = [
     ("uri", "url"),
     ("string", "title"),
     ("string", "description"),
-    ("string", "rev_host"),
+    ("string", "host"),
     ("varint", "visit_type"),
     ("varint", "visit_count"),
     ("boolean", "hidden"),
-    ("string", "typed"),
+    ("boolean", "typed"),
     ("varint", "session"),
     ("varint", "from_visit"),
     ("uri", "from_url"),

{dissect_target-3.23.dev40 → dissect_target-3.23.dev42}/dissect/target/plugins/apps/browser/chromium.py

@@ -205,11 +205,11 @@ class ChromiumMixin:
                 url (uri): History URL.
                 title (string): Page title.
                 description (string): Page description.
-                rev_host (string): Reverse hostname.
+                host (string): Hostname.
                 visit_type (varint): Visit type.
                 visit_count (varint): Amount of visits.
                 hidden (string): Hidden value.
-                typed (string): Typed value.
+                typed (boolean): Typed value.
                 session (varint): Session value.
                 from_visit (varint): Record ID of the "from" visit.
                 from_url (uri): URL of the "from" visit.
@@ -237,7 +237,7 @@ class ChromiumMixin:
                         url=try_idna(url.url),
                         title=url.title,
                         description=None,
-                        rev_host=None,
+                        host=None,
                         visit_type=None,
                         visit_count=url.visit_count,
                         hidden=url.hidden,

{dissect_target-3.23.dev40 → dissect_target-3.23.dev42}/dissect/target/plugins/apps/browser/firefox.py

@@ -174,11 +174,11 @@ class FirefoxPlugin(BrowserPlugin):
             url (uri): History URL.
             title (string): Page title.
             description (string): Page description.
-            rev_host (string): Reverse hostname.
+            host (string): Hostname.
             visit_type (varint): Visit type.
             visit_count (varint): Amount of visits.
             hidden (string): Hidden value.
-            typed (string): Typed value.
+            typed (boolean): Typed value.
             session (varint): Session value.
             from_visit (varint): Record ID of the "from" visit.
             from_url (uri): URL of the "from" visit.
@@ -208,7 +208,9 @@ class FirefoxPlugin(BrowserPlugin):
                         url=try_idna(place.url),
                         title=place.title,
                         description=place.description,
-                        rev_host=try_idna(place.rev_shot),
+                        host="".join(list(reversed(try_idna(place.rev_host).decode()))).lstrip(".")
+                        if place.rev_host
+                        else None,
                         visit_type=row.visit_type,
                         visit_count=place.visit_count,
                         hidden=place.hidden,

{dissect_target-3.23.dev40 → dissect_target-3.23.dev42}/dissect/target/plugins/apps/browser/iexplore.py

@@ -149,11 +149,11 @@ class InternetExplorerPlugin(BrowserPlugin):
             url (uri): History URL.
             title (string): Page title.
             description (string): Page description.
-            rev_host (string): Reverse hostname.
+            host (string): Hostname.
             visit_type (varint): Visit type.
             visit_count (varint): Amount of visits.
             hidden (string): Hidden value.
-            typed (string): Typed value.
+            typed (boolean): Typed value.
             session (varint): Session value.
             from_visit (varint): Record ID of the "from" visit.
             from_url (uri): URL of the "from" visit.
@@ -177,7 +177,7 @@ class InternetExplorerPlugin(BrowserPlugin):
                     url=try_idna(url),
                     title=None,
                     description=None,
-                    rev_host=None,
+                    host=None,
                     visit_type=None,
                     visit_count=container_record.get("AccessCount"),
                     hidden=None,

{dissect_target-3.23.dev40 → dissect_target-3.23.dev42}/dissect.target.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.target
-Version: 3.23.dev40
+Version: 3.23.dev42
 Summary: This module ties all other Dissect modules together, it provides a programming API and command line tools which allow easy access to various data sources inside disk images or file collections (a.k.a. targets)
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3
@@ -50,7 +50,7 @@ Requires-Dist: dissect.ole<4,>=3; extra == "full"
 Requires-Dist: dissect.qnxfs<2,>=1; extra == "full"
 Requires-Dist: dissect.shellitem<4,>=3; extra == "full"
 Requires-Dist: dissect.squashfs<2,>=1; extra == "full"
-Requires-Dist: dissect.sql<4,>=3; extra == "full"
+Requires-Dist: dissect.sql<4,>=3.12.dev4; extra == "full"
 Requires-Dist: dissect.thumbcache<2,>=1; extra == "full"
 Requires-Dist: dissect.vmfs<4,>=3; extra == "full"
 Requires-Dist: dissect.xfs<4,>=3; extra == "full"

{dissect_target-3.23.dev40 → dissect_target-3.23.dev42}/dissect.target.egg-info/requires.txt

@@ -64,7 +64,7 @@ dissect.ole<4,>=3
 dissect.qnxfs<2,>=1
 dissect.shellitem<4,>=3
 dissect.squashfs<2,>=1
-dissect.sql<4,>=3
+dissect.sql<4,>=3.12.dev4
 dissect.thumbcache<2,>=1
 dissect.vmfs<4,>=3
 dissect.xfs<4,>=3

{dissect_target-3.23.dev40 → dissect_target-3.23.dev42}/pyproject.toml

@@ -62,7 +62,7 @@ full = [
     "dissect.qnxfs>=1,<2",
     "dissect.shellitem>=3,<4",
     "dissect.squashfs>=1,<2",
-    "dissect.sql>=3,<4",
+    "dissect.sql>=3.12.dev4,<4",  # TODO: update on release!
     "dissect.thumbcache>=1,<2",
     "dissect.vmfs>=3,<4",
     "dissect.xfs>=3,<4",

{dissect_target-3.23.dev40 → dissect_target-3.23.dev42}/tests/loaders/test_vbk.py

@@ -8,12 +8,16 @@ import pytest
 
 from dissect.target.exceptions import LoaderError
 from dissect.target.filesystem import VirtualFilesystem
+from dissect.target.loader import open as loader_open
 from dissect.target.loaders.hyperv import HyperVLoader
 from dissect.target.loaders.raw import RawLoader
 from dissect.target.loaders.vbk import VbkLoader
 from dissect.target.loaders.vmx import VmxLoader
+from tests._utils import absolute_path
 
 if TYPE_CHECKING:
+    from pathlib import Path
+
     from dissect.target.target import Target
 
 
@@ -114,3 +118,31 @@ def test_vbk_loader_mock_vmcx(VbkFilesystem: Mock, HyperVFile: Mock, target_defa
 
     disks[1].seek(0)
     assert disks[1].read(-1).decode() == "🏃🏃"
+
+
+@pytest.mark.parametrize(
+    ("path", "disk_sizes"),
+    [
+        (
+            "Backup Job 1/VBK-Test-VM.e56465c7-3a5a-4599-bc25-3555b9b8cD2025-07-20T160920_3702.vbk",
+            [20 * 1024 * 1024 * 1024],
+        ),
+        (
+            "Backup Job 2_1/VBK-Test-VM-SCSI.8637b8b5-28a2-41e1-90c6-f8a0D2025-07-29T171659_FB82.vbk",
+            [40 * 1024 * 1024 * 1024],
+        ),
+    ],
+)
+def test_vbk_loader(path: Path, disk_sizes: list[int], target_default: Target) -> None:
+    """Test the VBK loader on real files."""
+
+    path = absolute_path("_data/loaders/vbk").joinpath(path)
+
+    loader = loader_open(path)
+    assert isinstance(loader, VbkLoader)
+
+    loader.map(target_default)
+
+    assert len(target_default.disks) == len(disk_sizes)
+    for disk, size in zip(sorted(target_default.disks, key=lambda disk: disk.size), sorted(disk_sizes)):
+        assert disk.size == size

{dissect_target-3.23.dev40 → dissect_target-3.23.dev42}/tests/plugins/apps/browser/test_firefox.py

@@ -63,22 +63,40 @@ def target_firefox_oculus(target_android: Target, fs_android: VirtualFilesystem)
 
 
 @pytest.mark.parametrize(
-    "target_platform",
-    ["target_firefox_win", "target_firefox_unix"],
+    ("target_platform", "expected_source"),
+    [
+        (
+            "target_firefox_win",
+            "C:\\Users\\John\\AppData\\local\\Mozilla\\Firefox\\Profiles\\g1rbw8y7.default-release\\places.sqlite",
+        ),
+        (
+            "target_firefox_unix",
+            "/root/.mozilla/firefox/g1rbw8y7.default-release/places.sqlite",
+        ),
+    ],
 )
-def test_firefox_history(target_platform: Target, request: pytest.FixtureRequest) -> None:
+def test_firefox_history(target_platform: Target, expected_source: str, request: pytest.FixtureRequest) -> None:
     target_platform = request.getfixturevalue(target_platform)
     records = list(target_platform.firefox.history())
 
     assert len(records) == 24
     assert {"firefox"} == {record.browser for record in records}
 
-    assert records[0].url == "https://www.mozilla.org/privacy/firefox/"
+    assert records[0].ts == dt("2021-12-01T10:42:05.742000+00:00")
+    assert records[0].browser == "firefox"
     assert records[0].id == 1
-    assert records[0].description == "47356411089529"
+    assert records[0].url == "https://www.mozilla.org/privacy/firefox/"
+    assert not records[0].title
+    assert not records[0].description
+    assert records[0].host == "www.mozilla.org"
+    assert records[0].visit_type == 1
     assert records[0].visit_count == 1
-    assert records[0].ts == dt("2021-12-01T10:42:05.742000+00:00")
     assert records[0].hidden
+    assert not records[0].typed
+    assert records[0].session == 0
+    assert not records[0].from_visit
+    assert not records[0].from_url
+    assert records[0].source == expected_source
 
 
 @pytest.mark.parametrize(
@@ -218,7 +236,7 @@ def test_firefox_oculus_history(target_firefox_oculus: Target) -> None:
 
     assert records[0].url == "https://webxr.today/"
     assert records[0].id == 1
-    assert records[0].description == "47356570952011"
+    assert not records[0].description
     assert records[0].ts == dt("2021-11-04 13:29:30.780000+00:00")