@serve.zone/dcrouter 13.22.0 → 13.23.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 +2 -2
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.dcrouter.d.ts +4 -0
- package/dist_ts/classes.dcrouter.js +69 -2
- package/dist_ts/db/documents/classes.ip-intelligence.doc.d.ts +25 -0
- package/dist_ts/db/documents/classes.ip-intelligence.doc.js +175 -0
- package/dist_ts/db/documents/classes.security-block-rule.doc.d.ts +17 -0
- package/dist_ts/db/documents/classes.security-block-rule.doc.js +124 -0
- package/dist_ts/db/documents/classes.security-policy-audit.doc.d.ts +11 -0
- package/dist_ts/db/documents/classes.security-policy-audit.doc.js +95 -0
- package/dist_ts/db/documents/index.d.ts +3 -0
- package/dist_ts/db/documents/index.js +4 -1
- package/dist_ts/monitoring/classes.metricsmanager.js +2 -1
- package/dist_ts/opsserver/handlers/security.handler.js +42 -1
- package/dist_ts/remoteingress/classes.remoteingress-manager.d.ts +10 -0
- package/dist_ts/remoteingress/classes.remoteingress-manager.js +9 -1
- package/dist_ts/security/classes.security-policy-manager.d.ts +41 -0
- package/dist_ts/security/classes.security-policy-manager.js +283 -0
- package/dist_ts/security/index.d.ts +1 -0
- package/dist_ts/security/index.js +2 -1
- package/dist_ts_interfaces/data/index.d.ts +1 -0
- package/dist_ts_interfaces/data/index.js +2 -1
- package/dist_ts_interfaces/data/security-policy.d.ts +32 -0
- package/dist_ts_interfaces/data/security-policy.js +2 -0
- package/dist_ts_interfaces/requests/index.d.ts +1 -0
- package/dist_ts_interfaces/requests/index.js +2 -1
- package/dist_ts_interfaces/requests/security-policy.d.ts +64 -0
- package/dist_ts_interfaces/requests/security-policy.js +2 -0
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/package.json +3 -3
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.dcrouter.ts +91 -3
- package/ts/db/documents/classes.ip-intelligence.doc.ts +75 -0
- package/ts/db/documents/classes.security-block-rule.doc.ts +52 -0
- package/ts/db/documents/classes.security-policy-audit.doc.ts +33 -0
- package/ts/db/documents/index.ts +3 -0
- package/ts/monitoring/classes.metricsmanager.ts +2 -0
- package/ts/opsserver/handlers/security.handler.ts +69 -0
- package/ts/remoteingress/classes.remoteingress-manager.ts +15 -2
- package/ts/security/classes.security-policy-manager.ts +315 -0
- package/ts/security/index.ts +7 -1
- package/ts_web/00_commitinfo_data.ts +1 -1
|
@@ -0,0 +1,283 @@
|
|
|
1
|
+
import * as plugins from '../plugins.js';
|
|
2
|
+
import { logger } from '../logger.js';
|
|
3
|
+
import { IpIntelligenceDoc, SecurityBlockRuleDoc, SecurityPolicyAuditDoc } from '../db/index.js';
|
|
4
|
+
export class SecurityPolicyManager {
|
|
5
|
+
smartNetwork = new plugins.smartnetwork.SmartNetwork({
|
|
6
|
+
cacheTtl: 24 * 60 * 60 * 1000,
|
|
7
|
+
});
|
|
8
|
+
intelligenceRefreshMs;
|
|
9
|
+
inFlightObservations = new Set();
|
|
10
|
+
onPolicyChanged;
|
|
11
|
+
constructor(options = {}) {
|
|
12
|
+
this.intelligenceRefreshMs = options.intelligenceRefreshMs ?? 24 * 60 * 60 * 1000;
|
|
13
|
+
this.onPolicyChanged = options.onPolicyChanged;
|
|
14
|
+
}
|
|
15
|
+
async start() {
|
|
16
|
+
logger.log('info', 'SecurityPolicyManager started');
|
|
17
|
+
}
|
|
18
|
+
async stop() {
|
|
19
|
+
await this.smartNetwork.stop();
|
|
20
|
+
}
|
|
21
|
+
async observeIps(ips) {
|
|
22
|
+
const uniqueIps = [...new Set(ips.map((ip) => this.normalizeIp(ip)).filter(Boolean))];
|
|
23
|
+
await Promise.allSettled(uniqueIps.map((ip) => this.observeIp(ip)));
|
|
24
|
+
}
|
|
25
|
+
async observeIp(ipAddress) {
|
|
26
|
+
const ip = this.normalizeIp(ipAddress);
|
|
27
|
+
if (!ip || !this.isPublicIp(ip) || this.inFlightObservations.has(ip)) {
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
30
|
+
this.inFlightObservations.add(ip);
|
|
31
|
+
try {
|
|
32
|
+
const now = Date.now();
|
|
33
|
+
let doc = await IpIntelligenceDoc.findByIp(ip);
|
|
34
|
+
if (doc && now - doc.updatedAt < this.intelligenceRefreshMs) {
|
|
35
|
+
if (now - doc.lastSeenAt > 60_000) {
|
|
36
|
+
doc.lastSeenAt = now;
|
|
37
|
+
doc.seenCount = (doc.seenCount || 0) + 1;
|
|
38
|
+
await doc.save();
|
|
39
|
+
}
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
42
|
+
const intelligence = await this.smartNetwork.getIpIntelligence(ip);
|
|
43
|
+
if (!doc) {
|
|
44
|
+
doc = new IpIntelligenceDoc();
|
|
45
|
+
doc.ipAddress = ip;
|
|
46
|
+
doc.firstSeenAt = now;
|
|
47
|
+
}
|
|
48
|
+
Object.assign(doc, intelligence);
|
|
49
|
+
doc.lastSeenAt = now;
|
|
50
|
+
doc.updatedAt = now;
|
|
51
|
+
doc.seenCount = (doc.seenCount || 0) + 1;
|
|
52
|
+
await doc.save();
|
|
53
|
+
if (await this.matchesAnyReactiveRule(doc)) {
|
|
54
|
+
await this.notifyPolicyChanged();
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
catch (err) {
|
|
58
|
+
logger.log('warn', `Failed to enrich IP ${ip}: ${err.message}`);
|
|
59
|
+
}
|
|
60
|
+
finally {
|
|
61
|
+
this.inFlightObservations.delete(ip);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
async listBlockRules() {
|
|
65
|
+
return (await SecurityBlockRuleDoc.findAll()).map((doc) => this.ruleFromDoc(doc));
|
|
66
|
+
}
|
|
67
|
+
async listIpIntelligence() {
|
|
68
|
+
return (await IpIntelligenceDoc.findAll()).map((doc) => ({
|
|
69
|
+
ipAddress: doc.ipAddress,
|
|
70
|
+
asn: doc.asn,
|
|
71
|
+
asnOrg: doc.asnOrg,
|
|
72
|
+
registrantOrg: doc.registrantOrg,
|
|
73
|
+
registrantCountry: doc.registrantCountry,
|
|
74
|
+
networkRange: doc.networkRange,
|
|
75
|
+
abuseContact: doc.abuseContact,
|
|
76
|
+
country: doc.country,
|
|
77
|
+
countryCode: doc.countryCode,
|
|
78
|
+
city: doc.city,
|
|
79
|
+
latitude: doc.latitude,
|
|
80
|
+
longitude: doc.longitude,
|
|
81
|
+
accuracyRadius: doc.accuracyRadius,
|
|
82
|
+
timezone: doc.timezone,
|
|
83
|
+
firstSeenAt: doc.firstSeenAt,
|
|
84
|
+
lastSeenAt: doc.lastSeenAt,
|
|
85
|
+
updatedAt: doc.updatedAt,
|
|
86
|
+
seenCount: doc.seenCount,
|
|
87
|
+
}));
|
|
88
|
+
}
|
|
89
|
+
async createBlockRule(input, actor = 'system') {
|
|
90
|
+
const now = Date.now();
|
|
91
|
+
const doc = new SecurityBlockRuleDoc();
|
|
92
|
+
doc.id = plugins.uuid.v4();
|
|
93
|
+
doc.type = input.type;
|
|
94
|
+
doc.value = input.value.trim();
|
|
95
|
+
doc.matchMode = input.matchMode;
|
|
96
|
+
doc.reason = input.reason;
|
|
97
|
+
doc.enabled = input.enabled ?? true;
|
|
98
|
+
doc.createdAt = now;
|
|
99
|
+
doc.updatedAt = now;
|
|
100
|
+
doc.createdBy = actor;
|
|
101
|
+
await doc.save();
|
|
102
|
+
await this.writeAudit('createBlockRule', actor, { rule: this.ruleFromDoc(doc) });
|
|
103
|
+
await this.notifyPolicyChanged();
|
|
104
|
+
return this.ruleFromDoc(doc);
|
|
105
|
+
}
|
|
106
|
+
async updateBlockRule(id, patch, actor = 'system') {
|
|
107
|
+
const doc = await SecurityBlockRuleDoc.findById(id);
|
|
108
|
+
if (!doc) {
|
|
109
|
+
return null;
|
|
110
|
+
}
|
|
111
|
+
if (patch.value !== undefined)
|
|
112
|
+
doc.value = patch.value.trim();
|
|
113
|
+
if (patch.matchMode !== undefined)
|
|
114
|
+
doc.matchMode = patch.matchMode;
|
|
115
|
+
if (patch.reason !== undefined)
|
|
116
|
+
doc.reason = patch.reason;
|
|
117
|
+
if (patch.enabled !== undefined)
|
|
118
|
+
doc.enabled = patch.enabled;
|
|
119
|
+
doc.updatedAt = Date.now();
|
|
120
|
+
await doc.save();
|
|
121
|
+
await this.writeAudit('updateBlockRule', actor, { id, patch });
|
|
122
|
+
await this.notifyPolicyChanged();
|
|
123
|
+
return this.ruleFromDoc(doc);
|
|
124
|
+
}
|
|
125
|
+
async deleteBlockRule(id, actor = 'system') {
|
|
126
|
+
const doc = await SecurityBlockRuleDoc.findById(id);
|
|
127
|
+
if (!doc) {
|
|
128
|
+
return false;
|
|
129
|
+
}
|
|
130
|
+
await doc.delete();
|
|
131
|
+
await this.writeAudit('deleteBlockRule', actor, { id });
|
|
132
|
+
await this.notifyPolicyChanged();
|
|
133
|
+
return true;
|
|
134
|
+
}
|
|
135
|
+
async compilePolicy() {
|
|
136
|
+
const rules = await SecurityBlockRuleDoc.findEnabled();
|
|
137
|
+
const intelligenceDocs = await IpIntelligenceDoc.findAll();
|
|
138
|
+
const blockedIps = new Set();
|
|
139
|
+
const blockedCidrs = new Set();
|
|
140
|
+
for (const rule of rules) {
|
|
141
|
+
const normalizedValue = rule.value.trim();
|
|
142
|
+
if (!normalizedValue)
|
|
143
|
+
continue;
|
|
144
|
+
if (rule.type === 'ip') {
|
|
145
|
+
const ip = this.normalizeIp(normalizedValue);
|
|
146
|
+
if (ip && plugins.net.isIP(ip))
|
|
147
|
+
blockedIps.add(ip);
|
|
148
|
+
continue;
|
|
149
|
+
}
|
|
150
|
+
if (rule.type === 'cidr') {
|
|
151
|
+
const cidr = this.normalizeCidr(normalizedValue);
|
|
152
|
+
if (cidr)
|
|
153
|
+
blockedCidrs.add(cidr);
|
|
154
|
+
continue;
|
|
155
|
+
}
|
|
156
|
+
for (const doc of intelligenceDocs) {
|
|
157
|
+
if (!this.ruleMatchesIntelligence(rule, doc))
|
|
158
|
+
continue;
|
|
159
|
+
const cidr = this.normalizeCidr(doc.networkRange || '');
|
|
160
|
+
if (cidr) {
|
|
161
|
+
blockedCidrs.add(cidr);
|
|
162
|
+
}
|
|
163
|
+
else if (this.normalizeIp(doc.ipAddress)) {
|
|
164
|
+
blockedIps.add(this.normalizeIp(doc.ipAddress));
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
return {
|
|
169
|
+
blockedIps: [...blockedIps].sort(),
|
|
170
|
+
blockedCidrs: [...blockedCidrs].sort(),
|
|
171
|
+
};
|
|
172
|
+
}
|
|
173
|
+
async compileSmartProxyPolicy() {
|
|
174
|
+
return await this.compilePolicy();
|
|
175
|
+
}
|
|
176
|
+
async compileRemoteIngressFirewall() {
|
|
177
|
+
const policy = await this.compilePolicy();
|
|
178
|
+
const blockedIps = [
|
|
179
|
+
...policy.blockedIps.filter((ip) => plugins.net.isIP(ip) === 4),
|
|
180
|
+
...policy.blockedCidrs.filter((cidr) => plugins.net.isIP(cidr.split('/')[0]) === 4),
|
|
181
|
+
];
|
|
182
|
+
return blockedIps.length > 0 ? { blockedIps } : undefined;
|
|
183
|
+
}
|
|
184
|
+
async matchesAnyReactiveRule(doc) {
|
|
185
|
+
const rules = await SecurityBlockRuleDoc.findEnabled();
|
|
186
|
+
return rules.some((rule) => rule.type === 'asn' || rule.type === 'organization'
|
|
187
|
+
? this.ruleMatchesIntelligence(rule, doc)
|
|
188
|
+
: false);
|
|
189
|
+
}
|
|
190
|
+
ruleMatchesIntelligence(rule, doc) {
|
|
191
|
+
const value = rule.value.trim().toLowerCase();
|
|
192
|
+
if (!value)
|
|
193
|
+
return false;
|
|
194
|
+
if (rule.type === 'asn') {
|
|
195
|
+
return String(doc.asn ?? '') === value.replace(/^as/i, '');
|
|
196
|
+
}
|
|
197
|
+
if (rule.type === 'organization') {
|
|
198
|
+
const candidates = [doc.asnOrg, doc.registrantOrg]
|
|
199
|
+
.filter(Boolean)
|
|
200
|
+
.map((candidate) => candidate.toLowerCase());
|
|
201
|
+
if (rule.matchMode === 'exact') {
|
|
202
|
+
return candidates.some((candidate) => candidate === value);
|
|
203
|
+
}
|
|
204
|
+
return candidates.some((candidate) => candidate.includes(value));
|
|
205
|
+
}
|
|
206
|
+
return false;
|
|
207
|
+
}
|
|
208
|
+
normalizeIp(ipAddress) {
|
|
209
|
+
const ip = ipAddress.trim();
|
|
210
|
+
if (ip.startsWith('::ffff:')) {
|
|
211
|
+
return ip.slice('::ffff:'.length);
|
|
212
|
+
}
|
|
213
|
+
return plugins.net.isIP(ip) ? ip : undefined;
|
|
214
|
+
}
|
|
215
|
+
normalizeCidr(value) {
|
|
216
|
+
const [rawIp, rawPrefix] = value.trim().split('/');
|
|
217
|
+
if (!rawIp || !rawPrefix)
|
|
218
|
+
return undefined;
|
|
219
|
+
const ip = this.normalizeIp(rawIp);
|
|
220
|
+
if (!ip)
|
|
221
|
+
return undefined;
|
|
222
|
+
const prefix = Number(rawPrefix);
|
|
223
|
+
const maxPrefix = plugins.net.isIP(ip) === 4 ? 32 : 128;
|
|
224
|
+
if (!Number.isInteger(prefix) || prefix < 0 || prefix > maxPrefix)
|
|
225
|
+
return undefined;
|
|
226
|
+
return `${ip}/${prefix}`;
|
|
227
|
+
}
|
|
228
|
+
isPublicIp(ip) {
|
|
229
|
+
const family = plugins.net.isIP(ip);
|
|
230
|
+
if (family === 4) {
|
|
231
|
+
const parts = ip.split('.').map((part) => Number(part));
|
|
232
|
+
const [a, b] = parts;
|
|
233
|
+
if (a === 10 || a === 127 || a === 0 || a >= 224)
|
|
234
|
+
return false;
|
|
235
|
+
if (a === 100 && b >= 64 && b <= 127)
|
|
236
|
+
return false;
|
|
237
|
+
if (a === 169 && b === 254)
|
|
238
|
+
return false;
|
|
239
|
+
if (a === 172 && b >= 16 && b <= 31)
|
|
240
|
+
return false;
|
|
241
|
+
if (a === 192 && b === 168)
|
|
242
|
+
return false;
|
|
243
|
+
return true;
|
|
244
|
+
}
|
|
245
|
+
if (family === 6) {
|
|
246
|
+
const lower = ip.toLowerCase();
|
|
247
|
+
if (lower === '::1' || lower === '::')
|
|
248
|
+
return false;
|
|
249
|
+
if (lower.startsWith('fe80:') || lower.startsWith('fc') || lower.startsWith('fd'))
|
|
250
|
+
return false;
|
|
251
|
+
return true;
|
|
252
|
+
}
|
|
253
|
+
return false;
|
|
254
|
+
}
|
|
255
|
+
ruleFromDoc(doc) {
|
|
256
|
+
return {
|
|
257
|
+
id: doc.id,
|
|
258
|
+
type: doc.type,
|
|
259
|
+
value: doc.value,
|
|
260
|
+
matchMode: doc.matchMode,
|
|
261
|
+
enabled: doc.enabled,
|
|
262
|
+
reason: doc.reason,
|
|
263
|
+
createdAt: doc.createdAt,
|
|
264
|
+
updatedAt: doc.updatedAt,
|
|
265
|
+
createdBy: doc.createdBy,
|
|
266
|
+
};
|
|
267
|
+
}
|
|
268
|
+
async writeAudit(action, actor, details) {
|
|
269
|
+
const doc = new SecurityPolicyAuditDoc();
|
|
270
|
+
doc.id = plugins.uuid.v4();
|
|
271
|
+
doc.action = action;
|
|
272
|
+
doc.actor = actor;
|
|
273
|
+
doc.details = details;
|
|
274
|
+
doc.createdAt = Date.now();
|
|
275
|
+
await doc.save();
|
|
276
|
+
}
|
|
277
|
+
async notifyPolicyChanged() {
|
|
278
|
+
if (this.onPolicyChanged) {
|
|
279
|
+
await this.onPolicyChanged();
|
|
280
|
+
}
|
|
281
|
+
}
|
|
282
|
+
}
|
|
283
|
+
//# 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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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
export { SecurityLogger, SecurityLogLevel, SecurityEventType, type ISecurityEvent } from './classes.securitylogger.js';
|
|
2
2
|
export { IPReputationChecker, ReputationThreshold, IPType, type IReputationResult, type IIPReputationOptions } from './classes.ipreputationchecker.js';
|
|
3
3
|
export { ContentScanner, ThreatCategory, type IScanResult, type IContentScannerOptions } from './classes.contentscanner.js';
|
|
4
|
+
export { SecurityPolicyManager, type ISecurityPolicyManagerOptions, type IRemoteIngressFirewallSnapshot, } from './classes.security-policy-manager.js';
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export { SecurityLogger, SecurityLogLevel, SecurityEventType } from './classes.securitylogger.js';
|
|
2
2
|
export { IPReputationChecker, ReputationThreshold, IPType } from './classes.ipreputationchecker.js';
|
|
3
3
|
export { ContentScanner, ThreatCategory } from './classes.contentscanner.js';
|
|
4
|
-
|
|
4
|
+
export { SecurityPolicyManager, } from './classes.security-policy-manager.js';
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9zZWN1cml0eS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsY0FBYyxFQUNkLGdCQUFnQixFQUNoQixpQkFBaUIsRUFFbEIsTUFBTSw2QkFBNkIsQ0FBQztBQUVyQyxPQUFPLEVBQ0wsbUJBQW1CLEVBQ25CLG1CQUFtQixFQUNuQixNQUFNLEVBR1AsTUFBTSxrQ0FBa0MsQ0FBQztBQUUxQyxPQUFPLEVBQ0wsY0FBYyxFQUNkLGNBQWMsRUFHZixNQUFNLDZCQUE2QixDQUFDO0FBRXJDLE9BQU8sRUFDTCxxQkFBcUIsR0FHdEIsTUFBTSxzQ0FBc0MsQ0FBQyJ9
|
|
@@ -9,4 +9,5 @@ export * from './domain.js';
|
|
|
9
9
|
export * from './dns-record.js';
|
|
10
10
|
export * from './acme-config.js';
|
|
11
11
|
export * from './email-domain.js';
|
|
12
|
-
|
|
12
|
+
export * from './security-policy.js';
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90c19pbnRlcmZhY2VzL2RhdGEvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxXQUFXLENBQUM7QUFDMUIsY0FBYyxZQUFZLENBQUM7QUFDM0IsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLHVCQUF1QixDQUFDO0FBQ3RDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxVQUFVLENBQUM7QUFDekIsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMsa0JBQWtCLENBQUM7QUFDakMsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLHNCQUFzQixDQUFDIn0=
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import type { IIpIntelligenceResult } from '@push.rocks/smartnetwork';
|
|
2
|
+
export type TSecurityBlockRuleType = 'ip' | 'cidr' | 'asn' | 'organization';
|
|
3
|
+
export type TSecurityBlockRuleMatchMode = 'exact' | 'contains';
|
|
4
|
+
export interface IIpIntelligenceRecord extends IIpIntelligenceResult {
|
|
5
|
+
ipAddress: string;
|
|
6
|
+
firstSeenAt: number;
|
|
7
|
+
lastSeenAt: number;
|
|
8
|
+
updatedAt: number;
|
|
9
|
+
seenCount: number;
|
|
10
|
+
}
|
|
11
|
+
export interface ISecurityBlockRule {
|
|
12
|
+
id: string;
|
|
13
|
+
type: TSecurityBlockRuleType;
|
|
14
|
+
value: string;
|
|
15
|
+
matchMode?: TSecurityBlockRuleMatchMode;
|
|
16
|
+
enabled: boolean;
|
|
17
|
+
reason?: string;
|
|
18
|
+
createdAt: number;
|
|
19
|
+
updatedAt: number;
|
|
20
|
+
createdBy: string;
|
|
21
|
+
}
|
|
22
|
+
export interface ISecurityCompiledPolicy {
|
|
23
|
+
blockedIps: string[];
|
|
24
|
+
blockedCidrs: string[];
|
|
25
|
+
}
|
|
26
|
+
export interface ISecurityPolicyAuditEvent {
|
|
27
|
+
id: string;
|
|
28
|
+
action: string;
|
|
29
|
+
actor: string;
|
|
30
|
+
details: Record<string, unknown>;
|
|
31
|
+
createdAt: number;
|
|
32
|
+
}
|
|
@@ -19,4 +19,5 @@ export * from './domains.js';
|
|
|
19
19
|
export * from './dns-records.js';
|
|
20
20
|
export * from './acme-config.js';
|
|
21
21
|
export * from './email-domains.js';
|
|
22
|
-
|
|
22
|
+
export * from './security-policy.js';
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90c19pbnRlcmZhY2VzL3JlcXVlc3RzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsWUFBWSxDQUFDO0FBQzNCLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsV0FBVyxDQUFDO0FBQzFCLGNBQWMsWUFBWSxDQUFDO0FBQzNCLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMsVUFBVSxDQUFDO0FBQ3pCLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsWUFBWSxDQUFDO0FBQzNCLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxrQkFBa0IsQ0FBQztBQUNqQyxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxzQkFBc0IsQ0FBQyJ9
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import * as plugins from '../plugins.js';
|
|
2
|
+
import type * as authInterfaces from '../data/auth.js';
|
|
3
|
+
import type { IIpIntelligenceRecord, ISecurityBlockRule, TSecurityBlockRuleMatchMode, TSecurityBlockRuleType } from '../data/security-policy.js';
|
|
4
|
+
export interface IReq_ListSecurityBlockRules extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_ListSecurityBlockRules> {
|
|
5
|
+
method: 'listSecurityBlockRules';
|
|
6
|
+
request: {
|
|
7
|
+
identity: authInterfaces.IIdentity;
|
|
8
|
+
};
|
|
9
|
+
response: {
|
|
10
|
+
rules: ISecurityBlockRule[];
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
export interface IReq_CreateSecurityBlockRule extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_CreateSecurityBlockRule> {
|
|
14
|
+
method: 'createSecurityBlockRule';
|
|
15
|
+
request: {
|
|
16
|
+
identity: authInterfaces.IIdentity;
|
|
17
|
+
type: TSecurityBlockRuleType;
|
|
18
|
+
value: string;
|
|
19
|
+
matchMode?: TSecurityBlockRuleMatchMode;
|
|
20
|
+
reason?: string;
|
|
21
|
+
enabled?: boolean;
|
|
22
|
+
};
|
|
23
|
+
response: {
|
|
24
|
+
success: boolean;
|
|
25
|
+
rule?: ISecurityBlockRule;
|
|
26
|
+
message?: string;
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
export interface IReq_UpdateSecurityBlockRule extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_UpdateSecurityBlockRule> {
|
|
30
|
+
method: 'updateSecurityBlockRule';
|
|
31
|
+
request: {
|
|
32
|
+
identity: authInterfaces.IIdentity;
|
|
33
|
+
id: string;
|
|
34
|
+
value?: string;
|
|
35
|
+
matchMode?: TSecurityBlockRuleMatchMode;
|
|
36
|
+
reason?: string;
|
|
37
|
+
enabled?: boolean;
|
|
38
|
+
};
|
|
39
|
+
response: {
|
|
40
|
+
success: boolean;
|
|
41
|
+
rule?: ISecurityBlockRule;
|
|
42
|
+
message?: string;
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
export interface IReq_DeleteSecurityBlockRule extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_DeleteSecurityBlockRule> {
|
|
46
|
+
method: 'deleteSecurityBlockRule';
|
|
47
|
+
request: {
|
|
48
|
+
identity: authInterfaces.IIdentity;
|
|
49
|
+
id: string;
|
|
50
|
+
};
|
|
51
|
+
response: {
|
|
52
|
+
success: boolean;
|
|
53
|
+
message?: string;
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
export interface IReq_ListIpIntelligence extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_ListIpIntelligence> {
|
|
57
|
+
method: 'listIpIntelligence';
|
|
58
|
+
request: {
|
|
59
|
+
identity: authInterfaces.IIdentity;
|
|
60
|
+
};
|
|
61
|
+
response: {
|
|
62
|
+
records: IIpIntelligenceRecord[];
|
|
63
|
+
};
|
|
64
|
+
}
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
import * as plugins from '../plugins.js';
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VjdXJpdHktcG9saWN5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHNfaW50ZXJmYWNlcy9yZXF1ZXN0cy9zZWN1cml0eS1wb2xpY3kudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxlQUFlLENBQUMifQ==
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/dcrouter',
|
|
6
|
-
version: '13.
|
|
6
|
+
version: '13.23.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.23.0",
|
|
5
5
|
"description": "A multifaceted routing service handling mail and SMS delivery functions.",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"exports": {
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"@push.rocks/smartnetwork": "^4.6.0",
|
|
55
55
|
"@push.rocks/smartpath": "^6.0.0",
|
|
56
56
|
"@push.rocks/smartpromise": "^4.2.3",
|
|
57
|
-
"@push.rocks/smartproxy": "^27.
|
|
57
|
+
"@push.rocks/smartproxy": "^27.9.0",
|
|
58
58
|
"@push.rocks/smartradius": "^1.1.1",
|
|
59
59
|
"@push.rocks/smartrequest": "^5.0.1",
|
|
60
60
|
"@push.rocks/smartrx": "^3.0.10",
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"@push.rocks/taskbuffer": "^8.0.2",
|
|
65
65
|
"@serve.zone/catalog": "^2.12.4",
|
|
66
66
|
"@serve.zone/interfaces": "^5.4.3",
|
|
67
|
-
"@serve.zone/remoteingress": "^4.17.
|
|
67
|
+
"@serve.zone/remoteingress": "^4.17.1",
|
|
68
68
|
"@tsclass/tsclass": "^9.5.0",
|
|
69
69
|
"@types/qrcode": "^1.5.6",
|
|
70
70
|
"lru-cache": "^11.3.5",
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/classes.dcrouter.ts
CHANGED
|
@@ -27,12 +27,13 @@ import { RemoteIngressManager, TunnelManager } from './remoteingress/index.js';
|
|
|
27
27
|
import { VpnManager, type IVpnManagerConfig } from './vpn/index.js';
|
|
28
28
|
import { RouteConfigManager, ApiTokenManager, ReferenceResolver, DbSeeder, TargetProfileManager } from './config/index.js';
|
|
29
29
|
import type { TIpAllowEntry } from './config/classes.route-config-manager.js';
|
|
30
|
-
import { SecurityLogger, ContentScanner, IPReputationChecker } from './security/index.js';
|
|
30
|
+
import { SecurityLogger, ContentScanner, IPReputationChecker, SecurityPolicyManager } from './security/index.js';
|
|
31
31
|
import { type IHttp3Config, augmentRoutesWithHttp3 } from './http3/index.js';
|
|
32
32
|
import { DnsManager } from './dns/manager.dns.js';
|
|
33
33
|
import { AcmeConfigManager } from './acme/manager.acme-config.js';
|
|
34
34
|
import { EmailDomainManager, SmartMtaStorageManager, buildEmailDnsRecords } from './email/index.js';
|
|
35
35
|
import type { IRoute } from '../ts_interfaces/data/route-management.js';
|
|
36
|
+
import type { ISecurityCompiledPolicy } from '../ts_interfaces/data/security-policy.js';
|
|
36
37
|
|
|
37
38
|
export interface IDcRouterOptions {
|
|
38
39
|
/** Base directory for all dcrouter data. Defaults to ~/.serve.zone/dcrouter */
|
|
@@ -284,6 +285,7 @@ export class DcRouter {
|
|
|
284
285
|
// ACME configuration (DB-backed singleton, replaces tls.contactEmail)
|
|
285
286
|
public acmeConfigManager?: AcmeConfigManager;
|
|
286
287
|
public emailDomainManager?: EmailDomainManager;
|
|
288
|
+
public securityPolicyManager?: SecurityPolicyManager;
|
|
287
289
|
|
|
288
290
|
// Auto-discovered public IP (populated by generateAuthoritativeRecords)
|
|
289
291
|
public detectedPublicIp: string | null = null;
|
|
@@ -471,12 +473,36 @@ export class DcRouter {
|
|
|
471
473
|
);
|
|
472
474
|
}
|
|
473
475
|
|
|
476
|
+
// SecurityPolicyManager: optional, depends on DcRouterDb — owns IP intelligence
|
|
477
|
+
// and compiles the global block policy for SmartProxy and remote ingress edges.
|
|
478
|
+
if (this.options.dbConfig?.enabled !== false) {
|
|
479
|
+
this.serviceManager.addService(
|
|
480
|
+
new plugins.taskbuffer.Service('SecurityPolicyManager')
|
|
481
|
+
.optional()
|
|
482
|
+
.dependsOn('DcRouterDb')
|
|
483
|
+
.withStart(async () => {
|
|
484
|
+
this.securityPolicyManager = new SecurityPolicyManager({
|
|
485
|
+
onPolicyChanged: () => this.applySecurityPolicy(),
|
|
486
|
+
});
|
|
487
|
+
await this.securityPolicyManager.start();
|
|
488
|
+
})
|
|
489
|
+
.withStop(async () => {
|
|
490
|
+
if (this.securityPolicyManager) {
|
|
491
|
+
await this.securityPolicyManager.stop();
|
|
492
|
+
this.securityPolicyManager = undefined;
|
|
493
|
+
}
|
|
494
|
+
})
|
|
495
|
+
.withRetry({ maxRetries: 1, baseDelayMs: 500 }),
|
|
496
|
+
);
|
|
497
|
+
}
|
|
498
|
+
|
|
474
499
|
// SmartProxy: critical, depends on DcRouterDb + DnsManager + AcmeConfigManager (if enabled)
|
|
475
500
|
const smartProxyDeps: string[] = [];
|
|
476
501
|
if (this.options.dbConfig?.enabled !== false) {
|
|
477
502
|
smartProxyDeps.push('DcRouterDb');
|
|
478
503
|
smartProxyDeps.push('DnsManager');
|
|
479
504
|
smartProxyDeps.push('AcmeConfigManager');
|
|
505
|
+
smartProxyDeps.push('SecurityPolicyManager');
|
|
480
506
|
}
|
|
481
507
|
this.serviceManager.addService(
|
|
482
508
|
new plugins.taskbuffer.Service('SmartProxy')
|
|
@@ -971,6 +997,12 @@ export class DcRouter {
|
|
|
971
997
|
logger.log('info', 'HTTP/3: Augmented qualifying HTTPS routes with QUIC/H3 configuration');
|
|
972
998
|
}
|
|
973
999
|
|
|
1000
|
+
const compiledSecurityPolicy = await this.securityPolicyManager?.compileSmartProxyPolicy();
|
|
1001
|
+
const mergedSecurityPolicy = this.mergeSecurityPolicies(
|
|
1002
|
+
(this.options.smartProxyConfig as any)?.securityPolicy,
|
|
1003
|
+
compiledSecurityPolicy,
|
|
1004
|
+
);
|
|
1005
|
+
|
|
974
1006
|
// If we have routes or need a basic SmartProxy instance, create it
|
|
975
1007
|
if (routes.length > 0 || this.options.smartProxyConfig) {
|
|
976
1008
|
logger.log('info', 'Setting up SmartProxy with combined configuration');
|
|
@@ -1002,6 +1034,7 @@ export class DcRouter {
|
|
|
1002
1034
|
// --- always set by dcrouter (after spread) ---
|
|
1003
1035
|
routes,
|
|
1004
1036
|
acme: acmeConfig,
|
|
1037
|
+
...(mergedSecurityPolicy ? { securityPolicy: mergedSecurityPolicy } as any : {}),
|
|
1005
1038
|
certStore: {
|
|
1006
1039
|
loadAll: async () => {
|
|
1007
1040
|
const docs = await ProxyCertDoc.findAll();
|
|
@@ -1244,8 +1277,60 @@ export class DcRouter {
|
|
|
1244
1277
|
logger.log('info', `SmartProxy started with ${routes.length} routes`);
|
|
1245
1278
|
}
|
|
1246
1279
|
}
|
|
1247
|
-
|
|
1248
|
-
|
|
1280
|
+
|
|
1281
|
+
public async applySecurityPolicy(): Promise<void> {
|
|
1282
|
+
if (!this.securityPolicyManager) {
|
|
1283
|
+
return;
|
|
1284
|
+
}
|
|
1285
|
+
|
|
1286
|
+
const compiledSmartProxyPolicy = await this.securityPolicyManager.compileSmartProxyPolicy();
|
|
1287
|
+
const mergedSecurityPolicy = this.mergeSecurityPolicies(
|
|
1288
|
+
(this.options.smartProxyConfig as any)?.securityPolicy,
|
|
1289
|
+
compiledSmartProxyPolicy,
|
|
1290
|
+
);
|
|
1291
|
+
|
|
1292
|
+
if (this.smartProxy && mergedSecurityPolicy) {
|
|
1293
|
+
const smartProxyWithPolicyApi = this.smartProxy as any;
|
|
1294
|
+
if (typeof smartProxyWithPolicyApi.updateSecurityPolicy === 'function') {
|
|
1295
|
+
await smartProxyWithPolicyApi.updateSecurityPolicy(mergedSecurityPolicy);
|
|
1296
|
+
}
|
|
1297
|
+
}
|
|
1298
|
+
|
|
1299
|
+
const firewallConfig = await this.securityPolicyManager.compileRemoteIngressFirewall();
|
|
1300
|
+
if (this.remoteIngressManager) {
|
|
1301
|
+
(this.remoteIngressManager as any).setFirewallConfig?.(firewallConfig);
|
|
1302
|
+
}
|
|
1303
|
+
if (this.tunnelManager) {
|
|
1304
|
+
await this.tunnelManager.syncAllowedEdges();
|
|
1305
|
+
}
|
|
1306
|
+
}
|
|
1307
|
+
|
|
1308
|
+
private mergeSecurityPolicies(
|
|
1309
|
+
...policies: Array<Partial<ISecurityCompiledPolicy> | undefined>
|
|
1310
|
+
): ISecurityCompiledPolicy | undefined {
|
|
1311
|
+
const blockedIps = new Set<string>();
|
|
1312
|
+
const blockedCidrs = new Set<string>();
|
|
1313
|
+
|
|
1314
|
+
for (const policy of policies) {
|
|
1315
|
+
for (const ip of policy?.blockedIps || []) {
|
|
1316
|
+
if (ip) blockedIps.add(ip);
|
|
1317
|
+
}
|
|
1318
|
+
for (const cidr of policy?.blockedCidrs || []) {
|
|
1319
|
+
if (cidr) blockedCidrs.add(cidr);
|
|
1320
|
+
}
|
|
1321
|
+
}
|
|
1322
|
+
|
|
1323
|
+
if (blockedIps.size === 0 && blockedCidrs.size === 0) {
|
|
1324
|
+
return undefined;
|
|
1325
|
+
}
|
|
1326
|
+
|
|
1327
|
+
return {
|
|
1328
|
+
blockedIps: [...blockedIps].sort(),
|
|
1329
|
+
blockedCidrs: [...blockedCidrs].sort(),
|
|
1330
|
+
};
|
|
1331
|
+
}
|
|
1332
|
+
|
|
1333
|
+
|
|
1249
1334
|
|
|
1250
1335
|
/**
|
|
1251
1336
|
* Generate SmartProxy routes for email configuration
|
|
@@ -2232,6 +2317,9 @@ export class DcRouter {
|
|
|
2232
2317
|
// Initialize the edge registration manager
|
|
2233
2318
|
this.remoteIngressManager = new RemoteIngressManager();
|
|
2234
2319
|
await this.remoteIngressManager.initialize();
|
|
2320
|
+
this.remoteIngressManager.setFirewallConfig(
|
|
2321
|
+
await this.securityPolicyManager?.compileRemoteIngressFirewall(),
|
|
2322
|
+
);
|
|
2235
2323
|
|
|
2236
2324
|
// Pass current bootstrap routes so the manager can derive edge ports initially.
|
|
2237
2325
|
// Once RouteConfigManager applies the full DB set, the onRoutesApplied callback
|