@push.rocks/smartmta 5.3.1 → 6.0.0
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.
- package/changelog.md +29 -0
- package/dist_rust/mailer-bin_linux_amd64 +0 -0
- package/dist_rust/mailer-bin_linux_arm64 +0 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/mail/core/classes.bouncemanager.d.ts +2 -1
- package/dist_ts/mail/core/classes.bouncemanager.js +6 -5
- package/dist_ts/mail/delivery/classes.delivery.queue.d.ts +3 -2
- package/dist_ts/mail/delivery/classes.delivery.queue.js +4 -1
- package/dist_ts/mail/index.d.ts +1 -0
- package/dist_ts/mail/index.js +2 -1
- package/dist_ts/mail/interfaces.storage.d.ts +7 -0
- package/dist_ts/mail/interfaces.storage.js +4 -0
- package/dist_ts/mail/routing/classes.dkim.manager.d.ts +2 -1
- package/dist_ts/mail/routing/classes.dkim.manager.js +17 -8
- package/dist_ts/mail/routing/classes.dns.manager.d.ts +1 -5
- package/dist_ts/mail/routing/classes.dns.manager.js +2 -2
- package/dist_ts/mail/routing/classes.email.router.d.ts +2 -1
- package/dist_ts/mail/routing/classes.email.router.js +6 -5
- package/dist_ts/mail/routing/classes.unified.email.server.d.ts +80 -3
- package/dist_ts/mail/routing/classes.unified.email.server.js +339 -47
- package/dist_ts/mail/routing/interfaces.d.ts +2 -0
- package/dist_ts/mail/security/classes.dkimcreator.d.ts +10 -5
- package/dist_ts/mail/security/classes.dkimcreator.js +91 -70
- package/dist_ts/security/classes.ipreputationchecker.d.ts +4 -3
- package/dist_ts/security/classes.ipreputationchecker.js +4 -3
- package/dist_ts/security/classes.rustsecuritybridge.d.ts +33 -1
- package/dist_ts/security/classes.rustsecuritybridge.js +18 -1
- package/package.json +19 -21
- package/readme.hints.md +1 -1
- package/readme.md +100 -30
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/mail/core/classes.bouncemanager.ts +7 -6
- package/ts/mail/delivery/classes.delivery.queue.ts +7 -3
- package/ts/mail/index.ts +2 -1
- package/ts/mail/interfaces.storage.ts +13 -0
- package/ts/mail/routing/classes.dkim.manager.ts +24 -11
- package/ts/mail/routing/classes.dns.manager.ts +3 -8
- package/ts/mail/routing/classes.email.router.ts +7 -6
- package/ts/mail/routing/classes.unified.email.server.ts +446 -50
- package/ts/mail/routing/interfaces.ts +3 -1
- package/ts/mail/security/classes.dkimcreator.ts +115 -91
- package/ts/security/classes.ipreputationchecker.ts +7 -6
- package/ts/security/classes.rustsecuritybridge.ts +53 -0
|
@@ -442,6 +442,13 @@ export class RustSecurityBridge extends EventEmitter {
|
|
|
442
442
|
this.ensureRunning();
|
|
443
443
|
await this.bridge.sendCommand('emailProcessingResult', opts);
|
|
444
444
|
}
|
|
445
|
+
/**
|
|
446
|
+
* Send the result of recipient policy validation back to the Rust SMTP server.
|
|
447
|
+
*/
|
|
448
|
+
async sendRcptToResult(opts) {
|
|
449
|
+
this.ensureRunning();
|
|
450
|
+
await this.bridge.sendCommand('rcptToResult', opts);
|
|
451
|
+
}
|
|
445
452
|
/**
|
|
446
453
|
* Send the result of authentication validation back to the Rust SMTP server.
|
|
447
454
|
*/
|
|
@@ -472,6 +479,12 @@ export class RustSecurityBridge extends EventEmitter {
|
|
|
472
479
|
onEmailReceived(handler) {
|
|
473
480
|
this.bridge.on('management:emailReceived', handler);
|
|
474
481
|
}
|
|
482
|
+
/**
|
|
483
|
+
* Register a handler for RCPT TO policy requests from the Rust SMTP server.
|
|
484
|
+
*/
|
|
485
|
+
onRcptToRequest(handler) {
|
|
486
|
+
this.bridge.on('management:rcptToRequest', handler);
|
|
487
|
+
}
|
|
475
488
|
/**
|
|
476
489
|
* Register a handler for authRequest events from the Rust SMTP server.
|
|
477
490
|
* The handler must call sendAuthResult() with the correlationId.
|
|
@@ -490,6 +503,10 @@ export class RustSecurityBridge extends EventEmitter {
|
|
|
490
503
|
offEmailReceived(handler) {
|
|
491
504
|
this.bridge.off('management:emailReceived', handler);
|
|
492
505
|
}
|
|
506
|
+
/** Remove an RCPT TO policy request handler. */
|
|
507
|
+
offRcptToRequest(handler) {
|
|
508
|
+
this.bridge.off('management:rcptToRequest', handler);
|
|
509
|
+
}
|
|
493
510
|
/** Remove an authRequest event handler. */
|
|
494
511
|
offAuthRequest(handler) {
|
|
495
512
|
this.bridge.off('management:authRequest', handler);
|
|
@@ -499,4 +516,4 @@ export class RustSecurityBridge extends EventEmitter {
|
|
|
499
516
|
this.bridge.off('management:scramCredentialRequest', handler);
|
|
500
517
|
}
|
|
501
518
|
}
|
|
502
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.rustsecuritybridge.js","sourceRoot":"","sources":["../../ts/security/classes.rustsecuritybridge.ts"],"names":[],"mappings":"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"}
|
|
519
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.rustsecuritybridge.js","sourceRoot":"","sources":["../../ts/security/classes.rustsecuritybridge.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartmta",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "6.0.0",
|
|
4
4
|
"description": "A high-performance, enterprise-grade Mail Transfer Agent (MTA) built from scratch in TypeScript with Rust acceleration.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"mta",
|
|
@@ -30,29 +30,25 @@
|
|
|
30
30
|
"exports": {
|
|
31
31
|
".": "./dist_ts/index.js"
|
|
32
32
|
},
|
|
33
|
-
"scripts": {
|
|
34
|
-
"test": "tstest test/ --logfile --verbose --timeout 60",
|
|
35
|
-
"build": "tsbuild tsfolders && tsrust",
|
|
36
|
-
"check": "tsbuild check"
|
|
37
|
-
},
|
|
38
33
|
"devDependencies": {
|
|
39
|
-
"@git.zone/
|
|
40
|
-
"@git.zone/
|
|
41
|
-
"@git.zone/
|
|
34
|
+
"@git.zone/cli": "^2.19.6",
|
|
35
|
+
"@git.zone/tsbuild": "4.1.2",
|
|
36
|
+
"@git.zone/tsrust": "^1.3.4",
|
|
37
|
+
"@git.zone/tstest": "^3.6.6",
|
|
42
38
|
"@types/mailparser": "^3.4.6",
|
|
43
|
-
"@types/node": "^25.
|
|
39
|
+
"@types/node": "^25.9.1",
|
|
44
40
|
"tsx": "^4.21.0"
|
|
45
41
|
},
|
|
46
42
|
"dependencies": {
|
|
47
43
|
"@push.rocks/smartfile": "^13.1.2",
|
|
48
|
-
"@push.rocks/smartfs": "^1.
|
|
49
|
-
"@push.rocks/smartlog": "^3.
|
|
44
|
+
"@push.rocks/smartfs": "^1.5.0",
|
|
45
|
+
"@push.rocks/smartlog": "^3.2.2",
|
|
50
46
|
"@push.rocks/smartmail": "^2.2.0",
|
|
51
47
|
"@push.rocks/smartpath": "^6.0.0",
|
|
52
|
-
"@push.rocks/smartrust": "^1.2
|
|
53
|
-
"@tsclass/tsclass": "^9.
|
|
54
|
-
"lru-cache": "^
|
|
55
|
-
"mailparser": "^3.9.
|
|
48
|
+
"@push.rocks/smartrust": "^1.3.2",
|
|
49
|
+
"@tsclass/tsclass": "^9.5.0",
|
|
50
|
+
"lru-cache": "^10.4.3",
|
|
51
|
+
"mailparser": "^3.9.8",
|
|
56
52
|
"uuid": "^13.0.0"
|
|
57
53
|
},
|
|
58
54
|
"files": [
|
|
@@ -67,9 +63,7 @@
|
|
|
67
63
|
"node": ">=14.0.0"
|
|
68
64
|
},
|
|
69
65
|
"os": [
|
|
70
|
-
"
|
|
71
|
-
"linux",
|
|
72
|
-
"win32"
|
|
66
|
+
"linux"
|
|
73
67
|
],
|
|
74
68
|
"cpu": [
|
|
75
69
|
"x64",
|
|
@@ -79,5 +73,9 @@
|
|
|
79
73
|
"access": "public",
|
|
80
74
|
"registry": "https://registry.npmjs.org/"
|
|
81
75
|
},
|
|
82
|
-
"
|
|
83
|
-
|
|
76
|
+
"scripts": {
|
|
77
|
+
"test": "tstest test/ --logfile --verbose --timeout 60",
|
|
78
|
+
"build": "tsbuild tsfolders && tsrust",
|
|
79
|
+
"check": "tsbuild check"
|
|
80
|
+
}
|
|
81
|
+
}
|
package/readme.hints.md
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
- `mailer-bin` is the binary target that `tsrust` builds for cross-compilation
|
|
7
7
|
- `mailer-napi` is a cdylib for N-API bindings (not built by tsrust, needs separate napi-rs build pipeline)
|
|
8
8
|
- tsrust only supports binary targets (looks for `src/main.rs` or `[[bin]]` entries)
|
|
9
|
-
- Cross-compilation targets: `linux_amd64`, `linux_arm64` (configured in
|
|
9
|
+
- Cross-compilation targets: `linux_amd64`, `linux_arm64` (configured in `.smartconfig.json`)
|
|
10
10
|
- Build output goes to `dist_rust/`
|
|
11
11
|
|
|
12
12
|
## Build
|
package/readme.md
CHANGED
|
@@ -70,11 +70,12 @@ After installation, run `pnpm build` to compile the Rust binary (`mailer-bin`).
|
|
|
70
70
|
|
|
71
71
|
**Data flow for inbound mail:**
|
|
72
72
|
|
|
73
|
-
1. 📨 Rust SMTP server accepts the connection and handles the
|
|
74
|
-
2.
|
|
75
|
-
3.
|
|
76
|
-
4.
|
|
77
|
-
5.
|
|
73
|
+
1. 📨 Rust SMTP server accepts the connection and handles the SMTP protocol
|
|
74
|
+
2. 🛂 If recipient validation is enabled, Rust asks TypeScript to approve each `RCPT TO` before `DATA`
|
|
75
|
+
3. 🔒 On `DATA` completion, Rust runs the security pipeline **in-process** (DKIM/SPF/DMARC verification, content scanning, IP reputation check) — zero IPC round-trips
|
|
76
|
+
4. 📤 Rust emits an `emailReceived` event via IPC with pre-computed security results attached
|
|
77
|
+
5. 🔀 TypeScript accepts responsibility or rejects the message through routing and optional hooks
|
|
78
|
+
6. ✅ Rust sends the final SMTP response only after TypeScript returns the acceptance decision
|
|
78
79
|
|
|
79
80
|
**Data flow for outbound mail:**
|
|
80
81
|
|
|
@@ -95,6 +96,8 @@ import { UnifiedEmailServer } from '@push.rocks/smartmta';
|
|
|
95
96
|
const emailServer = new UnifiedEmailServer(dcRouterRef, {
|
|
96
97
|
// Ports to listen on (465 = implicit TLS, 25/587 = STARTTLS)
|
|
97
98
|
ports: [25, 587, 465],
|
|
99
|
+
|
|
100
|
+
// Public SMTP hostname used for greeting/banner and as the default outbound identity
|
|
98
101
|
hostname: 'mail.example.com',
|
|
99
102
|
|
|
100
103
|
// Multi-domain configuration
|
|
@@ -145,8 +148,58 @@ const emailServer = new UnifiedEmailServer(dcRouterRef, {
|
|
|
145
148
|
},
|
|
146
149
|
},
|
|
147
150
|
},
|
|
151
|
+
{
|
|
152
|
+
name: 'authenticated-outbound-relay',
|
|
153
|
+
priority: 90,
|
|
154
|
+
match: {
|
|
155
|
+
authenticated: true,
|
|
156
|
+
recipients: '*@*',
|
|
157
|
+
},
|
|
158
|
+
action: {
|
|
159
|
+
type: 'process',
|
|
160
|
+
// External relay is denied by default. Set allowRelay only on routes that explicitly permit it.
|
|
161
|
+
allowRelay: true,
|
|
162
|
+
},
|
|
163
|
+
},
|
|
148
164
|
],
|
|
149
165
|
|
|
166
|
+
smtp: {
|
|
167
|
+
// Enabled by default: ask TypeScript to approve every RCPT TO before DATA.
|
|
168
|
+
recipientValidation: true,
|
|
169
|
+
recipientValidationTimeoutMs: 5000,
|
|
170
|
+
|
|
171
|
+
// Timeout for hooks.onMessageData before returning a temporary SMTP failure.
|
|
172
|
+
messageAcceptanceTimeoutMs: 30000,
|
|
173
|
+
|
|
174
|
+
// Set required to true only on backend listeners reached through trusted proxies.
|
|
175
|
+
proxyProtocol: {
|
|
176
|
+
required: false,
|
|
177
|
+
trustedIps: [],
|
|
178
|
+
},
|
|
179
|
+
},
|
|
180
|
+
|
|
181
|
+
hooks: {
|
|
182
|
+
async onRcptTo(context) {
|
|
183
|
+
if (context.abortSignal?.aborted) {
|
|
184
|
+
return { accepted: false, smtpCode: 451, smtpMessage: 'Recipient policy timeout' };
|
|
185
|
+
}
|
|
186
|
+
const recipientDomain = context.rcptTo.split('@').pop()?.toLowerCase();
|
|
187
|
+
if (recipientDomain === 'example.com') {
|
|
188
|
+
return { accepted: true };
|
|
189
|
+
}
|
|
190
|
+
if (context.authenticated) {
|
|
191
|
+
// External relay still requires a matched route with action.allowRelay: true.
|
|
192
|
+
return { accepted: true };
|
|
193
|
+
}
|
|
194
|
+
return { accepted: false, smtpCode: 550, smtpMessage: 'Relay not permitted' };
|
|
195
|
+
},
|
|
196
|
+
async onMessageData(context) {
|
|
197
|
+
// Return accepted only after the consumer has taken responsibility for the message.
|
|
198
|
+
// await durableStore.save(context.email, context.rawMessage, { signal: context.abortSignal });
|
|
199
|
+
return { accepted: true, continueProcessing: false };
|
|
200
|
+
},
|
|
201
|
+
},
|
|
202
|
+
|
|
150
203
|
// Authentication settings for the SMTP server
|
|
151
204
|
auth: {
|
|
152
205
|
required: false,
|
|
@@ -160,6 +213,16 @@ const emailServer = new UnifiedEmailServer(dcRouterRef, {
|
|
|
160
213
|
keyPath: '/etc/ssl/mail.key',
|
|
161
214
|
},
|
|
162
215
|
|
|
216
|
+
outbound: {
|
|
217
|
+
// Optional override for outbound EHLO/HELO identity
|
|
218
|
+
hostname: 'smtp-out.example.com',
|
|
219
|
+
},
|
|
220
|
+
|
|
221
|
+
queue: {
|
|
222
|
+
storageType: 'disk',
|
|
223
|
+
persistentPath: '/var/lib/smartmta/email-queue',
|
|
224
|
+
},
|
|
225
|
+
|
|
163
226
|
maxMessageSize: 25 * 1024 * 1024, // 25 MB
|
|
164
227
|
maxClients: 500,
|
|
165
228
|
});
|
|
@@ -169,6 +232,20 @@ await emailServer.start();
|
|
|
169
232
|
```
|
|
170
233
|
|
|
171
234
|
> 🔒 **Note:** `start()` will throw if the Rust binary is not compiled. Run `pnpm build` first.
|
|
235
|
+
>
|
|
236
|
+
> `hostname` is the public SMTP identity for greetings and outbound delivery by default. It is not a bind address.
|
|
237
|
+
|
|
238
|
+
### 🛂 Inbound Recipient Policy And Relay Control
|
|
239
|
+
|
|
240
|
+
SmartMTA validates each `RCPT TO` before the client can enter `DATA` by default. The default policy evaluates routes and accepts configured local domains. External recipients are rejected unless the matched route action explicitly sets `allowRelay: true`. Set `smtp.recipientValidation: false` only on fully trusted private listeners where another layer performs recipient and relay policy.
|
|
241
|
+
|
|
242
|
+
Use `allowRelay` only for intentional relay routes, for example authenticated submission or tightly scoped internal networks. Broad `process` or `deliver` routes do not grant relay permission by themselves.
|
|
243
|
+
|
|
244
|
+
`hooks.onRcptTo` and `hooks.onMessageData` are awaited asynchronously. If a hook throws or times out, SmartMTA returns a temporary SMTP failure. The hook context includes `abortSignal`; long-running consumers should observe it and stop work promptly. A custom `onRcptTo` hook may accept local recipients using application-specific lookup, but external relay is still blocked unless a matched route explicitly sets `allowRelay: true`.
|
|
245
|
+
|
|
246
|
+
`hooks.onMessageData` runs after `DATA` and before the final SMTP response. Return `{ accepted: true }` only after your application has accepted responsibility for the message, such as after durable persistence. Set `continueProcessing: false` when the consumer owns all downstream processing.
|
|
247
|
+
|
|
248
|
+
Trusted PROXY protocol v1 support is configured with `smtp.proxyProtocol`. Only enable `required: true` on backend listeners that are reached through a trusted local or private proxy, and always provide `trustedIps`. Required PROXY mode fails closed when no trusted peers are configured.
|
|
172
249
|
|
|
173
250
|
### 📧 Sending Emails (Automatic MX Discovery)
|
|
174
251
|
|
|
@@ -201,6 +278,8 @@ const emailId = await emailServer.sendEmail(email);
|
|
|
201
278
|
const emailId2 = await emailServer.sendEmail(email, 'mta');
|
|
202
279
|
```
|
|
203
280
|
|
|
281
|
+
`sendEmail()` returns the delivery queue item ID, which you can later use with queue/status APIs.
|
|
282
|
+
|
|
204
283
|
In MTA mode, smartmta:
|
|
205
284
|
- 🔍 Resolves MX records for each recipient domain (e.g. `gmail.com`, `company.org`)
|
|
206
285
|
- 📊 Sorts MX hosts by priority (lowest = highest priority per RFC 5321)
|
|
@@ -254,6 +333,7 @@ The `sendOutboundEmail` method:
|
|
|
254
333
|
- 🔑 Automatically resolves DKIM keys from the `DKIMCreator` for the specified domain
|
|
255
334
|
- 🔗 Uses connection pooling in Rust — reuses TCP/TLS connections across sends
|
|
256
335
|
- ⏱️ Configurable connection and socket timeouts via `outbound` options on the server
|
|
336
|
+
- 🪪 Uses `outbound.hostname` as the SMTP identity when configured, otherwise falls back to `hostname`
|
|
257
337
|
|
|
258
338
|
### 🔑 DKIM Signing & Key Management
|
|
259
339
|
|
|
@@ -289,25 +369,15 @@ When `UnifiedEmailServer.start()` is called:
|
|
|
289
369
|
|
|
290
370
|
All verification is powered by the Rust binary. For inbound mail, `UnifiedEmailServer` runs the full security pipeline **automatically** — DKIM, SPF, DMARC, content scanning, and IP reputation in a single Rust pass. Results are attached as headers (`Received-SPF`, `X-DKIM-Result`, `X-DMARC-Result`).
|
|
291
371
|
|
|
292
|
-
|
|
372
|
+
For direct TypeScript usage, `SpfVerifier` is exported as a lightweight SPF record parser. DKIM signing/key management is handled through `DKIMCreator` and the Rust bridge; SPF, DKIM, and DMARC verification results are produced by the automatic inbound security pipeline.
|
|
293
373
|
|
|
294
374
|
```typescript
|
|
295
|
-
import {
|
|
375
|
+
import { SpfVerifier } from '@push.rocks/smartmta';
|
|
296
376
|
|
|
297
|
-
// SPF
|
|
377
|
+
// Local SPF record parsing
|
|
298
378
|
const spfVerifier = new SpfVerifier();
|
|
299
|
-
const
|
|
300
|
-
// -> {
|
|
301
|
-
|
|
302
|
-
// DKIM verification
|
|
303
|
-
const dkimVerifier = new DKIMVerifier();
|
|
304
|
-
const dkimResult = await dkimVerifier.verify(rawEmailContent);
|
|
305
|
-
// -> [{ is_valid: true, domain: 'example.com', selector: 'default', status: 'pass' }]
|
|
306
|
-
|
|
307
|
-
// DMARC verification
|
|
308
|
-
const dmarcVerifier = new DmarcVerifier();
|
|
309
|
-
const dmarcResult = await dmarcVerifier.verify(email, spfResult, dkimResult);
|
|
310
|
-
// -> { action: 'pass' | 'quarantine' | 'reject', policy, spfDomainAligned, dkimDomainAligned }
|
|
379
|
+
const spfRecord = spfVerifier.parseSpfRecord('v=spf1 ip4:192.0.2.0/24 -all');
|
|
380
|
+
// -> { version: 'spf1', mechanisms: [...], modifiers: {} }
|
|
311
381
|
```
|
|
312
382
|
|
|
313
383
|
### 🔀 Email Routing
|
|
@@ -375,6 +445,8 @@ const matchedRoute = await router.evaluateRoutes(emailContext);
|
|
|
375
445
|
| `process` | Queue for processing (with optional content scanning and DKIM signing) |
|
|
376
446
|
| `reject` | Reject with a configurable SMTP error code and message |
|
|
377
447
|
|
|
448
|
+
Every action can include `allowRelay?: boolean`. It defaults to `false`. Non-local recipients are accepted only when the matched action explicitly sets `allowRelay: true`; configured local domains remain eligible for inbound delivery without relay permission.
|
|
449
|
+
|
|
378
450
|
#### Match Criteria
|
|
379
451
|
|
|
380
452
|
| Criterion | Description |
|
|
@@ -515,10 +587,10 @@ Performance-critical operations are implemented in Rust and communicate with the
|
|
|
515
587
|
|
|
516
588
|
| Crate | Status | Purpose |
|
|
517
589
|
|---|---|---|
|
|
518
|
-
| `mailer-core` |
|
|
519
|
-
| `mailer-security` |
|
|
520
|
-
| `mailer-smtp` |
|
|
521
|
-
| `mailer-bin` |
|
|
590
|
+
| `mailer-core` | Complete | Email types, validation, MIME building, bounce detection |
|
|
591
|
+
| `mailer-security` | Complete | DKIM sign/verify, SPF, DMARC, IP reputation/DNSBL, content scanning |
|
|
592
|
+
| `mailer-smtp` | Complete | Full SMTP protocol engine — TCP/TLS server + client, STARTTLS, AUTH, pipelining, connection pooling, in-process security pipeline |
|
|
593
|
+
| `mailer-bin` | Complete | CLI + smartrust IPC bridge — wires everything together |
|
|
522
594
|
|
|
523
595
|
### What Runs Where
|
|
524
596
|
|
|
@@ -547,7 +619,7 @@ smartmta/
|
|
|
547
619
|
│ │ ├── core/ # Email, EmailValidator, BounceManager, TemplateManager
|
|
548
620
|
│ │ ├── delivery/ # DeliveryQueue, DeliverySystem, RateLimiter
|
|
549
621
|
│ │ ├── routing/ # UnifiedEmailServer, EmailRouter, DomainRegistry, DnsManager
|
|
550
|
-
│ │ └── security/ # DKIMCreator,
|
|
622
|
+
│ │ └── security/ # DKIMCreator, SpfVerifier
|
|
551
623
|
│ └── security/ # ContentScanner, IPReputationChecker, RustSecurityBridge
|
|
552
624
|
├── rust/ # Rust workspace
|
|
553
625
|
│ └── crates/
|
|
@@ -555,7 +627,7 @@ smartmta/
|
|
|
555
627
|
│ ├── mailer-security/ # DKIM, SPF, DMARC, IP reputation, content scanning
|
|
556
628
|
│ ├── mailer-smtp/ # Full SMTP server + client (TCP/TLS, rate limiting, pooling)
|
|
557
629
|
│ └── mailer-bin/ # CLI + smartrust IPC bridge
|
|
558
|
-
├── test/ #
|
|
630
|
+
├── test/ # TypeScript test suite
|
|
559
631
|
├── dist_ts/ # Compiled TypeScript output
|
|
560
632
|
└── dist_rust/ # Compiled Rust binaries
|
|
561
633
|
```
|
|
@@ -592,9 +664,7 @@ tstest test/test.e2e.outbound-delivery.node.ts --verbose --timeout 60
|
|
|
592
664
|
| `DomainRegistry` | Multi-domain configuration manager |
|
|
593
665
|
| `DnsManager` | Automatic DNS record management |
|
|
594
666
|
| `DKIMCreator` | DKIM key generation, storage, rotation |
|
|
595
|
-
| `
|
|
596
|
-
| `SpfVerifier` | SPF record validation (delegates to Rust) |
|
|
597
|
-
| `DmarcVerifier` | DMARC policy enforcement (delegates to Rust) |
|
|
667
|
+
| `SpfVerifier` | Lightweight SPF record parser |
|
|
598
668
|
|
|
599
669
|
### Namespaced Exports
|
|
600
670
|
|
|
@@ -605,7 +675,7 @@ tstest test/test.e2e.outbound-delivery.node.ts --verbose --timeout 60
|
|
|
605
675
|
|
|
606
676
|
## License and Legal Information
|
|
607
677
|
|
|
608
|
-
This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [
|
|
678
|
+
This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [license](./license) file.
|
|
609
679
|
|
|
610
680
|
**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
|
|
611
681
|
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as plugins from '../../plugins.js';
|
|
2
2
|
import * as paths from '../../paths.js';
|
|
3
3
|
import { logger } from '../../logger.js';
|
|
4
|
+
import { hasStorageManagerMethods, type IStorageManagerLike } from '../interfaces.storage.js';
|
|
4
5
|
import { SecurityLogger, SecurityLogLevel, SecurityEventType } from '../../security/index.js';
|
|
5
6
|
import { RustSecurityBridge } from '../../security/classes.rustsecuritybridge.js';
|
|
6
7
|
import { LRUCache } from 'lru-cache';
|
|
@@ -107,13 +108,13 @@ export class BounceManager {
|
|
|
107
108
|
expiresAt?: number; // undefined means permanent
|
|
108
109
|
}> = new Map();
|
|
109
110
|
|
|
110
|
-
private storageManager?:
|
|
111
|
+
private storageManager?: IStorageManagerLike;
|
|
111
112
|
|
|
112
113
|
constructor(options?: {
|
|
113
114
|
retryStrategy?: Partial<RetryStrategy>;
|
|
114
115
|
maxCacheSize?: number;
|
|
115
116
|
cacheTTL?: number;
|
|
116
|
-
|
|
117
|
+
storageManager?: IStorageManagerLike;
|
|
117
118
|
}) {
|
|
118
119
|
// Set retry strategy with defaults
|
|
119
120
|
if (options?.retryStrategy) {
|
|
@@ -552,7 +553,7 @@ export class BounceManager {
|
|
|
552
553
|
try {
|
|
553
554
|
const suppressionData = JSON.stringify(Array.from(this.suppressionList.entries()));
|
|
554
555
|
|
|
555
|
-
if (this.storageManager) {
|
|
556
|
+
if (hasStorageManagerMethods(this.storageManager, ['set'])) {
|
|
556
557
|
// Use storage manager
|
|
557
558
|
await this.storageManager.set('/email/bounces/suppression-list.json', suppressionData);
|
|
558
559
|
} else {
|
|
@@ -574,7 +575,7 @@ export class BounceManager {
|
|
|
574
575
|
let entries = null;
|
|
575
576
|
let needsMigration = false;
|
|
576
577
|
|
|
577
|
-
if (this.storageManager) {
|
|
578
|
+
if (hasStorageManagerMethods(this.storageManager, ['get'])) {
|
|
578
579
|
// Try to load from storage manager first
|
|
579
580
|
const suppressionData = await this.storageManager.get('/email/bounces/suppression-list.json');
|
|
580
581
|
|
|
@@ -636,7 +637,7 @@ export class BounceManager {
|
|
|
636
637
|
try {
|
|
637
638
|
const bounceData = JSON.stringify(bounce, null, 2);
|
|
638
639
|
|
|
639
|
-
if (this.storageManager) {
|
|
640
|
+
if (hasStorageManagerMethods(this.storageManager, ['set'])) {
|
|
640
641
|
// Use storage manager
|
|
641
642
|
await this.storageManager.set(`/email/bounces/records/${bounce.id}.json`, bounceData);
|
|
642
643
|
} else {
|
|
@@ -750,4 +751,4 @@ export class BounceManager {
|
|
|
750
751
|
this.cleanupInterval = undefined;
|
|
751
752
|
}
|
|
752
753
|
}
|
|
753
|
-
}
|
|
754
|
+
}
|
|
@@ -18,7 +18,7 @@ export interface IQueueItem {
|
|
|
18
18
|
id: string;
|
|
19
19
|
processingMode: EmailProcessingMode;
|
|
20
20
|
processingResult: any;
|
|
21
|
-
route
|
|
21
|
+
route?: IEmailRoute;
|
|
22
22
|
status: QueueItemStatus;
|
|
23
23
|
attempts: number;
|
|
24
24
|
nextAttempt: Date;
|
|
@@ -237,7 +237,7 @@ export class UnifiedDeliveryQueue extends EventEmitter {
|
|
|
237
237
|
* @param mode Processing mode
|
|
238
238
|
* @param route Email route
|
|
239
239
|
*/
|
|
240
|
-
public async enqueue(processingResult: any, mode: EmailProcessingMode, route
|
|
240
|
+
public async enqueue(processingResult: any, mode: EmailProcessingMode, route?: IEmailRoute): Promise<string> {
|
|
241
241
|
// Check if queue is full
|
|
242
242
|
if (this.queue.size >= this.options.maxQueueSize) {
|
|
243
243
|
throw new Error('Queue is full');
|
|
@@ -284,6 +284,10 @@ export class UnifiedDeliveryQueue extends EventEmitter {
|
|
|
284
284
|
public getItem(id: string): IQueueItem | undefined {
|
|
285
285
|
return this.queue.get(id);
|
|
286
286
|
}
|
|
287
|
+
|
|
288
|
+
public listItems(): IQueueItem[] {
|
|
289
|
+
return Array.from(this.queue.values()).map((item) => ({ ...item }));
|
|
290
|
+
}
|
|
287
291
|
|
|
288
292
|
/**
|
|
289
293
|
* Mark an item as being processed
|
|
@@ -657,4 +661,4 @@ export class UnifiedDeliveryQueue extends EventEmitter {
|
|
|
657
661
|
this.emit('shutdown');
|
|
658
662
|
logger.log('info', 'UnifiedDeliveryQueue shut down successfully');
|
|
659
663
|
}
|
|
660
|
-
}
|
|
664
|
+
}
|
package/ts/mail/index.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
// Export all mail modules for simplified imports
|
|
2
|
+
export * from './interfaces.storage.js';
|
|
2
3
|
export * from './routing/index.js';
|
|
3
4
|
export * from './security/index.js';
|
|
4
5
|
|
|
@@ -14,4 +15,4 @@ import { Email } from './core/classes.email.js';
|
|
|
14
15
|
// Re-export commonly used classes
|
|
15
16
|
export {
|
|
16
17
|
Email,
|
|
17
|
-
};
|
|
18
|
+
};
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export interface IStorageManagerLike {
|
|
2
|
+
get?(key: string): Promise<string | null>;
|
|
3
|
+
set?(key: string, value: string): Promise<void>;
|
|
4
|
+
list?(prefix: string): Promise<string[]>;
|
|
5
|
+
delete?(key: string): Promise<void>;
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
export function hasStorageManagerMethods<T extends keyof IStorageManagerLike>(
|
|
9
|
+
storageManager: IStorageManagerLike | undefined,
|
|
10
|
+
methods: T[],
|
|
11
|
+
): storageManager is IStorageManagerLike & Required<Pick<IStorageManagerLike, T>> {
|
|
12
|
+
return !!storageManager && methods.every((method) => typeof storageManager[method] === 'function');
|
|
13
|
+
}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { logger } from '../../logger.js';
|
|
2
2
|
import { DKIMCreator } from '../security/classes.dkimcreator.js';
|
|
3
|
+
import { hasStorageManagerMethods, type IStorageManagerLike } from '../interfaces.storage.js';
|
|
3
4
|
import { DomainRegistry } from './classes.domain.registry.js';
|
|
4
5
|
import { RustSecurityBridge } from '../../security/classes.rustsecuritybridge.js';
|
|
5
6
|
import { Email } from '../core/classes.email.js';
|
|
6
7
|
|
|
7
8
|
/** External DcRouter interface shape used by DkimManager */
|
|
8
9
|
interface DcRouter {
|
|
9
|
-
storageManager
|
|
10
|
+
storageManager?: IStorageManagerLike;
|
|
10
11
|
dnsServer?: any;
|
|
11
12
|
}
|
|
12
13
|
|
|
@@ -39,11 +40,19 @@ export class DkimManager {
|
|
|
39
40
|
let keyPair: { privateKey: string; publicKey: string };
|
|
40
41
|
|
|
41
42
|
try {
|
|
42
|
-
keyPair =
|
|
43
|
+
keyPair = selector === 'default'
|
|
44
|
+
? await this.dkimCreator.readDKIMKeys(domain)
|
|
45
|
+
: await this.dkimCreator.readDKIMKeysForSelector(domain, selector);
|
|
43
46
|
logger.log('info', `Using existing DKIM keys for domain: ${domain}`);
|
|
44
|
-
} catch
|
|
45
|
-
|
|
46
|
-
|
|
47
|
+
} catch {
|
|
48
|
+
await this.dkimCreator.handleDKIMKeysForSelector(
|
|
49
|
+
domain,
|
|
50
|
+
selector,
|
|
51
|
+
domainConfig.dkim?.keySize || 2048,
|
|
52
|
+
);
|
|
53
|
+
keyPair = selector === 'default'
|
|
54
|
+
? await this.dkimCreator.readDKIMKeys(domain)
|
|
55
|
+
: await this.dkimCreator.readDKIMKeysForSelector(domain, selector);
|
|
47
56
|
logger.log('info', `Generated new DKIM keys for domain: ${domain}`);
|
|
48
57
|
}
|
|
49
58
|
|
|
@@ -106,10 +115,12 @@ export class DkimManager {
|
|
|
106
115
|
|
|
107
116
|
logger.log('info', `DKIM DNS handler registered for new selector: ${newSelector}._domainkey.${domain}`);
|
|
108
117
|
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
118
|
+
if (hasStorageManagerMethods(this.dcRouter.storageManager, ['set'])) {
|
|
119
|
+
await this.dcRouter.storageManager.set(
|
|
120
|
+
`/email/dkim/${domain}/public.key`,
|
|
121
|
+
keyPair.publicKey
|
|
122
|
+
);
|
|
123
|
+
}
|
|
113
124
|
}
|
|
114
125
|
|
|
115
126
|
this.dkimCreator.cleanupOldKeys(domain, 30).catch(error => {
|
|
@@ -127,8 +138,10 @@ export class DkimManager {
|
|
|
127
138
|
|
|
128
139
|
async handleDkimSigning(email: Email, domain: string, selector: string): Promise<void> {
|
|
129
140
|
try {
|
|
130
|
-
await this.dkimCreator.
|
|
131
|
-
const { privateKey } =
|
|
141
|
+
await this.dkimCreator.handleDKIMKeysForSelector(domain, selector);
|
|
142
|
+
const { privateKey } = selector === 'default'
|
|
143
|
+
? await this.dkimCreator.readDKIMKeys(domain)
|
|
144
|
+
: await this.dkimCreator.readDKIMKeysForSelector(domain, selector);
|
|
132
145
|
const rawEmail = email.toRFC822String();
|
|
133
146
|
|
|
134
147
|
// Detect key type from PEM header
|