dissect.target 3.22.dev32__tar.gz → 3.22.dev33__tar.gz

{dissect_target-3.22.dev32 → dissect_target-3.22.dev33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.target
-Version: 3.22.dev32
+Version: 3.22.dev33
 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.22.dev32 → dissect_target-3.22.dev33}/dissect/target/plugin.py

@@ -805,7 +805,7 @@ def failed() -> list[FailureDescriptor]:
 
 
 @functools.cache
-def _generate_long_paths() -> dict[str, FunctionDescriptor]:
+def _generate_long_paths() -> dict[str, list[FunctionDescriptor]]:
     """Generate a dictionary of all long paths to their function descriptors."""
     paths = {}
     for value in _get_plugins().__functions__.__regular__.values():
@@ -813,7 +813,8 @@ def _generate_long_paths() -> dict[str, FunctionDescriptor]:
             # Namespace plugins are callable so exclude the explicit __call__ method
             if descriptor.method_name == "__call__":
                 continue
-            paths[descriptor.path] = descriptor
+
+            paths.setdefault(descriptor.path, []).append(descriptor)
 
     return paths
 
@@ -939,17 +940,16 @@ def _filter_tree_match(pattern: str, os_filter: str, show_hidden: bool = False)
         search_pattern += "*"
 
     for path in fnmatch.filter(path_lookup.keys(), search_pattern):
-        descriptor = path_lookup[path]
-
-        # Skip plugins that don't want to be found by wildcards
-        if not descriptor.exported or (not show_hidden and not descriptor.findable):
-            continue
+        for descriptor in path_lookup[path]:
+            # Skip plugins that don't want to be found by wildcards
+            if not descriptor.exported or (not show_hidden and not descriptor.findable):
+                continue
 
-        # Skip plugins that do not match our OS
-        if os_filter and not _os_match(os_filter, descriptor.path):
-            continue
+            # Skip plugins that do not match our OS
+            if os_filter and not _os_match(os_filter, descriptor.path):
+                continue
 
