dissect.target 3.20.dev41__tar.gz → 3.20.dev43__tar.gz

{dissect_target-3.20.dev41/dissect.target.egg-info → dissect_target-3.20.dev43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.20.dev41
+Version: 3.20.dev43
 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.20.dev43/dissect/target/plugins/general/loaders.py

@@ -0,0 +1,39 @@
+import json
+
+from dissect.target.helpers.docs import INDENT_STEP, get_docstring
+from dissect.target.loader import LOADERS_BY_SCHEME
+from dissect.target.plugin import Plugin, arg, export
+
+
+class LoaderListPlugin(Plugin):
+    """Plugin to list the available loaders."""
+
+    def check_compatible(self) -> None:
+        pass
+
+    @export(output="none")
+    # NOTE: We would prefer to re-use arguments across plugins from argparse in query.py, but that is not possible yet.
+    # For now we use --as-json, but in the future this should be changed to inherit --json from target-query.
+    # https://github.com/fox-it/dissect.target/pull/841
+    # https://github.com/fox-it/dissect.target/issues/889
+    @arg("--as-json", dest="as_json", action="store_true")
+    def loaders(self, as_json: bool = False) -> None:
+        """List the available loaders."""
+
+        loaders_info = {}
+        for key, loader in LOADERS_BY_SCHEME.items():
+            try:
+                docstring = get_docstring(loader, "No documentation.").splitlines()[0].strip()
+                loaders_info[key] = docstring
+            except ImportError:
+                continue
+
+        loaders = sorted(loaders_info.items())
+
+        if as_json:
+            print(json.dumps([{"name": name, "description": desc} for name, desc in loaders]), end="")
+
+        else:
+            print("Available loaders:")
+            for loader_name, loader_description in loaders:
+                print(f"{INDENT_STEP}{loader_name} - {loader_description}")

{dissect_target-3.20.dev41 → dissect_target-3.20.dev43}/dissect/target/plugins/general/plugins.py

@@ -1,5 +1,8 @@
+from __future__ import annotations
+
+import json
 import textwrap
-from typing import Dict, List, Type, Union
+from typing import Iterator, Type
 
 from dissect.target import plugin
 from dissect.target.helpers.docs import INDENT_STEP, get_plugin_overview
@@ -23,7 +26,8 @@ def categorize_plugins(plugins_selection: list[dict] = None) -> dict:
     return output_dict
 
 
-def get_exported_plugins():
+def get_exported_plugins() -> list:
+    """Returns list of exported plugins."""
     return [p for p in plugin.plugins() if len(p["exports"])]
 
 
@@ -50,10 +54,10 @@ def update_dict_recursive(source_dict: dict, updated_dict: dict) -> dict:
 
 
 def output_plugin_description_recursive(
-    structure_dict: Union[Dict, Plugin],
+    structure_dict: dict | Plugin,
     print_docs: bool,
-    indentation_step=0,
-) -> List[str]:
+    indentation_step: int = 0,
+) -> list[str]:
     """Create plugin overview with identations."""
 
     if isinstance(structure_dict, type) and issubclass(structure_dict, Plugin):
@@ -78,10 +82,10 @@ def get_plugin_description(
 
 
 def get_description_dict(
-    structure_dict: Dict,
+    structure_dict: dict,
     print_docs: bool,
     indentation_step: int,
-) -> List[str]:
+) -> list[str]:
     """Returns a list of indented descriptions."""
 
     output_descriptions = []
@@ -105,10 +109,17 @@ class PluginListPlugin(Plugin):
 
     @export(output="none", cache=False)
     @arg("--docs", dest="print_docs", action="store_true")
-    def plugins(self, plugins: list[dict] = None, print_docs: bool = False) -> None:
-        """Print all registered plugins to stdout."""
+    # NOTE: We would prefer to re-use arguments across plugins from argparse in query.py, but that is not possible yet.
+    # For now we use --as-json, but in the future this should be changed to inherit --json from target-query.
+    # https://github.com/fox-it/dissect.target/pull/841
+    # https://github.com/fox-it/dissect.target/issues/889
+    @arg("--as-json", dest="as_json", action="store_true")
+    def plugins(self, plugins: list[Plugin] = None, print_docs: bool = False, as_json: bool = False) -> None:
+        """Print all available plugins."""
+
+        dict_plugins = list({p.path: p.plugin_desc for p in plugins}.values())
+        categorized_plugins = dict(sorted(categorize_plugins(dict_plugins).items()))
 
