@serve.zone/dcrouter 18.0.1 → 18.1.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.
Files changed (71) hide show
  1. package/deno.json +1 -1
  2. package/dist_serve/bundle.js +1522 -1375
  3. package/dist_ts/00_commitinfo_data.js +1 -1
  4. package/dist_ts/classes.dcrouter.d.ts +3 -1
  5. package/dist_ts/classes.dcrouter.js +32 -4
  6. package/dist_ts/db/documents/classes.smtp-account.doc.d.ts +31 -0
  7. package/dist_ts/db/documents/classes.smtp-account.doc.js +176 -0
  8. package/dist_ts/db/documents/index.d.ts +1 -0
  9. package/dist_ts/db/documents/index.js +2 -1
  10. package/dist_ts/email/classes.email-settings.manager.d.ts +7 -0
  11. package/dist_ts/email/classes.email-settings.manager.js +30 -1
  12. package/dist_ts/email/classes.smtp-account.manager.d.ts +110 -0
  13. package/dist_ts/email/classes.smtp-account.manager.js +507 -0
  14. package/dist_ts/email/classes.workapp-mail-manager.d.ts +23 -4
  15. package/dist_ts/email/classes.workapp-mail-manager.js +39 -46
  16. package/dist_ts/email/index.d.ts +2 -0
  17. package/dist_ts/email/index.js +3 -1
  18. package/dist_ts/email/smtp-scram.d.ts +13 -0
  19. package/dist_ts/email/smtp-scram.js +19 -0
  20. package/dist_ts/opsserver/classes.opsserver.d.ts +1 -0
  21. package/dist_ts/opsserver/classes.opsserver.js +3 -1
  22. package/dist_ts/opsserver/handlers/email-settings.handler.js +14 -2
  23. package/dist_ts/opsserver/handlers/index.d.ts +1 -0
  24. package/dist_ts/opsserver/handlers/index.js +2 -1
  25. package/dist_ts/opsserver/handlers/smtp-account.handler.d.ts +20 -0
  26. package/dist_ts/opsserver/handlers/smtp-account.handler.js +155 -0
  27. package/dist_ts_interfaces/data/email-settings.d.ts +10 -0
  28. package/dist_ts_interfaces/data/index.d.ts +1 -0
  29. package/dist_ts_interfaces/data/index.js +2 -1
  30. package/dist_ts_interfaces/data/route-management.d.ts +1 -1
  31. package/dist_ts_interfaces/data/route-management.js +3 -1
  32. package/dist_ts_interfaces/data/smtp-account.d.ts +50 -0
  33. package/dist_ts_interfaces/data/smtp-account.js +9 -0
  34. package/dist_ts_interfaces/requests/index.d.ts +1 -0
  35. package/dist_ts_interfaces/requests/index.js +2 -1
  36. package/dist_ts_interfaces/requests/smtp-accounts.d.ts +125 -0
  37. package/dist_ts_interfaces/requests/smtp-accounts.js +2 -0
  38. package/dist_ts_migrations/index.js +198 -9
  39. package/dist_ts_web/00_commitinfo_data.js +1 -1
  40. package/dist_ts_web/appstate/smtp-accounts.d.ts +38 -0
  41. package/dist_ts_web/appstate/smtp-accounts.js +94 -0
  42. package/dist_ts_web/appstate.d.ts +1 -0
  43. package/dist_ts_web/appstate.js +2 -1
  44. package/dist_ts_web/elements/email/index.d.ts +1 -0
  45. package/dist_ts_web/elements/email/index.js +2 -1
  46. package/dist_ts_web/elements/email/ops-view-smtp-accounts.d.ts +25 -0
  47. package/dist_ts_web/elements/email/ops-view-smtp-accounts.js +598 -0
  48. package/dist_ts_web/elements/ops-dashboard.js +3 -1
  49. package/dist_ts_web/router.js +2 -2
  50. package/package.json +2 -2
  51. package/readme.md +12 -0
  52. package/ts/00_commitinfo_data.ts +1 -1
  53. package/ts/classes.dcrouter.ts +35 -3
  54. package/ts/db/documents/classes.smtp-account.doc.ts +103 -0
  55. package/ts/db/documents/index.ts +1 -0
  56. package/ts/email/classes.email-settings.manager.ts +34 -0
  57. package/ts/email/classes.smtp-account.manager.ts +601 -0
  58. package/ts/email/classes.workapp-mail-manager.ts +53 -55
  59. package/ts/email/index.ts +2 -0
  60. package/ts/email/smtp-scram.ts +24 -0
  61. package/ts/opsserver/classes.opsserver.ts +2 -0
  62. package/ts/opsserver/handlers/email-settings.handler.ts +13 -1
  63. package/ts/opsserver/handlers/index.ts +1 -0
  64. package/ts/opsserver/handlers/smtp-account.handler.ts +199 -0
  65. package/ts_web/00_commitinfo_data.ts +1 -1
  66. package/ts_web/appstate/smtp-accounts.ts +143 -0
  67. package/ts_web/appstate.ts +1 -0
  68. package/ts_web/elements/email/index.ts +1 -0
  69. package/ts_web/elements/email/ops-view-smtp-accounts.ts +586 -0
  70. package/ts_web/elements/ops-dashboard.ts +2 -0
  71. package/ts_web/router.ts +1 -1