-        yield descriptor
+            yield descriptor
 
 
 def _filter_compatible(

{dissect_target-3.22.dev32 → dissect_target-3.22.dev33}/dissect/target/plugins/general/plugins.py

@@ -109,29 +109,29 @@ def _categorize_functions(functions: list[plugin.FunctionDescriptor] | None = No
         for part in parts[:-1]:
             obj = obj.setdefault(part, {})
 
-        if parts[-1] not in obj:
-            obj[parts[-1]] = desc.cls
+        obj.setdefault(parts[-1], set()).add(desc.cls)
 
-    return dict(sorted(result.items()))
+    return result
 
 
 def _generate_plugin_tree_overview(
-    plugin_tree: dict | type[Plugin],
+    plugin_tree: dict | set[type[Plugin]],
     print_docs: bool,
     indent: int = 0,
 ) -> list[str]:
     """Create plugin overview with identations."""
 
-    if isinstance(plugin_tree, type) and issubclass(plugin_tree, Plugin):
+    if isinstance(plugin_tree, set):
         return [
             textwrap.indent(
-                get_plugin_overview(plugin_tree, print_docs, print_docs),
+                get_plugin_overview(plugin, print_docs, print_docs),
                 prefix=" " * indent,
             )
+            for plugin in sorted(plugin_tree, key=lambda x: x.__module__)
         ]
 
     result = []
-    for key in plugin_tree:
+    for key in sorted(plugin_tree.keys()):
         result.append(textwrap.indent(key + ":", prefix=" " * indent) if key != "" else "OS plugins")
         result.extend(
             _generate_plugin_tree_overview(

{dissect_target-3.22.dev32 → dissect_target-3.22.dev33}/dissect.target.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.target
-Version: 3.22.dev32
+Version: 3.22.dev33
 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.22.dev32 → dissect_target-3.22.dev33}/tests/plugins/general/test_plugins.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from unittest.mock import MagicMock, patch
 
 from dissect.target import plugin
+from dissect.target.plugins.general.loaders import LoaderListPlugin
 from dissect.target.plugins.general.plugins import (
     PluginListPlugin,
     _categorize_functions,
@@ -11,12 +12,12 @@ from dissect.target.plugins.general.plugins import (
 
 
 def test_plugin_description() -> None:
-    description = list(_generate_plugin_tree_overview(PluginListPlugin, False))
+    description = list(_generate_plugin_tree_overview({PluginListPlugin}, False))
     assert description == ["plugins - Print all available plugins. (output: no output)"]
 
 
 def test_plugin_description_compacting() -> None:
-    module = {"hello": {"world": PluginListPlugin}}
+    module = {"hello": {"world": {PluginListPlugin}}}
 
     description = list(_generate_plugin_tree_overview(module, False))
     assert description == [
@@ -27,7 +28,7 @@ def test_plugin_description_compacting() -> None:
 
 
 def test_plugin_description_in_dict_multiple() -> None:
-    module = {"hello": {"world": {"data": PluginListPlugin, "data2": PluginListPlugin}}}
+    module = {"hello": {"world": {"data": {PluginListPlugin}, "data2": {PluginListPlugin}}}}
 
     description = list(_generate_plugin_tree_overview(module, False))
     assert description == [
@@ -40,6 +41,17 @@ def test_plugin_description_in_dict_multiple() -> None:
     ]
 
 
+def test_plugin_description_multiple_in_path() -> None:
+    module = {"hello": {"world": {PluginListPlugin, LoaderListPlugin}}}
+    description = list(_generate_plugin_tree_overview(module, False))
+    assert description == [
+        "hello:",
+        "  world:",
+        "    loaders - List the available loaders. (output: no output)",
+        "    plugins - Print all available plugins. (output: no output)",
+    ]
+
+
 @patch("dissect.target.plugins.general.plugins.plugin.load")
 @patch("dissect.target.plugins.general.plugins.plugin.functions")
 def test_categorize_plugins(mocked_plugins: MagicMock, mocked_load: MagicMock) -> None:
@@ -58,4 +70,34 @@ def test_categorize_plugins(mocked_plugins: MagicMock, mocked_load: MagicMock) -
             qualname="DataClass",
         ),
     ]
-    assert _categorize_functions() == {"something": mocked_load.return_value}
+    assert _categorize_functions() == {"something": {mocked_load.return_value}}
+
+    mocked_plugins.return_value = [
+        plugin.FunctionDescriptor(
+            name="data",
+            namespace=None,
+            path="something.data",
+            exported=True,
+            internal=False,
+            findable=True,
+            alias=False,
+            output=None,
+            method_name="data",
+            module="other.root.something.data",
+            qualname="DataClass1",
+        ),
+        plugin.FunctionDescriptor(
+            name="data",
+            namespace=None,
+            path="something.data",
+            exported=True,
+            internal=False,
+            findable=True,
+            alias=False,
+            output=None,
+            method_name="data",
+            module="other.root.something.data",
+            qualname="DataClass2",
+        ),
+    ]
+    assert _categorize_functions() == {"something": {mocked_load.return_value}}

{dissect_target-3.22.dev32 → dissect_target-3.22.dev33}/tests/test_plugin.py

@@ -573,6 +573,33 @@ def test_namespace_plugin_registration(mock_plugins: PluginRegistry) -> None:
     assert next(lookup("t1.test")).exported
 
 
+@patch("dissect.target.plugin.PLUGINS", new_callable=PluginRegistry)
+def test_namesplace_plugin_multiple_same_module(mock_plugins: PluginRegistry) -> None:
+    class NS(NamespacePlugin):
+        __namespace__ = "ns"
+
+        def check_compatible(self) -> None:
+            return None
+
+    class Foo(NS):
+        __namespace__ = "foo"
+
+        @export(output="yield")
+        def baz(self) -> Iterator[str]:
+            yield from ["foo"]
+
+    class Bar(NS):
+        __namespace__ = "bar"
+
+        @export(output="yield")
+        def baz(self) -> Iterator[str]:
+            yield from ["bar"]
+
+    result, _ = find_functions("*.baz")
+    assert len(result) == 2
+    assert sorted(desc.name for desc in result) == ["bar.baz", "foo.baz"]
+
+
 def test_find_plugin_function_default(target_default: Target) -> None:
     found, _ = find_functions("services", target_default)