-        categorized_plugins = dict(sorted(categorize_plugins(plugins).items()))
         plugin_descriptions = output_plugin_description_recursive(categorized_plugins, print_docs)
 
         plugins_list = textwrap.indent(
@@ -142,4 +153,32 @@ class PluginListPlugin(Plugin):
             "Failed to load:",
             failed_list,
         ]
-        print("\n".join(output_lines))
+
+        if as_json:
+            out = {"loaded": list(generate_plugins_json(plugins))}
+
+            if failed_plugins := plugin.failed():
+                out["failed"] = [
+                    {"module": p["module"], "stacktrace": "".join(p["stacktrace"])} for p in failed_plugins
+                ]
+
+            print(json.dumps(out), end="")
+
+        else:
+            print("\n".join(output_lines))
+
+
+def generate_plugins_json(plugins: list[Plugin]) -> Iterator[dict]:
+    """Generates JSON output of a list of :class:`Plugin`s."""
+
+    for p in plugins:
+        func = getattr(p.class_object, p.method_name)
+        description = getattr(func, "__doc__", None)
+        summary = description.split("\n\n", 1)[0].strip() if description else None
+
+        yield {
+            "name": p.name,
+            "output": p.output_type,
+            "description": summary,
+            "path": p.path,
+        }

{dissect_target-3.20.dev41 → dissect_target-3.20.dev43}/dissect/target/tools/query.py

@@ -169,31 +169,40 @@ def main():
     # Show the list of available plugins for the given optional target and optional
     # search pattern, only display plugins that can be applied to ANY targets
     if args.list:
-        collected_plugins = {}
+        collected_plugins = []
 
         if targets:
             for plugin_target in Target.open_all(targets, args.children):
                 funcs, _ = find_plugin_functions(plugin_target, args.list, compatibility=True, show_hidden=True)
                 for func in funcs:
-                    collected_plugins[func.path] = func.plugin_desc
+                    collected_plugins.append(func)
         else:
             funcs, _ = find_plugin_functions(Target(), args.list, compatibility=False, show_hidden=True)
             for func in funcs:
-                collected_plugins[func.path] = func.plugin_desc
+                collected_plugins.append(func)
 
-        # Display in a user friendly manner
         target = Target()
         fparser = generate_argparse_for_bound_method(target.plugins, usage_tmpl=USAGE_FORMAT_TMPL)
         fargs, rest = fparser.parse_known_args(rest)
 
+        # Display in a user friendly manner
         if collected_plugins:
-            target.plugins(list(collected_plugins.values()))
+            if args.json:
+                print('{"plugins": ', end="")
+            target.plugins(collected_plugins, as_json=args.json)
 
         # No real targets specified, show the available loaders
         if not targets:
             fparser = generate_argparse_for_bound_method(target.loaders, usage_tmpl=USAGE_FORMAT_TMPL)
             fargs, rest = fparser.parse_known_args(rest)
-            target.loaders(**vars(fargs))
+            del fargs.as_json
+            if args.json:
+                print(', "loaders": ', end="")
+            target.loaders(**vars(fargs), as_json=args.json)
+
+        if args.json:
+            print("}")
+
         parser.exit()
 
     if not targets:

{dissect_target-3.20.dev41 → dissect_target-3.20.dev43/dissect.target.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.20.dev41
+Version: 3.20.dev43
 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.20.dev41 → dissect_target-3.20.dev43}/tests/plugins/general/test_plugins.py

@@ -29,7 +29,7 @@ def test_update_dict():
 
 def test_plugin_description():
     description = [x for x in output_plugin_description_recursive(PluginListPlugin, False)]
-    assert description == ["plugins - Print all registered plugins to stdout. (output: no output)"]
+    assert description == ["plugins - Print all available plugins. (output: no output)"]
 
 
 def test_plugin_description_compacting():
