dissect.target 3.19.dev8__py3-none-any.whl → 3.19.dev10__py3-none-any.whl

dissect/target/plugins/apps/browser/firefox.py

@@ -350,7 +350,7 @@ 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, profile_dir
+                    "No 'extensions.json' addon file found for user %s in directory %s", user.user.name, profile_dir
                 )
                 continue
 
@@ -363,17 +363,17 @@ class FirefoxPlugin(BrowserPlugin):
                         ts_update=extension.get("updateDate", 0) // 1000,
                         browser="firefox",
                         id=extension.get("id"),
-                        name=extension.get("defaultLocale", {}).get("name"),
+                        name=(extension.get("defaultLocale", {}) or {}).get("name"),
                         short_name=None,
                         default_title=None,
-                        description=extension.get("defaultLocale", {}).get("description"),
+                        description=(extension.get("defaultLocale", {}) or {}).get("description"),
                         version=extension.get("version"),
                         ext_path=extension.get("path"),
                         from_webstore=None,
-                        permissions=extension.get("userPermissions", {}).get("permissions"),
+                        permissions=(extension.get("userPermissions", {}) or {}).get("permissions"),
                         manifest_version=extension.get("manifestVersion"),
                         source_uri=extension.get("sourceURI"),
-                        optional_permissions=extension.get("optionalPermissions", {}).get("permissions"),
+                        optional_permissions=(extension.get("optionalPermissions", {}) or {}).get("permissions"),
                         source=extension_file,
                         _target=self.target,
                         _user=user.user,
