Fix circular imports during loader registration

dissect/target/loader.py

@@ -116,7 +116,6 @@ def register(module_name: str, class_name: str, internal: bool = True) -> None:
         module = ".".join([MODULE_PATH, module_name])
     else:
         module = module_name
-
     loader = getattr(import_lazy(module), class_name)
     LOADERS.append(loader)
     LOADERS_BY_SCHEME[module_name] = loader

dissect/target/loaders/ab.py

@@ -1,10 +1,12 @@
+from __future__ import annotations
+
 import hashlib
 import io
 import posixpath
 import shutil
 import struct
 from pathlib import Path
-from typing import BinaryIO
+from typing import TYPE_CHECKING, BinaryIO
 
 try:
     from Crypto.Cipher import AES
@@ -21,7 +23,10 @@
 from dissect.target.helpers import keychain
 from dissect.target.loader import Loader
 from dissect.target.plugins.os.unix.linux.android._os import AndroidPlugin
-from dissect.target.target import Target
+
+if TYPE_CHECKING:
+    from dissect.target import Target
+
 
 DIRECTORY_MAPPING = {
     "a": "/data/app/{id}",

dissect/target/loaders/cb.py

@@ -30,7 +30,7 @@
 from dissect.target.plugins.os.windows.registry import RegistryPlugin
 
 if TYPE_CHECKING:
-    from dissect.target.target import Target
+    from dissect.target import Target
 
 
 class CbLoader(Loader):

dissect/target/loaders/cyber.py

@@ -1,13 +1,18 @@
+from __future__ import annotations
+
 import os
 import textwrap
 from pathlib import Path
+from typing import TYPE_CHECKING
 
-from dissect.target import Target
 from dissect.target.helpers.cyber import cyber
 from dissect.target.loader import Loader
 from dissect.target.loader import open as loader_open
 from dissect.target.loaders.raw import RawLoader
 
+if TYPE_CHECKING:
+    from dissect.target import Target
+
 HEADER = r"""
 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
 ┃      _______     ______  ______ _____      ┃

dissect/target/loaders/local.py

@@ -1,18 +1,25 @@
+from __future__ import annotations
+
 import ctypes
 import platform
 import re
 from functools import cache
+from logging import Logger
 from pathlib import Path
+from typing import TYPE_CHECKING, Iterator
 
 from dissect.util.stream import BufferedStream
 
-from dissect.target import Target, filesystem, volume
+from dissect.target import filesystem, volume
 from dissect.target.containers.raw import RawContainer
 from dissect.target.exceptions import LoaderError
 from dissect.target.filesystems.dir import DirectoryFilesystem
 from dissect.target.helpers.utils import parse_path_uri
 from dissect.target.loader import Loader
 
+if TYPE_CHECKING:
+    from dissect.target import Target
+
 SOLARIS_DEV_DIR = Path("/dev/dsk")
 SOLARIS_DRIVE_REGEX = re.compile(r".+d\d+$")
 
@@ -33,11 +40,11 @@
     """Load local filesystem."""
 
     @staticmethod
-    def detect(path):
+    def detect(path: Path) -> bool:
         _, path_part, _ = parse_path_uri(path)
         return path_part == "local"
 
-    def map(self, target):
+    def map(self, target: Target) -> None:
         os_name = _get_os_name()
 
         force_dirfs = "force-directory-fs" in target.path_query
@@ -68,7 +75,7 @@
                 raise LoaderError(f"Unsupported OS for local target: {os_name}")
 
 
-def map_linux_drives(target: Target):
+def map_linux_drives(target: Target) -> None:
     """Map Linux raw disks and /proc and /sys.
 
     Iterate through /dev and match raw device names (not partitions).
@@ -92,7 +99,7 @@
             target.fs.mount(str(volatile_path), volatile_fs)
 
 
-def map_solaris_drives(target):
+def map_solaris_drives(target: Target) -> None:
     """Map Solaris raw disks.
 
     Iterate through /dev/dsk and match raw device names (not slices or partitions).
@@ -103,7 +110,7 @@
         _add_disk_as_raw_container_to_target(drive, target)
 
 
-def map_esxi_drives(target):
+def map_esxi_drives(target: Target) -> None:
     """Map ESXi raw disks.
 
     Get all devices from /vmfs/devices/disks/* (not partitions).
@@ -114,7 +121,7 @@
         _add_disk_as_raw_container_to_target(drive, target)
 
 
-def map_windows_drives(target):
+def map_windows_drives(target: Target) -> None:
     """Map Windows drives by iterating physical drives.
 
     For each physical drive, load the partition table and volumes.
@@ -175,15 +182,15 @@
         target.log.warning(f"Unable to open drive: {drive}, skipped", exc_info=e)
 
 
-def _read_drive_letters():
+def _read_drive_letters() -> bytes:
     # Get all logical drive letters
     drives_buf = ctypes.c_buffer(256)
     ctypes.windll.kernel32.GetLogicalDriveStringsA(256, drives_buf)
 
     return drives_buf.raw.rstrip(b"\x00").split(b"\x00")
 
 
-def _get_windows_drive_volumes(log):
+def _get_windows_drive_volumes(log: Logger) -> Iterator[tuple[volume.Volume, bool, RawContainer | None, int | None]]:
     # Get the sysvol drive letter
     windir_buf = ctypes.c_buffer(256)
     ctypes.windll.kernel32.GetWindowsDirectoryA(windir_buf, 256)

dissect/target/loaders/log.py

@@ -2,13 +2,15 @@
 
 import urllib
 from pathlib import Path
-from typing import Union
+from typing import TYPE_CHECKING, Union
 
-from dissect.target import Target
 from dissect.target.filesystem import VirtualFilesystem
 from dissect.target.loader import Loader
 from dissect.target.plugin import arg
 
+if TYPE_CHECKING:
+    from dissect.target import Target
+
 
 @arg("--log-hint", dest="hint", help="hint for file type")
 class LogLoader(Loader):

dissect/target/loaders/mqtt.py

@@ -16,7 +16,7 @@
 from pathlib import Path
 from struct import pack, unpack_from
 from threading import Thread
-from typing import Any, Callable, Iterator, Optional, Union
+from typing import TYPE_CHECKING, Any, Callable, Iterator, Optional, Union
 
 import paho.mqtt.client as mqtt
 from dissect.util.stream import AlignedStream
@@ -25,7 +25,9 @@
 from dissect.target.exceptions import LoaderError
 from dissect.target.loader import Loader
 from dissect.target.plugin import arg
-from dissect.target.target import Target
+
+if TYPE_CHECKING:
+    from dissect.target import Target
 
 log = logging.getLogger(__name__)
 

dissect/target/loaders/multiraw.py

@@ -1,9 +1,14 @@
+from __future__ import annotations
+
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 from dissect.target import container
 from dissect.target.helpers.fsutil import TargetPath
 from dissect.target.loader import Loader
-from dissect.target.target import Target
+
+if TYPE_CHECKING:
+    from dissect.target import Target
 
 
 class MultiRawLoader(Loader):

dissect/target/loaders/overlay.py

@@ -1,7 +1,13 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 from dissect.target.filesystems.overlay import Overlay2Filesystem
 from dissect.target.helpers.fsutil import TargetPath
 from dissect.target.loader import Loader
-from dissect.target.target import Target
+
+if TYPE_CHECKING:
+    from dissect.target import Target
 
 
 class Overlay2Loader(Loader):

dissect/target/loaders/ovf.py

@@ -1,10 +1,15 @@
+from __future__ import annotations
+
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 from dissect.hypervisor import ovf
 
 from dissect.target import container
 from dissect.target.loader import Loader
-from dissect.target.target import Target
+
+if TYPE_CHECKING:
+    from dissect.target import Target
 
 
 class OvfLoader(Loader):

dissect/target/loaders/raw.py

@@ -1,9 +1,14 @@
+from __future__ import annotations
+
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 from dissect.target import container
 from dissect.target.exceptions import TargetPathNotFoundError
 from dissect.target.loader import Loader
-from dissect.target.target import Target
+
+if TYPE_CHECKING:
+    from dissect.target import Target
 
 
 class RawLoader(Loader):

dissect/target/loaders/remote.py

@@ -8,15 +8,17 @@
 from io import DEFAULT_BUFFER_SIZE
 from pathlib import Path
 from struct import pack, unpack
-from typing import Optional, Union
+from typing import TYPE_CHECKING, Optional, Union
 
 from dissect.util.stream import AlignedStream
 
 from dissect.target.containers.raw import RawContainer
 from dissect.target.exceptions import LoaderError
 from dissect.target.loader import Loader
 from dissect.target.plugin import arg
-from dissect.target.target import Target
+
+if TYPE_CHECKING:
+    from dissect.target import Target
 
 log = logging.getLogger(__name__)
 

dissect/target/loaders/smb.py

@@ -14,7 +14,6 @@
 from impacket.dcerpc.v5.rpcrt import DCERPCException
 from impacket.smbconnection import SessionError, SMBConnection
 
-from dissect.target import Target
 from dissect.target.exceptions import (
     LoaderError,
     RegistryKeyNotFoundError,
@@ -30,6 +29,8 @@
 if TYPE_CHECKING:
     from impacket.dcerpc.v5.srvs import SHARE_INFO_1
 
+    from dissect.target import Target
+
 
 class SmbLoader(Loader):
     """Use remote SMB servers as targets.

dissect/target/loaders/target.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from pathlib import Path
 from typing import TYPE_CHECKING
 
@@ -10,7 +12,7 @@
 from dissect.target.loader import Loader
 
 if TYPE_CHECKING:
-    from dissect.target.target import Target
+    from dissect.target import Target
 
 
 class TargetLoader(Loader):

dissect/target/loaders/utm.py

@@ -1,10 +1,15 @@
+from __future__ import annotations
+
 import plistlib
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 from dissect.target import container
 from dissect.target.loader import Loader
-from dissect.target.target import Target
+
+if TYPE_CHECKING:
+    from dissect.target import Target
 
 
 class UtmLoader(Loader):
     """Load UTM virtual machine files."""

dissect/target/plugins/general/users.py

@@ -1,14 +1,17 @@
 from __future__ import annotations
 
 from functools import lru_cache
-from typing import Iterator, NamedTuple, Union
+from typing import TYPE_CHECKING, Iterator, NamedTuple, Union
 
-from dissect.target import Target
 from dissect.target.exceptions import UnsupportedPluginError
 from dissect.target.helpers.fsutil import TargetPath
 from dissect.target.helpers.record import UnixUserRecord, WindowsUserRecord
 from dissect.target.plugin import InternalPlugin
 
+if TYPE_CHECKING:
+    from dissect.target import Target
+
+
 UserRecord = Union[UnixUserRecord, WindowsUserRecord]
 
 

dissect/target/plugins/os/unix/_os.py

@@ -4,7 +4,7 @@
 import re
 import uuid
 from struct import unpack
-from typing import Iterator
+from typing import TYPE_CHECKING, Iterator
 
 from flow.record.fieldtypes import posix_path
 
@@ -13,7 +13,9 @@
 from dissect.target.helpers.record import UnixUserRecord
 from dissect.target.helpers.utils import parse_options_string
 from dissect.target.plugin import OperatingSystem, OSPlugin, arg, export
-from dissect.target.target import Target
+
+if TYPE_CHECKING:
+    from dissect.target import Target
 
 log = logging.getLogger(__name__)
 

dissect/target/plugins/os/unix/bsd/_os.py

@@ -1,11 +1,13 @@
 from __future__ import annotations
 
-from typing import List, Optional
+from typing import TYPE_CHECKING, List, Optional
 
 from dissect.target.filesystem import Filesystem
 from dissect.target.plugin import OperatingSystem, export
 from dissect.target.plugins.os.unix._os import UnixPlugin
-from dissect.target.target import Target
+
+if TYPE_CHECKING:
+    from dissect.target import Target
 
 
 class BsdPlugin(UnixPlugin):