@@ -39,7 +39,7 @@ def test_plugin_description_compacting():
     assert description == [
         "hello:",
         "  world:",
-        "    plugins - Print all registered plugins to stdout. (output: no output)",
+        "    plugins - Print all available plugins. (output: no output)",
     ]
 
 
@@ -54,9 +54,9 @@ def test_plugin_description_in_dict_multiple():
         "hello:",
         "  world:",
         "    data:",
-        "      plugins - Print all registered plugins to stdout. (output: no output)",
+        "      plugins - Print all available plugins. (output: no output)",
         "    data2:",
-        "      plugins - Print all registered plugins to stdout. (output: no output)",
+        "      plugins - Print all available plugins. (output: no output)",
     ]
 
 

{dissect_target-3.20.dev41 → dissect_target-3.20.dev43}/tests/tools/test_query.py

@@ -1,3 +1,4 @@
+import json
 import os
 import re
 from typing import Any, Optional
@@ -244,3 +245,56 @@ def test_target_query_dry_run(capsys: pytest.CaptureFixture, monkeypatch: pytest
             "  execute: network.interfaces (general.network.interfaces)\n"
             "  execute: osinfo (general.osinfo.osinfo)\n"
         )
+
+
+def test_target_query_list_json(capsys: pytest.CaptureFixture, monkeypatch: pytest.MonkeyPatch) -> None:
+    """test if target-query --list --json output is formatted as we expect it to be."""
+
+    with monkeypatch.context() as m:
+        m.setattr("sys.argv", ["target-query", "-l", "-j"])
+        with pytest.raises((SystemExit, IndexError, ImportError)):
+            target_query()
+        out, _ = capsys.readouterr()
+
+    try:
+        output = json.loads(out)
+    except json.JSONDecodeError:
+        pass
+
+    # test the generic structure of the returned dictionary.
+    assert isinstance(output, dict), "Could not load JSON output of 'target-query --list --json'"
+    assert output["plugins"], "Expected a dictionary of plugins"
+    assert output["loaders"], "Expected a dictionary of loaders"
+    assert len(output["plugins"]["loaded"]) > 200, "Expected more loaded plugins"
+    assert not output["plugins"].get("failed"), "Some plugin(s) failed to initialize"
+
+    def get_plugin(plugins: list[dict], needle: str) -> dict:
+        match = [p for p in output["plugins"]["loaded"] if p["name"] == needle]
+        return match[0] if match else False
+
+    # general plugin
+    users_plugin = get_plugin(output, "users")
+    assert users_plugin == {
+        "name": "users",
+        "description": "Return the users available in the target.",
+        "output": "record",
+        "path": "general.default.users",
+    }
+
+    # namespaced plugin
+    plocate_plugin = get_plugin(output, "plocate.locate")
+    assert plocate_plugin == {
+        "name": "plocate.locate",
+        "description": "Yield file and directory names from the plocate.db.",
+        "output": "record",
+        "path": "os.unix.locate.plocate.locate",
+    }
+
+    # regular plugin
+    sam_plugin = get_plugin(output, "sam")
+    assert sam_plugin == {
+        "name": "sam",
+        "description": "Dump SAM entries",
+        "output": "record",
+        "path": "os.windows.credential.sam.sam",
+    }

dissect_target-3.20.dev41/dissect/target/plugins/general/loaders.py

@@ -1,26 +0,0 @@
-from dissect.target.helpers.docs import INDENT_STEP, get_docstring
-from dissect.target.loader import LOADERS_BY_SCHEME
-from dissect.target.plugin import Plugin, export
-
-
-class LoaderListPlugin(Plugin):
-    """Plugin to list the available loaders."""
-
-    def check_compatible(self) -> None:
-        pass
-
-    @export(output="none")
-    def loaders(self) -> None:
-        """List the available loaders."""
-
-        loaders_info = {}
-        for key, loader in LOADERS_BY_SCHEME.items():
-            try:
-                docstring = get_docstring(loader, "No documentation.").splitlines()[0].strip()
-                loaders_info[key] = docstring
-            except ImportError:
-                continue
-
-        print("Available loaders:")
-        for loader_name, loader_description in sorted(loaders_info.items()):
-            print(f"{INDENT_STEP}{loader_name} - {loader_description}")