dissect.target 3.20.dev36__py3-none-any.whl → 3.20.dev38__py3-none-any.whl

dissect/target/plugins/os/windows/registry.py

@@ -68,6 +68,10 @@ class RegistryPlugin(Plugin):
         "COMPONENTS",
         "DEFAULT",
         "ELAM",
+        "USER.DAT",  # Win 95/98/ME
+        "SYSTEM.DAT",  # Win 95/98/ME
+        "CLASSES.DAT",  # Win ME
+        "REG.DAT",  # Win 3.1
     ]
 
     def __init__(self, target: Target) -> None:
@@ -88,7 +92,14 @@ class RegistryPlugin(Plugin):
 
     def _init_registry(self) -> None:
         dirs = [
+            # Windows XP or newer
             ("sysvol/windows/system32/config", False),
+            # Windows NT3, NT4, 2k
+            ("sysvol/WINNT/system32/config", False),
+            # Windows 3.11, 95, 98, ME
+            ("sysvol/windows", False),
+            # ReactOS (alternative location)
+            ("sysvol/reactos", False),
             # RegBack hives are often empty files
             ("sysvol/windows/system32/config/RegBack", True),
         ]

dissect/target/plugins/os/windows/services.py

@@ -1,4 +1,5 @@
 import re
+from typing import Iterator
 
 from dissect.target.exceptions import (
     RegistryError,
@@ -62,8 +63,8 @@ class ServicesPlugin(Plugin):
             raise UnsupportedPluginError("No services found in the registry")
 
     @export(record=ServiceRecord)
-    def services(self):
-        """Return information about all installed services.
+    def services(self) -> Iterator[ServiceRecord]:
+        """Return information about all installed Windows services.
 
         The HKLM\\SYSTEM\\CurrentControlSet\\Services registry key contains information about the installed services and
         drivers on the system.

dissect/target/plugins/os/windows/startupinfo.py

@@ -1,4 +1,7 @@
+from __future__ import annotations
+
 import datetime
+from typing import Iterator
 
 from defusedxml import ElementTree
 
@@ -34,7 +37,7 @@ StartupInfoRecord = TargetRecordDescriptor(
 )
 
 
-def parse_ts(time_string):
+def parse_ts(time_string: str) -> datetime.datetime | None:
     if not time_string:
         return None
 
@@ -42,6 +45,8 @@ def parse_ts(time_string):
 
 
 class StartupInfoPlugin(Plugin):
+    """Windows startup info plugin."""
+
     def __init__(self, target):
         super().__init__(target)
         self._files = []
@@ -55,7 +60,7 @@ class StartupInfoPlugin(Plugin):
             raise UnsupportedPluginError("No StartupInfo files found")
 
     @export(record=StartupInfoRecord)
-    def startupinfo(self):
+    def startupinfo(self) -> Iterator[StartupInfoRecord]:
         """Return the contents of StartupInfo files.
 
         On a Windows system, the StartupInfo log files contain information about process execution for the first 90

dissect/target/plugins/os/windows/syscache.py

@@ -1,3 +1,5 @@
+from typing import Iterator
+
 from dissect.ntfs import ntfs
 
 from dissect.target.exceptions import RegistryValueNotFoundError, UnsupportedPluginError
@@ -41,7 +43,7 @@ class SyscachePlugin(Plugin):
             raise UnsupportedPluginError("Could not load Syscache.hve")
 
     @export(record=SyscacheRecord)
-    def syscache(self):
+    def syscache(self) -> Iterator[SyscacheRecord]:
         """Parse the objects in the ObjectTable from the Syscache.hve file."""
 
         # Try to get the system volume

dissect/target/plugins/os/windows/tasks.py

@@ -125,7 +125,7 @@ class TasksPlugin(Plugin):
         intervals. An adversary may leverage such scheduled tasks to gain persistence on a system.
 
         References:
-            https://en.wikipedia.org/wiki/Windows_Task_Scheduler
+            - https://en.wikipedia.org/wiki/Windows_Task_Scheduler
 
         Yields:
             The scheduled tasks found on the target.

dissect/target/plugins/os/windows/thumbcache.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 from pathlib import Path
-from typing import Iterator, Optional, Union
+from typing import Iterator
 
 from dissect.thumbcache import Error, Thumbcache
 from dissect.thumbcache.tools.extract_with_index import dump_entry_data_through_index
@@ -33,6 +35,8 @@ IconcacheRecord = TargetRecordDescriptor("windows/thumbcache/iconcache", GENERIC
 
 
 class ThumbcachePlugin(Plugin):
+    """Windows thumbcache plugin."""
+
     __namespace__ = "thumbcache"
 
     def get_cache_paths(self) -> Iterator[TargetPath]:
@@ -71,8 +75,8 @@ class ThumbcachePlugin(Plugin):
         self,
         record_type: TargetRecordDescriptor,
         prefix: str,
-        output_dir: Optional[Path],
-    ) -> Iterator[Union[ThumbcacheRecord, IconcacheRecord, IndexRecord]]:
+        output_dir: Path | None,
+    ) -> Iterator[ThumbcacheRecord | IconcacheRecord | IndexRecord]:
         for cache_path in self.get_cache_paths():
             try:
                 if output_dir:
@@ -91,10 +95,12 @@ class ThumbcachePlugin(Plugin):
 
     @arg("--output", "-o", dest="output_dir", type=Path, help="Path to extract thumbcache thumbnails to.")
     @export(record=[ThumbcacheRecord, IndexRecord])
-    def thumbcache(self, output_dir: Optional[Path] = None) -> Iterator[Union[ThumbcacheRecord, IndexRecord]]:
+    def thumbcache(self, output_dir: Path | None = None) -> Iterator[ThumbcacheRecord | IndexRecord]:
+        """Yield thumbcache thumbnails."""
         yield from self._parse_thumbcache(ThumbcacheRecord, "thumbcache", output_dir)
 
     @arg("--output", "-o", dest="output_dir", type=Path, help="Path to extract iconcache thumbnails to.")
     @export(record=[IconcacheRecord, IndexRecord])
-    def iconcache(self, output_dir: Optional[Path] = None) -> Iterator[Union[IconcacheRecord, IndexRecord]]:
+    def iconcache(self, output_dir: Path | None = None) -> Iterator[IconcacheRecord | IndexRecord]:
+        """Yield iconcache thumbnails."""
         yield from self._parse_thumbcache(IconcacheRecord, "iconcache", output_dir)

dissect/target/plugins/os/windows/ual.py

@@ -1,3 +1,6 @@
+from pathlib import Path
+from typing import Any, Iterator
+
 from dissect.esedb.exceptions import Error
 from dissect.esedb.tools import ual
 
@@ -165,14 +168,14 @@ class UalPlugin(Plugin):
         if not any([path.exists() for path in self.mdb_paths]):
             raise UnsupportedPluginError("No MDB files found")
 
-    def find_mdb_files(self):
+    def find_mdb_files(self) -> list[Path]:
         return [
             path
             for path in self.target.fs.path("/").glob(self.LOG_DB_GLOB)
             if path.exists() and path.name != self.IDENTITY_DB_FILENAME
         ]
 
-    def populate_role_guid_map(self):
+    def populate_role_guid_map(self) -> None:
         identity_db = self.target.fs.path(self.IDENTITY_DB_PATH)
         if not identity_db.exists():
             return
@@ -192,13 +195,13 @@ class UalPlugin(Plugin):
                 "role_name": record.get("RoleName"),
             }
 
-    def read_table_records(self, table_name):
+    def read_table_records(self, table_name: str) -> Iterator[tuple[Path, dict[str, Any]]]:
         for mdb_path in self.mdb_paths:
             fh = mdb_path.open()
             try:
                 parser = ual.UAL(fh)
             except Error as e:
-                self.target.log.warning(f"Error opening {mdb_path} database", exc_info=e)
+                self.target.log.warning("Error opening database: %s", mdb_path, exc_info=e)
                 continue
 
             for table_record in parser.get_table_records(table_name):
@@ -206,7 +209,7 @@ class UalPlugin(Plugin):
                 yield mdb_path, values
 
     @export(record=ClientAccessRecord)
-    def client_access(self):
+    def client_access(self) -> Iterator[ClientAccessRecord]:
         """Return client access data within the User Access Logs."""
         for path, client_record in self.read_table_records("CLIENTS"):
             common_values = {k: v for k, v in client_record.items() if k != "activity_counts"}
@@ -224,7 +227,7 @@ class UalPlugin(Plugin):
                 )
 
     @export(record=RoleAccessRecord)
-    def role_access(self):
+    def role_access(self) -> Iterator[RoleAccessRecord]:
         """Return role access data within the User Access Logs."""
         for path, record in self.read_table_records("ROLE_ACCESS"):
             role_guid_data = self.role_guid_map.get(record.get("role_guid"), {})
@@ -237,19 +240,19 @@ class UalPlugin(Plugin):
             )
 
     @export(record=VirtualMachineRecord)
-    def virtual_machines(self):
+    def virtual_machines(self) -> Iterator[VirtualMachineRecord]:
         """Return virtual machine data within the User Access Logs."""
         for path, record in self.read_table_records("VIRTUALMACHINES"):
             yield VirtualMachineRecord(path=path, _target=self.target, **record)
 
     @export(record=DomainSeenRecord)
-    def domains_seen(self):
+    def domains_seen(self) -> Iterator[DomainSeenRecord]:
         """Return DNS data within the User Access Logs."""
         for path, record in self.read_table_records("DNS"):
             yield DomainSeenRecord(path=path, _target=self.target, **record)
 
     @export(record=SystemIdentityRecord)
-    def system_identities(self):
+    def system_identities(self) -> Iterator[SystemIdentityRecord]:
         """Return system identity data within the User Access Logs."""
         if not self.identity_db_parser:
             return

dissect/target/plugins/os/windows/wua_history.py

@@ -994,7 +994,6 @@ class WuaHistoryPlugin(Plugin):
             - https://learn.microsoft.com/en-us/windows/deployment/update/windows-update-error-reference
             - https://learn.microsoft.com/en-us/troubleshoot/windows-client/installing-updates-features-roles/common-windows-update-errors
             - https://learn.microsoft.com/en-us/troubleshoot/windows-client/installing-updates-features-roles/common-windows-update-errors?context=%2Fwindows%2Fdeployment%2Fcontext%2Fcontext
-
             - https://github.com/libyal/esedb-kb/blob/main/documentation/Windows%20Update.asciidoc
             - https://www.nirsoft.net/articles/extract-windows-updates-list-external-drive.html
 

dissect/target/tools/dump/utils.py

@@ -38,6 +38,8 @@ log = structlog.get_logger(__name__)
 
 
 class Compression(enum.Enum):
+    """Supported compression types."""
+
     BZIP2 = "bzip2"
     GZIP = "gzip"
     LZ4 = "lz4"
@@ -46,6 +48,8 @@ class Compression(enum.Enum):
 
 
 class Serialization(enum.Enum):
+    """Supported serialization methods."""
+
     JSONLINES = "jsonlines"
     MSGPACK = "msgpack"
 

dissect/target/tools/shell.py

@@ -205,7 +205,8 @@ class ExtendedCmd(cmd.Cmd):
 
         When entering an empty command, the cmd module will by default repeat the previous command.
         By defining an empty ``emptyline`` function we make sure no command is executed instead.
-        Resources:
+
+        References:
             - https://stackoverflow.com/a/16479030
             - https://github.com/python/cpython/blob/3.12/Lib/cmd.py#L10
         """

{dissect.target-3.20.dev36.dist-info → dissect.target-3.20.dev38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.20.dev36
+Version: 3.20.dev38
 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