@serve.zone/dcrouter 17.4.1 → 17.4.2
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/deno.json +1 -1
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/email/classes.email-settings.manager.d.ts +8 -0
- package/dist_ts/email/classes.email-settings.manager.js +27 -1
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/package.json +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/email/classes.email-settings.manager.ts +30 -0
- package/ts_web/00_commitinfo_data.ts +1 -1
package/deno.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/dcrouter',
|
|
6
|
-
version: '17.4.
|
|
6
|
+
version: '17.4.2',
|
|
7
7
|
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxzQkFBc0I7SUFDNUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLDBFQUEwRTtDQUN4RixDQUFBIn0=
|
|
@@ -11,6 +11,14 @@ export declare class EmailSettingsManager {
|
|
|
11
11
|
private updatedBy;
|
|
12
12
|
constructor(options: IDcRouterOptions);
|
|
13
13
|
start(): Promise<void>;
|
|
14
|
+
/**
|
|
15
|
+
* One-time persisted-data normalization: the legacy bootstrap config carried
|
|
16
|
+
* a catch-all `default-reject` route (recipients '*' → 550) that outranks
|
|
17
|
+
* the per-domain inbound catch-all store policy, making every configured
|
|
18
|
+
* domain send-only. The domain inboundPolicy is the canonical way to reject
|
|
19
|
+
* inbound mail now, so the legacy route is removed outright.
|
|
20
|
+
*/
|
|
21
|
+
private removeLegacyDefaultRejectRoute;
|
|
14
22
|
stop(): Promise<void>;
|
|
15
23
|
isEnabled(): boolean;
|
|
16
24
|
getEmailConfig(): IUnifiedEmailServerOptions | undefined;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { EmailServerSettingsDoc } from '../db/index.js';
|
|
2
|
+
import { logger } from '../logger.js';
|
|
2
3
|
const defaultEmailPorts = [25, 587, 465];
|
|
3
4
|
function clonePlain(value) {
|
|
4
5
|
if (value === undefined)
|
|
@@ -29,9 +30,34 @@ export class EmailSettingsManager {
|
|
|
29
30
|
doc.updatedBy = 'default';
|
|
30
31
|
await doc.save();
|
|
31
32
|
}
|
|
33
|
+
await this.removeLegacyDefaultRejectRoute(doc);
|
|
32
34
|
this.loadFromDoc(doc);
|
|
33
35
|
this.applyToRuntimeOptions();
|
|
34
36
|
}
|
|
37
|
+
/**
|
|
38
|
+
* One-time persisted-data normalization: the legacy bootstrap config carried
|
|
39
|
+
* a catch-all `default-reject` route (recipients '*' → 550) that outranks
|
|
40
|
+
* the per-domain inbound catch-all store policy, making every configured
|
|
41
|
+
* domain send-only. The domain inboundPolicy is the canonical way to reject
|
|
42
|
+
* inbound mail now, so the legacy route is removed outright.
|
|
43
|
+
*/
|
|
44
|
+
async removeLegacyDefaultRejectRoute(doc) {
|
|
45
|
+
const routes = doc.emailConfig?.routes;
|
|
46
|
+
if (!Array.isArray(routes))
|
|
47
|
+
return;
|
|
48
|
+
const isLegacyDefaultReject = (route) => route?.name === 'default-reject'
|
|
49
|
+
&& route?.action?.type === 'reject'
|
|
50
|
+
&& (route?.match?.recipients === '*'
|
|
51
|
+
|| (Array.isArray(route?.match?.recipients) && route.match.recipients.length === 1 && route.match.recipients[0] === '*'));
|
|
52
|
+
const remaining = routes.filter((route) => !isLegacyDefaultReject(route));
|
|
53
|
+
if (remaining.length === routes.length)
|
|
54
|
+
return;
|
|
55
|
+
doc.emailConfig.routes = remaining;
|
|
56
|
+
doc.updatedAt = Date.now();
|
|
57
|
+
doc.updatedBy = 'legacy-default-reject-normalization';
|
|
58
|
+
await doc.save();
|
|
59
|
+
logger.log('warn', 'Removed legacy catch-all default-reject email route from persisted settings; per-domain inbound policies now govern unrouted recipients');
|
|
60
|
+
}
|
|
35
61
|
async stop() {
|
|
36
62
|
this.cachedEmailConfig = undefined;
|
|
37
63
|
this.cachedEmailPortConfig = undefined;
|
|
@@ -205,4 +231,4 @@ export class EmailSettingsManager {
|
|
|
205
231
|
return normalized;
|
|
206
232
|
}
|
|
207
233
|
}
|
|
208
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.email-settings.manager.js","sourceRoot":"","sources":["../../../ts/email/classes.email-settings.manager.ts"],"names":[],"mappings":"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"}
|
|
234
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.email-settings.manager.js","sourceRoot":"","sources":["../../../ts/email/classes.email-settings.manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/dcrouter',
|
|
6
|
-
version: '17.4.
|
|
6
|
+
version: '17.4.2',
|
|
7
7
|
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHNfd2ViLzAwX2NvbW1pdGluZm9fZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRztJQUN4QixJQUFJLEVBQUUsc0JBQXNCO0lBQzVCLE9BQU8sRUFBRSxRQUFRO0lBQ2pCLFdBQVcsRUFBRSwwRUFBMEU7Q0FDeEYsQ0FBQSJ9
|
package/package.json
CHANGED
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { IUnifiedEmailServerOptions } from '@push.rocks/smartmta';
|
|
2
2
|
import { EmailServerSettingsDoc } from '../db/index.js';
|
|
3
|
+
import { logger } from '../logger.js';
|
|
3
4
|
import type { IDcRouterOptions } from '../classes.dcrouter.js';
|
|
4
5
|
import type {
|
|
5
6
|
IEmailPortConfig,
|
|
@@ -41,10 +42,39 @@ export class EmailSettingsManager {
|
|
|
41
42
|
await doc.save();
|
|
42
43
|
}
|
|
43
44
|
|
|
45
|
+
await this.removeLegacyDefaultRejectRoute(doc);
|
|
44
46
|
this.loadFromDoc(doc);
|
|
45
47
|
this.applyToRuntimeOptions();
|
|
46
48
|
}
|
|
47
49
|
|
|
50
|
+
/**
|
|
51
|
+
* One-time persisted-data normalization: the legacy bootstrap config carried
|
|
52
|
+
* a catch-all `default-reject` route (recipients '*' → 550) that outranks
|
|
53
|
+
* the per-domain inbound catch-all store policy, making every configured
|
|
54
|
+
* domain send-only. The domain inboundPolicy is the canonical way to reject
|
|
55
|
+
* inbound mail now, so the legacy route is removed outright.
|
|
56
|
+
*/
|
|
57
|
+
private async removeLegacyDefaultRejectRoute(doc: EmailServerSettingsDoc): Promise<void> {
|
|
58
|
+
const routes = doc.emailConfig?.routes;
|
|
59
|
+
if (!Array.isArray(routes)) return;
|
|
60
|
+
const isLegacyDefaultReject = (route: any): boolean =>
|
|
61
|
+
route?.name === 'default-reject'
|
|
62
|
+
&& route?.action?.type === 'reject'
|
|
63
|
+
&& (route?.match?.recipients === '*'
|
|
64
|
+
|| (Array.isArray(route?.match?.recipients) && route.match.recipients.length === 1 && route.match.recipients[0] === '*'));
|
|
65
|
+
const remaining = routes.filter((route: any) => !isLegacyDefaultReject(route));
|
|
66
|
+
if (remaining.length === routes.length) return;
|
|
67
|
+
|
|
68
|
+
doc.emailConfig!.routes = remaining;
|
|
69
|
+
doc.updatedAt = Date.now();
|
|
70
|
+
doc.updatedBy = 'legacy-default-reject-normalization';
|
|
71
|
+
await doc.save();
|
|
72
|
+
logger.log(
|
|
73
|
+
'warn',
|
|
74
|
+
'Removed legacy catch-all default-reject email route from persisted settings; per-domain inbound policies now govern unrouted recipients',
|
|
75
|
+
);
|
|
76
|
+
}
|
|
77
|
+
|
|
48
78
|
public async stop(): Promise<void> {
|
|
49
79
|
this.cachedEmailConfig = undefined;
|
|
50
80
|
this.cachedEmailPortConfig = undefined;
|