dissect.target 3.20.dev4__py3-none-any.whl → 3.20.dev6__py3-none-any.whl

dissect/target/helpers/record.py

@@ -144,6 +144,7 @@ EmptyRecord = RecordDescriptor(
 )
 
 COMMON_INTERFACE_ELEMENTS = [
+    ("string", "source"),
     ("string", "name"),
     ("string", "type"),
     ("boolean", "enabled"),
@@ -151,7 +152,6 @@ COMMON_INTERFACE_ELEMENTS = [
     ("net.ipaddress[]", "dns"),
     ("net.ipaddress[]", "ip"),
     ("net.ipaddress[]", "gateway"),
-    ("string", "source"),
 ]
 
 
@@ -165,8 +165,13 @@ WindowsInterfaceRecord = TargetRecordDescriptor(
     [
         *COMMON_INTERFACE_ELEMENTS,
         ("varint", "vlan"),
-        ("string", "metric"),
+        ("net.ipnetwork[]", "network"),
+        ("varint", "metric"),
+        ("stringlist", "search_domain"),
+        ("datetime", "first_connected"),
         ("datetime", "last_connected"),
+        ("net.ipaddress[]", "subnetmask"),
+        ("boolean", "dhcp"),
     ],
 )
 

dissect/target/loader.py

@@ -177,7 +177,6 @@ def open(item: Union[str, Path], *args, **kwargs) -> Loader:
 register("local", "LocalLoader")
 register("remote", "RemoteLoader")
 register("mqtt", "MQTTLoader")
-register("targetd", "TargetdLoader")
 register("asdf", "AsdfLoader")
 register("tar", "TarLoader")
 register("vmx", "VmxLoader")

dissect/target/loaders/mqtt.py

@@ -1,9 +1,11 @@
 from __future__ import annotations
 
+import argparse
 import atexit
 import logging
 import math
 import os
+import re
 import ssl
 import sys
 import time
@@ -280,7 +282,7 @@ class Broker:
     factor = 1
 
     def __init__(
-        self, broker: Broker, port: str, key: str, crt: str, ca: str, case: str, username: str, password: str, **kwargs
+        self, broker: str, port: str, key: str, crt: str, ca: str, case: str, username: str, password: str, **kwargs
     ):
         self.broker_host = broker
         self.broker_port = int(port)
@@ -352,8 +354,7 @@ class Broker:
             log.error(f"Failed to decode payload for hostname {hostname}: {e}")
             return
 
-        # The payload with the username and password is comma separated
-        print(f'"{hostname}",{decoded_payload}')
+        print(decoded_payload)
 
     def _on_log(self, client: mqtt.Client, userdata: Any, log_level: int, message: str) -> None:
         log.debug(message)
@@ -423,16 +424,97 @@ class Broker:
         self.mqtt_client.loop_start()
 
 
-@arg("--mqtt-peers", type=int, dest="peers", help="minimum number of peers to await for first alias")
-@arg("--mqtt-case", dest="case", help="case name (broker will determine if you are allowed to access this data)")
-@arg("--mqtt-port", type=int, dest="port", help="broker connection port")
-@arg("--mqtt-broker", dest="broker", help="broker ip-address")
-@arg("--mqtt-key", dest="key", help="private key file")
-@arg("--mqtt-crt", dest="crt", help="client certificate file")
-@arg("--mqtt-ca", dest="ca", help="certificate authority file")
+def strictly_positive(value: str) -> int:
+    """
+    Validates that the provided value is a strictly positive integer.
+
+    This function is intended to be used as a type for argparse arguments.
+
+    Args:
+        value (str): The value to validate.
+
+    Returns:
+        int: The validated integer value.
+
+    Raises:
+        argparse.ArgumentTypeError: If the value is not a strictly positive integer.
+    """
+    try:
+        strictly_positive_value = int(value)
+        if strictly_positive_value < 1:
+            raise argparse.ArgumentTypeError("Value must be larger than or equal to 1.")
+        return strictly_positive_value
+    except ValueError:
+        raise argparse.ArgumentTypeError(f"Invalid integer value specified: '{value}'")
+
+
+def port(value: str) -> int:
+    """
+    Convert a string value to an integer representing a valid port number.
+
+    This function is intended to be used as a type for argparse arguments.
+
+    Args:
+        value (str): The string representation of the port number.
+    Returns:
+        int: The port number as an integer.
+    Raises:
+        argparse.ArgumentTypeError: If the port number is not an integer or out of the valid range (1-65535).
+    """
+
+    try:
+        port = int(value)
+        if port < 1 or port > 65535:
+            raise argparse.ArgumentTypeError("Port number must be between 1 and 65535.")
+        return port
+    except ValueError:
+        raise argparse.ArgumentTypeError(f"Invalid port number specified: '{value}'")
+
+
+def case(value: str) -> str:
+    """
+    Validates that the given value is a valid case name consisting of
+    alphanumeric characters and underscores only.
+
+    This function is intended to be used as a type for argparse arguments.
+
+    Args:
+        value (str): The case name to validate.
+
+    Returns:
+        str: The validated case name if it matches the required pattern.
+
+    Raises:
+        argparse.ArgumentTypeError: If the case name does not match the required pattern.
+    """
+
+    if re.match(r"^[a-zA-Z0-9_]+$", value):
+        return value
+
+    raise argparse.ArgumentTypeError(f"Invalid case name specified: '{value}'")
+
+
+@arg(
+    "--mqtt-peers",
+    type=strictly_positive,
+    dest="peers",
+    default=1,
+    help="minimum number of peers to await for first alias",
+)
+@arg(
+    "--mqtt-case",
+    type=case,
+    dest="case",
+    help="case name (broker will determine if you are allowed to access this data)",
+)
+@arg("--mqtt-port", type=port, dest="port", default=443, help="broker connection port")
+@arg("--mqtt-broker", default="localhost", dest="broker", help="broker ip-address")
+@arg("--mqtt-key", type=Path, dest="key", required=True, help="private key file")
+@arg("--mqtt-crt", type=Path, dest="crt", required=True, help="client certificate file")
+@arg("--mqtt-ca", type=Path, dest="ca", required=True, help="certificate authority file")
 @arg("--mqtt-command", dest="command", help="direct command to client(s)")
 @arg("--mqtt-diag", action="store_true", dest="diag", help="show MQTT diagnostic information")
-@arg("--mqtt-username", dest="username", help="Username for connection")
+@arg("--mqtt-username", dest="username", default="mqtt-loader", help="Username for connection")
 @arg("--mqtt-password", action="store_true", dest="password", help="Ask for password before connecting")
 class MQTTLoader(Loader):
     """Load remote targets through a broker."""

dissect/target/plugins/general/network.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from typing import Any, Iterator, Union
 
 from flow.record.fieldtypes.net import IPAddress, IPNetwork
+from flow.record.fieldtypes.net.ipv4 import Address, addr_long, addr_str, mask_to_bits
 
 from dissect.target.helpers.record import (
     MacInterfaceRecord,
@@ -80,3 +81,10 @@ class NetworkPlugin(Plugin):
         for interface in self.interfaces():
             if any(ip_addr in cidr for ip_addr in interface.ip):
                 yield interface
+
+    def calculate_network(self, ips: int | Address, subnets: int | Address) -> Iterator[str]:
+        for ip, subnet_mask in zip(ips, subnets):
+            subnet_mask_int = addr_long(subnet_mask)
+            cidr = mask_to_bits(subnet_mask_int)
+            network_address = addr_str(addr_long(ip) & subnet_mask_int)
+            yield f"{network_address}/{cidr}"

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

@@ -99,28 +99,7 @@ class WindowsPlugin(OSPlugin):
 
     @export(property=True)
     def ips(self) -> list[str]:
-        key = "HKLM\\SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces"
-        fields = ["IPAddress", "DhcpIPAddress"]
-        ips = set()
-
-        for r in self.target.registry.keys(key):
-            for s in r.subkeys():
-                for field in fields:
-                    try:
-                        ip = s.value(field).value
-                    except RegistryValueNotFoundError:
-                        continue
-
-                    if isinstance(ip, str):
-                        ip = [ip]
-
-                    for i in ip:
-                        if i == "0.0.0.0":
-                            continue
-
-                        ips.add(i)
-
-        return list(ips)
+        return self.target.network.ips()
 
     def _get_version_reg_value(self, value_name: str) -> Any:
         try:

dissect/target/plugins/os/windows/network.py

@@ -0,0 +1,363 @@
+from __future__ import annotations
+
+from enum import IntEnum
+from typing import Iterator
+
+from dissect.util.ts import wintimestamp
+
+from dissect.target.exceptions import (
+    RegistryKeyNotFoundError,
+    RegistryValueNotFoundError,
+)
+from dissect.target.helpers.record import WindowsInterfaceRecord
+from dissect.target.helpers.regutil import RegistryKey
+from dissect.target.plugins.general.network import NetworkPlugin
+
+
+class IfTypes(IntEnum):
+    OTHER = 1
+    REGULAR_1822 = 2
+    HDH_1822 = 3
+    DDN_X25 = 4
+    RFC877_X25 = 5
+    ETHERNET_CSMACD = 6
+    IS088023_CSMACD = 7
+    ISO88024_TOKENBUS = 8
+    ISO88025_TOKENRING = 9
+    ISO88026_MAN = 10
+    STARLAN = 11
+    PROTEON_10MBIT = 12
+    PROTEON_80MBIT = 13
+    HYPERCHANNEL = 14
+    FDDI = 15
+    LAP_B = 16
+    SDLC = 17
+    DS1 = 18
+    E1 = 19
+    BASIC_ISDN = 20
+    PRIMARY_ISDN = 21
+    PROP_POINT2POINT_SERIAL = 22
+    PPP = 23
+    SOFTWARE_LOOPBACK = 24
+    EON = 25
+    ETHERNET_3MBIT = 26
+    NSIP = 27
+    SLIP = 28
+    ULTRA = 29
+    DS3 = 30
+    SIP = 31
+    FRAMERELAY = 32
+    RS232 = 33
+    PARA = 34
+    ARCNET = 35
+    ARCNET_PLUS = 36
+    ATM = 37
+    MIO_X25 = 38
+    SONET = 39
+    X25_PLE = 40
+    ISO88022_LLC = 41
+    LOCALTALK = 42
+    SMDS_DXI = 43
+    FRAMERELAY_SERVICE = 44
+    V35 = 45
+    HSSI = 46
+    HIPPI = 47
+    MODEM = 48
+    AAL5 = 49
+    SONET_PATH = 50
+    SONET_VT = 51
+    SMDS_ICIP = 52
+    PROP_VIRTUAL = 53
+    PROP_MULTIPLEXOR = 54
+    IEEE80212 = 55
+    FIBRECHANNEL = 56
+    HIPPIINTERFACE = 57
+    FRAMERELAY_INTERCONNECT = 58
+    AFLANE_8023 = 59
+    AFLANE_8025 = 60
+    CCTEMUL = 61
+    FASTETHER = 62
+    ISDN = 63
+    V11 = 64
+    V36 = 65
+    G703_64K = 66
+    G703_2MB = 67
+    QLLC = 68
+    FASTETHER_FX = 69
+    CHANNEL = 70
+    IEEE80211 = 71
+    IBM370PARCHAN = 72
+    ESCON = 73
+    DLSW = 74
+    ISDN_S = 75
+    ISDN_U = 76
+    LAP_D = 77
+    IPSWITCH = 78
+    RSRB = 79
+    ATM_LOGICAL = 80
+    DS0 = 81
+    DS0_BUNDLE = 82
+    BSC = 83
+    ASYNC = 84
+    CNR = 85
+    ISO88025R_DTR = 86
+    EPLRS = 87
+    ARAP = 88
+    PROP_CNLS = 89
+    HOSTPAD = 90
+    TERMPAD = 91
+    FRAMERELAY_MPI = 92
+    X213 = 93
+    ADSL = 94
+    RADSL = 95
+    SDSL = 96
+    VDSL = 97
+    ISO88025_CRFPRINT = 98
+    MYRINET = 99
+    VOICE_EM = 100
+    VOICE_FXO = 101
+    VOICE_FXS = 102
+    VOICE_ENCAP = 103
+    VOICE_OVERIP = 104
+    ATM_DXI = 105
+    ATM_FUNI = 106
+    ATM_IMA = 107
+    PPPMULTILINKBUNDLE = 108
+    IPOVER_CDLC = 109
+    IPOVER_CLAW = 110
+    STACKTOSTACK = 111
+    VIRTUALIPADDRESS = 112
+    MPC = 113
+    IPOVER_ATM = 114
+    ISO88025_FIBER = 115
+    TDLC = 116
+    GIGABITETHERNET = 117
+    HDLC = 118
+    LAP_F = 119
+    V37 = 120
+    X25_MLP = 121
+    X25_HUNTGROUP = 122
+    TRANSPHDLC = 123
+    INTERLEAVE = 124
+    FAST = 125
+    IP = 126
+    DOCSCABLE_MACLAYER = 127
+    DOCSCABLE_DOWNSTREAM = 128
+    DOCSCABLE_UPSTREAM = 129
+    A12MPPSWITCH = 130
+    TUNNEL = 131
+    COFFEE = 132
+    CES = 133
+    ATM_SUBINTERFACE = 134
+    L2_VLAN = 135
+    L3_IPVLAN = 136
+    L3_IPXVLAN = 137
+    DIGITALPOWERLINE = 138
+    MEDIAMAILOVERIP = 139
+    DTM = 140
+    DCN = 141
+    IPFORWARD = 142
+    MSDSL = 143
+    IEEE1394 = 144
+    IF_GSN = 145
+    DVBRCC_MACLAYER = 146
+    DVBRCC_DOWNSTREAM = 147
+    DVBRCC_UPSTREAM = 148
+    ATM_VIRTUAL = 149
+    MPLS_TUNNEL = 150
+    SRP = 151
+    VOICEOVERATM = 152
+    VOICEOVERFRAMERELAY = 153
+    IDSL = 154
+    COMPOSITELINK = 155
+    SS7_SIGLINK = 156
+    PROP_WIRELESS_P2P = 157
+    FR_FORWARD = 158
+    RFC1483 = 159
+    USB = 160
+    IEEE8023AD_LAG = 161
+    BGP_POLICY_ACCOUNTING = 162
+    FRF16_MFR_BUNDLE = 163
+    H323_GATEKEEPER = 164
+    H323_PROXY = 165
+    MPLS = 166
+    MF_SIGLINK = 167
+    HDSL2 = 168
+    SHDSL = 169
+    DS1_FDL = 170
+    POS = 171
+    DVB_ASI_IN = 172
+    DVB_ASI_OUT = 173
+    PLC = 174
+    NFAS = 175
+    TR008 = 176
+    GR303_RDT = 177
+    GR303_IDT = 178
+    ISUP = 179
+    PROP_DOCS_WIRELESS_MACLAYER = 180
+    PROP_DOCS_WIRELESS_DOWNSTREAM = 181
+    PROP_DOCS_WIRELESS_UPSTREAM = 182
+    HIPERLAN2 = 183
+    PROP_BWA_P2MP = 184
+    SONET_OVERHEAD_CHANNEL = 185
+    DIGITAL_WRAPPER_OVERHEAD_CHANNEL = 186
+    AAL2 = 187
+    RADIO_MAC = 188
+    ATM_RADIO = 189
+    IMT = 190
+    MVL = 191
+    REACH_DSL = 192
+    FR_DLCI_ENDPT = 193
+    ATM_VCI_ENDPT = 194
+    OPTICAL_CHANNEL = 195
+    OPTICAL_TRANSPORT = 196
+    WWANPP = 243
+    WWANPP2 = 244
+
+
+def _try_value(subkey: RegistryKey, value: str) -> str | list | None:
+    try:
+        return subkey.value(value).value
+    except RegistryValueNotFoundError:
+        return None
+
+
+class WindowsNetworkPlugin(NetworkPlugin):
+    def _interfaces(self) -> Iterator[WindowsInterfaceRecord]:
+        # Get all the network interfaces
+        for keys in self.target.registry.keys(
+            "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Class\\{4d36e972-e325-11ce-bfc1-08002be10318}"
+        ):
+            for subkey in keys.subkeys():
+                device_info = {}
+
+                if (net_cfg_instance_id := _try_value(subkey, "NetCfgInstanceId")) is None:
+                    # if no NetCfgInstanceId is found, skip this network interface
+                    continue
+
+                # Extract the network device configuration for given interface id
+                config = self._extract_network_device_config(net_cfg_instance_id)
+                if config is None or all(not conf for conf in config):
+                    # if no configuration is found or all configurations are empty, skip this network interface
+                    continue
+
+                # Extract the network device name for given interface id
+                name_key = self.target.registry.key(
+                    f"HKLM\\SYSTEM\\CurrentControlSet\\Control\\Network\\"
+                    f"{{4D36E972-E325-11CE-BFC1-08002BE10318}}\\{net_cfg_instance_id}\\Connection"
+                )
+                if value_name := _try_value(name_key, "Name"):
+                    device_info["name"] = value_name
+
+                # Extract the metric value from the REGISTRY_KEY_INTERFACE key
+                interface_key = self.target.registry.key(
+                    f"HKLM\\SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\{net_cfg_instance_id}"
+                )
+                if value_metric := _try_value(interface_key, "InterfaceMetric"):
+                    device_info["metric"] = value_metric
+
+                # Extract the rest of the device information
+                device_info["mac"] = _try_value(subkey, "NetworkAddress")
+                device_info["vlan"] = _try_value(subkey, "VlanID")
+
+                if timestamp := _try_value(subkey, "NetworkInterfaceInstallTimestamp"):
+                    device_info["first_connected"] = wintimestamp(timestamp)
+
+                if type_device := _try_value(subkey, "*IfType"):
+                    device_info["type"] = IfTypes(int(type_device)).name
+
+                # Yield a record for each non-empty configuration
+                for conf in config:
+                    if conf:
+                        # Create a copy of device_info to avoid overwriting
+                        record_info = device_info.copy()
+                        record_info.update(conf)
+                        yield WindowsInterfaceRecord(
+                            **record_info,
+                            source=f"HKLM\\SYSTEM\\{subkey.path}",
+                            _target=self.target,
+                        )
+
+    def _extract_network_device_config(
+        self, interface_id: str
+    ) -> list[dict[str, str | list], dict[str, str | list]] | None:
+        dhcp_config = {}
+        static_config = {}
+
+        # Get the registry keys for the given interface id
+        try:
+            keys = self.target.registry.key(
+                f"HKLM\\SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\{interface_id}"
+            )
+        except RegistryKeyNotFoundError:
+            return None
+
+        if not len(keys):
+            return None
+
+        # Extract DHCP configuration from the registry
+        dhcp_gateway = _try_value(keys, "DhcpDefaultGateway")
+        if dhcp_gateway not in ["", "0.0.0.0", None, []]:
+            dhcp_config["gateway"] = dhcp_gateway
+
+        dhcp_ip = _try_value(keys, "DhcpIPAddress")
+        if dhcp_ip not in ["", "0.0.0.0", None]:
+            dhcp_config["ip"] = [dhcp_ip]
+
+        dhcp_dns = _try_value(keys, "DhcpNameServer")
+        if dhcp_dns not in ["", "0.0.0.0", None]:
+            dhcp_config["dns"] = dhcp_dns.split(" ")
+
+        dhcp_subnetmask = _try_value(keys, "DhcpSubnetMask")
+        if dhcp_subnetmask not in ["", "0.0.0.0", None]:
+            dhcp_config["subnetmask"] = [dhcp_subnetmask]
+
+        dhcp_domain = _try_value(keys, "DhcpDomain")
+        if dhcp_domain not in ["", None]:
+            dhcp_config["search_domain"] = [dhcp_domain]
+
+        if len(dhcp_config) > 0:
+            dhcp_enable = _try_value(keys, "EnableDHCP")
+            dhcp_config["enabled"] = dhcp_enable == 1
+            dhcp_config["dhcp"] = True
+
+        # Extract static configuration from the registry
+        static_gateway = _try_value(keys, "DefaultGateway")
+        if static_gateway not in ["", None, []]:
+            static_config["gateway"] = static_gateway
+
+        static_ip = _try_value(keys, "IPAddress")
+        if static_ip not in ["", "0.0.0.0", ["0.0.0.0"], None, []]:
+            static_config["ip"] = static_ip if isinstance(static_ip, list) else [static_ip]
+
+        static_dns = _try_value(keys, "NameServer")
+        if static_dns not in ["", "0.0.0.0", None]:
+            static_config["dns"] = static_dns.split(",")
+
+        static_subnetmask = _try_value(keys, "SubnetMask")
+        if static_subnetmask not in ["", "0.0.0.0", ["0.0.0.0"], None, []]:
+            static_config["subnetmask"] = (
+                static_subnetmask if isinstance(static_subnetmask, list) else [static_subnetmask]
+            )
+
+        static_domain = _try_value(keys, "Domain")
+        if static_domain not in ["", None]:
+            static_config["search_domain"] = [static_domain]
+
+        if len(static_config) > 0:
+            static_config["enabled"] = None
+            static_config["dhcp"] = False
+
+        # Combine ip and subnetmask for extraction
+        combined_configs = [
+            (dhcp_config, dhcp_config.get("ip", []), dhcp_config.get("subnetmask", [])),
+            (static_config, static_config.get("ip", []), static_config.get("subnetmask", [])),
+        ]
+
+        # Iterate over combined ip/subnet lists
+        for config, ips, subnet_masks in combined_configs:
+            for network_address in self.calculate_network(ips, subnet_masks):
+                config.setdefault("network", []).append(network_address)
+
+        # Return both configurations
+        return [dhcp_config, static_config]

dissect/target/tools/query.py

@@ -18,7 +18,6 @@ from dissect.target.exceptions import (
     UnsupportedPluginError,
 )
 from dissect.target.helpers import cache, record_modifier
-from dissect.target.loaders.targetd import ProxyLoader
 from dissect.target.plugin import PLUGINS, OSPlugin, Plugin, find_plugin_functions
 from dissect.target.report import ExecutionReport
 from dissect.target.tools.utils import (
@@ -174,8 +173,6 @@ def main():
 
         if targets:
             for plugin_target in Target.open_all(targets, args.children):
-                if isinstance(plugin_target._loader, ProxyLoader):
-                    parser.error("can't list compatible plugins for remote targets.")
                 funcs, _ = find_plugin_functions(plugin_target, args.list, compatibility=True, show_hidden=True)
                 for func in funcs:
                     collected_plugins[func.path] = func.plugin_desc

dissect/target/tools/utils.py

@@ -16,7 +16,6 @@ from dissect.target import Target
 from dissect.target.exceptions import UnsupportedPluginError
 from dissect.target.helpers import docs, keychain
 from dissect.target.helpers.docs import get_docstring
-from dissect.target.helpers.targetd import CommandProxy
 from dissect.target.loader import LOADERS_BY_SCHEME
 from dissect.target.plugin import (
     OSPlugin,
@@ -250,9 +249,6 @@ def plugin_function_with_argparser(
 
         plugin_method = plugin_obj.get_all_records
         parser = generate_argparse_for_plugin(plugin_obj)
-    elif isinstance(target_attr, CommandProxy):
-        plugin_method = target_attr.command()
-        parser = generate_argparse_for_bound_method(plugin_method)
     elif callable(target_attr):
         plugin_method = target_attr
         parser = generate_argparse_for_bound_method(target_attr)

{dissect.target-3.20.dev4.dist-info → dissect.target-3.20.dev6.dist-info}/METADATA

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

@@ -2,7 +2,7 @@ dissect/target/__init__.py,sha256=Oc7ounTgq2hE4nR6YcNabetc7SQA40ldSa35VEdZcQU,63
 dissect/target/container.py,sha256=0YcwcGmfJjhPXUB6DEcjWEoSuAtTDxMDpoTviMrLsxM,9353
 dissect/target/exceptions.py,sha256=ULi7NXlqju_d8KENEL3aimmfKTFfbNssfeWhAnOB654,2972
 dissect/target/filesystem.py,sha256=__p2p72B6mKgIiAOj85EC3ESdZ8gjgkm2pt1KKym3h0,60743
-dissect/target/loader.py,sha256=I8WNzDA0SMy42F7zfyBcSKj_VKNv64213WUvtGZ77qE,7374
+dissect/target/loader.py,sha256=11B3W9IpfdTU9GJiKONGffuGeICog7J9ypXZ6mffsBE,7337
 dissect/target/plugin.py,sha256=xbvmjZMFNwJXZYMBE4KI93-nWL9Zhum8x39ydcO6s2o,50578
 dissect/target/report.py,sha256=06uiP4MbNI8cWMVrC1SasNS-Yg6ptjVjckwj8Yhe0Js,7958
 dissect/target/target.py,sha256=m4bAKgPLUJERKgxRZFevKvEBNaz77wIC5mVrDe6eI8o,32438
@@ -61,12 +61,11 @@ dissect/target/helpers/mui.py,sha256=i-7XoHbu4WO2fYapK9yGAMW04rFlgRispknc1KQIS5Q
 dissect/target/helpers/network_managers.py,sha256=ByBSe2K3c8hgQC6dokcf-hHdmPcD8PmrOj0xs1C3yhs,25743
 dissect/target/helpers/polypath.py,sha256=h8p7m_OCNiQljGwoZh5Aflr9H2ot6CZr6WKq1OSw58o,2175
 dissect/target/helpers/protobuf.py,sha256=b4DsnqrRLrefcDjx7rQno-_LBcwtJXxuKf5RdOegzfE,1537
-dissect/target/helpers/record.py,sha256=zwqEnFSgxgX6JdhhF4zycMMZK09crCTWWEFzRxZSuC8,5658
+dissect/target/helpers/record.py,sha256=euNDDZi29fo8ENN1gsPycB38OMn35clLM9_K-srZ5E0,5852
 dissect/target/helpers/record_modifier.py,sha256=O_Jj7zOi891HIyAYjxxe6LFPYETHdMa5lNjo4NA_T_w,3969
 dissect/target/helpers/regutil.py,sha256=kX-sSZbW8Qkg29Dn_9zYbaQrwLumrr4Y8zJ1EhHXIAM,27337
 dissect/target/helpers/shell_application_ids.py,sha256=hYxrP-YtHK7ZM0ectJFHfoMB8QUXLbYNKmKXMWLZRlA,38132
 dissect/target/helpers/shell_folder_ids.py,sha256=Behhb8oh0kMxrEk6YYKYigCDZe8Hw5QS6iK_d2hTs2Y,24978
-dissect/target/helpers/targetd.py,sha256=ELhUulzQ4OgXgHsWhsLgM14vut8Wm6btr7qTynlwKaE,1812
 dissect/target/helpers/utils.py,sha256=K3xVq9D0FwIhTBAuiWN8ph7Pq2GABgG3hOz-3AmKuEA,4244
 dissect/target/helpers/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dissect/target/helpers/compat/path_310.py,sha256=PsLDIodlp3Hv5u-w7GDl6_LnTtchBYcRjz2MicX1egg,16982
@@ -88,7 +87,7 @@ dissect/target/loaders/kape.py,sha256=t5TfrGLqPeIpUUpXzIl6aHsqXMEGDqJ5YwDCs07DiB
 dissect/target/loaders/libvirt.py,sha256=_3EFIytMGbiLMISHx4QXVrDebsRO6J6sMkE3TH68qsg,1374
 dissect/target/loaders/local.py,sha256=Ul-LCd_fY7SyWOVR6nH-NqbkuNpxoZVmffwrkvQElU8,16453
 dissect/target/loaders/log.py,sha256=cCkDIRS4aPlX3U-n_jUKaI2FPSV3BDpfqKceaU7rBbo,1507
-dissect/target/loaders/mqtt.py,sha256=28gmDFZ-9ikR2NXJ2mClUhXqH_YiAk1JpK-5yChmBjY,17095
+dissect/target/loaders/mqtt.py,sha256=WVNXDCzEluyyUidXr25-H9Ic-c75dZIRdDdL5sa4yVQ,19375
 dissect/target/loaders/multiraw.py,sha256=4a3ZST0NwjnfPDxHkcEfAcX2ddUlT_C-rcrMHNg1wp4,1046
 dissect/target/loaders/ova.py,sha256=6h4O-7i87J394C6KgLsPkdXRAKNwtPubzLNS3vBGs7U,744
 dissect/target/loaders/overlay.py,sha256=tj99HKvNG5_JbGfb1WCv4KNSbXXSnEcPQY5XT-JUxn8,992
@@ -104,7 +103,6 @@ dissect/target/loaders/smb.py,sha256=qP8m4Jq7hvAvUCF9jB4yr2Zut7p_R02_vxziNN3R1to
 dissect/target/loaders/tanium.py,sha256=P9euiQzvVaQQtMQlEmNe0V25w1BkQFRZBuS-0-ksHpY,1585
 dissect/target/loaders/tar.py,sha256=2uF9-mmFbSdLsCkySfT9AkzagQXsTQvDjrdL1UyjFuI,4170
 dissect/target/loaders/target.py,sha256=MU_HUtg58YdhdZu6ga1sYG7fK61Dn7N0TBkWXDCWwyc,798
-dissect/target/loaders/targetd.py,sha256=sfbn2_j3il2G-rPywAoNT5YPtD5KmKkmBv1zrPDRs6I,8250
 dissect/target/loaders/utm.py,sha256=7oHYP_jmr5gcjoyOP1pnh9Rz-IqQirBI6bjSvGwiKao,1053
 dissect/target/loaders/vb.py,sha256=CdimOMeoJEDq8xYDgtldGSiwhR-dY5uxac1L0sYwAEU,2078
 dissect/target/loaders/vbox.py,sha256=8JD7D8iAY9JRvTHsrosp5ZMsZezuLhZ10Zt8sEL7KBI,732
@@ -184,7 +182,7 @@ dissect/target/plugins/general/config.py,sha256=Mdy9uhWn4OJ96zfXpLgjVifV5SrViqHn
 dissect/target/plugins/general/default.py,sha256=8W_9JV3jKEeETlyTrB25sACoIIFmmO8wlVU5Zoi51W0,1425
 dissect/target/plugins/general/example.py,sha256=6B_YOqajRBLNWBEOfIL_HnLaEANBF8KKoc0mweihiug,6034
 dissect/target/plugins/general/loaders.py,sha256=6iUxhlSAgo7qSE8_XFxgiihK8sdMiP-s4k0W5Iv8m9k,879
-dissect/target/plugins/general/network.py,sha256=Ol4Ls1w78-7zpmVaQQOZG27rvYOhJLFVhomZj5kwibs,2430
+dissect/target/plugins/general/network.py,sha256=1dCWiVIaVPySquRs3YEsP7PxXXU5voa8CsxyIa7Vh54,2882
 dissect/target/plugins/general/osinfo.py,sha256=RdK5mw3-H9H3sGXz8yP8U_p3wUG1Ww7_HBKZpFdsbTE,1358
 dissect/target/plugins/general/plugins.py,sha256=4URjS6DN1Ey6Cqlbyx6NfFGgQZpWDrqxl8KLcZFODGE,4479
 dissect/target/plugins/general/scrape.py,sha256=Fz7BNXflvuxlnVulyyDhLpyU8D_hJdH6vWVtER9vjTg,6651
@@ -262,7 +260,7 @@ dissect/target/plugins/os/unix/log/lastlog.py,sha256=Wq89wRSFZSBsoKVCxjDofnC4yw9
 dissect/target/plugins/os/unix/log/messages.py,sha256=CXA-SkMPLaCgnTQg9nzII-7tO8Il_ENQmuYvDxo33rI,4698
 dissect/target/plugins/os/unix/log/utmp.py,sha256=1nPHIaBUHt_9z6PDrvyqg4huKLihUaWLrMmgMsbaeIo,7755
 dissect/target/plugins/os/windows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dissect/target/plugins/os/windows/_os.py,sha256=uBa0dVkFxDsxHAU3T23UEIOCgAx5R6cIpCgbGq3fflY,13131
+dissect/target/plugins/os/windows/_os.py,sha256=-x5TD5BvFw-7zEfqT6WG7n04YSeyr7wVLO07y6xkBP8,12476
 dissect/target/plugins/os/windows/activitiescache.py,sha256=Q2aILnhJ2rp2AwEbWwyBuSLjMbGqaYJTsavSbfkcFKE,6741
 dissect/target/plugins/os/windows/adpolicy.py,sha256=qjv0s-gAIGKCznWdVOARJbLXnCKYgvzoFNWoXnq3m1M,7102
 dissect/target/plugins/os/windows/amcache.py,sha256=ZZNOs3bILTf0AGkDkhoatndl0j39DXkstN7oOyxJECU,27188
@@ -276,6 +274,7 @@ dissect/target/plugins/os/windows/generic.py,sha256=BSvDPfB9faU0uquMj0guw5tnR_97
 dissect/target/plugins/os/windows/jumplist.py,sha256=3gZk6O1B3lKK2Jxe0B-HapOCEehk94CYNvCVDpQC9nQ,11773
 dissect/target/plugins/os/windows/lnk.py,sha256=toEZV00CESLUsF7UmN65-ivWk0Ijg-ZPST0qyD-antY,7860
 dissect/target/plugins/os/windows/locale.py,sha256=yXVdclpUqss9h8Nq7N4kg3OHwWGDfjdfiLiUZR3wqv8,2324
+dissect/target/plugins/os/windows/network.py,sha256=nKNgCqVjzjPwkwyXIIgIIECO2UEYnzvM0PzqRVtCGls,10788
 dissect/target/plugins/os/windows/notifications.py,sha256=T1CIvQgpW__qDR0Rq5zpeWmRWwjNDpvdMnvJJ_6tZXs,17378
 dissect/target/plugins/os/windows/prefetch.py,sha256=v4OgSKMwcihz0SOuA0o0Ec8wsAKuiuEmJolqZmHFgJA,10491
 dissect/target/plugins/os/windows/recyclebin.py,sha256=zx58hDCvcrD_eJl9nJmr_i80krSN03ya8nQzWFr2Tw0,4917
@@ -347,10 +346,10 @@ dissect/target/tools/fsutils.py,sha256=dyAdp2fzydcozaIZ1mFTpdUeVcibYNJCHN8AFw5Fo
 dissect/target/tools/info.py,sha256=8nnbqFUYeo4NLPE7ORcTBcDL-TioGB2Nqc1TKcu5qdY,5715
 dissect/target/tools/logging.py,sha256=5ZnumtMWLyslxfrUGZ4ntRyf3obOOhmn8SBjKfdLcEg,4174
 dissect/target/tools/mount.py,sha256=8GRYnu4xEmFBHxuIZAYhOMyyTGX8fat1Ou07DNiUnW4,3945
-dissect/target/tools/query.py,sha256=XgMDSfaN4SivJmIIEntYJOXcOEwWrUp_tYt5AjEtB4k,15602
+dissect/target/tools/query.py,sha256=e-yAN9zdQjuOiTuoOQoo17mVEQGGcOgaA9YkF4GYpkM,15394
 dissect/target/tools/reg.py,sha256=FDsiBBDxjWVUBTRj8xn82vZe-J_d9piM-TKS3PHZCcM,3193
 dissect/target/tools/shell.py,sha256=dmshIriwdd_UwrdUcTfWkcYD8Z0mjzbDqwyZG-snDdM,50482
-dissect/target/tools/utils.py,sha256=nnhjNW8v99eVZQ-CgxTbsi8Wa6Z2XKDFr1aWakgq9jc,12191
+dissect/target/tools/utils.py,sha256=cGk_DxEqVL0ofxlIC15GD4w3PV5RSE_IaKvVkAxEhR8,11974
 dissect/target/tools/yara.py,sha256=70k-2VMulf1EdkX03nCACzejaOEcsFHOyX-4E40MdQU,2044
 dissect/target/tools/dump/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dissect/target/tools/dump/run.py,sha256=aD84peRS4zHqC78fH7Vd4ni3m1ZmVP70LyMwBRvoDGY,9463
@@ -364,10 +363,10 @@ dissect/target/volumes/luks.py,sha256=OmCMsw6rCUXG1_plnLVLTpsvE1n_6WtoRUGQbpmu1z
 dissect/target/volumes/lvm.py,sha256=wwQVR9I3G9YzmY6UxFsH2Y4MXGBcKL9aayWGCDTiWMU,2269
 dissect/target/volumes/md.py,sha256=7ShPtusuLGaIv27SvEETtgsuoQyAa4iAAeOR1NEaajI,1689
 dissect/target/volumes/vmfs.py,sha256=-LoUbn9WNwTtLi_4K34uV_-wDw2W5hgaqxZNj4UmqAQ,1730
-dissect.target-3.20.dev4.dist-info/COPYRIGHT,sha256=m-9ih2RVhMiXHI2bf_oNSSgHgkeIvaYRVfKTwFbnJPA,301
-dissect.target-3.20.dev4.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-dissect.target-3.20.dev4.dist-info/METADATA,sha256=-UKtuhQiUY4OhJbAtGRU1GcyyCoHAHqkHJs51thHJOg,12896
-dissect.target-3.20.dev4.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-dissect.target-3.20.dev4.dist-info/entry_points.txt,sha256=BWuxAb_6AvUAQpIQOQU0IMTlaF6TDht2AIZK8bHd-zE,492
-dissect.target-3.20.dev4.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect.target-3.20.dev4.dist-info/RECORD,,
+dissect.target-3.20.dev6.dist-info/COPYRIGHT,sha256=m-9ih2RVhMiXHI2bf_oNSSgHgkeIvaYRVfKTwFbnJPA,301
+dissect.target-3.20.dev6.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+dissect.target-3.20.dev6.dist-info/METADATA,sha256=fpn-GHvIaUQ8kWFx0kTIwF9A0-q43fdFymwUWjX-AXQ,12896
+dissect.target-3.20.dev6.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+dissect.target-3.20.dev6.dist-info/entry_points.txt,sha256=BWuxAb_6AvUAQpIQOQU0IMTlaF6TDht2AIZK8bHd-zE,492
+dissect.target-3.20.dev6.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
+dissect.target-3.20.dev6.dist-info/RECORD,,

{dissect.target-3.20.dev4.dist-info → dissect.target-3.20.dev6.dist-info}/WHEEL

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

dissect/target/helpers/targetd.py

@@ -1,58 +0,0 @@
-from __future__ import annotations
-
-import functools
-from typing import Any, Callable, Optional, Union
-
-from dissect.util.stream import AlignedStream
-
-from dissect.target.exceptions import FatalError
-from dissect.target.loader import Loader
-
-
-class TargetdStream(AlignedStream):
-    def _read(self, offset: int, length: int) -> bytes:
-        return b""
-
-
-# Marker interface to indicate this loader loads targets from remote machines
-class ProxyLoader(Loader):
-    pass
-
-
-class TargetdInvalidStateError(FatalError):
-    pass
-
-
-class CommandProxy:
-    def __init__(self, loader: Loader, func: Callable, namespace: Optional[str] = None):
-        self._loader = loader
-        self._func = func
-        self._namespace = namespace or func
-
-    def __getattr__(self, func: Union[Callable, str]) -> CommandProxy:
-        if func == "func":
-            return self._func.func
-        self._func = func
-        return self
-
-    def command(self) -> Callable:
-        namespace = None if self._func == self._namespace else self._namespace
-        return self._get(namespace, self._func)
-
-    def _get(self, namespace: Optional[str], plugin_func: Callable) -> Callable:
-        if namespace:
-            func = functools.update_wrapper(
-                functools.partial(self._loader.plugin_bridge, plugin_func=self._func, namespace=self._namespace),
-                self._loader.plugin_bridge,
-            )
-        else:
-            func = functools.update_wrapper(
-                functools.partial(self._loader.plugin_bridge, plugin_func=plugin_func), self._loader.plugin_bridge
-            )
-        return func
-
-    def __call__(self, *args, **kwargs) -> Any:
-        return self.command()(*args, **kwargs)
-
-    def __repr__(self) -> str:
-        return str(self._get(None, "get")(**{"property_name": self._func}))

dissect/target/loaders/targetd.py

@@ -1,223 +0,0 @@
-from __future__ import annotations
-
-import functools
-import ssl
-import time
-import urllib
-from pathlib import Path
-from platform import os
-from typing import Any, Callable, Optional, Union
-
-from dissect.target.containers.raw import RawContainer
-from dissect.target.exceptions import LoaderError
-
-# to avoid loading issues during automatic loader detection
-from dissect.target.helpers.targetd import (
-    CommandProxy,
-    ProxyLoader,
-    TargetdInvalidStateError,
-    TargetdStream,
-)
-from dissect.target.loader import Loader
-from dissect.target.plugin import Plugin, export
-from dissect.target.target import Target
-
-TARGETD_AVAILABLE = False
-try:
-    from flow import remoting
-    from targetd.clients import Client
-
-    TARGETD_AVAILABLE = True
-except Exception:
-    pass
-
-
-class TargetdLoader(ProxyLoader):
-    """Load remote targets through a broker."""
-
-    instance = None
-
-    def __init__(self, path: Union[Path, str], **kwargs):
-        super().__init__(path)
-        self._plugin_func = None
-        self.client = None
-        self.output = None
-        self.peers = 1
-        self.cacert = None
-        self.adapter = "Flow.Remoting"
-        self.host = "localhost"
-        self.port = 1883
-        self.chunking = True
-        self.local_link = "unix:///tmp/targetd" if os.name == "posix" else "pipe:///tmp/targetd"
-        # @todo Add these options to loader help (when available)
-        self.configurables = [
-            ["cacert", Path, "SSL: cacert file"],
-            ["host", str, "IP-address of targetd broker"],
-            ["port", int, "Port for connecting to targetd broker"],
-            ["local_link", str, "Domain socket or named pipe"],
-            ["adapter", str, "Adapter to use"],
-            ["peers", int, "Minimum number of hosts to wait for before executing query"],
-            ["chunking", int, "Chunk mode"],
-        ]
-        uri = kwargs.get("parsed_path")
-        if uri is None:
-            raise LoaderError("No URI connection details have been passed.")
-        self.uri = uri.path
-        self.options = dict(urllib.parse.parse_qsl(uri.query, keep_blank_values=True))
-
-    def _process_options(self, target: Target) -> None:
-        for configurable_details in self.configurables:
-            configurable, value_type, description = configurable_details
-            configuration = self.options.get(configurable)
-            if not configuration:
-                default_value = getattr(self, configurable)
-                target.log.warning("%s not configured, using: %s=%s", description, configurable, default_value)
-            else:
-                setattr(self, configurable, value_type(configuration))
-
-    @export(output="record", cache=False)
-    def plugin_bridge(self, *args, **kwargs) -> list[Any]:
-        """Command Execution Bridge Plugin for Targetd.
-
-        This is a generic plugin interceptor that becomes active only if using
-        the targetd loader. This plugin acts as a bridge to connect to the Targetd broker
-        and will translate the requested plugin-operation into Targetd-commands using the selected
-        adapter (i.e. Flow.Remoting).
-        """
-
-        if not TARGETD_AVAILABLE:
-            raise ImportError("This loader requires the targetd package to be installed.")
-
-        self.output = None
-        self.has_output = False
-
-        plugin_func = kwargs.pop("plugin_func", None)
-
-        if self.client is None:
-            ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
-            ssl_context.check_hostname = False
-            if self.cacert and not self.cacert.exists():
-                raise LoaderError(f"file not found: {self.cacert}")
-            if self.cacert:
-                ssl_context.load_verify_locations(self.cacert)
-            else:
-                ssl_context.load_default_certs(purpose=ssl.Purpose.SERVER_AUTH)
-            self.client = Client(self.host, self.port, ssl_context, [self.uri], self.local_link, "targetd")
-            self.client.module_fullname = "dissect.target.loaders"
-            self.client.module_fromlist = ["command_runner"]
-            self.client.command = plugin_func
-            try:
-                self.client.start(*args, **kwargs)
-            except Exception:
-                # If something happens that prevents targetd from properly closing/resetting the
-                # connection, this exception is thrown during the next connection and the connection
-                # is closed properly after all so that the next time the loader will be able to
-                # use a new connection with a new session.
-                self.client.close()
-                raise TargetdInvalidStateError("Targetd connection is in invalid state, retry.")
-        else:
-            self.client.command = plugin_func
-            self.client.exec_command(*args, **kwargs)
-
-        while not self.has_output:
-            time.sleep(1)
-        return self.output
-
-    def _get_command(self, func: str, namespace: str = None) -> tuple[Loader, functools.partial]:
-        return (self, CommandProxy(self, func, namespace=namespace))
-
-    def each(self, func: Callable, target: Optional[Target] = None) -> Any:
-        """Allows you to attach a scriptlet (function) to each of the remote hosts.
-        The results of the function are accumulated using +=. Exceptions are
-        catched and logged as warnings.
-
-        Usage:
-
-        def my_function(remote_target):
-            ...do something interesting...
-
-        targets = Target.open( targetd://... )
-        targets.each(my_function)
-
-        """
-        result = None
-        if not self.client:
-            target.init()
-        for peer in self.client.peers:
-            target.select(peer)
-            try:
-                if result is None:
-                    result = func(target)
-                else:
-                    result += func(target)
-            except Exception as failure:
-                target.log.warning("Exception while applying function to target: %s: %s", peer, failure)
-        return result
-
-    def _add_plugin(self, plugin: Plugin):
-        plugin.check_compatibe = lambda: True
-
-    def map(self, target: Target) -> None:
-        if TargetdLoader.instance:
-            raise Exception("You can only initiated 1 targetd control connection per session.")
-        self._process_options(target)
-        target.disks.add(RawContainer(TargetdStream()))
-        target.get_function = self._get_command
-        target.add_plugin = self._add_plugin
-        target.each = functools.update_wrapper(functools.partial(self.each, target=target), self.each)
-        TargetdLoader.instance = self
-
-    @staticmethod
-    def detect(path: Path) -> bool:
-        # You can only activate this loader by URI-scheme "targetd://"
-        return False
-
-    def __del__(self) -> None:
-        if self.client:
-            self.client.close()
-
-
-if TARGETD_AVAILABLE:
-    # Loader has to provide the control script for targetd in this case
-    def command_runner(link: str, targetd: Client, *args, **kwargs) -> None:
-        caller = TargetdLoader.instance
-        if not targetd.rpcs:
-            targetd.easy_connect_remoting(remoting, link, caller.peers)
-
-        obj = targetd.rpcs
-        if namespace := kwargs.get("namespace", None):
-            obj = getattr(obj, namespace)
-
-        caller.has_output = True
-        if targetd.command == "init":
-            caller.output = True
-            return
-
-        if targetd.command == "select":
-            targetd.rpcs.select(*args)
-            caller.output = True
-            return
-
-        if targetd.command == "deselect":
-            targetd.rpcs.deselect()
-            caller.output = True
-            return
-
-        func = getattr(obj, targetd.command)
-
-        result = func(*args, **kwargs)
-        if result is not None:
-            if targetd.command == "get":
-                result = list(result)[0]
-            elif caller.chunking:
-                data = []
-                gen = func()
-                targetd.reset()
-                while True:
-                    try:
-                        data.append(next(gen))
-                    except Exception:
-                        break
-                result = data
-            caller.output = result
-        targetd.reset()