dissect.target 3.11.dev29__py3-none-any.whl → 3.11.dev31__py3-none-any.whl

dissect/target/loader.py

@@ -198,3 +198,4 @@ register("log", "LogLoader")
 # register("res", "ResLoader")
 register("phobos", "PhobosLoader")
 register("velociraptor", "VelociraptorLoader")
+register("multiraw", "MultiRawLoader")  # Should be last

dissect/target/loaders/multiraw.py

@@ -0,0 +1,34 @@
+from pathlib import Path
+
+from dissect.target import container
+from dissect.target.helpers.fsutil import TargetPath
+from dissect.target.loader import Loader
+from dissect.target.target import Target
+
+
+class MultiRawLoader(Loader):
+    """Load multiple raw containers as a single target (i.e. a multi-disk system).
+
+    Use as ``/path/to/disk1+/path/to/disk2`` to load a single target with two disks.
+    The disks can be anything that Dissect supports such as EWF, VMDK, etc.
+    """
+
+    @staticmethod
+    def detect(path: Path) -> bool:
+        if not path.exists() and "+" in str(path):
+            return all(p.exists() for p in _split_paths(path))
+
+        return False
+
+    def map(self, target: Target) -> None:
+        for subpath in _split_paths(self.path):
+            target.disks.add(container.open(subpath))
+
+
+def _split_paths(path: Path) -> list[Path]:
+    if isinstance(path, TargetPath):
+        root = path.joinpath("/")
+    else:
+        root = path.cwd()
+
+    return [root.joinpath(subpath) for subpath in str(path).split("+")]

dissect/target/tools/utils.py

@@ -12,7 +12,6 @@ from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Type, U
 from dissect.target import Target
 from dissect.target.exceptions import UnsupportedPluginError
 from dissect.target.helpers import docs, keychain
