dementor 1.0.0.dev11__tar.gz → 1.0.0.dev12__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (62) hide show
  1. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/PKG-INFO +16 -1
  2. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/__init__.py +1 -1
  3. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/assets/Dementor.toml +40 -1
  4. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/config/session.py +11 -0
  5. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/config/util.py +8 -3
  6. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/database.py +11 -5
  7. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/loader.py +0 -2
  8. dementor-1.0.0.dev12/dementor/log/__init__.py +24 -0
  9. {dementor-1.0.0.dev11/dementor → dementor-1.0.0.dev12/dementor/log}/logger.py +8 -26
  10. dementor-1.0.0.dev12/dementor/log/stream.py +214 -0
  11. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/paths.py +1 -1
  12. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/ftp.py +1 -1
  13. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/http.py +1 -1
  14. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/imap.py +1 -1
  15. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/ipp.py +1 -1
  16. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/kerberos.py +1 -1
  17. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/ldap.py +2 -2
  18. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/llmnr.py +3 -2
  19. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/mdns.py +14 -7
  20. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/msrpc/rpc.py +6 -2
  21. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/mssql.py +35 -25
  22. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/mysql.py +3 -3
  23. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/netbios.py +10 -5
  24. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/pop3.py +1 -1
  25. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/quic.py +8 -6
  26. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/smb.py +2 -2
  27. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/smtp.py +1 -1
  28. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/ssdp.py +6 -4
  29. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/upnp.py +1 -1
  30. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/x11.py +1 -1
  31. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/servers.py +3 -1
  32. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/standalone.py +44 -9
  33. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor.egg-info/PKG-INFO +16 -1
  34. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor.egg-info/SOURCES.txt +3 -1
  35. dementor-1.0.0.dev12/docs/README.pypi.md +58 -0
  36. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/pyproject.toml +2 -2
  37. dementor-1.0.0.dev11/docs/README.pypi.md +0 -43
  38. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/LICENSE +0 -0
  39. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/README.md +0 -0
  40. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/__main__.py +0 -0
  41. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/assets/banner.txt +0 -0
  42. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/assets/www/error_page.html +0 -0
  43. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/assets/www/upnp-default/dd.xml +0 -0
  44. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/assets/www/upnp-default/present.html +0 -0
  45. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/assets/www/upnp-default/scpd.xml +0 -0
  46. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/assets/www/wpad.dat +0 -0
  47. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/config/__init__.py +0 -0
  48. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/config/attr.py +0 -0
  49. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/config/toml.py +0 -0
  50. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/filters.py +0 -0
  51. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/__init__.py +0 -0
  52. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/msrpc/__init__.py +0 -0
  53. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/msrpc/dcom.py +0 -0
  54. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/msrpc/epm.py +0 -0
  55. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/msrpc.py +0 -0
  56. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/ntlm.py +0 -0
  57. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor/protocols/spnego.py +0 -0
  58. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor.egg-info/dependency_links.txt +0 -0
  59. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor.egg-info/entry_points.txt +0 -0
  60. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor.egg-info/requires.txt +0 -0
  61. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/dementor.egg-info/top_level.txt +0 -0
  62. {dementor-1.0.0.dev11 → dementor-1.0.0.dev12}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: dementor
3
- Version: 1.0.0.dev11
3
+ Version: 1.0.0.dev12
4
4
  Summary: LLMNR/NBT-NS/mDNS Poisoner and rogue service provider
5
5
  Author: MatrixEditor
6
6
  Maintainer: MatrixEditor
@@ -90,6 +90,21 @@ Let's take a look.
90
90
 
