@serve.zone/dcrouter 13.24.0 → 13.25.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/dist_serve/bundle.js +1 -1
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/db/documents/classes.ip-intelligence.doc.d.ts +1 -0
- package/dist_ts/db/documents/classes.ip-intelligence.doc.js +8 -2
- package/dist_ts/security/classes.security-policy-manager.d.ts +8 -2
- package/dist_ts/security/classes.security-policy-manager.js +83 -7
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/package.json +2 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/db/documents/classes.ip-intelligence.doc.ts +3 -0
- package/ts/security/classes.security-policy-manager.ts +90 -8
- package/ts_web/00_commitinfo_data.ts +1 -1
package/dist_serve/bundle.js
CHANGED
|
@@ -46507,4 +46507,4 @@ ibantools/jsnext/ibantools.js:
|
|
|
46507
46507
|
* @preferred
|
|
46508
46508
|
*)
|
|
46509
46509
|
*/
|
|
46510
|
-
//# sourceMappingURL=bundle-
|
|
46510
|
+
//# sourceMappingURL=bundle-1777236643763.js.map
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/dcrouter',
|
|
6
|
-
version: '13.
|
|
6
|
+
version: '13.25.0',
|
|
7
7
|
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxzQkFBc0I7SUFDNUIsT0FBTyxFQUFFLFNBQVM7SUFDbEIsV0FBVyxFQUFFLDBFQUEwRTtDQUN4RixDQUFBIn0=
|
|
@@ -7,6 +7,7 @@ export declare class IpIntelligenceDoc extends plugins.smartdata.SmartDataDbDoc<
|
|
|
7
7
|
registrantOrg: string | null;
|
|
8
8
|
registrantCountry: string | null;
|
|
9
9
|
networkRange: string | null;
|
|
10
|
+
networkCidrs: string[] | null;
|
|
10
11
|
abuseContact: string | null;
|
|
11
12
|
country: string | null;
|
|
12
13
|
countryCode: string | null;
|
|
@@ -59,6 +59,9 @@ let IpIntelligenceDoc = (() => {
|
|
|
59
59
|
let _networkRange_decorators;
|
|
60
60
|
let _networkRange_initializers = [];
|
|
61
61
|
let _networkRange_extraInitializers = [];
|
|
62
|
+
let _networkCidrs_decorators;
|
|
63
|
+
let _networkCidrs_initializers = [];
|
|
64
|
+
let _networkCidrs_extraInitializers = [];
|
|
62
65
|
let _abuseContact_decorators;
|
|
63
66
|
let _abuseContact_initializers = [];
|
|
64
67
|
let _abuseContact_extraInitializers = [];
|
|
@@ -105,6 +108,7 @@ let IpIntelligenceDoc = (() => {
|
|
|
105
108
|
_registrantOrg_decorators = [plugins.smartdata.svDb()];
|
|
106
109
|
_registrantCountry_decorators = [plugins.smartdata.svDb()];
|
|
107
110
|
_networkRange_decorators = [plugins.smartdata.svDb()];
|
|
111
|
+
_networkCidrs_decorators = [plugins.smartdata.svDb()];
|
|
108
112
|
_abuseContact_decorators = [plugins.smartdata.svDb()];
|
|
109
113
|
_country_decorators = [plugins.smartdata.svDb()];
|
|
110
114
|
_countryCode_decorators = [plugins.smartdata.svDb()];
|
|
@@ -123,6 +127,7 @@ let IpIntelligenceDoc = (() => {
|
|
|
123
127
|
__esDecorate(null, null, _registrantOrg_decorators, { kind: "field", name: "registrantOrg", static: false, private: false, access: { has: obj => "registrantOrg" in obj, get: obj => obj.registrantOrg, set: (obj, value) => { obj.registrantOrg = value; } }, metadata: _metadata }, _registrantOrg_initializers, _registrantOrg_extraInitializers);
|
|
124
128
|
__esDecorate(null, null, _registrantCountry_decorators, { kind: "field", name: "registrantCountry", static: false, private: false, access: { has: obj => "registrantCountry" in obj, get: obj => obj.registrantCountry, set: (obj, value) => { obj.registrantCountry = value; } }, metadata: _metadata }, _registrantCountry_initializers, _registrantCountry_extraInitializers);
|
|
125
129
|
__esDecorate(null, null, _networkRange_decorators, { kind: "field", name: "networkRange", static: false, private: false, access: { has: obj => "networkRange" in obj, get: obj => obj.networkRange, set: (obj, value) => { obj.networkRange = value; } }, metadata: _metadata }, _networkRange_initializers, _networkRange_extraInitializers);
|
|
130
|
+
__esDecorate(null, null, _networkCidrs_decorators, { kind: "field", name: "networkCidrs", static: false, private: false, access: { has: obj => "networkCidrs" in obj, get: obj => obj.networkCidrs, set: (obj, value) => { obj.networkCidrs = value; } }, metadata: _metadata }, _networkCidrs_initializers, _networkCidrs_extraInitializers);
|
|
126
131
|
__esDecorate(null, null, _abuseContact_decorators, { kind: "field", name: "abuseContact", static: false, private: false, access: { has: obj => "abuseContact" in obj, get: obj => obj.abuseContact, set: (obj, value) => { obj.abuseContact = value; } }, metadata: _metadata }, _abuseContact_initializers, _abuseContact_extraInitializers);
|
|
127
132
|
__esDecorate(null, null, _country_decorators, { kind: "field", name: "country", static: false, private: false, access: { has: obj => "country" in obj, get: obj => obj.country, set: (obj, value) => { obj.country = value; } }, metadata: _metadata }, _country_initializers, _country_extraInitializers);
|
|
128
133
|
__esDecorate(null, null, _countryCode_decorators, { kind: "field", name: "countryCode", static: false, private: false, access: { has: obj => "countryCode" in obj, get: obj => obj.countryCode, set: (obj, value) => { obj.countryCode = value; } }, metadata: _metadata }, _countryCode_initializers, _countryCode_extraInitializers);
|
|
@@ -146,7 +151,8 @@ let IpIntelligenceDoc = (() => {
|
|
|
146
151
|
registrantOrg = (__runInitializers(this, _asnOrg_extraInitializers), __runInitializers(this, _registrantOrg_initializers, null));
|
|
147
152
|
registrantCountry = (__runInitializers(this, _registrantOrg_extraInitializers), __runInitializers(this, _registrantCountry_initializers, null));
|
|
148
153
|
networkRange = (__runInitializers(this, _registrantCountry_extraInitializers), __runInitializers(this, _networkRange_initializers, null));
|
|
149
|
-
|
|
154
|
+
networkCidrs = (__runInitializers(this, _networkRange_extraInitializers), __runInitializers(this, _networkCidrs_initializers, null));
|
|
155
|
+
abuseContact = (__runInitializers(this, _networkCidrs_extraInitializers), __runInitializers(this, _abuseContact_initializers, null));
|
|
150
156
|
country = (__runInitializers(this, _abuseContact_extraInitializers), __runInitializers(this, _country_initializers, null));
|
|
151
157
|
countryCode = (__runInitializers(this, _country_extraInitializers), __runInitializers(this, _countryCode_initializers, null));
|
|
152
158
|
city = (__runInitializers(this, _countryCode_extraInitializers), __runInitializers(this, _city_initializers, null));
|
|
@@ -172,4 +178,4 @@ let IpIntelligenceDoc = (() => {
|
|
|
172
178
|
return IpIntelligenceDoc = _classThis;
|
|
173
179
|
})();
|
|
174
180
|
export { IpIntelligenceDoc };
|
|
175
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
181
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5pcC1pbnRlbGxpZ2VuY2UuZG9jLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vdHMvZGIvZG9jdW1lbnRzL2NsYXNzZXMuaXAtaW50ZWxsaWdlbmNlLmRvYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxrQkFBa0IsQ0FBQztBQUM1QyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFHdkQsTUFBTSxLQUFLLEdBQUcsR0FBRyxFQUFFLENBQUMsVUFBVSxDQUFDLFdBQVcsRUFBRSxDQUFDLEtBQUssRUFBRSxDQUFDO0lBR3hDLGlCQUFpQjs0QkFEN0IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLENBQUMsS0FBSyxFQUFFLENBQUM7Ozs7c0JBQ0wsT0FBTyxDQUFDLFNBQVMsQ0FBQyxjQUFjOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O2lDQUF4QyxTQUFRLFdBQXNFOzs7O3FDQUMxRyxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsRUFBRSxFQUN2QixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRTsrQkFHeEIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUU7a0NBR3hCLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxFQUFFO3lDQUd4QixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRTs2Q0FHeEIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUU7d0NBR3hCLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxFQUFFO3dDQUd4QixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRTt3Q0FHeEIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUU7bUNBR3hCLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxFQUFFO3VDQUd4QixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRTtnQ0FHeEIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUU7b0NBR3hCLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxFQUFFO3FDQUd4QixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRTswQ0FHeEIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUU7b0NBR3hCLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxFQUFFO3VDQUd4QixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRTtzQ0FHeEIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUU7cUNBR3hCLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxFQUFFO3FDQUd4QixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRTtZQXJEekIsNktBQU8sU0FBUyw2QkFBVCxTQUFTLDZGQUFVO1lBRzFCLDJKQUFPLEdBQUcsNkJBQUgsR0FBRyxpRkFBdUI7WUFHakMsb0tBQU8sTUFBTSw2QkFBTixNQUFNLHVGQUF1QjtZQUdwQyx5TEFBTyxhQUFhLDZCQUFiLGFBQWEscUdBQXVCO1lBRzNDLHFNQUFPLGlCQUFpQiw2QkFBakIsaUJBQWlCLDZHQUF1QjtZQUcvQyxzTEFBTyxZQUFZLDZCQUFaLFlBQVksbUdBQXVCO1lBRzFDLHNMQUFPLFlBQVksNkJBQVosWUFBWSxtR0FBeUI7WUFHNUMsc0xBQU8sWUFBWSw2QkFBWixZQUFZLG1HQUF1QjtZQUcxQyx1S0FBTyxPQUFPLDZCQUFQLE9BQU8seUZBQXVCO1lBR3JDLG1MQUFPLFdBQVcsNkJBQVgsV0FBVyxpR0FBdUI7WUFHekMsOEpBQU8sSUFBSSw2QkFBSixJQUFJLG1GQUF1QjtZQUdsQywwS0FBTyxRQUFRLDZCQUFSLFFBQVEsMkZBQXVCO1lBR3RDLDZLQUFPLFNBQVMsNkJBQVQsU0FBUyw2RkFBdUI7WUFHdkMsNExBQU8sY0FBYyw2QkFBZCxjQUFjLHVHQUF1QjtZQUc1QywwS0FBTyxRQUFRLDZCQUFSLFFBQVEsMkZBQXVCO1lBR3RDLG1MQUFPLFdBQVcsNkJBQVgsV0FBVyxpR0FBc0I7WUFHeEMsZ0xBQU8sVUFBVSw2QkFBVixVQUFVLCtGQUFzQjtZQUd2Qyw2S0FBTyxTQUFTLDZCQUFULFNBQVMsNkZBQXNCO1lBR3RDLDZLQUFPLFNBQVMsNkJBQVQsU0FBUyw2RkFBYTtZQXpEL0IsNktBc0VDOzs7WUF0RVksdURBQWlCOztRQUdyQixTQUFTLDREQUFVO1FBR25CLEdBQUcsc0dBQWtCLElBQUksR0FBQztRQUcxQixNQUFNLG1HQUFrQixJQUFJLEdBQUM7UUFHN0IsYUFBYSw2R0FBa0IsSUFBSSxHQUFDO1FBR3BDLGlCQUFpQix3SEFBa0IsSUFBSSxHQUFDO1FBR3hDLFlBQVksdUhBQWtCLElBQUksR0FBQztRQUduQyxZQUFZLGtIQUFvQixJQUFJLEdBQUM7UUFHckMsWUFBWSxrSEFBa0IsSUFBSSxHQUFDO1FBR25DLE9BQU8sNkdBQWtCLElBQUksR0FBQztRQUc5QixXQUFXLDRHQUFrQixJQUFJLEdBQUM7UUFHbEMsSUFBSSx5R0FBa0IsSUFBSSxHQUFDO1FBRzNCLFFBQVEsc0dBQWtCLElBQUksR0FBQztRQUcvQixTQUFTLDJHQUFrQixJQUFJLEdBQUM7UUFHaEMsY0FBYyxpSEFBa0IsSUFBSSxHQUFDO1FBR3JDLFFBQVEsZ0hBQWtCLElBQUksR0FBQztRQUcvQixXQUFXLDZHQUFXLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBQztRQUdqQyxVQUFVLCtHQUFXLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBQztRQUdoQyxTQUFTLDZHQUFXLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBQztRQUcvQixTQUFTLDRHQUFXLENBQUMsR0FBQztRQUU3QjtZQUNFLEtBQUssRUFBRSxDQUFDOztTQUNUO1FBRU0sTUFBTSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsU0FBaUI7WUFDNUMsT0FBTyxNQUFNLGlCQUFpQixDQUFDLFdBQVcsQ0FBQyxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUM7UUFDNUQsQ0FBQztRQUVNLE1BQU0sQ0FBQyxLQUFLLENBQUMsT0FBTztZQUN6QixPQUFPLE1BQU0saUJBQWlCLENBQUMsWUFBWSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ2xELENBQUM7Ozs7U0FyRVUsaUJBQWlCIn0=
|
|
@@ -4,7 +4,7 @@ export interface ISecurityPolicyManagerOptions {
|
|
|
4
4
|
onPolicyChanged?: () => void | Promise<void>;
|
|
5
5
|
}
|
|
6
6
|
export interface IRemoteIngressFirewallSnapshot {
|
|
7
|
-
blockedIps
|
|
7
|
+
blockedIps: string[];
|
|
8
8
|
}
|
|
9
9
|
export declare class SecurityPolicyManager {
|
|
10
10
|
private readonly smartNetwork;
|
|
@@ -34,11 +34,17 @@ export declare class SecurityPolicyManager {
|
|
|
34
34
|
deleteBlockRule(id: string, actor?: string): Promise<boolean>;
|
|
35
35
|
compilePolicy(): Promise<ISecurityCompiledPolicy>;
|
|
36
36
|
compileSmartProxyPolicy(): Promise<ISecurityCompiledPolicy>;
|
|
37
|
-
compileRemoteIngressFirewall(): Promise<IRemoteIngressFirewallSnapshot
|
|
37
|
+
compileRemoteIngressFirewall(): Promise<IRemoteIngressFirewallSnapshot>;
|
|
38
38
|
private matchesAnyReactiveRule;
|
|
39
39
|
private ruleMatchesIntelligence;
|
|
40
40
|
private normalizeIp;
|
|
41
41
|
private normalizeCidr;
|
|
42
|
+
private normalizeNetworkEntries;
|
|
43
|
+
private normalizeNetworkEntryList;
|
|
44
|
+
private ipv4RangeToCidrs;
|
|
45
|
+
private ipv4ToBigInt;
|
|
46
|
+
private numberToIpv4;
|
|
47
|
+
private powerOfTwoExponent;
|
|
42
48
|
private isPublicIp;
|
|
43
49
|
private ruleFromDoc;
|
|
44
50
|
private writeAudit;
|
|
@@ -93,6 +93,7 @@ export class SecurityPolicyManager {
|
|
|
93
93
|
registrantOrg: doc.registrantOrg,
|
|
94
94
|
registrantCountry: doc.registrantCountry,
|
|
95
95
|
networkRange: doc.networkRange,
|
|
96
|
+
networkCidrs: doc.networkCidrs,
|
|
96
97
|
abuseContact: doc.abuseContact,
|
|
97
98
|
country: doc.country,
|
|
98
99
|
countryCode: doc.countryCode,
|
|
@@ -169,17 +170,22 @@ export class SecurityPolicyManager {
|
|
|
169
170
|
continue;
|
|
170
171
|
}
|
|
171
172
|
if (rule.type === 'cidr') {
|
|
172
|
-
const cidr
|
|
173
|
-
if (cidr)
|
|
173
|
+
for (const cidr of this.normalizeNetworkEntries(normalizedValue)) {
|
|
174
174
|
blockedCidrs.add(cidr);
|
|
175
|
+
}
|
|
175
176
|
continue;
|
|
176
177
|
}
|
|
177
178
|
for (const doc of intelligenceDocs) {
|
|
178
179
|
if (!this.ruleMatchesIntelligence(rule, doc))
|
|
179
180
|
continue;
|
|
180
|
-
const
|
|
181
|
-
|
|
182
|
-
|
|
181
|
+
const networkEntries = this.normalizeNetworkEntryList([
|
|
182
|
+
...(doc.networkCidrs || []),
|
|
183
|
+
doc.networkRange,
|
|
184
|
+
]);
|
|
185
|
+
if (networkEntries.length > 0) {
|
|
186
|
+
for (const cidr of networkEntries) {
|
|
187
|
+
blockedCidrs.add(cidr);
|
|
188
|
+
}
|
|
183
189
|
}
|
|
184
190
|
else if (this.normalizeIp(doc.ipAddress)) {
|
|
185
191
|
blockedIps.add(this.normalizeIp(doc.ipAddress));
|
|
@@ -200,7 +206,7 @@ export class SecurityPolicyManager {
|
|
|
200
206
|
...policy.blockedIps.filter((ip) => plugins.net.isIP(ip) === 4),
|
|
201
207
|
...policy.blockedCidrs.filter((cidr) => plugins.net.isIP(cidr.split('/')[0]) === 4),
|
|
202
208
|
];
|
|
203
|
-
return
|
|
209
|
+
return { blockedIps };
|
|
204
210
|
}
|
|
205
211
|
async matchesAnyReactiveRule(doc) {
|
|
206
212
|
const rules = await SecurityBlockRuleDoc.findEnabled();
|
|
@@ -246,6 +252,76 @@ export class SecurityPolicyManager {
|
|
|
246
252
|
return undefined;
|
|
247
253
|
return `${ip}/${prefix}`;
|
|
248
254
|
}
|
|
255
|
+
normalizeNetworkEntries(value) {
|
|
256
|
+
const trimmed = value.trim();
|
|
257
|
+
if (!trimmed)
|
|
258
|
+
return [];
|
|
259
|
+
const cidr = this.normalizeCidr(trimmed);
|
|
260
|
+
if (cidr)
|
|
261
|
+
return [cidr];
|
|
262
|
+
const rangeParts = trimmed.split(/\s+-\s+/);
|
|
263
|
+
if (rangeParts.length === 2) {
|
|
264
|
+
return this.ipv4RangeToCidrs(rangeParts[0], rangeParts[1]);
|
|
265
|
+
}
|
|
266
|
+
return [];
|
|
267
|
+
}
|
|
268
|
+
normalizeNetworkEntryList(values) {
|
|
269
|
+
const cidrs = new Set();
|
|
270
|
+
for (const value of values) {
|
|
271
|
+
if (!value)
|
|
272
|
+
continue;
|
|
273
|
+
for (const entry of value.split(',').map((part) => part.trim()).filter(Boolean)) {
|
|
274
|
+
for (const cidr of this.normalizeNetworkEntries(entry)) {
|
|
275
|
+
cidrs.add(cidr);
|
|
276
|
+
}
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
return [...cidrs];
|
|
280
|
+
}
|
|
281
|
+
ipv4RangeToCidrs(startIp, endIp) {
|
|
282
|
+
const start = this.ipv4ToBigInt(startIp);
|
|
283
|
+
const end = this.ipv4ToBigInt(endIp);
|
|
284
|
+
if (start === undefined || end === undefined || start > end)
|
|
285
|
+
return [];
|
|
286
|
+
const cidrs = [];
|
|
287
|
+
let current = start;
|
|
288
|
+
while (current <= end) {
|
|
289
|
+
let maxBlockSize = current === 0n ? 1n << 32n : current & -current;
|
|
290
|
+
const remaining = end - current + 1n;
|
|
291
|
+
while (maxBlockSize > remaining) {
|
|
292
|
+
maxBlockSize = maxBlockSize / 2n;
|
|
293
|
+
}
|
|
294
|
+
const prefixLength = 32 - this.powerOfTwoExponent(maxBlockSize);
|
|
295
|
+
cidrs.push(`${this.numberToIpv4(current)}/${prefixLength}`);
|
|
296
|
+
current += maxBlockSize;
|
|
297
|
+
}
|
|
298
|
+
return cidrs;
|
|
299
|
+
}
|
|
300
|
+
ipv4ToBigInt(ip) {
|
|
301
|
+
const normalized = this.normalizeIp(ip);
|
|
302
|
+
if (!normalized || plugins.net.isIP(normalized) !== 4)
|
|
303
|
+
return undefined;
|
|
304
|
+
return normalized
|
|
305
|
+
.split('.')
|
|
306
|
+
.reduce((sum, part) => (sum * 256n) + BigInt(Number(part)), 0n);
|
|
307
|
+
}
|
|
308
|
+
numberToIpv4(value) {
|
|
309
|
+
return [
|
|
310
|
+
Number((value >> 24n) & 255n),
|
|
311
|
+
Number((value >> 16n) & 255n),
|
|
312
|
+
Number((value >> 8n) & 255n),
|
|
313
|
+
Number(value & 255n),
|
|
314
|
+
].join('.');
|
|
315
|
+
}
|
|
316
|
+
powerOfTwoExponent(value) {
|
|
317
|
+
let exponent = 0;
|
|
318
|
+
let remaining = value;
|
|
319
|
+
while (remaining > 1n) {
|
|
320
|
+
remaining >>= 1n;
|
|
321
|
+
exponent++;
|
|
322
|
+
}
|
|
323
|
+
return exponent;
|
|
324
|
+
}
|
|
249
325
|
isPublicIp(ip) {
|
|
250
326
|
const family = plugins.net.isIP(ip);
|
|
251
327
|
if (family === 4) {
|
|
@@ -301,4 +377,4 @@ export class SecurityPolicyManager {
|
|
|
301
377
|
}
|
|
302
378
|
}
|
|
303
379
|
}
|
|
304
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.security-policy-manager.js","sourceRoot":"","sources":["../../../ts/security/classes.security-policy-manager.ts"],"names":[],"mappings":"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"}
|
|
380
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.security-policy-manager.js","sourceRoot":"","sources":["../../../ts/security/classes.security-policy-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: '13.
|
|
6
|
+
version: '13.25.0',
|
|
7
7
|
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHNfd2ViLzAwX2NvbW1pdGluZm9fZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRztJQUN4QixJQUFJLEVBQUUsc0JBQXNCO0lBQzVCLE9BQU8sRUFBRSxTQUFTO0lBQ2xCLFdBQVcsRUFBRSwwRUFBMEU7Q0FDeEYsQ0FBQSJ9
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/dcrouter",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "13.
|
|
4
|
+
"version": "13.25.0",
|
|
5
5
|
"description": "A multifaceted routing service handling mail and SMS delivery functions.",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"exports": {
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"@push.rocks/smartmetrics": "^3.0.3",
|
|
52
52
|
"@push.rocks/smartmigration": "1.2.0",
|
|
53
53
|
"@push.rocks/smartmta": "^5.3.3",
|
|
54
|
-
"@push.rocks/smartnetwork": "^4.
|
|
54
|
+
"@push.rocks/smartnetwork": "^4.7.0",
|
|
55
55
|
"@push.rocks/smartpath": "^6.0.0",
|
|
56
56
|
"@push.rocks/smartpromise": "^4.2.3",
|
|
57
57
|
"@push.rocks/smartproxy": "^27.9.0",
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -25,6 +25,9 @@ export class IpIntelligenceDoc extends plugins.smartdata.SmartDataDbDoc<IpIntell
|
|
|
25
25
|
@plugins.smartdata.svDb()
|
|
26
26
|
public networkRange: string | null = null;
|
|
27
27
|
|
|
28
|
+
@plugins.smartdata.svDb()
|
|
29
|
+
public networkCidrs: string[] | null = null;
|
|
30
|
+
|
|
28
31
|
@plugins.smartdata.svDb()
|
|
29
32
|
public abuseContact: string | null = null;
|
|
30
33
|
|
|
@@ -16,7 +16,7 @@ export interface ISecurityPolicyManagerOptions {
|
|
|
16
16
|
}
|
|
17
17
|
|
|
18
18
|
export interface IRemoteIngressFirewallSnapshot {
|
|
19
|
-
blockedIps
|
|
19
|
+
blockedIps: string[];
|
|
20
20
|
}
|
|
21
21
|
|
|
22
22
|
export class SecurityPolicyManager {
|
|
@@ -122,6 +122,7 @@ export class SecurityPolicyManager {
|
|
|
122
122
|
registrantOrg: doc.registrantOrg,
|
|
123
123
|
registrantCountry: doc.registrantCountry,
|
|
124
124
|
networkRange: doc.networkRange,
|
|
125
|
+
networkCidrs: doc.networkCidrs,
|
|
125
126
|
abuseContact: doc.abuseContact,
|
|
126
127
|
country: doc.country,
|
|
127
128
|
countryCode: doc.countryCode,
|
|
@@ -205,16 +206,22 @@ export class SecurityPolicyManager {
|
|
|
205
206
|
}
|
|
206
207
|
|
|
207
208
|
if (rule.type === 'cidr') {
|
|
208
|
-
const cidr
|
|
209
|
-
|
|
209
|
+
for (const cidr of this.normalizeNetworkEntries(normalizedValue)) {
|
|
210
|
+
blockedCidrs.add(cidr);
|
|
211
|
+
}
|
|
210
212
|
continue;
|
|
211
213
|
}
|
|
212
214
|
|
|
213
215
|
for (const doc of intelligenceDocs) {
|
|
214
216
|
if (!this.ruleMatchesIntelligence(rule, doc)) continue;
|
|
215
|
-
const
|
|
216
|
-
|
|
217
|
-
|
|
217
|
+
const networkEntries = this.normalizeNetworkEntryList([
|
|
218
|
+
...(doc.networkCidrs || []),
|
|
219
|
+
doc.networkRange,
|
|
220
|
+
]);
|
|
221
|
+
if (networkEntries.length > 0) {
|
|
222
|
+
for (const cidr of networkEntries) {
|
|
223
|
+
blockedCidrs.add(cidr);
|
|
224
|
+
}
|
|
218
225
|
} else if (this.normalizeIp(doc.ipAddress)) {
|
|
219
226
|
blockedIps.add(this.normalizeIp(doc.ipAddress)!);
|
|
220
227
|
}
|
|
@@ -231,13 +238,13 @@ export class SecurityPolicyManager {
|
|
|
231
238
|
return await this.compilePolicy();
|
|
232
239
|
}
|
|
233
240
|
|
|
234
|
-
public async compileRemoteIngressFirewall(): Promise<IRemoteIngressFirewallSnapshot
|
|
241
|
+
public async compileRemoteIngressFirewall(): Promise<IRemoteIngressFirewallSnapshot> {
|
|
235
242
|
const policy = await this.compilePolicy();
|
|
236
243
|
const blockedIps = [
|
|
237
244
|
...policy.blockedIps.filter((ip) => plugins.net.isIP(ip) === 4),
|
|
238
245
|
...policy.blockedCidrs.filter((cidr) => plugins.net.isIP(cidr.split('/')[0]) === 4),
|
|
239
246
|
];
|
|
240
|
-
return
|
|
247
|
+
return { blockedIps };
|
|
241
248
|
}
|
|
242
249
|
|
|
243
250
|
private async matchesAnyReactiveRule(doc: IpIntelligenceDoc): Promise<boolean> {
|
|
@@ -287,6 +294,81 @@ export class SecurityPolicyManager {
|
|
|
287
294
|
return `${ip}/${prefix}`;
|
|
288
295
|
}
|
|
289
296
|
|
|
297
|
+
private normalizeNetworkEntries(value: string): string[] {
|
|
298
|
+
const trimmed = value.trim();
|
|
299
|
+
if (!trimmed) return [];
|
|
300
|
+
|
|
301
|
+
const cidr = this.normalizeCidr(trimmed);
|
|
302
|
+
if (cidr) return [cidr];
|
|
303
|
+
|
|
304
|
+
const rangeParts = trimmed.split(/\s+-\s+/);
|
|
305
|
+
if (rangeParts.length === 2) {
|
|
306
|
+
return this.ipv4RangeToCidrs(rangeParts[0], rangeParts[1]);
|
|
307
|
+
}
|
|
308
|
+
|
|
309
|
+
return [];
|
|
310
|
+
}
|
|
311
|
+
|
|
312
|
+
private normalizeNetworkEntryList(values: Array<string | null | undefined>): string[] {
|
|
313
|
+
const cidrs = new Set<string>();
|
|
314
|
+
for (const value of values) {
|
|
315
|
+
if (!value) continue;
|
|
316
|
+
for (const entry of value.split(',').map((part) => part.trim()).filter(Boolean)) {
|
|
317
|
+
for (const cidr of this.normalizeNetworkEntries(entry)) {
|
|
318
|
+
cidrs.add(cidr);
|
|
319
|
+
}
|
|
320
|
+
}
|
|
321
|
+
}
|
|
322
|
+
return [...cidrs];
|
|
323
|
+
}
|
|
324
|
+
|
|
325
|
+
private ipv4RangeToCidrs(startIp: string, endIp: string): string[] {
|
|
326
|
+
const start = this.ipv4ToBigInt(startIp);
|
|
327
|
+
const end = this.ipv4ToBigInt(endIp);
|
|
328
|
+
if (start === undefined || end === undefined || start > end) return [];
|
|
329
|
+
|
|
330
|
+
const cidrs: string[] = [];
|
|
331
|
+
let current = start;
|
|
332
|
+
while (current <= end) {
|
|
333
|
+
let maxBlockSize = current === 0n ? 1n << 32n : current & -current;
|
|
334
|
+
const remaining = end - current + 1n;
|
|
335
|
+
while (maxBlockSize > remaining) {
|
|
336
|
+
maxBlockSize = maxBlockSize / 2n;
|
|
337
|
+
}
|
|
338
|
+
const prefixLength = 32 - this.powerOfTwoExponent(maxBlockSize);
|
|
339
|
+
cidrs.push(`${this.numberToIpv4(current)}/${prefixLength}`);
|
|
340
|
+
current += maxBlockSize;
|
|
341
|
+
}
|
|
342
|
+
return cidrs;
|
|
343
|
+
}
|
|
344
|
+
|
|
345
|
+
private ipv4ToBigInt(ip: string): bigint | undefined {
|
|
346
|
+
const normalized = this.normalizeIp(ip);
|
|
347
|
+
if (!normalized || plugins.net.isIP(normalized) !== 4) return undefined;
|
|
348
|
+
return normalized
|
|
349
|
+
.split('.')
|
|
350
|
+
.reduce((sum, part) => (sum * 256n) + BigInt(Number(part)), 0n);
|
|
351
|
+
}
|
|
352
|
+
|
|
353
|
+
private numberToIpv4(value: bigint): string {
|
|
354
|
+
return [
|
|
355
|
+
Number((value >> 24n) & 255n),
|
|
356
|
+
Number((value >> 16n) & 255n),
|
|
357
|
+
Number((value >> 8n) & 255n),
|
|
358
|
+
Number(value & 255n),
|
|
359
|
+
].join('.');
|
|
360
|
+
}
|
|
361
|
+
|
|
362
|
+
private powerOfTwoExponent(value: bigint): number {
|
|
363
|
+
let exponent = 0;
|
|
364
|
+
let remaining = value;
|
|
365
|
+
while (remaining > 1n) {
|
|
366
|
+
remaining >>= 1n;
|
|
367
|
+
exponent++;
|
|
368
|
+
}
|
|
369
|
+
return exponent;
|
|
370
|
+
}
|
|
371
|
+
|
|
290
372
|
private isPublicIp(ip: string): boolean {
|
|
291
373
|
const family = plugins.net.isIP(ip);
|
|
292
374
|
if (family === 4) {
|