dissect.target 3.19.dev28__tar.gz → 3.19.dev30__tar.gz

{dissect_target-3.19.dev28/dissect.target.egg-info → dissect_target-3.19.dev30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.19.dev28
+Version: 3.19.dev30
 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

{dissect_target-3.19.dev28 → dissect_target-3.19.dev30}/dissect/target/plugins/apps/browser/firefox.py

@@ -3,6 +3,7 @@ import json
 import logging
 from base64 import b64decode
 from hashlib import pbkdf2_hmac, sha1
+from itertools import chain
 from typing import Iterator, Optional
 
 from dissect.sql import sqlite3
@@ -14,7 +15,7 @@ from dissect.target.exceptions import FileNotFoundError, UnsupportedPluginError
 from dissect.target.helpers.descriptor_extensions import UserRecordDescriptorExtension
 from dissect.target.helpers.fsutil import TargetPath
 from dissect.target.helpers.record import create_extended_descriptor
-from dissect.target.plugin import export
+from dissect.target.plugin import OperatingSystem, export
 from dissect.target.plugins.apps.browser.browser import (
     GENERIC_COOKIE_FIELDS,
     GENERIC_DOWNLOAD_RECORD_FIELDS,
@@ -24,7 +25,7 @@ from dissect.target.plugins.apps.browser.browser import (
     BrowserPlugin,
     try_idna,
 )
-from dissect.target.plugins.general.users import UserDetails
+from dissect.target.plugins.general.users import UserRecord
 
 try:
     from asn1crypto import algos, core
@@ -44,7 +45,10 @@ try:
 except ImportError:
     HAS_CRYPTO = False
 
-FIREFOX_EXTENSION_RECORD_FIELDS = [("uri", "source_uri"), ("string[]", "optional_permissions")]
+FIREFOX_EXTENSION_RECORD_FIELDS = [
+    ("uri", "source_uri"),
+    ("string[]", "optional_permissions"),
+]
 
 log = logging.getLogger(__name__)
 
@@ -54,7 +58,7 @@ class FirefoxPlugin(BrowserPlugin):
 
     __namespace__ = "firefox"
 
-    DIRS = [
+    USER_DIRS = [
         # Windows
         "AppData/Roaming/Mozilla/Firefox/Profiles",
         "AppData/local/Mozilla/Firefox/Profiles",
@@ -66,6 +70,10 @@ class FirefoxPlugin(BrowserPlugin):
         "Library/Application Support/Firefox",
     ]
 
+    SYSTEM_DIRS = [
+        "/data/data/org.mozilla.vrbrowser/files/mozilla",
+    ]
+
     BrowserHistoryRecord = create_extended_descriptor([UserRecordDescriptorExtension])(
         "browser/firefox/history", GENERIC_HISTORY_RECORD_FIELDS
     )
@@ -79,7 +87,8 @@ class FirefoxPlugin(BrowserPlugin):
     )
 
     BrowserExtensionRecord = create_extended_descriptor([UserRecordDescriptorExtension])(
-        "browser/firefox/extension", GENERIC_EXTENSION_RECORD_FIELDS + FIREFOX_EXTENSION_RECORD_FIELDS
+        "browser/firefox/extension",
+        GENERIC_EXTENSION_RECORD_FIELDS + FIREFOX_EXTENSION_RECORD_FIELDS,
     )
 
     BrowserPasswordRecord = create_extended_descriptor([UserRecordDescriptorExtension])(
@@ -88,27 +97,32 @@ class FirefoxPlugin(BrowserPlugin):
 
     def __init__(self, target):
         super().__init__(target)
-        self.users_dirs: list[tuple[UserDetails, TargetPath]] = []
+        self.dirs: list[tuple[UserRecord, TargetPath]] = []
+
         for user_details in self.target.user_details.all_with_home():
-            for directory in self.DIRS:
+            for directory in self.USER_DIRS:
                 cur_dir = user_details.home_path.joinpath(directory)
                 if not cur_dir.exists():
                     continue
-                self.users_dirs.append((user_details, cur_dir))
+                self.dirs.append((user_details.user, cur_dir))
+
+        for directory in self.SYSTEM_DIRS:
+            if (cur_dir := target.fs.path(directory)).exists():
+                self.dirs.append((None, cur_dir))
 
     def check_compatible(self) -> None:
-        if not len(self.users_dirs):
+        if not len(self.dirs):
             raise UnsupportedPluginError("No Firefox directories found")
 
-    def _iter_profiles(self) -> Iterator[tuple[UserDetails, TargetPath, TargetPath]]:
+    def _iter_profiles(self) -> Iterator[tuple[UserRecord, TargetPath, TargetPath]]:
         """Yield user directories."""
-        for user, cur_dir in self.users_dirs:
+        for user, cur_dir in self.dirs:
             for profile_dir in cur_dir.iterdir():
                 if not profile_dir.is_dir():
                     continue
                 yield user, cur_dir, profile_dir
 
-    def _iter_db(self, filename: str) -> Iterator[tuple[UserDetails, SQLite3]]:
+    def _iter_db(self, filename: str) -> Iterator[tuple[UserRecord, SQLite3]]:
         """Yield opened history database files of all users.
 
         Args:
@@ -117,12 +131,24 @@ class FirefoxPlugin(BrowserPlugin):
         Yields:
             Opened SQLite3 databases.
         """
-        for user, cur_dir, profile_dir in self._iter_profiles():
-            db_file = profile_dir.joinpath(filename)
+        iter_system = ((None, system_dir, None) for user, system_dir in self.dirs if user is None)
+
+        for user, cur_dir, profile_dir in chain(iter_system, self._iter_profiles()):
+            if user is None and profile_dir is None:
+                db_file = cur_dir.parent.joinpath(filename)
+                # On some Android variants, some files may exist in the base directory (places.sqlite) but others
+                # in a nested profile directory (cookies.sqlite)
+                # /data/data/org.mozilla.vrbrowser/files/places.sqlite
+                # /data/data/org.mozilla.vrbrowser/files/mozilla/xxxxxx.default/cookies.sqlite
+                if not db_file.exists():
+                    continue
+            else:
+                db_file = profile_dir.joinpath(filename)
+
             try:
                 yield user, db_file, sqlite3.SQLite3(db_file.open())
             except FileNotFoundError:
-                self.target.log.warning("Could not find %s file: %s", filename, db_file)
+                self.target.log.info("Could not find %s file: %s", filename, db_file)
             except SQLError as e:
                 self.target.log.warning("Could not open %s file: %s", filename, db_file)
                 self.target.log.debug("", exc_info=e)
@@ -151,6 +177,11 @@ class FirefoxPlugin(BrowserPlugin):
             from_url (uri): URL of the "from" visit.
             source: (path): The source file of the history record.
         """
+        if self.target.os == OperatingSystem.ANDROID:
+            from_timestamp = from_unix_ms
+        else:
+            from_timestamp = from_unix_us
+
         for user, db_file, db in self._iter_db("places.sqlite"):
             try:
                 places = {row.id: row for row in db.table("moz_places").rows()}
@@ -167,7 +198,7 @@ class FirefoxPlugin(BrowserPlugin):
                         from_visit, from_place = None, None
 
                     yield self.BrowserHistoryRecord(
-                        ts=from_unix_us(row.visit_date),
+                        ts=from_timestamp(row.visit_date),
                         browser="firefox",
                         id=row.id,
                         url=try_idna(place.url),
@@ -183,7 +214,7 @@ class FirefoxPlugin(BrowserPlugin):
                         from_url=try_idna(from_place.url) if from_place else None,
                         source=db_file,
                         _target=self.target,
-                        _user=user.user,
+                        _user=user,
                     )
             except SQLError as e:
                 self.target.log.warning("Error processing history file: %s", db_file, exc_info=e)
@@ -229,7 +260,7 @@ class FirefoxPlugin(BrowserPlugin):
                         same_site=bool(cookie.sameSite),
                         source=db_file,
                         _target=self.target,
-                        _user=user.user,
+                        _user=user,
                     )
             except SQLError as e:
                 self.target.log.warning("Error processing cookie file: %s", db_file, exc_info=e)
@@ -255,7 +286,10 @@ class FirefoxPlugin(BrowserPlugin):
         for user, db_file, db in self._iter_db("places.sqlite"):
             try:
                 places = {row.id: row for row in db.table("moz_places").rows()}
-                attributes = {row.id: row.name for row in db.table("moz_anno_attributes").rows()}
+                if not (moz_anno_attributes := db.table("moz_anno_attributes")):
+                    continue
+
+                attributes = {row.id: row.name for row in moz_anno_attributes.rows()}
                 annotations = {}
 
                 for row in db.table("moz_annos"):
@@ -316,7 +350,7 @@ class FirefoxPlugin(BrowserPlugin):
                         state=state,
                         source=db_file,
                         _target=self.target,
-                        _user=user.user,
+                        _user=user,
                     )
             except SQLError as e:
                 self.target.log.warning("Error processing history file: %s", db_file, exc_info=e)
@@ -351,7 +385,9 @@ class FirefoxPlugin(BrowserPlugin):
 
             if not extension_file.exists():
                 self.target.log.warning(
-                    "No 'extensions.json' addon file found for user %s in directory %s", user.user.name, profile_dir
+                    "No 'extensions.json' addon file found for user %s in directory %s",
+                    user.name,
+                    profile_dir,
                 )
                 continue
 
@@ -360,8 +396,8 @@ class FirefoxPlugin(BrowserPlugin):
 
                 for extension in extensions.get("addons", []):
                     yield self.BrowserExtensionRecord(
-                        ts_install=extension.get("installDate", 0) // 1000,
-                        ts_update=extension.get("updateDate", 0) // 1000,
+                        ts_install=from_unix_ms(extension.get("installDate", 0)),
+                        ts_update=from_unix_ms(extension.get("updateDate", 0)),
                         browser="firefox",
                         id=extension.get("id"),
                         name=(extension.get("defaultLocale", {}) or {}).get("name"),
@@ -377,12 +413,14 @@ class FirefoxPlugin(BrowserPlugin):
                         optional_permissions=(extension.get("optionalPermissions", {}) or {}).get("permissions"),
                         source=extension_file,
                         _target=self.target,
-                        _user=user.user,
+                        _user=user,
                     )
 
             except FileNotFoundError:
                 self.target.log.info(
-                    "No 'extensions.json' addon file found for user %s in directory %s", user.user.name, profile_dir
+                    "No 'extensions.json' addon file found for user %s in directory %s",
+                    user.name,
+                    profile_dir,
                 )
             except json.JSONDecodeError:
                 self.target.log.warning(
@@ -410,7 +448,9 @@ class FirefoxPlugin(BrowserPlugin):
 
             if not login_file.exists():
                 self.target.log.warning(
-                    "No 'logins.json' password file found for user %s in directory %s", user, profile_dir
+                    "No 'logins.json' password file found for user %s in directory %s",
+                    user.name,
+                    profile_dir,
                 )
                 continue
 
@@ -445,9 +485,9 @@ class FirefoxPlugin(BrowserPlugin):
                             break
 
                     yield self.BrowserPasswordRecord(
-                        ts_created=login.get("timeCreated", 0) // 1000,
-                        ts_last_used=login.get("timeLastUsed", 0) // 1000,
-                        ts_last_changed=login.get("timePasswordChanged", 0) // 1000,
+                        ts_created=from_unix_ms(login.get("timeCreated", 0)),
+                        ts_last_used=from_unix_ms(login.get("timeLastUsed", 0)),
+                        ts_last_changed=from_unix_ms(login.get("timePasswordChanged", 0)),
                         browser="firefox",
                         id=login.get("id"),
                         url=login.get("hostname"),
@@ -457,14 +497,19 @@ class FirefoxPlugin(BrowserPlugin):
                         decrypted_password=decrypted_password,
                         source=login_file,
                         _target=self.target,
-                        _user=user.user,
+                        _user=user,
                     )
 
             except FileNotFoundError:
-                self.target.log.info("No password file found for user %s in directory %s", user, profile_dir)
+                self.target.log.info(
+                    "No password file found for user %s in directory %s",
+                    user.name,
+                    profile_dir,
+                )
             except json.JSONDecodeError:
                 self.target.log.warning(
-                    "logins.json file in directory %s is malformed, consider inspecting the file manually", profile_dir
+                    "logins.json file in directory %s is malformed, consider inspecting the file manually",
+                    profile_dir,
                 )
 
 

{dissect_target-3.19.dev28 → dissect_target-3.19.dev30}/dissect/target/plugins/general/users.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 from functools import lru_cache
-from typing import Generator, NamedTuple, Optional, Union
+from typing import Iterator, NamedTuple, Union
 
 from dissect.target import Target
 from dissect.target.exceptions import UnsupportedPluginError
@@ -7,10 +9,12 @@ from dissect.target.helpers.fsutil import TargetPath
 from dissect.target.helpers.record import UnixUserRecord, WindowsUserRecord
 from dissect.target.plugin import InternalPlugin
 
+UserRecord = Union[UnixUserRecord, WindowsUserRecord]
+
 
 class UserDetails(NamedTuple):
-    user: Union[UnixUserRecord, WindowsUserRecord]
-    home_path: Optional[TargetPath]
+    user: UserRecord
+    home_path: TargetPath | None
 
 
 class UsersPlugin(InternalPlugin):
@@ -28,11 +32,11 @@ class UsersPlugin(InternalPlugin):
 
     def find(
         self,
-        sid: Optional[str] = None,
-        uid: Optional[str] = None,
-        username: Optional[str] = None,
+        sid: str | None = None,
+        uid: str | None = None,
+        username: str | None = None,
         force_case_sensitive: bool = False,
-    ) -> Optional[UserDetails]:
+    ) -> UserDetails | None:
         """Find User record matching provided sid, uid or username and return UserDetails object"""
         if all(map(lambda x: x is None, [sid, uid, username])):
             raise ValueError("Either sid or uid or username is expected")
@@ -52,7 +56,7 @@ class UsersPlugin(InternalPlugin):
             ):
                 return self.get(user)
 
-    def get(self, user: Union[UnixUserRecord, WindowsUserRecord]) -> UserDetails:
+    def get(self, user: UserRecord) -> UserDetails:
         """Return additional details about the user"""
         # Resolving the user home can not use the user's environment variables,
         # as those depend on the user's home to be known first. So we resolve
@@ -60,12 +64,12 @@ class UsersPlugin(InternalPlugin):
         home_path = self.target.fs.path(self.target.resolve(str(user.home))) if user.home else None
         return UserDetails(user=user, home_path=home_path)
 
-    def all(self) -> Generator[UserDetails, None, None]:
+    def all(self) -> Iterator[UserDetails]:
         """Return UserDetails objects for all users found"""
         for user in self.target.users():
             yield self.get(user)
 
-    def all_with_home(self) -> Generator[UserDetails, None, None]:
+    def all_with_home(self) -> Iterator[UserDetails]:
         """Return UserDetails objects for users that have existing directory set as home directory"""
         for user in self.target.users():
             if user.home:

{dissect_target-3.19.dev28 → dissect_target-3.19.dev30}/dissect/target/plugins/os/unix/esxi/_os.py

@@ -8,7 +8,7 @@ import subprocess
 from configparser import ConfigParser
 from configparser import Error as ConfigParserError
 from io import BytesIO
-from typing import Any, BinaryIO, Iterator, Optional, TextIO
+from typing import Any, BinaryIO, Iterator, TextIO
 
 from defusedxml import ElementTree
 from dissect.hypervisor.util import vmtar
@@ -73,7 +73,7 @@ class ESXiPlugin(UnixPlugin):
         if configstore.exists():
             self._configstore = parse_config_store(configstore.open())
 
-    def _cfg(self, path: str) -> Optional[str]:
+    def _cfg(self, path: str) -> str | None:
         if not self._config:
             self.target.log.warning("No ESXi config!")
             return None
@@ -87,7 +87,7 @@ class ESXiPlugin(UnixPlugin):
         return obj.get(value_name) if obj else None
 
     @classmethod
-    def detect(cls, target: Target) -> Optional[Filesystem]:
+    def detect(cls, target: Target) -> Filesystem | None:
         bootbanks = [
             fs for fs in target.filesystems if fs.path("boot.cfg").exists() and list(fs.path("/").glob("*.v00"))
         ]
@@ -128,7 +128,7 @@ class ESXiPlugin(UnixPlugin):
         return "localhost"
 
     @export(property=True)
-    def domain(self) -> Optional[str]:
+    def domain(self) -> str | None:
         if hostname := self._cfg("/adv/Misc/HostName"):
             return hostname.partition(".")[2]
 
@@ -146,7 +146,7 @@ class ESXiPlugin(UnixPlugin):
         return list(result)
 
     @export(property=True)
-    def version(self) -> Optional[str]:
+    def version(self) -> str | None:
         boot_cfg = self.target.fs.path("/bootbank/boot.cfg")
         if not boot_cfg.exists():
             return None
@@ -187,11 +187,11 @@ class ESXiPlugin(UnixPlugin):
         return self._configstore
 
     @export(property=True)
-    def os(self):
+    def os(self) -> str:
         return OperatingSystem.ESXI.value
 
 
-def _mount_modules(target: Target, sysvol: Filesystem, cfg: dict[str, str]):
+def _mount_modules(target: Target, sysvol: Filesystem, cfg: dict[str, str]) -> None:
     modules = [m.strip() for m in cfg["modules"].split("---")]
 
     for module in modules:
@@ -218,20 +218,22 @@ def _mount_modules(target: Target, sysvol: Filesystem, cfg: dict[str, str]):
             target.fs.append_layer().mount("/", tfs)
 
 
-def _mount_local(target: Target, local_layer: VirtualFilesystem):
+def _mount_local(target: Target, local_layer: VirtualFilesystem) -> None:
     local_tgz = target.fs.path("local.tgz")
+    local_tgz_ve = target.fs.path("local.tgz.ve")
     local_fs = None
 
     if local_tgz.exists():
         local_fs = tar.TarFilesystem(local_tgz.open())
-    else:
-        local_tgz_ve = target.fs.path("local.tgz.ve")
+    elif local_tgz_ve.exists():
         # In the case "encryption.info" does not exist, but ".#encryption.info" does
         encryption_info = next(target.fs.path("/").glob("*encryption.info"), None)
         if not local_tgz_ve.exists() or not encryption_info.exists():
             raise ValueError("Unable to find valid configuration archive")
 
         local_fs = _create_local_fs(target, local_tgz_ve, encryption_info)
+    else:
+        target.log.warning("No local.tgz or local.tgz.ve found, skipping local state")
 
     if local_fs:
         local_layer.mount("/", local_fs)
@@ -245,7 +247,7 @@ def _decrypt_envelope(local_tgz_ve: TargetPath, encryption_info: TargetPath) ->
     return local_tgz
 
 
-def _decrypt_crypto_util(local_tgz_ve: TargetPath) -> Optional[BytesIO]:
+def _decrypt_crypto_util(local_tgz_ve: TargetPath) -> BytesIO | None:
     """Decrypt ``local.tgz.ve`` using ESXi ``crypto-util``.
 
     We write to stdout, but this results in ``crypto-util`` exiting with a non-zero return code
@@ -264,9 +266,7 @@ def _decrypt_crypto_util(local_tgz_ve: TargetPath) -> Optional[BytesIO]:
     return BytesIO(result.stdout)
 
 
-def _create_local_fs(
-    target: Target, local_tgz_ve: TargetPath, encryption_info: TargetPath
-) -> Optional[tar.TarFilesystem]:
+def _create_local_fs(target: Target, local_tgz_ve: TargetPath, encryption_info: TargetPath) -> tar.TarFilesystem | None:
     local_tgz = None
 
     if HAS_ENVELOPE:
@@ -292,7 +292,7 @@ def _create_local_fs(
         return tar.TarFilesystem(local_tgz)
 
 
-def _mount_filesystems(target: Target, sysvol: Filesystem, cfg: dict[str, str]):
+def _mount_filesystems(target: Target, sysvol: Filesystem, cfg: dict[str, str]) -> None:
     version = cfg["build"]
 
     osdata_fs = None
@@ -371,7 +371,7 @@ def _mount_filesystems(target: Target, sysvol: Filesystem, cfg: dict[str, str]):
         target.fs.symlink(f"/vmfs/volumes/LOCKER-{locker_fs.vmfs.uuid}", "/locker")
 
 
-def _link_log_dir(target: Target, cfg: dict[str, str], plugin_obj: ESXiPlugin):
+def _link_log_dir(target: Target, cfg: dict[str, str], plugin_obj: ESXiPlugin) -> None:
     version = cfg["build"]
 
     # Don't really know how ESXi does this, but let's just take a shortcut for now
@@ -441,7 +441,7 @@ def parse_esx_conf(fh: TextIO) -> dict[str, Any]:
     return config
 
 
-def _traverse(path: str, obj: dict[str, Any], create: bool = False):
+def _traverse(path: str, obj: dict[str, Any], create: bool = False) -> dict[str, Any] | None:
     parts = path.strip("/").split("/")
     path_parts = parts[:-1]
     for part in path_parts:

{dissect_target-3.19.dev28 → dissect_target-3.19.dev30/dissect.target.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.19.dev28
+Version: 3.19.dev30
 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