91
91
  ![index_video](https://raw.githubusercontent.com/MatrixEditor/dementor/refs/heads/master/docs/source/_static/images/index-video.gif)
92
92
 
93
+ ### CLI Options
94
+
95
+ ```
96
+ Usage: Dementor [OPTIONS]
97
+
98
+ ╭─ Options ────────────────────────────────────────────────────────────────────────────────────────────╮
99
+ │ * --interface -I NAME Network interface to use (required for poisoning) [required] │
100
+ │ --analyze -A Only analyze traffic, don't respond to requests │
101
+ │ --config -c PATH Path to a configuration file (otherwise standard path is used) │
102
+ │ --option -O KEY=VALUE Add an extra option to the global configuration file. │
103
+ │ --yes -y Do not ask before starting attack mode. │
104
+ │ --quiet -q Don't print banner at startup │
105
+ │ --help Show this message and exit. │
106
+ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────╯
107
+ ```
93
108
 
94
109
  ## You need more?
95
110
 
@@ -18,5 +18,5 @@
18
18
  # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19
19
  # SOFTWARE.
20
20
 
21
- __version__ = "1.0.0.dev11"
21
+ __version__ = "1.0.0.dev12"
22
22
  __author__ = "MatrixEditor"
@@ -708,7 +708,7 @@ AuthMechanisms = ["PLAIN", "LOGIN", "NTLM"]
708
708
 
709
709
  # default plaintext server
710
710
  [[IMAP.Server]]
711
- Port = 110
711
+ Port = 143
712
712
 
713
713
  # Example TLS server
714
714
  # [[POP3.Server]]
@@ -901,3 +901,42 @@ DebugLoggers = [
901
901
  "quic",
902
902
  "pyipp.parser",
903
903
  ]
904
+
905
+
906
+ [Log.Stream.Hosts]
907
+
908
+ # Uncommenting the Path variable will enable logging all identified clients
909
+ # within the network that either (1) establish a direct connection to dementor,
910
+ # or (2) via multicast/broadcast messages.
911
+
912
+ # Path = "./client_hosts.txt"
913
+
914
+ # Enables/Disables logging IPv4/v6 addresses
915
+
916
+ # IPv6 = true
917
+ # IPv4 = true
918
+
919
+ [Log.Stream.DNS]
920
+
921
+ # Uncommenting the Path variable will enable logging all multicast or broadcast
922
+ # name queries (currently: mDNS, LLMNR and NetBIOS).
923
+
924
+ # Path = "/absolute/path"
925
+
926
+ [Log.Stream.Hashes]
927
+
928
+ # Enables logging captured hashes either to a single output file or into
929
+ # separate files.
930
+
931
+ # Path = "./hash-collections"
932
+
933
+ # "Splits" the collected hashes into separate files.
934
+
935
+ # Split = true
936
+
937
+ # File prefix (dynamic string) and suffix to apply when writeing hashes to
938
+ # separate files.
939
+
940
+ # FilePrefix = "{{ hash_type }}-capture"
941
+ # FileSuffix = ".txt"
942
+
@@ -21,6 +21,8 @@ import asyncio
21
21
 
22
22
  from typing import Any, List
23
23
 
24
+ from pathlib import Path
25
+
24
26
  from dementor.config.toml import TomlConfig, Attribute
25
27
  from dementor.config.util import is_true
26
28
  from dementor.paths import DEMENTOR_PATH
@@ -102,3 +104,12 @@ class SessionConfig(TomlConfig):
102
104
  @property
103
105
  def ipv6_support(self) -> bool:
104
106
  return bool(self.ipv6) and not getattr(self, "ipv4_only", False)
107
+
108
+ def resolve_path(self, path: str | Path) -> Path:
109
+ raw_path = str(path)
110
+ if raw_path[0] == "/":
111
+ return Path(raw_path)
112
+ elif raw_path.startswith("./") or raw_path.startswith("../"):
113
+ return Path(raw_path).resolve()
114
+
115
+ return (Path(self.workspace_path) / raw_path).resolve()
@@ -17,6 +17,7 @@
17
17
  # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18
18
  # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19
19
  # SOFTWARE.
20
+ import datetime
20
21
  import random
21
22
  import string
22
23
  import secrets
@@ -38,7 +39,7 @@ def get_value(section: str, key: str | None, default=None) -> Any:
38
39
  else:
39
40
  target = config
40
41
  for section in sections:
41
- target = target[section]
42
+ target = target.get(section, {})
42
43
 
43
44
  if key is None:
44
45
  return target
@@ -77,11 +78,15 @@ def random_value(size: int) -> str:
77
78
  return "".join(random.choice(string.ascii_letters) for _ in range(size))
78
79
 
79
80
 
80
- def format_string(value: str) -> str:
81
+ def format_string(value: str, locals: dict | None = None) -> str:
81
82
  config = _get_global_config()
82
83
  try:
83
84
  template = _SANDBOX.from_string(value)
84
- return template.render(config=config, random=random_value)
85
+ return template.render(config=config, random=random_value, **(locals or {}))
85
86
  except Exception as e:
86
87
  # TODO: log that
87
88
  return value
89
+
90
+
91
+ def now() -> str:
92
+ return datetime.datetime.now().strftime("%Y-%m-%d-%H-%M-%S")
@@ -32,8 +32,10 @@ from sqlalchemy import sql
32
32
  from sqlalchemy.exc import NoSuchTableError, NoInspectionAvailable, OperationalError
33
33
 
34
34
 
35
- from dementor.logger import dm_logger, dm_console_lock
35
+ from dementor.log.logger import dm_logger
36
+ from dementor.log import dm_console_lock
36
37
  from dementor.config.toml import TomlConfig, Attribute as A
38
+ from dementor.log.stream import log_to
37
39
 
38
40
 
39
41
  class DatabaseConfig(TomlConfig):
@@ -69,6 +71,8 @@ def init_dementor_db(session) -> str:
69
71
  # commit and save changes
70
72
  conn.commit()
71
73
  conn.close()
74
+
75
+ dm_logger.debug("Using database at: %s", db_path)
72
76
  return db_path
73
77
 
74
78
 
@@ -134,7 +138,7 @@ class DementorDB:
134
138
  "password" TEXT
135
139
  )"""
136
140
  )
137
-
141
+ # TODO: still unused
138
142
  cursor.execute(
139
143
  """CREATE TABLE "hosts" (
140
144
  "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -171,7 +175,7 @@ class DementorDB:
171
175
  if not logger and not protocol:
172
176
  dm_logger.error(
173
177
  f"Failed to add {credtype} for {username} on {client[0]}:{client[1]}: "
174
- "Protocol must be present either in the logger or as a parameter!"
178
+ + "Protocol must be present either in the logger or as a parameter!"
175
179
  )
176
180
  return
177
181
 
@@ -182,7 +186,7 @@ class DementorDB:
182
186
 
183
187
  target_logger.debug(
184
188
  f"Adding {credtype} for {username} on {client_address}: "
185
- f"{logger} | {protocol} | {domain} | {hostname} | {username} | {password}"
189
+ + f"{logger} | {protocol} | {domain} | {hostname} | {username} | {password}"
186
190
  )
187
191
 
188
192
  q = sql.select(self.CredentialsTable).filter(
@@ -211,6 +215,8 @@ class DementorDB:
211
215
  full_name = ""
212
216
 
213
217
  if not results or self.config.db_config.db_duplicate_creds:
218
+ if credtype != _CLEARTEXT:
219
+ log_to("hashes", type=credtype, value=password)
214
220
  # just insert a new row
215
221
  q = sql.insert(self.CredentialsTable).values(
216
222
  {
@@ -231,7 +237,7 @@ class DementorDB:
231
237
  if "readonly database" in str(e):
232
238
  dm_logger.warning(
233
239
  f"Failed to add {credtype} for {username} on {client_address}: "
234
- "Database is read-only! (maybe restart in sudo mode?)"
240
+ + "Database is read-only! (maybe restart in sudo mode?)"
235
241
  )
236
242
  else:
237
243
  raise
@@ -17,8 +17,6 @@
17
17
  # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18
18
  # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19
19
  # SOFTWARE.
20
- import argparse
21
- from ntpath import isfile
22
20
  import types
23
21
  import os
24
22
  import dementor
@@ -0,0 +1,24 @@
1
+ import threading
2
+ from rich.console import Console
3
+
4
+ dm_console = Console(
5
+ soft_wrap=True,
6
+ tab_size=4,
7
+ highlight=False,
8
+ highlighter=None,
9
+ )
10
+
11
+ dm_console_lock = threading.Lock()
12
+
13
+
14
+ def dm_print(msg: str, *args, **kwargs) -> None:
15
+ # If someone has a better idea I'll be open for it. This is just
16
+ # here to synchronize the logging output
17
+ if kwargs.pop("locked", False):
18
+ dm_console.print(msg, *args, **kwargs)
19
+ else:
20
+ with dm_console_lock:
21
+ dm_console.print(msg, *args, **kwargs)
22
+
23
+
24
+ __all__ = ["dm_console", "dm_console_lock", "dm_print"]
@@ -20,7 +20,6 @@
20
20
  import argparse
21
21
  import inspect
22
22
  import logging
23
- import threading
24
23
  import pathlib
25
24
  import datetime
26
25
  import sys
@@ -28,21 +27,12 @@ import sys
28
27
  from abc import abstractmethod
29
28
  from logging.handlers import RotatingFileHandler
30
29
 
31
- from rich.console import Console
32
30
  from rich.logging import RichHandler
33
31
  from rich.markup import render
34
32
 
33
+ from dementor.config import util
35
34
  from dementor.config.toml import TomlConfig, Attribute as A
36
-
37
- dm_console = Console(
38
- soft_wrap=True,
39
- tab_size=4,
40
- highlight=False,
41
- highlighter=None,
42
- )
43
-
44
- dm_console_lock = threading.Lock()
45
-
35
+ from dementor.log import dm_print, dm_console
46
36
 
47
37
  class LoggingConfig(TomlConfig):
48
38
  _section_ = "Log"
@@ -50,6 +40,7 @@ class LoggingConfig(TomlConfig):
50
40
  A("log_debug_loggers", "DebugLoggers", list),
51
41
  A("log_dir", "LogDir", "logs"),
52
42
  A("log_enable", "Enabled", True),
43
+ A("log_capture_hosts", "CaptureHostsTo", None),
53
44
  ]
54
45
 
55
46
 
@@ -99,17 +90,6 @@ def init():
99
90
  root_logger.setLevel(logging.INFO)
100
91
 
101
92
 
102
- def dm_print(msg, *args, **kwargs) -> None:
103
- # If someone has a better idea I'll be open for it. This is just
104
- # a here to synchronize the logging output
105
- if kwargs.pop("locked", False):
106
- dm_console.print(msg, *args, **kwargs)
107
- return
108
-
109
- with dm_console_lock:
110
- dm_console.print(msg, *args, **kwargs)
111
-
112
-
113
93
  class ProtocolLogger(logging.LoggerAdapter):
114
94
  def __init__(self, extra=None) -> None:
115
95
  super().__init__(logging.getLogger("dementor"), extra or {})
@@ -226,7 +206,9 @@ class ProtocolLogger(logging.LoggerAdapter):
226
206
  outfile = pathlib.Path(log_file_path)
227
207
  file_exists = outfile.exists()
228
208
  if not file_exists:
229
- open(str(outfile), "x")
209
+ if not outfile.parent.exists():
210
+ outfile.parent.mkdir(parents=True, exist_ok=True)
211
+ open(str(outfile), "x").close()
230
212
 
231
213
  handler = RotatingFileHandler(
232
214
  outfile,
@@ -244,7 +226,7 @@ class ProtocolLogger(logging.LoggerAdapter):
244
226
 
245
227
  handler.setFormatter(formatter)
246
228
  self.logger.addHandler(handler)
247
- self.logger.debug(f"Created log file handler for {log_file_path}")
229
+ self.logger.info(f"Created log file handler for {log_file_path}")
248
230
 
249
231
  @staticmethod
250
232
  def init_logfile(session) -> None:
@@ -255,7 +237,7 @@ class ProtocolLogger(logging.LoggerAdapter):
255
237
  workspace = pathlib.Path(session.workspace_path)
256
238
  workspace /= config.log_dir or "logs"
257
239
  workspace.mkdir(parents=True, exist_ok=True)
258
- log_name = f"log_{datetime.datetime.now().strftime('%Y-%m-%d-%H-%M-%S')}.log"
240
+ log_name = f"log_{util.now()}.log"
259
241
  dm_logger.add_logfile(str(workspace / log_name))
260
242
 
261
243
 
@@ -0,0 +1,214 @@
1
+ from collections import defaultdict
2
+ from io import IOBase
3
+ from pathlib import Path
4
+ from typing import Any, override
5
+
6
+ from dementor.config import util
7
+ from dementor.config.toml import TomlConfig, Attribute as A
8
+ from dementor.log.logger import dm_logger
9
+
10
+ dm_streams = {}
11
+
12
+
13
+ class LoggingStream:
14
+ _name_: str
15
+ _config_cls_: type[TomlConfig]
16
+
17
+ def __init__(self, stream: IOBase) -> None:
18
+ self.fp = stream
19
+
20
+ def close(self) -> None:
21
+ if not self.fp.closed:
22
+ self.fp.flush()
23
+ self.fp.close()
24
+
25
+ def write(self, data: str) -> None:
26
+ line = f"{data}\n"
27
+ self.fp.write(line.encode())
28
+ self.fp.flush()
29
+
30
+ def write_columns(self, *values: Any) -> None:
31
+ line = "\t".join(map(str, values))
32
+ self.write(line)
33
+
34
+ def add(self, **kwargs: Any) -> None:
35
+ pass
36
+
37
+ @classmethod
38
+ def start(cls, session) -> None:
39
+ config = TomlConfig.build_config(cls._config_cls_)
40
+ path = config.path
41
+ if path is not None:
42
+ path = session.resolve_path(path)
43
+ if not path.parent.exists():
44
+ dm_logger.debug(f"Creating log directory {path.parent}")
45
+ path.parent.mkdir(parents=True, exist_ok=True)
46
+
47
+ dm_streams[cls._name_] = cls(path, config)
48
+
49
+
50
+ class LoggingFileStream(LoggingStream):
51
+ def __init__(self, path: str | Path) -> None:
52
+ self.path = Path(path)
53
+ if self.path.exists():
54
+ mode = "ab"
55
+ else:
56
+ mode = "wb"
57
+
58
+ # make sure not error is thrown
59
+ self.path.parent.mkdir(parents=True, exist_ok=True)
60
+ super().__init__(self.path.open(mode))
61
+
62
+ def reopen(self) -> None:
63
+ if not self.fp.closed:
64
+ self.fp.close()
65
+
66
+ self.fp = self.path.open("wb")
67
+
68
+
69
+ class HostsStreamConfig(TomlConfig):
70
+ _section_ = "Log.Stream.Hosts"
71
+ _fields_ = [
72
+ A("path", "Path", default_val=None),
73
+ A("log_ipv4", "IPv4", default_val=True),
74
+ A("log_ipv6", "IPv6", default_val=True),
75
+ ]
76
+
77
+
78
+ class HostsStream(LoggingFileStream):
79
+ _name_ = "hosts"
80
+ _config_cls_ = HostsStreamConfig
81
+
82
+ def __init__(self, path: str | Path, config: HostsStreamConfig) -> None:
83
+ super().__init__(path)
84
+ self.hosts = set()
85
+ self.ipv4 = config.log_ipv4
86
+ self.ipv6 = config.log_ipv6
87
+ dm_logger.info(
88
+ f"Logging host IPs to {path} (IPv4={self.ipv4}, IPv6={self.ipv6})"
89
+ )
90
+
91
+ @override
92
+ def add(self, **kwargs: Any) -> None:
93
+ ip = kwargs.get("ip")
94
+ if ip and ip not in self.hosts:
95
+ if not self.ipv4 and "." in ip:
96
+ return
97
+
98
+ if not self.ipv6 and ":" in ip:
99
+ return
100
+
101
+ self.write_columns(ip)
102
+ self.hosts.add(ip)
103
+
104
+
105
+ class DNSNamesStreamConfig(TomlConfig):
106
+ _section_ = "Log.Stream.DNS"
107
+ _fields_ = [
108
+ A("path", "Path", default_val=None),
109
+ # reserved for future extensions
110
+ ]
111
+
112
+
113
+ class DNSNamesStream(LoggingFileStream):
114
+ _name_ = "dns"
115
+ _config_cls_ = DNSNamesStreamConfig
116
+
117
+ def __init__(self, path: str | Path, config: DNSNamesStreamConfig) -> None:
118
+ super().__init__(path)
119
+ self.hosts = defaultdict(set)
120
+ dm_logger.info(f"Logging DNS names to {path}")
121
+
122
+ @override
123
+ def add(self, **kwargs: Any) -> None:
124
+ name = kwargs.get("type")
125
+ query = kwargs.get("name")
126
+ if name and query:
127
+ if query not in self.hosts[name]:
128
+ self.write_columns(name, query)
129
+ self.hosts[name].add(query)
130
+
131
+
132
+ class HashesStreamConfig(TomlConfig):
133
+ _section_ = "Log.Stream.Hashes"
134
+ _fields_ = [
135
+ A("path", "Path", default_val=None),
136
+ A("split", "Split", default_val=None),
137
+ A("prefix", "FilePrefix", default_val=None),
138
+ A("suffix", "FileSuffix", default_val=".txt"),
139
+ ]
140
+
141
+
142
+ class HashStreams(LoggingFileStream):
143
+ _name_ = "hashes"
144
+ _config_cls_ = HashesStreamConfig
145
+
146
+ def __init__(self, path: str | Path, config: HashesStreamConfig) -> None:
147
+ super().__init__(path if not config.split else "/dev/null")
148
+ self.config = config
149
+ self.path = Path(path)
150
+ self.start_time = util.now()
151
+ dm_logger.info(f"Logging hashes to {path} (split files: {config.split})")
152
+
153
+ @override
154
+ def add(self, **kwargs: Any) -> None:
155
+ hash_type = kwargs.get("type").upper()
156
+ hash_value = kwargs.get("value")
157
+ if hash_type and hash_value:
158
+ if not self.config.split:
159
+ self.write(f"{hash_type} {hash_value}")
160
+ else:
161
+ prefix = self.config.prefix or ""
162
+ suffix = self.config.suffix
163
+ if not prefix:
164
+ prefix = f"{hash_type}_{self.start_time}"
165
+ else:
166
+ prefix = util.format_string(
167
+ prefix,
168
+ {
169
+ "hash_type": hash_type,
170
+ "time": self.start_time,
171
+ },
172
+ )
173
+
174
+ target_path = Path(self.path) / f"{prefix}{suffix}"
175
+ if not target_path.exists():
176
+ # create a new logging stream for that hash type
177
+ target_path.parent.mkdir(parents=True, exist_ok=True)
178
+ dm_streams[f"HASH_{hash_type}"] = LoggingFileStream(target_path)
179
+
180
+ write_to(f"HASH_{hash_type}", str(hash_value))
181
+
182
+
183
+ def init_streams(session):
184
+ HostsStream.start(session)
185
+ DNSNamesStream.start(session)
186
+ HashStreams.start(session)
187
+ session.streams = dm_streams
188
+
189
+
190
+ def add_stream(name: str, stream: LoggingStream):
191
+ dm_streams[name] = stream
192
+
193
+
194
+ def get_stream(name: str) -> LoggingStream:
195
+ return dm_streams.get(name)
196
+
197
+
198
+ def close_streams(session):
199
+ for stream in session.streams.values():
200
+ stream.close()
201
+
202
+
203
+ def log_to(__name: str, /, **kwargs):
204
+ if __name in dm_streams:
205
+ dm_streams[__name].add(**kwargs)
206
+
207
+
208
+ def write_to(name: str, line: str):
209
+ if name in dm_streams:
210
+ dm_streams[name].write(line)
211
+
212
+
213
+ def log_host(ip: str):
214
+ log_to("hosts", ip=ip)
@@ -31,7 +31,7 @@ HTTP_TEMPLATES_PATH = os.path.join(ASSETS_PATH, "www")
31
31
  if __name__ == "__main__":
32
32
  print(f"DefaultWorkspace : {DEMENTOR_PATH}")
33
33
  print(f"AssetsPath : {ASSETS_PATH}")
34
- print(f"ConfigPath : {CONFIG_PATH}")
34
+ print(f"ConfigPath : {CONFIG_PATH} (for root: /root/.dementor)")
35
35
  print(f"BannerPath : {BANNER_PATH}")
36
36
  print(f"DefaultConfigPath : {DEFAULT_CONFIG_PATH}")
37
37
  print(f"HTTPTemplatesPath : {HTTP_TEMPLATES_PATH}")
@@ -19,7 +19,7 @@
19
19
  # SOFTWARE.
20
20
  from dementor.config.toml import TomlConfig, Attribute as A
21
21
  from dementor.config.util import get_value
22
- from dementor.logger import ProtocolLogger
22
+ from dementor.log.logger import ProtocolLogger
23
23
  from dementor.servers import BaseProtoHandler, ThreadingTCPServer, ServerThread
24
24
  from dementor.database import _CLEARTEXT
25
25
 
@@ -35,7 +35,7 @@ from impacket import ntlm
35
35
 
36
36
  from dementor.config.toml import TomlConfig, Attribute as A
37
37
  from dementor.config.util import format_string, get_value, is_true
38
- from dementor.logger import ProtocolLogger, dm_logger
38
+ from dementor.log.logger import ProtocolLogger, dm_logger
39
39
  from dementor.servers import ServerThread, bind_server
40
40
  from dementor.database import _CLEARTEXT, normalize_client_address, _NO_USER
41
41
  from dementor.paths import HTTP_TEMPLATES_PATH
@@ -41,7 +41,7 @@ from dementor.servers import (
41
41
  BaseProtoHandler,
42
42
  create_tls_context,
43
43
  )
44
- from dementor.logger import ProtocolLogger
44
+ from dementor.log.logger import ProtocolLogger
45
45
  from dementor.database import _CLEARTEXT
46
46
  from dementor.config.toml import (
47
47
  TomlConfig,
@@ -46,7 +46,7 @@ from pyipp.tags import ATTRIBUTE_TAG_MAP
46
46
 
47
47
  from dementor.config.toml import Attribute as A, TomlConfig
48
48
  from dementor.config.util import format_string
49
- from dementor.logger import ProtocolLogger, dm_logger
49
+ from dementor.log.logger import ProtocolLogger, dm_logger
50
50
  from dementor.servers import ServerThread, bind_server
51
51
  from dementor.database import normalize_client_address
52
52
 
@@ -49,7 +49,7 @@ from dementor.servers import (
49
49
  BaseProtoHandler,
50
50
  ServerThread,
51
51
  )
52
- from dementor.logger import ProtocolLogger
52
+ from dementor.log.logger import ProtocolLogger
53
53
 
54
54
 
55
55
  class KerberosConfig(TomlConfig):
@@ -39,7 +39,7 @@ from pyasn1.codec.ber import encoder as BEREncoder, decoder as BERDecoder
39
39
  from dementor.config.toml import TomlConfig, Attribute as A
40
40
  from dementor.config.session import SessionConfig
41
41
  from dementor.config.util import get_value
42
- from dementor.logger import ProtocolLogger
42
+ from dementor.log.logger import ProtocolLogger
43
43
  from dementor.servers import (
44
44
  ThreadingTCPServer,
45
45
  ThreadingUDPServer,
@@ -346,7 +346,7 @@ class LDAPHandler(BaseProtoHandler):
346
346
  try:
347
347
  message, _ = BERDecoder.decode(data, asn1Spec=LDAPMessage())
348
348
  except Exception as e:
349
- self.logger.error(f"Failed to decode LDAP packet: {e}")
349
+ self.logger.error(f"Failed to decode LDAP packet. Original data (hex): {data.hex()}")
350
350
  return
351
351
 
352
352
  return message
@@ -31,8 +31,9 @@ from dementor.servers import (
31
31
  )
32
32
  from dementor.config.toml import TomlConfig, Attribute as A
33
33
  from dementor.config.session import SessionConfig
34
- from dementor.logger import ProtocolLogger
34
+ from dementor.log.logger import ProtocolLogger
35
35
  from dementor.filters import ATTR_WHITELIST, ATTR_BLACKLIST, in_scope
36
+ from dementor.log.stream import log_to
36
37
 
37
38
 
38
39
  # --- Protocol Interface ---
@@ -82,7 +83,7 @@ class LLMNRPoisoner(BaseProtoHandler):
82
83
  # similar to mdns but here we don't have to check for .local
83
84
  qname = question.qname.decode(errors="replace").removesuffix(".")
84
85
  qtype = dns.dnsqtypes.get(question.qtype)
85
-
86
+ log_to("dns", type="LLMNR", name=qname)
86
87
  # Whitelist+Blacklist filters
87
88
  if not in_scope(qname, config) or not in_scope(host, config):
88
89
  # REVISIT: maybe log ignored requests via option