@@ -381,7 +381,7 @@ class FirefoxPlugin(BrowserPlugin):
 
             except FileNotFoundError:
                 self.target.log.info(
-                    "No 'extensions.json' addon file found for user %s in directory %s", user, profile_dir
+                    "No 'extensions.json' addon file found for user %s in directory %s", user.user.name, profile_dir
                 )
             except json.JSONDecodeError:
                 self.target.log.warning(

dissect/target/tools/shell.py

@@ -16,7 +16,6 @@ import shutil
 import stat
 import subprocess
 import sys
-import traceback
 from contextlib import contextmanager
 from typing import Any, BinaryIO, Callable, Iterator, Optional, TextIO, Union
 
@@ -33,13 +32,15 @@ from dissect.target.exceptions import (
 )
 from dissect.target.filesystem import FilesystemEntry, LayerFilesystemEntry
 from dissect.target.helpers import cyber, fsutil, regutil
-from dissect.target.plugin import arg
+from dissect.target.plugin import PluginFunction, arg
 from dissect.target.target import Target
 from dissect.target.tools.info import print_target_info
 from dissect.target.tools.utils import (
     args_to_uri,
     catch_sigpipe,
     configure_generic_arguments,
+    execute_function_on_target,
+    find_and_filter_plugins,
     generate_argparse_for_bound_method,
     process_generic_arguments,
 )
@@ -114,6 +115,7 @@ class TargetCmd(cmd.Cmd):
         cmd.Cmd.__init__(self)
         self.target = target
         self.debug = False
+        self.identchars += "."
 
     def __getattr__(self, attr: str) -> Any:
         if attr.startswith("help_"):
@@ -154,8 +156,8 @@ class TargetCmd(cmd.Cmd):
         except AttributeError:
             pass
 
-        if self.target.has_function(command):
-            return self._exec_target(command, command_args_str)
+        if plugins := list(find_and_filter_plugins(self.target, command, [])):
+            return self._exec_target(plugins, command_args_str)
 
         return cmd.Cmd.default(self, line)
 
@@ -213,24 +215,15 @@ class TargetCmd(cmd.Cmd):
         no_cyber = cmdfunc.__func__ in (TargetCli.cmd_registry, TargetCli.cmd_enter)
         return self._exec(_exec_, command_args_str, no_cyber)
 
-    def _exec_target(self, func: str, command_args_str: str) -> Optional[bool]:
+    def _exec_target(self, funcs: list[PluginFunction], command_args_str: str) -> Optional[bool]:
         """Command exection helper for target plugins."""
-        attr = self.target
-        for part in func.split("."):
-            attr = getattr(attr, part)
 
         def _exec_(argparts: list[str], stdout: TextIO) -> Optional[bool]:
-            if callable(attr):
-                argparser = generate_argparse_for_bound_method(attr)
-                try:
-                    args = argparser.parse_args(argparts)
-                except SystemExit:
-                    return False
-                value = attr(**vars(args))
-            else:
-                value = attr
+            try:
+                output, value, _ = execute_function_on_target(self.target, func, argparts)
+            except SystemExit:
+                return False
 
-            output = getattr(attr, "__output__", "default")
             if output == "record":
                 # if the command results are piped to another process,
                 # the process will receive Record objects
@@ -251,10 +244,16 @@ class TargetCmd(cmd.Cmd):
             else:
                 print(value, file=stdout)
 
-        try:
-            return self._exec(_exec_, command_args_str)
-        except PluginError:
-            traceback.print_exc()
+        result = None
+        for func in funcs:
+            try:
+                result = self._exec(_exec_, command_args_str)
+            except PluginError as err:
+                if self.debug:
+                    raise err
+                self.target.log.error(err)
+
+        return result
 
     def do_python(self, line: str) -> Optional[bool]:
         """drop into a Python shell"""

{dissect.target-3.19.dev8.dist-info → dissect.target-3.19.dev10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.19.dev8
+Version: 3.19.dev10
 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.dev8.dist-info → dissect.target-3.19.dev10.dist-info}/RECORD

@@ -124,7 +124,7 @@ dissect/target/plugins/apps/browser/browser.py,sha256=rBIwcgdl73gm-8APwx2jEUAYXR
 dissect/target/plugins/apps/browser/chrome.py,sha256=hxS8gqpBwoCrPaxNpllIa6K9DtsSGzn6XXcUaHyes6w,3048
 dissect/target/plugins/apps/browser/chromium.py,sha256=N9hS-a45iEv_GyKhLZQR_FSkEjWlMA0f22eURBuxF5Y,27999
 dissect/target/plugins/apps/browser/edge.py,sha256=woXzZtHPWmfcV8vbxGKHELKru5JRb32MAXs43_b4K4E,2883
-dissect/target/plugins/apps/browser/firefox.py,sha256=ROrzhI2SV81E63hi5PRtyJveRrBacWNJ9FWZS_ondlk,30929
+dissect/target/plugins/apps/browser/firefox.py,sha256=3Ucp85DXTDyCofW1_aEzjba_Pr0QyC4F5gX8NqY-uOg,30981
 dissect/target/plugins/apps/browser/iexplore.py,sha256=g_xw0toaiyjevxO8g9XPCOqc-CXZp39FVquRhPFGdTE,8801
 dissect/target/plugins/apps/container/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dissect/target/plugins/apps/container/docker.py,sha256=KxQRbKGgxkf3YFBMa7fjeJ7qo8qjFys7zEmfQhDTnLw,15305
@@ -331,7 +331,7 @@ dissect/target/tools/logging.py,sha256=5ZnumtMWLyslxfrUGZ4ntRyf3obOOhmn8SBjKfdLc
 dissect/target/tools/mount.py,sha256=L_0tSmiBdW4aSaF0vXjB0bAkTC0kmT2N1hrbW6s5Jow,3254
 dissect/target/tools/query.py,sha256=ONHu2FVomLccikb84qBrlhNmEfRoHYFQMcahk_y2c9A,15580
 dissect/target/tools/reg.py,sha256=FDsiBBDxjWVUBTRj8xn82vZe-J_d9piM-TKS3PHZCcM,3193
-dissect/target/tools/shell.py,sha256=1Z-gYRlJu0rmFI20taatlofrvp52ac_arXG8AMhwj0w,45182
+dissect/target/tools/shell.py,sha256=_widEuIRqZhYzcFR52NYI8O2aPFm6tG5Uiv-AIrC32U,45155
 dissect/target/tools/utils.py,sha256=sQizexY3ui5vmWw4KOBLg5ecK3TPFjD-uxDqRn56ZTY,11304
 dissect/target/tools/dump/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dissect/target/tools/dump/run.py,sha256=aD84peRS4zHqC78fH7Vd4ni3m1ZmVP70LyMwBRvoDGY,9463
@@ -345,10 +345,10 @@ dissect/target/volumes/luks.py,sha256=OmCMsw6rCUXG1_plnLVLTpsvE1n_6WtoRUGQbpmu1z
 dissect/target/volumes/lvm.py,sha256=wwQVR9I3G9YzmY6UxFsH2Y4MXGBcKL9aayWGCDTiWMU,2269
 dissect/target/volumes/md.py,sha256=j1K1iKmspl0C_OJFc7-Q1BMWN2OCC5EVANIgVlJ_fIE,1673
 dissect/target/volumes/vmfs.py,sha256=-LoUbn9WNwTtLi_4K34uV_-wDw2W5hgaqxZNj4UmqAQ,1730
-dissect.target-3.19.dev8.dist-info/COPYRIGHT,sha256=m-9ih2RVhMiXHI2bf_oNSSgHgkeIvaYRVfKTwFbnJPA,301
-dissect.target-3.19.dev8.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-dissect.target-3.19.dev8.dist-info/METADATA,sha256=zA-ZXpcU071N4CXn2gcBA5eRTWBrQHLRDqNW5MME_bY,12718
-dissect.target-3.19.dev8.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-dissect.target-3.19.dev8.dist-info/entry_points.txt,sha256=tvFPa-Ap-gakjaPwRc6Fl6mxHzxEZ_arAVU-IUYeo_s,447
-dissect.target-3.19.dev8.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect.target-3.19.dev8.dist-info/RECORD,,
+dissect.target-3.19.dev10.dist-info/COPYRIGHT,sha256=m-9ih2RVhMiXHI2bf_oNSSgHgkeIvaYRVfKTwFbnJPA,301
+dissect.target-3.19.dev10.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+dissect.target-3.19.dev10.dist-info/METADATA,sha256=_IaES22tqwU15qttr5A5X3d0VUa43dSOESK8X8Ao0K0,12719
+dissect.target-3.19.dev10.dist-info/WHEEL,sha256=FZ75kcLy9M91ncbIgG8dnpCncbiKXSRGJ_PFILs6SFg,91
+dissect.target-3.19.dev10.dist-info/entry_points.txt,sha256=tvFPa-Ap-gakjaPwRc6Fl6mxHzxEZ_arAVU-IUYeo_s,447
+dissect.target-3.19.dev10.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
+dissect.target-3.19.dev10.dist-info/RECORD,,

{dissect.target-3.19.dev8.dist-info → dissect.target-3.19.dev10.dist-info}/WHEEL

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