@@ -0,0 +1,507 @@
1
+ import { assertValidAuthAccounts } from '@push.rocks/smartmta';
2
+ import * as plugins from '../plugins.js';
3
+ import { logger } from '../logger.js';
4
+ import { SmtpAccountDoc } from '../db/index.js';
5
+ import { isWorkAppManagedMailRouteName, isWorkAppManagedSmtpUsername, } from './classes.workapp-mail-manager.js';
6
+ import { deriveSmtpScramVerifier, generateSmtpAccountPassword } from './smtp-scram.js';
7
+ /** Route names generated (and owned wholesale) by SmtpAccountManager. */
8
+ export function isSmtpAccountRouteName(routeName) {
9
+ return routeName.startsWith('smtp-account-');
10
+ }
11
+ const SMTP_ACCOUNT_USERNAME_PATTERN = /^[a-z0-9][a-z0-9._-]{2,63}$/;
12
+ /** Literal domain label chain — no wildcards, at least one dot. */
13
+ const SMTP_ACCOUNT_DOMAIN_PATTERN = /^[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)+$/;
14
+ /** Address pattern: optional '*' glob in the local part only, literal domain. */
15
+ const SMTP_ACCOUNT_ADDRESS_LOCAL_PATTERN = /^[a-z0-9*][a-z0-9.*_+-]*$/;
16
+ /**
17
+ * SmtpAccountManager — operator-managed authenticated SMTP submission
18
+ * accounts, backed by SmtpAccountDoc rows holding hashed SCRAM verifiers only.
19
+ *
20
+ * Single composition owner of the email runtime `auth` block and route list:
21
+ * every runtime application of auth/routes goes through composeEmailConfig /
22
+ * applyToRuntime here. WorkAppMailManager identities feed in as an explicit
23
+ * contribution; nothing else writes `auth` wholesale.
24
+ *
25
+ * Accounts are served from an in-memory map loaded at start() — the SMTP auth
26
+ * path (smartmta's Rust bridge, 5s callback timeout) never touches the DB.
27
+ */
28
+ export class SmtpAccountManager {
29
+ dcRouterRef;
30
+ accounts = new Map();
31
+ started = false;
32
+ mutationChain = Promise.resolve();
33
+ /** Explicit upstream capability marker; absence is deliberately fail-closed. */
34
+ get authAccountsCapability() {
35
+ return plugins.smartmta.smartMtaCapabilities?.smtpAuthAccountsAndScopes === true;
36
+ }
37
+ constructor(dcRouterRef) {
38
+ this.dcRouterRef = dcRouterRef;
39
+ }
40
+ async start() {
41
+ const docs = await SmtpAccountDoc.findAll();
42
+ this.accounts = new Map(docs.map((doc) => [doc.id, doc]));
43
+ this.started = true;
44
+ if (this.accounts.size > 0) {
45
+ logger.log('info', `SmtpAccountManager loaded ${this.accounts.size} SMTP account(s)`);
46
+ }
47
+ }
48
+ async stop() {
49
+ this.accounts.clear();
50
+ this.started = false;
51
+ }
52
+ isStarted() {
53
+ return this.started;
54
+ }
55
+ getAccountCount() {
56
+ return this.accounts.size;
57
+ }
58
+ // ==========================================================================
59
+ // Composition — the single owner of auth + route-list assembly
60
+ // ==========================================================================
61
+ /**
62
+ * Compose the runtime email config: operator-configured routes/users plus
63
+ * the workapp identity contribution plus DB-backed SMTP accounts and their
64
+ * generated relay routes. Idempotent — previously generated entries are
65
+ * stripped by their reserved name prefixes before re-adding.
66
+ */
67
+ async composeEmailConfig(emailConfig, workappContribution) {
68
+ const contribution = workappContribution
69
+ ?? await this.dcRouterRef.workAppMailManager.getStoredIdentityContribution(emailConfig);
70
+ if (!this.authAccountsCapability) {
71
+ // Fail closed: without the smartmta capability the accounts field would
72
+ // be silently ignored (or rejected), so never pretend they are active —
73
+ // any pre-existing accounts entry is dropped from the composed auth too.
74
+ if (this.accounts.size > 0) {
75
+ logger.log('error', `SmartMTA is missing the smtpAuthAccountsAndScopes capability — ${this.accounts.size} stored SMTP account(s) are NOT active`);
76
+ }
77
+ const authWithoutAccounts = { ...(emailConfig.auth || {}) };
78
+ delete authWithoutAccounts.accounts;
79
+ return {
80
+ ...emailConfig,
81
+ routes: [
82
+ ...(emailConfig.routes || [])
83
+ .filter((route) => !isWorkAppManagedMailRouteName(route.name) && !isSmtpAccountRouteName(route.name)),
84
+ ...contribution.routes,
85
+ ],
86
+ auth: {
87
+ ...authWithoutAccounts,
88
+ users: [
89
+ ...(emailConfig.auth?.users || []).filter((user) => !isWorkAppManagedSmtpUsername(user.username)),
90
+ ...contribution.users,
91
+ ],
92
+ },
93
+ };
94
+ }
95
+ const accountDocs = [...this.accounts.values()]
96
+ .sort((a, b) => a.username.localeCompare(b.username));
97
+ const smtpAccounts = [];
98
+ const accountRoutes = [];
99
+ for (const doc of accountDocs) {
100
+ const account = this.buildAuthAccount(doc);
101
+ try {
102
+ // smartmta's own validator — construction and updateOptions throw on
103
+ // invalid accounts, so a bad DB row must never reach the push.
104
+ // Validated per account so one row cannot take the whole auth block
105
+ // down.
106
+ assertValidAuthAccounts([account]);
107
+ }
108
+ catch (error) {
109
+ const message = error.message;
110
+ logger.log('error', `SMTP account ${doc.username} excluded from runtime auth (invalid stored configuration): ${message}`);
111
+ this.recordAccountConflictEvent(doc.username, message);
112
+ continue;
113
+ }
114
+ smtpAccounts.push(account);
115
+ if (doc.enabled) {
116
+ accountRoutes.push(...this.buildAccountRoutes(doc));
117
+ }
118
+ }
119
+ const configuredRoutes = (emailConfig.routes || [])
120
+ .filter((route) => !isWorkAppManagedMailRouteName(route.name) && !isSmtpAccountRouteName(route.name));
121
+ const configuredUsers = (emailConfig.auth?.users || [])
122
+ .filter((user) => !isWorkAppManagedSmtpUsername(user.username));
123
+ return {
124
+ ...emailConfig,
125
+ routes: [...configuredRoutes, ...contribution.routes, ...accountRoutes],
126
+ auth: {
127
+ ...(emailConfig.auth || {}),
128
+ users: [...configuredUsers, ...contribution.users],
129
+ accounts: smtpAccounts,
130
+ },
131
+ };
132
+ }
133
+ /**
134
+ * Recompose from the live runtime options and push the result: replace the
135
+ * whole `auth` block (smartmta toggles listener AUTH live) and re-apply the
136
+ * route list.
137
+ */
138
+ async applyToRuntime(workappContribution) {
139
+ const emailConfig = this.dcRouterRef.options.emailConfig;
140
+ if (!emailConfig)
141
+ return;
142
+ const nextConfig = await this.composeEmailConfig(emailConfig, workappContribution);
143
+ this.dcRouterRef.options.emailConfig = nextConfig;
144
+ if (this.dcRouterRef.emailServer) {
145
+ this.dcRouterRef.emailServer.updateOptions({ auth: nextConfig.auth });
146
+ await this.dcRouterRef.updateEmailRoutes(nextConfig.routes);
147
+ }
148
+ }
149
+ buildAuthAccount(doc) {
150
+ const senders = [
151
+ ...(doc.senderScope?.addresses || []),
152
+ ...(doc.senderScope?.domains || []).map((domain) => `*@${domain}`),
153
+ ];
154
+ const recipientsRestricted = doc.recipientScope?.mode === 'restricted';
155
+ const recipientPatterns = [
156
+ ...(doc.recipientScope?.addresses || []),
157
+ ...(doc.recipientScope?.domains || []).map((domain) => `*@${domain}`),
158
+ ];
159
+ let scope;
160
+ if (senders.length > 0 || recipientsRestricted) {
161
+ scope = {
162
+ // Unrestricted senders with restricted recipients still needs a scope
163
+ // block; '*' matches every sender including the null sender.
164
+ senders: senders.length > 0 ? senders : ['*'],
165
+ ...(recipientsRestricted
166
+ ? { recipients: { mode: 'patterns', patterns: recipientPatterns } }
167
+ : {}),
168
+ };
169
+ }
170
+ return {
171
+ username: doc.username,
172
+ enabled: doc.enabled,
173
+ credential: { verifier: doc.credentialVerifier },
174
+ ...(scope ? { scope } : {}),
175
+ };
176
+ }
177
+ /**
178
+ * One generated relay route per (account × sender-scope domain), name
179
+ * `smtp-account-<id>-<domainHash>`, priority 850 — below workapp
180
+ * per-address routes (900), above operator-configured DB routes.
181
+ *
182
+ * Accounts without a sender scope generate no routes: their relay
183
+ * permission stays exactly whatever operator-configured routes grant
184
+ * (this is what keeps the legacy-user migration from widening relay).
185
+ *
186
+ * DKIM policy rides on `process.dkim` only — smartmta ≥9.1 resolves the
187
+ * active selector per sender domain from its domain registry, so no
188
+ * selector is snapshotted into routes and rotation stays owned by
189
+ * EmailDomainManager/mail-dns-sync.
190
+ */
191
+ buildAccountRoutes(doc) {
192
+ const senderDomains = this.collectSenderDomainPatterns(doc.senderScope);
193
+ const routes = [];
194
+ for (const [domain, patterns] of senderDomains) {
195
+ routes.push({
196
+ name: `smtp-account-${doc.id}-${this.hashDomain(domain)}`,
197
+ priority: 850,
198
+ match: {
199
+ authenticated: true,
200
+ authenticatedUser: doc.username,
201
+ senders: patterns,
202
+ },
203
+ action: {
204
+ type: 'process',
205
+ allowRelay: true,
206
+ process: {
207
+ dkim: Boolean(doc.mailPolicy?.dkimSign),
208
+ queue: doc.mailPolicy?.queue ?? 'normal',
209
+ },
210
+ },
211
+ });
212
+ }
213
+ return routes;
214
+ }
215
+ /** Map of sender-scope domain -> the scope patterns belonging to it. */
216
+ collectSenderDomainPatterns(senderScope) {
217
+ const byDomain = new Map();
218
+ for (const domain of senderScope?.domains || []) {
219
+ const key = domain.toLowerCase();
220
+ byDomain.set(key, [...(byDomain.get(key) || []), `*@${key}`]);
221
+ }
222
+ for (const address of senderScope?.addresses || []) {
223
+ const domainPart = address.split('@')[1]?.toLowerCase();
224
+ if (!domainPart)
225
+ continue;
226
+ byDomain.set(domainPart, [...(byDomain.get(domainPart) || []), address.toLowerCase()]);
227
+ }
228
+ return byDomain;
229
+ }
230
+ hashDomain(domain) {
231
+ return plugins.crypto.createHash('sha256').update(domain.toLowerCase()).digest('hex').slice(0, 8);
232
+ }
233
+ recordAccountConflictEvent(username, message) {
234
+ const opsEventManager = this.dcRouterRef.opsEventManager;
235
+ if (!opsEventManager)
236
+ return;
237
+ opsEventManager.recordEvent({
238
+ severity: 'error',
239
+ category: 'smtp-accounts',
240
+ title: 'SMTP account excluded from runtime authentication',
241
+ detail: `Stored SMTP account '${username}' failed validation and was excluded from the composed auth block: ${message}`,
242
+ context: { recordName: username },
243
+ }).catch((error) => {
244
+ logger.log('warn', `Failed to record SMTP account conflict event for ${username}: ${error.message}`);
245
+ });
246
+ }
247
+ // ==========================================================================
248
+ // CRUD
249
+ // ==========================================================================
250
+ async listAccounts() {
251
+ const docs = [...this.accounts.values()]
252
+ .sort((a, b) => a.username.localeCompare(b.username));
253
+ const accounts = [];
254
+ for (const doc of docs) {
255
+ accounts.push(await this.decorateWithDomainReadiness(doc));
256
+ }
257
+ return accounts;
258
+ }
259
+ async createAccount(options) {
260
+ return await this.runMutationExclusive(async () => {
261
+ if (!this.authAccountsCapability) {
262
+ throw new Error('SmartMTA runtime does not support SMTP auth accounts (smtpAuthAccountsAndScopes capability missing)');
263
+ }
264
+ const username = this.normalizeUsername(options.username);
265
+ const senderScope = this.normalizeSenderScope(options.senderScope);
266
+ const recipientScope = this.normalizeRecipientScope(options.recipientScope);
267
+ const mailPolicy = this.normalizeMailPolicy(options.mailPolicy);
268
+ await this.assertDkimPolicyAllowed(mailPolicy, senderScope, username);
269
+ if ([...this.accounts.values()].some((doc) => doc.username === username)
270
+ || await SmtpAccountDoc.findByUsername(username)) {
271
+ throw new Error(`SMTP account username is already taken: ${username}`);
272
+ }
273
+ const password = generateSmtpAccountPassword();
274
+ const now = Date.now();
275
+ const doc = new SmtpAccountDoc();
276
+ doc.id = `smtpacct_${now.toString(36)}_${plugins.crypto.randomBytes(6).toString('hex')}`;
277
+ doc.username = username;
278
+ doc.description = (options.description || '').trim();
279
+ doc.enabled = true;
280
+ doc.credentialVerifier = deriveSmtpScramVerifier(password);
281
+ doc.senderScope = senderScope;
282
+ doc.recipientScope = recipientScope;
283
+ doc.mailPolicy = mailPolicy;
284
+ doc.createdAt = now;
285
+ doc.updatedAt = now;
286
+ doc.createdBy = options.createdBy;
287
+ await doc.save();
288
+ this.accounts.set(doc.id, doc);
289
+ await this.applyToRuntime();
290
+ const warnings = await this.collectSenderDomainWarnings(senderScope);
291
+ logger.log('info', `SMTP account '${username}' created by ${options.createdBy} (id: ${doc.id})`);
292
+ return { account: await this.decorateWithDomainReadiness(doc), password, warnings };
293
+ });
294
+ }
295
+ async updateAccount(id, updates, updatedBy) {
296
+ return await this.runMutationExclusive(async () => {
297
+ const doc = this.requireAccount(id);
298
+ const senderScope = updates.senderScope !== undefined
299
+ ? this.normalizeSenderScope(updates.senderScope)
300
+ : doc.senderScope;
301
+ const recipientScope = updates.recipientScope !== undefined
302
+ ? this.normalizeRecipientScope(updates.recipientScope)
303
+ : doc.recipientScope;
304
+ const mailPolicy = updates.mailPolicy !== undefined
305
+ ? this.normalizeMailPolicy(updates.mailPolicy)
306
+ : doc.mailPolicy;
307
+ await this.assertDkimPolicyAllowed(mailPolicy, senderScope, doc.username);
308
+ if (updates.description !== undefined) {
309
+ doc.description = updates.description.trim();
310
+ }
311
+ doc.senderScope = senderScope;
312
+ doc.recipientScope = recipientScope;
313
+ doc.mailPolicy = mailPolicy;
314
+ doc.updatedAt = Date.now();
315
+ await doc.save();
316
+ this.accounts.set(doc.id, doc);
317
+ await this.applyToRuntime();
318
+ const warnings = await this.collectSenderDomainWarnings(senderScope);
319
+ logger.log('info', `SMTP account '${doc.username}' updated by ${updatedBy}`);
320
+ return { account: await this.decorateWithDomainReadiness(doc), warnings };
321
+ });
322
+ }
323
+ async toggleAccount(id, enabled, updatedBy) {
324
+ return await this.runMutationExclusive(async () => {
325
+ const doc = this.requireAccount(id);
326
+ doc.enabled = enabled;
327
+ doc.updatedAt = Date.now();
328
+ await doc.save();
329
+ this.accounts.set(doc.id, doc);
330
+ await this.applyToRuntime();
331
+ logger.log('info', `SMTP account '${doc.username}' ${enabled ? 'enabled' : 'disabled'} by ${updatedBy}`);
332
+ return { account: await this.decorateWithDomainReadiness(doc), warnings: [] };
333
+ });
334
+ }
335
+ async rotatePassword(id, rotatedBy) {
336
+ return await this.runMutationExclusive(async () => {
337
+ const doc = this.requireAccount(id);
338
+ const password = generateSmtpAccountPassword();
339
+ doc.credentialVerifier = deriveSmtpScramVerifier(password);
340
+ doc.lastRotatedAt = Date.now();
341
+ doc.updatedAt = doc.lastRotatedAt;
342
+ await doc.save();
343
+ this.accounts.set(doc.id, doc);
344
+ await this.applyToRuntime();
345
+ logger.log('info', `SMTP account '${doc.username}' password rotated by ${rotatedBy}`);
346
+ return { account: await this.decorateWithDomainReadiness(doc), password, warnings: [] };
347
+ });
348
+ }
349
+ async deleteAccount(id, deletedBy) {
350
+ return await this.runMutationExclusive(async () => {
351
+ const doc = this.requireAccount(id);
352
+ await doc.delete();
353
+ this.accounts.delete(id);
354
+ await this.applyToRuntime();
355
+ logger.log('info', `SMTP account '${doc.username}' deleted by ${deletedBy}`);
356
+ });
357
+ }
358
+ // ==========================================================================
359
+ // Validation / normalization
360
+ // ==========================================================================
361
+ requireAccount(id) {
362
+ const doc = this.accounts.get(id);
363
+ if (!doc) {
364
+ throw new Error(`SMTP account not found: ${id}`);
365
+ }
366
+ return doc;
367
+ }
368
+ normalizeUsername(usernameArg) {
369
+ const username = (usernameArg || '').trim().toLowerCase();
370
+ if (!SMTP_ACCOUNT_USERNAME_PATTERN.test(username)) {
371
+ throw new Error('SMTP account username must be 3-64 characters of a-z, 0-9, dot, underscore, or dash, starting alphanumeric');
372
+ }
373
+ if (isWorkAppManagedSmtpUsername(username)) {
374
+ throw new Error(`SMTP account usernames may not use the reserved 'workapp-' prefix: ${username}`);
375
+ }
376
+ return username;
377
+ }
378
+ normalizeDomain(domainArg, context) {
379
+ const domain = (domainArg || '').trim().toLowerCase();
380
+ if (!SMTP_ACCOUNT_DOMAIN_PATTERN.test(domain)) {
381
+ throw new Error(`Invalid ${context} domain (wildcards are not allowed in domains): ${domainArg}`);
382
+ }
383
+ return domain;
384
+ }
385
+ normalizeAddressPattern(addressArg, context) {
386
+ const address = (addressArg || '').trim().toLowerCase();
387
+ const parts = address.split('@');
388
+ if (parts.length !== 2
389
+ || !SMTP_ACCOUNT_ADDRESS_LOCAL_PATTERN.test(parts[0])
390
+ || !SMTP_ACCOUNT_DOMAIN_PATTERN.test(parts[1])) {
391
+ throw new Error(`Invalid ${context} address pattern ('local@domain', '*' allowed in the local part only): ${addressArg}`);
392
+ }
393
+ return address;
394
+ }
395
+ normalizeSenderScope(scopeArg) {
396
+ return {
397
+ addresses: this.dedupe((scopeArg?.addresses || []).map((address) => this.normalizeAddressPattern(address, 'sender scope'))),
398
+ domains: this.dedupe((scopeArg?.domains || []).map((domain) => this.normalizeDomain(domain, 'sender scope'))),
399
+ };
400
+ }
401
+ normalizeRecipientScope(scopeArg) {
402
+ const mode = scopeArg?.mode === 'restricted' ? 'restricted' : 'any';
403
+ const addresses = this.dedupe((scopeArg?.addresses || []).map((address) => this.normalizeAddressPattern(address, 'recipient scope')));
404
+ const domains = this.dedupe((scopeArg?.domains || []).map((domain) => this.normalizeDomain(domain, 'recipient scope')));
405
+ if (mode === 'restricted' && addresses.length === 0 && domains.length === 0) {
406
+ throw new Error('A restricted recipient scope requires at least one address or domain (an empty list would silently deny all mail)');
407
+ }
408
+ return { mode, addresses, domains };
409
+ }
410
+ normalizeMailPolicy(policyArg) {
411
+ const queue = policyArg?.queue;
412
+ if (queue !== undefined && !['normal', 'priority', 'bulk'].includes(queue)) {
413
+ throw new Error(`Invalid mail policy queue: ${queue}`);
414
+ }
415
+ return {
416
+ dkimSign: Boolean(policyArg?.dkimSign),
417
+ ...(queue ? { queue } : {}),
418
+ };
419
+ }
420
+ /**
421
+ * DKIM signing fails at configuration time, never at delivery time: it is
422
+ * only allowed when every sender-scope domain is a managed email domain
423
+ * that is outbound-ready with active DKIM material.
424
+ */
425
+ async assertDkimPolicyAllowed(mailPolicy, senderScope, username) {
426
+ if (!mailPolicy.dkimSign)
427
+ return;
428
+ const senderDomains = [...this.collectSenderDomainPatterns(senderScope).keys()];
429
+ if (senderDomains.length === 0) {
430
+ throw new Error(`DKIM signing for SMTP account '${username}' requires an explicit sender scope naming the domain(s) to sign for`);
431
+ }
432
+ const emailDomainManager = this.dcRouterRef.emailDomainManager;
433
+ if (!emailDomainManager) {
434
+ throw new Error('DKIM signing requires the email domain manager, which is not available');
435
+ }
436
+ for (const domain of senderDomains) {
437
+ if (!await emailDomainManager.getByDomain(domain)) {
438
+ throw new Error(`DKIM signing requires managed email domains; '${domain}' is not managed by dcrouter`);
439
+ }
440
+ const readiness = await emailDomainManager.getOutboundReadiness(domain);
441
+ if (!readiness.ready || !readiness.selector) {
442
+ throw new Error(`DKIM signing requires outbound-ready DKIM material for '${domain}': ${readiness.reason || 'no active DKIM selector'}`);
443
+ }
444
+ }
445
+ }
446
+ /** Warn-and-allow: sender domains outside managed email domains are permitted but flagged. */
447
+ async collectSenderDomainWarnings(senderScope) {
448
+ const warnings = [];
449
+ const emailDomainManager = this.dcRouterRef.emailDomainManager;
450
+ if (!emailDomainManager)
451
+ return warnings;
452
+ for (const domain of this.collectSenderDomainPatterns(senderScope).keys()) {
453
+ try {
454
+ if (!await emailDomainManager.getByDomain(domain)) {
455
+ warnings.push(`Sender domain '${domain}' is not a managed email domain — outbound DNS alignment (SPF/DKIM/DMARC) is not managed by dcrouter`);
456
+ }
457
+ }
458
+ catch (error) {
459
+ warnings.push(`Could not verify sender domain '${domain}': ${error.message}`);
460
+ }
461
+ }
462
+ return warnings;
463
+ }
464
+ async decorateWithDomainReadiness(doc) {
465
+ const info = doc.toApiObject();
466
+ const emailDomainManager = this.dcRouterRef.emailDomainManager;
467
+ const senderDomains = [...this.collectSenderDomainPatterns(doc.senderScope).keys()];
468
+ if (!emailDomainManager || senderDomains.length === 0)
469
+ return info;
470
+ const domainReadiness = [];
471
+ for (const domain of senderDomains) {
472
+ try {
473
+ if (!await emailDomainManager.getByDomain(domain)) {
474
+ domainReadiness.push({
475
+ domain,
476
+ ready: !doc.mailPolicy?.dkimSign,
477
+ reason: 'not a managed email domain',
478
+ });
479
+ continue;
480
+ }
481
+ const readiness = await emailDomainManager.getOutboundReadiness(domain);
482
+ domainReadiness.push({
483
+ domain,
484
+ ready: readiness.ready,
485
+ ...(readiness.reason ? { reason: readiness.reason } : {}),
486
+ });
487
+ }
488
+ catch (error) {
489
+ domainReadiness.push({
490
+ domain,
491
+ ready: false,
492
+ reason: `readiness check failed: ${error.message}`,
493
+ });
494
+ }
495
+ }
496
+ return { ...info, domainReadiness };
497
+ }
498
+ dedupe(values) {
499
+ return [...new Set(values)];
500
+ }
501
+ async runMutationExclusive(action) {
502
+ const run = this.mutationChain.then(action, action);
503
+ this.mutationChain = run.catch(() => undefined);
504
+ return await run;
505
+ }
506
+ }
507
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.smtp-account.manager.js","sourceRoot":"","sources":["../../../ts/email/classes.smtp-account.manager.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { IExtendedSmtpSession, IMessageAcceptanceContext, IMessageAcceptanceDecision, IUnifiedEmailServerOptions } from '@push.rocks/smartmta';
1
+ import type { IEmailRoute, IExtendedSmtpSession, IMessageAcceptanceContext, IMessageAcceptanceDecision, IUnifiedEmailServerOptions } from '@push.rocks/smartmta';
2
2
  import type { Buffer } from 'node:buffer';
