dementor 1.0.0.dev8__tar.gz → 1.0.0.dev9__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.

Potentially problematic release.


This version of dementor might be problematic. Click here for more details.

Files changed (59) hide show
  1. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/PKG-INFO +1 -1
  2. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/__init__.py +1 -1
  3. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/config/session.py +1 -0
  4. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/database.py +9 -2
  5. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/http.py +1 -0
  6. dementor-1.0.0.dev9/dementor/protocols/x11.py +272 -0
  7. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor.egg-info/PKG-INFO +1 -1
  8. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor.egg-info/SOURCES.txt +1 -0
  9. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/pyproject.toml +1 -1
  10. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/LICENSE +0 -0
  11. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/README.md +0 -0
  12. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/__main__.py +0 -0
  13. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/assets/Dementor.toml +0 -0
  14. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/assets/banner.txt +0 -0
  15. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/assets/www/error_page.html +0 -0
  16. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/assets/www/wpad.dat +0 -0
  17. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/config/__init__.py +0 -0
  18. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/config/attr.py +0 -0
  19. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/config/toml.py +0 -0
  20. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/config/util.py +0 -0
  21. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/filters.py +0 -0
  22. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/loader.py +0 -0
  23. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/logger.py +0 -0
  24. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/paths.py +0 -0
  25. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/__init__.py +0 -0
  26. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/ftp.py +0 -0
  27. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/imap.py +0 -0
  28. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/kerberos.py +0 -0
  29. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/ldap.py +0 -0
  30. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/llmnr.py +0 -0
  31. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/mdns.py +0 -0
  32. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/msrpc/__init__.py +0 -0
  33. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/msrpc/dcom.py +0 -0
  34. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/msrpc/epm.py +0 -0
  35. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/msrpc/rpc.py +0 -0
  36. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/msrpc.py +0 -0
  37. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/mssql.py +0 -0
  38. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/mysql.py +0 -0
  39. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/netbios.py +0 -0
  40. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/ntlm.py +0 -0
  41. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/pop3.py +0 -0
  42. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/quic.py +0 -0
  43. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/smb.py +0 -0
  44. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/smtp.py +0 -0
  45. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/protocols/spnego.py +0 -0
  46. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/servers.py +0 -0
  47. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor/standalone.py +0 -0
  48. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor.egg-info/dependency_links.txt +0 -0
  49. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor.egg-info/entry_points.txt +0 -0
  50. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor.egg-info/requires.txt +0 -0
  51. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/dementor.egg-info/top_level.txt +0 -0
  52. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/docs/README.pypi.md +0 -0
  53. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/setup.cfg +0 -0
  54. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/test/test_dcerpc.py +0 -0
  55. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/test/test_dcom.py +0 -0
  56. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/test/test_epm.py +0 -0
  57. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/test/test_mssql_auth.py +0 -0
  58. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/test/test_ssl_client.py +0 -0
  59. {dementor-1.0.0.dev8 → dementor-1.0.0.dev9}/test/test_ssl_server.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: dementor
3
- Version: 1.0.0.dev8
3
+ Version: 1.0.0.dev9
4
4
  Summary: LLMNR/NBT-NS/mDNS Poisoner and rogue service provider
5
5
  Author: MatrixEditor
6
6
  Maintainer: MatrixEditor
@@ -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.dev8"
21
+ __version__ = "1.0.0.dev9"
22
22
  __author__ = "MatrixEditor"
@@ -54,6 +54,7 @@ class SessionConfig(TomlConfig):
54
54
  "IMAP",
55
55
  "POP3",
56
56
  "MySQL",
57
+ "X11",
57
58
  )
58
59
  ]
59
60
 
@@ -166,6 +166,7 @@ class DementorDB:
166
166
  domain: str | None = None,
167
167
  hostname: str | None = None,
168
168
  extras: dict | None = None,
169
+ custom: bool = False,
169
170
  ) -> None:
170
171
  if not logger and not protocol:
171
172
  dm_logger.error(
@@ -235,8 +236,10 @@ class DementorDB:
235
236
  else:
236
237
  raise
237
238
  with dm_console_lock:
239
+ head_text = text if not custom else ""
240
+ credtype = markup.escape(credtype)
238
241
  target_logger.success(
239
- f"Captured {credtype} {text}{full_name} from {client_address}:",
242
+ f"Captured {credtype} {head_text}{full_name} from {client_address}:",
240
243
  host=hostname or client_address,
241
244
  locked=True,
242
245
  )
@@ -248,7 +251,11 @@ class DementorDB:
248
251
  )