-from dissect.target.loaders.targetd import TargetdLoader
 from dissect.target.plugin import (
     OSPlugin,
     Plugin,
@@ -134,7 +133,7 @@ def generate_argparse_for_plugin(
 
 
 def plugin_factory(target: Target, plugin: Union[type, object], funcname: str) -> tuple[Plugin, str]:
-    if TargetdLoader.instance:
+    if hasattr(target, "instance"):
         return target.get_function(funcname)
 
     if isinstance(plugin, type):

{dissect.target-3.11.dev29.dist-info → dissect.target-3.11.dev31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.11.dev29
+Version: 3.11.dev31
 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.11.dev29.dist-info → dissect.target-3.11.dev31.dist-info}/RECORD

@@ -2,7 +2,7 @@ dissect/target/__init__.py,sha256=Oc7ounTgq2hE4nR6YcNabetc7SQA40ldSa35VEdZcQU,63
 dissect/target/container.py,sha256=R8M9EE7DqKq8DeMuekcpR1nxtZ827zuqmTmO4s7PYkg,7730
 dissect/target/exceptions.py,sha256=DQVgo6puVBRPBiappL9GU5EA94lrcr3eVta0m56a-ng,2777
 dissect/target/filesystem.py,sha256=Kn9RJtdYUWRXh4hxGnHpN_ttwcslZpwzVtUvX_W7qIQ,49335
-dissect/target/loader.py,sha256=uQ-uclbiJgzcWWXQdcMjNjossyjo9xlYsM2W0Qfk0v4,7043
+dissect/target/loader.py,sha256=oTpNhmb2abgWuPUqdewLjZz2zcbSYQP5kzZ5yYu7XXg,7100
 dissect/target/plugin.py,sha256=1AZDXM4BuutW4fD6ghuFFl61dy2hWSTkTyUjTQGPWM8,32533
 dissect/target/report.py,sha256=06uiP4MbNI8cWMVrC1SasNS-Yg6ptjVjckwj8Yhe0Js,7958
 dissect/target/target.py,sha256=TgDY-yAsReOQOG-Phz_m1vdNucdbk9fUI_RMZpMeYG8,28334
@@ -64,6 +64,7 @@ dissect/target/loaders/itunes.py,sha256=69aMTQiiGYpmD_EYSmf9mO1re8C3jAZIEStmwlMx
 dissect/target/loaders/kape.py,sha256=t5TfrGLqPeIpUUpXzIl6aHsqXMEGDqJ5YwDCs07DiBA,1237
 dissect/target/loaders/local.py,sha256=tZLpcvbKd70N9KU1eb1P1BCXtwaM7RJ9YP8PKct7xyU,15573
 dissect/target/loaders/log.py,sha256=_Mo44icM_4qQ05pjgcowrSnLeUHkwAGVYlYrHiIXLJw,1234
+dissect/target/loaders/multiraw.py,sha256=4a3ZST0NwjnfPDxHkcEfAcX2ddUlT_C-rcrMHNg1wp4,1046
 dissect/target/loaders/ovf.py,sha256=ro1F9Gr3ta5dgov483twzine9_Sw6hwZoILz2srHJI0,1069
 dissect/target/loaders/phobos.py,sha256=XtxF7FZXfZrXJruFUZUQzxlREyfc86dTxph7BNoNMvw,2277
 dissect/target/loaders/profile.py,sha256=5ylgmzEEGyBFW3izvb-BZ7dGByXN9OFyRnnggR98P9w,1667
@@ -264,7 +265,7 @@ dissect/target/tools/mount.py,sha256=88U_Q_0RVB8gaQGsC0vf-rY0UoBBGYgKmqopqWNlytc
 dissect/target/tools/query.py,sha256=6wVZsIlRMoGR04bh792aynTZbX5EyrTyNfvRBhWmurc,13530
 dissect/target/tools/reg.py,sha256=ZB5WDmKfiDvs988kHZVyzF-RIoDLXcXuvdLjuEYvDi4,2181
 dissect/target/tools/shell.py,sha256=ozNcHaOWzgE3jdYzK8kL3E2vug1Y_S0iBfMQ9ubK9Y4,40444
-dissect/target/tools/utils.py,sha256=f9rOyLUfdddwy0sxoHJW9OmqJhJfMIP1_GBvVjm2UOw,9198
+dissect/target/tools/utils.py,sha256=UDZoeXO_82YewSKasiw0zwtoyEdd0Koko-xSboCpkN4,9146
 dissect/target/tools/dump/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dissect/target/tools/dump/run.py,sha256=yHn9xl_VjasgiuLpjtZdnLW32QCbkwHfnnTPY6Ck_aw,9689
 dissect/target/tools/dump/state.py,sha256=ZBNz4ou2Xk20K1H8R83S1gq6qcqPvPPVAaPWzpKpX34,9123
@@ -274,10 +275,10 @@ dissect/target/volumes/bde.py,sha256=gYGg5yF9MNARwNzEkrEfZmKkxyZW4rhLkpdnPJCbhGk
 dissect/target/volumes/disk.py,sha256=95grSsPt1BLVpKwTclwQYzPFGKTkFFqapIk0RoGWf38,968
 dissect/target/volumes/lvm.py,sha256=_kIB1mdRs1OFhRgoT4VEP5Fv8imQnI7oQ_ie4x710tQ,1814
 dissect/target/volumes/vmfs.py,sha256=mlAJ8278tYaoRjk1u6tFFlCaDQUrVu5ZZE4ikiFvxi8,1707
-dissect.target-3.11.dev29.dist-info/COPYRIGHT,sha256=m-9ih2RVhMiXHI2bf_oNSSgHgkeIvaYRVfKTwFbnJPA,301
-dissect.target-3.11.dev29.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-dissect.target-3.11.dev29.dist-info/METADATA,sha256=m03cyMq3P5ZrKwHrr1l0WZJq6i2ll8vyItJhC4cx3sk,10755
-dissect.target-3.11.dev29.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
-dissect.target-3.11.dev29.dist-info/entry_points.txt,sha256=tvFPa-Ap-gakjaPwRc6Fl6mxHzxEZ_arAVU-IUYeo_s,447
-dissect.target-3.11.dev29.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect.target-3.11.dev29.dist-info/RECORD,,
+dissect.target-3.11.dev31.dist-info/COPYRIGHT,sha256=m-9ih2RVhMiXHI2bf_oNSSgHgkeIvaYRVfKTwFbnJPA,301
+dissect.target-3.11.dev31.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+dissect.target-3.11.dev31.dist-info/METADATA,sha256=ZWMfnWRLWUsYNG7urwZmvl4-lMLhySSmKz0eZqw4FlM,10755
+dissect.target-3.11.dev31.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
+dissect.target-3.11.dev31.dist-info/entry_points.txt,sha256=tvFPa-Ap-gakjaPwRc6Fl6mxHzxEZ_arAVU-IUYeo_s,447
+dissect.target-3.11.dev31.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
+dissect.target-3.11.dev31.dist-info/RECORD,,