3
3
  import * as plugins from '../plugins.js';
4
4
  import { CachedEmail } from '../db/index.js';
@@ -47,6 +47,22 @@ interface IStoredWorkAppMailIdentity {
47
47
  smtpPassword: string;
48
48
  smtpLastRotatedAt?: number;
49
49
  }
50
+ /**
51
+ * WorkApp-generated routes and SMTP users contributed to the composed email
52
+ * runtime config. Consumed by SmtpAccountManager, the single owner of the
53
+ * final `auth` block and route-list composition.
54
+ */
55
+ export interface IWorkAppMailRuntimeContribution {
56
+ routes: IEmailRoute[];
57
+ users: Array<{
58
+ username: string;
59
+ password: string;
60
+ }>;
61
+ }
62
+ /** Route names generated (and owned wholesale) by WorkAppMailManager. */
63
+ export declare function isWorkAppManagedMailRouteName(routeName: string): boolean;
64
+ /** SMTP usernames generated (and owned wholesale) by WorkAppMailManager. */
65
+ export declare function isWorkAppManagedSmtpUsername(username: string): boolean;
50
66
  export declare class WorkAppMailManager {
51
67
  private dcRouterRef;
52
68
  private readonly storageKey;
@@ -79,12 +95,16 @@ export declare class WorkAppMailManager {
79
95
  deliverCachedEmailToTypedEndpoint(cachedEmailArg: CachedEmail, rawMessageArg: Buffer | plugins.buffer.Buffer, sessionArg: IExtendedSmtpSession): Promise<boolean>;
80
96
  deleteMailAddressBinding(id: string, createdBy: string): Promise<TMailAddressBindingDeleteResponse>;
81
97
  private deleteMailAddressBindingInner;
82
- applyStoredIdentitiesToEmailConfig<TConfig extends IUnifiedEmailServerOptions>(emailConfig: TConfig): Promise<TConfig>;
98
+ /**
99
+ * Compute the workapp-generated routes and SMTP users for the given
100
+ * candidate email config. Pure contribution — the final composition of
101
+ * routes and the `auth` block is owned exclusively by SmtpAccountManager.
102
+ */
103
+ getStoredIdentityContribution(emailConfig: IUnifiedEmailServerOptions, identities?: IStoredWorkAppMailIdentity[] | undefined): Promise<IWorkAppMailRuntimeContribution>;
83
104
  applyStoredIdentitiesToRuntime(identities?: IStoredWorkAppMailIdentity[] | undefined): Promise<void>;
84
105
  private readStoredIdentities;
85
106
  private writeStoredIdentities;
86
107
  private getRequiredStorageManager;
87
- private mergeIdentitiesIntoEmailConfig;
88
108
  private buildInboundRoute;
89
109
  private buildOutboundRoute;
90
110
  private ensureEmailDomainConfigured;
@@ -143,7 +163,6 @@ export declare class WorkAppMailManager {
143
163
  private buildOutboundRouteName;
144
164
  private hashExternalKey;
145
165
  private generateSmtpPassword;
146
- private isManagedMailRouteName;
147
166
  private isManagedSmtpUsername;
148
167
  private buildSmtpCredentials;
149
168
  private toMailCredentialPublic;