249
252
 
250
253
  target_logger.highlight(
251
- f"{credtype} {text}: {markup.escape(password)}",
254
+ (
255
+ f"{credtype} {text}: {markup.escape(password)}"
256
+ if not custom
257
+ else f"{credtype}: {markup.escape(password)}"
258
+ ),
252
259
  host=hostname or client_address,
253
260
  locked=True,
254
261
  )
@@ -428,6 +428,7 @@ class HTTPHandler(BaseHTTPRequestHandler):
428
428
  password=token.encode().hex(),
429
429
  logger=logger,
430
430
  extras=self.get_extras(),
431
+ custom=True,
431
432
  )
432
433
  self.finish_request(logger)
433
434
 
@@ -0,0 +1,272 @@
1
+ # Copyright (c) 2025-Present MatrixEditor
2
+ #
3
+ # Permission is hereby granted, free of charge, to any person obtaining a copy
4
+ # of this software and associated documentation files (the "Software"), to deal
5
+ # in the Software without restriction, including without limitation the rights
6
+ # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7
+ # copies of the Software, and to permit persons to whom the Software is
8
+ # furnished to do so, subject to the following conditions:
9
+ #
10
+ # The above copyright notice and this permission notice shall be included in all
11
+ # copies or substantial portions of the Software.
12
+ #
13
+ # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14
+ # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15
+ # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16
+ # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17
+ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18
+ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19
+ # SOFTWARE.
20
+ #
21
+ # Reference:
22
+ # - https://x.org/releases/X11R7.7/doc/xproto/x11protocol.html
23
+ # pyright: reportInvalidTypeForm=false, reportCallIssue=false, reportGeneralTypeIssues=false
24
+ from caterpillar import py
25
+
26
+ from dementor.config.toml import Attribute as A, TomlConfig
27
+ from dementor.logger import ProtocolLogger
28
+ from dementor.servers import BaseProtoHandler, ThreadingTCPServer, ServerThread
29
+ from dementor.database import _NO_USER
30
+
31
+
32
+ class X11Config(TomlConfig):
33
+ _section_ = "X11"
34
+ _fields_ = [
35
+ A("x11_ports", "PortRange", None),
36
+ A("x11_error_reason", "ErrorMessage", "Access denied"),
37
+ ]
38
+
39
+ def set_x11_ports(self, port_range: str | range | dict):
40
+ self.x11_ports = None
41
+ match port_range:
42
+ case range():
43
+ self.x11_ports = port_range
44
+ case dict():
45
+ self.x11_ports = range(
46
+ port_range.get("start", 6000), port_range.get("end", 6005)
47
+ )
48
+ case str():
49
+ values = port_range.split("-")
50
+ if len(values) == 2:
51
+ self.x11_ports = range(int(values[0]), int(values[1]))
52
+
53
+ if not self.x11_ports:
54
+ self.x11_ports = range(6000, 6005)
55
+
56
+
57
+ def apply_config(session):
58
+ session.x11_config = TomlConfig.build_config(X11Config)
59
+
60
+
61
+ def create_server_threads(session):
62
+ servers = []
63
+ if session.x11_enabled:
64
+ for port in session.x11_config.x11_ports:
65
+ servers.append(
66
+ ServerThread(
67
+ session,
68
+ X11Server,
69
+ server_address=(session.bind_address, port),
70
+ )
71
+ )
72
+ return servers
73
+
74
+
75
+ # --- Protocol definitions ---
76
+ # Chapter 3. Common Types
77
+ # Only necessary types are specified here - a complete list can be taken from
78
+ # the reference
79
+ BYTE = py.uint8
80
+ CARD8 = py.uint8
81
+ CARD16 = py.uint16
82
+ CARD32 = py.uint32
83
+ STRING8 = py.Bytes
84
+
85
+ # Chapter 8. Connection Setup
86
+
87
+
88
+ # [Connection Initiation]
89
+ # The value 102 (ASCII uppercase B) means values are transmitted most significant byte first,
90
+ # and value 154 (ASCII lowercase l) means values are transmitted least significant byte first.
91
+ X_CONN_LE = ord("l")
92
+ X_CONN_BE = ord("B")
93
+ X_CONN_REMOTE_LE = ord("r")
94
+ X_CONN_REMOTE_BE = ord("R")
95
+ X_AUTH_MISSING = "Authorization required, but no authorization protocol specified"
96
+
97
+
98
+ # If the number of unused bytes is variable, the encode-form typically is:
99
+ # p unused, p=pad(E)
100
+ # where E is some expression, and pad(E) is the number of bytes needed to round E up to a multiple of four.
101
+ # pad(E) = (4 - (E mod 4)) mod 4
102
+ def pad(E):
103
+ def _wrap(context):
104
+ size = E(context)
105
+ return (4 - (size % 4)) % 4
106
+
107
+ return _wrap
108
+
109
+
110
+ def xConnClient_set_length(context):
111
+ self = context._obj
112
+ self.nbytesAuthProto = len(self.authProto)
113
+ self.nbytesAuthString = len(self.authString)
114
+
115
+
116
+ @py.struct(order=py.LittleEndian)
117
+ class xConnClientPrefixLE:
118
+ byteOrder: py.Const(X_CONN_LE, CARD8)
119
+ _pad: py.padding[1]
120
+ # The version numbers indicate what version of the protocol the client expects the server to implement.
121
+ majorVersion: CARD16
122
+ minorVersion: CARD16
123
+
124
+ _aset_length: py.Action(pack=xConnClient_set_length)
125
+ nbytesAuthProto: CARD16
126
+ nbytesAuthString: CARD16
127
+ _pad2: py.padding[2]
128
+ # The authorization name indicates what authorization (and authentication) protocol the client expects
129
+ # the server to use, and the data is specific to that protocol. Specification of valid authorization
130
+ # mechanisms is not part of the core X protocol. A server that does not implement the protocol the
131
+ # client expects or that only implements the host-based mechanism may simply ignore this information.
132
+ # If both name and data strings are empty, this is to be interpreted as "no explicit authorization."
133
+ authProto: STRING8(py.this.nbytesAuthProto)
134
+ _pad3: py.padding[pad(py.this.nbytesAuthProto)]
135
+ authString: STRING8(py.this.nbytesAuthString)
136
+ _pad4: py.padding[pad(py.this.nbytesAuthString)]
137
+
138
+
139
+ @py.struct(order=py.BigEndian)
140
+ class xConnClientPrefixBE:
141
+ byteOrder: py.Const(X_CONN_BE, CARD8)
142
+ _pad: py.padding[1]
143
+ majorVersion: CARD16
144
+ minorVersion: CARD16
145
+ _aset_length: py.Action(pack=xConnClient_set_length)
146
+ nbytesAuthProto: CARD16
147
+ nbytesAuthString: CARD16
148
+ _pad2: py.padding[2]
149
+ authProto: STRING8(py.this.nbytesAuthProto)
150
+ _pad3: py.padding[pad(py.this.nbytesAuthProto)]
151
+ authString: STRING8(py.this.nbytesAuthString)
152
+ _pad4: py.padding[pad(py.this.nbytesAuthString)]
153
+
154
+
155
+ # [Server Response]
156
+ X_CONN_FAILED = 0
157
+ X_CONN_SUCCESS = 1
158
+ X_CONN_AUTHENTICATE = 2
159
+
160
+
161
+ # nformation received by the client if the connection is refused:
162
+ # 1 0 Failed
163
+ # 1 n length of reason in bytes
164
+ # 2 CARD16 protocol-major-version
165
+ # 2 CARD16 protocol-minor-version
166
+ # 2 (n+p)/4 length in 4-byte units of "additional data"
167
+ # n STRING8 reason
168
+ # p unused, p=pad(n)
169
+ def xConnSetup_set_length(context):
170
+ self = context._obj
171
+ self.lengthReason = len(self.reason)
172
+ pad = (4 - (self.lengthReason % 4)) % 4
173
+ self.length = (self.lengthReason + pad) // 4
174
+
175
+
176
+ @py.struct(order=py.LittleEndian)
177
+ class xConnSetupPrefixLE:
178
+ _aset_length: py.Action(pack=xConnSetup_set_length)
179
+
180
+ # Taken from Xproto.h#L286:
181
+ # The protocol also defines a case of success == Authenticate, but
182
+ # that doesn't seem to have ever been implemented by the X Consortium.
183
+ success: CARD8 = X_CONN_SUCCESS
184
+ lengthReason: BYTE = 0
185
+ majorVersion: CARD16
186
+ minorVersion: CARD16
187
+ length: CARD16 = 0
188
+ reason: STRING8(py.this.lengthReason)
189
+ _pad: py.padding[pad(py.this.lengthReason)] = None
190
+
191
+
192
+ @py.struct(order=py.BigEndian)
193
+ class xConnSetupPrefixBE:
194
+ _aset_length: py.Action(pack=xConnSetup_set_length)
195
+ success: CARD8 = X_CONN_SUCCESS
196
+ lengthReason: BYTE = 0
197
+ majorVersion: CARD16
198
+ minorVersion: CARD16
199
+ length: CARD16 = 0
200
+ reason: STRING8(py.this.lengthReason)
201
+ _pad: py.padding[pad(py.this.lengthReason)] = None
202
+
203
+
204
+ # -- Server and Handler ---
205
+ class X11Handler(BaseProtoHandler):
206
+ def proto_logger(self) -> ProtocolLogger:
207
+ return ProtocolLogger(
208
+ extra={
209
+ "protocol": "X11",
210
+ "protocol_color": "light_sky_blue1",
211
+ "host": self.client_host,
212
+ "port": self.server.server_address[1],
213
+ }
214
+ )
215
+
216
+ def handle_data(self, data, transport) -> None:
217
+ data = self.recv(8192)
218
+ if not data:
219
+ return
220
+
221
+ self.logger.debug(f"({chr(data[0])!r}) {data.hex()}", is_client=True)
222
+ match chr(data[0]):
223
+ case "l" | "r": # Xserver implementation uses 'r' for remote
224
+ RequestTy = xConnClientPrefixLE
225
+ ResponseTy = xConnSetupPrefixLE
226
+ endian_name = "LE"
227
+ case "B" | "R":
228
+ RequestTy = xConnClientPrefixBE
229
+ ResponseTy = xConnSetupPrefixBE
230
+ endian_name = "BE"
231
+ case _:
232
+ return self.logger.warning(
233
+ f"Unknown byteorder type in X11 request: '{data[0]:#x}'"
234
+ )
235
+
236
+ try:
237
+ request: RequestTy = py.unpack(RequestTy, data)
238
+ except Exception as e:
239
+ return self.logger.error(f"Invalid X11 request: {e}")
240
+
241
+ error_message = X_AUTH_MISSING
242
+ if request.authProto:
243
+ self.config.db.add_auth(
244
+ client=self.client_address,
245
+ credtype=request.authProto.decode(errors="replace").strip(),
246
+ username=_NO_USER,
247
+ password=request.authString.hex(),
248
+ logger=self.logger,
249
+ custom=True,
250
+ )
251
+ error_message = self.config.x11_config.x11_error_reason
252
+ else:
253
+ self.logger.display(
254
+ f"[i]Anonymous[/i] X11 request from {self.client_host} (version: "
255
+ f"{request.majorVersion}.{request.minorVersion})"
256
+ )
257
+
258
+ resp = ResponseTy(
259
+ success=X_CONN_FAILED,
260
+ reason=error_message.encode(errors="replace"),
261
+ majorVersion=request.majorVersion,
262
+ minorVersion=request.minorVersion,
263
+ )
264
+ data = py.pack(resp)
265
+ self.logger.debug(f"({endian_name}) {data.hex()}", is_server=True)
266
+ self.send(data)
267
+
268
+
269
+ class X11Server(ThreadingTCPServer):
270
+ default_port = 6000
271
+ default_handler_class = X11Handler
272
+ service_name = "X11"
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: dementor
3
- Version: 1.0.0.dev8
3
+ Version: 1.0.0.dev9
4
4
  Summary: LLMNR/NBT-NS/mDNS Poisoner and rogue service provider
5
5
  Author: MatrixEditor
6
6
  Maintainer: MatrixEditor
@@ -43,6 +43,7 @@ dementor/protocols/quic.py
43
43
  dementor/protocols/smb.py
44
44
  dementor/protocols/smtp.py
45
45
  dementor/protocols/spnego.py
46
+ dementor/protocols/x11.py
46
47
  dementor/protocols/msrpc/__init__.py
47
48
  dementor/protocols/msrpc/dcom.py
48
49
  dementor/protocols/msrpc/epm.py
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "dementor"
3
- version = "1.0.0.dev8"
3
+ version = "1.0.0.dev9"
4
4
  license = { file = "LICENSE" }
5
5
 
6
6
  description = "LLMNR/NBT-NS/mDNS Poisoner and rogue service provider"
File without changes
File without changes
File without changes