@serve.zone/dcrouter 13.23.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 +952 -792
- 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/opsserver/handlers/security.handler.js +22 -1
- package/dist_ts/security/classes.security-policy-manager.d.ts +15 -4
- package/dist_ts/security/classes.security-policy-manager.js +108 -11
- package/dist_ts_interfaces/requests/security-policy.d.ts +32 -1
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/dist_ts_web/appstate.d.ts +28 -0
- package/dist_ts_web/appstate.js +171 -4
- package/dist_ts_web/elements/network/ops-view-network-activity.d.ts +9 -0
- package/dist_ts_web/elements/network/ops-view-network-activity.js +210 -3
- package/dist_ts_web/elements/security/ops-view-security-blocked.d.ts +12 -3
- package/dist_ts_web/elements/security/ops-view-security-blocked.js +407 -52
- 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/opsserver/handlers/security.handler.ts +38 -0
- package/ts/security/classes.security-policy-manager.ts +119 -12
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/appstate.ts +236 -3
- package/ts_web/elements/network/ops-view-network-activity.ts +219 -2
- package/ts_web/elements/security/ops-view-security-blocked.ts +414 -51
|
@@ -33,6 +33,7 @@ var __runInitializers = (this && this.__runInitializers) || function (thisArg, i
|
|
|
33
33
|
return useValue ? value : void 0;
|
|
34
34
|
};
|
|
35
35
|
import * as appstate from '../../appstate.js';
|
|
36
|
+
import * as interfaces from '../../../dist_ts_interfaces/index.js';
|
|
36
37
|
import { viewHostCss } from '../shared/css.js';
|
|
37
38
|
import { DeesElement, customElement, html, state, css, cssManager, } from '@design.estate/dees-element';
|
|
38
39
|
import {} from '@design.estate/dees-catalog';
|
|
@@ -42,32 +43,36 @@ let OpsViewSecurityBlocked = (() => {
|
|
|
42
43
|
let _classExtraInitializers = [];
|
|
43
44
|
let _classThis;
|
|
44
45
|
let _classSuper = DeesElement;
|
|
45
|
-
let
|
|
46
|
-
let
|
|
47
|
-
let
|
|
46
|
+
let _securityPolicyState_decorators;
|
|
47
|
+
let _securityPolicyState_initializers = [];
|
|
48
|
+
let _securityPolicyState_extraInitializers = [];
|
|
48
49
|
var OpsViewSecurityBlocked = class extends _classSuper {
|
|
49
50
|
static { _classThis = this; }
|
|
50
51
|
static {
|
|
51
52
|
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
|
|
52
|
-
|
|
53
|
-
__esDecorate(this, null,
|
|
53
|
+
_securityPolicyState_decorators = [state()];
|
|
54
|
+
__esDecorate(this, null, _securityPolicyState_decorators, { kind: "accessor", name: "securityPolicyState", static: false, private: false, access: { has: obj => "securityPolicyState" in obj, get: obj => obj.securityPolicyState, set: (obj, value) => { obj.securityPolicyState = value; } }, metadata: _metadata }, _securityPolicyState_initializers, _securityPolicyState_extraInitializers);
|
|
54
55
|
__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
|
|
55
56
|
OpsViewSecurityBlocked = _classThis = _classDescriptor.value;
|
|
56
57
|
if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
|
|
57
58
|
}
|
|
58
|
-
#
|
|
59
|
-
get
|
|
60
|
-
set
|
|
59
|
+
#securityPolicyState_accessor_storage = __runInitializers(this, _securityPolicyState_initializers, appstate.securityPolicyStatePart.getState());
|
|
60
|
+
get securityPolicyState() { return this.#securityPolicyState_accessor_storage; }
|
|
61
|
+
set securityPolicyState(value) { this.#securityPolicyState_accessor_storage = value; }
|
|
61
62
|
constructor() {
|
|
62
63
|
super();
|
|
63
|
-
__runInitializers(this,
|
|
64
|
-
const sub = appstate.
|
|
64
|
+
__runInitializers(this, _securityPolicyState_extraInitializers);
|
|
65
|
+
const sub = appstate.securityPolicyStatePart
|
|
65
66
|
.select((s) => s)
|
|
66
67
|
.subscribe((s) => {
|
|
67
|
-
this.
|
|
68
|
+
this.securityPolicyState = s;
|
|
68
69
|
});
|
|
69
70
|
this.rxSubscriptions.push(sub);
|
|
70
71
|
}
|
|
72
|
+
async connectedCallback() {
|
|
73
|
+
await super.connectedCallback();
|
|
74
|
+
await appstate.securityPolicyStatePart.dispatchAction(appstate.fetchSecurityPolicyAction, null);
|
|
75
|
+
}
|
|
71
76
|
static styles = [
|
|
72
77
|
cssManager.defaultStyles,
|
|
73
78
|
viewHostCss,
|
|
@@ -75,73 +80,423 @@ let OpsViewSecurityBlocked = (() => {
|
|
|
75
80
|
dees-statsgrid {
|
|
76
81
|
margin-bottom: 32px;
|
|
77
82
|
}
|
|
83
|
+
|
|
84
|
+
.sectionStack {
|
|
85
|
+
display: flex;
|
|
86
|
+
flex-direction: column;
|
|
87
|
+
gap: 32px;
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
.statusBadge {
|
|
91
|
+
display: inline-flex;
|
|
92
|
+
align-items: center;
|
|
93
|
+
padding: 4px 8px;
|
|
94
|
+
border-radius: 4px;
|
|
95
|
+
font-size: 12px;
|
|
96
|
+
font-weight: 500;
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
.statusBadge.enabled {
|
|
100
|
+
background: ${cssManager.bdTheme('#e8f5e9', '#1a3a1a')};
|
|
101
|
+
color: ${cssManager.bdTheme('#388e3c', '#66bb6a')};
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
.statusBadge.disabled {
|
|
105
|
+
background: ${cssManager.bdTheme('#f5f5f5', '#2a2a2a')};
|
|
106
|
+
color: ${cssManager.bdTheme('#757575', '#999')};
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
.typeBadge {
|
|
110
|
+
display: inline-flex;
|
|
111
|
+
align-items: center;
|
|
112
|
+
padding: 4px 8px;
|
|
113
|
+
border-radius: 999px;
|
|
114
|
+
font-size: 12px;
|
|
115
|
+
font-weight: 500;
|
|
116
|
+
background: ${cssManager.bdTheme('#eef2ff', '#1e1b4b')};
|
|
117
|
+
color: ${cssManager.bdTheme('#4338ca', '#a5b4fc')};
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
.errorMessage {
|
|
121
|
+
padding: 12px 16px;
|
|
122
|
+
border-radius: 8px;
|
|
123
|
+
background: ${cssManager.bdTheme('#fef2f2', '#450a0a')};
|
|
124
|
+
color: ${cssManager.bdTheme('#b91c1c', '#fca5a5')};
|
|
125
|
+
}
|
|
78
126
|
`,
|
|
79
127
|
];
|
|
80
128
|
render() {
|
|
81
|
-
const
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
<p>Loading security metrics...</p>
|
|
86
|
-
</div>
|
|
87
|
-
`;
|
|
88
|
-
}
|
|
89
|
-
const blockedIPs = metrics.blockedIPs || [];
|
|
129
|
+
const state = this.securityPolicyState;
|
|
130
|
+
const activeRules = state.rules.filter((rule) => rule.enabled);
|
|
131
|
+
const disabledRules = state.rules.length - activeRules.length;
|
|
132
|
+
const compiledPolicy = state.compiledPolicy || { blockedIps: [], blockedCidrs: [] };
|
|
90
133
|
const tiles = [
|
|
91
134
|
{
|
|
92
|
-
id: '
|
|
93
|
-
title: '
|
|
94
|
-
value:
|
|
135
|
+
id: 'activeRules',
|
|
136
|
+
title: 'Active Rules',
|
|
137
|
+
value: activeRules.length,
|
|
138
|
+
type: 'number',
|
|
139
|
+
icon: 'lucide:shield-check',
|
|
140
|
+
color: activeRules.length > 0 ? '#ef4444' : '#22c55e',
|
|
141
|
+
description: `${disabledRules} disabled`,
|
|
142
|
+
},
|
|
143
|
+
{
|
|
144
|
+
id: 'compiledIps',
|
|
145
|
+
title: 'Compiled IPs',
|
|
146
|
+
value: compiledPolicy.blockedIps.length,
|
|
95
147
|
type: 'number',
|
|
96
|
-
icon: 'lucide:
|
|
97
|
-
color:
|
|
98
|
-
description: '
|
|
148
|
+
icon: 'lucide:server-off',
|
|
149
|
+
color: '#ef4444',
|
|
150
|
+
description: 'Direct IP blocks enforced by SmartProxy',
|
|
151
|
+
},
|
|
152
|
+
{
|
|
153
|
+
id: 'compiledCidrs',
|
|
154
|
+
title: 'Compiled CIDRs',
|
|
155
|
+
value: compiledPolicy.blockedCidrs.length,
|
|
156
|
+
type: 'number',
|
|
157
|
+
icon: 'lucide:network',
|
|
158
|
+
color: '#f97316',
|
|
159
|
+
description: 'Network ranges pushed to enforcement layers',
|
|
160
|
+
},
|
|
161
|
+
{
|
|
162
|
+
id: 'intelligenceRecords',
|
|
163
|
+
title: 'IP Intelligence',
|
|
164
|
+
value: state.ipIntelligence.length,
|
|
165
|
+
type: 'number',
|
|
166
|
+
icon: 'lucide:radar',
|
|
167
|
+
color: '#6366f1',
|
|
168
|
+
description: 'Observed public IPs with enrichment',
|
|
99
169
|
},
|
|
100
170
|
];
|
|
101
171
|
return html `
|
|
102
|
-
<dees-heading level="3">
|
|
172
|
+
<dees-heading level="3">Security Blocking</dees-heading>
|
|
173
|
+
|
|
174
|
+
${state.error ? html `<div class="errorMessage">${state.error}</div>` : html ``}
|
|
103
175
|
|
|
104
176
|
<dees-statsgrid
|
|
105
177
|
.tiles=${tiles}
|
|
106
178
|
.minTileWidth=${200}
|
|
107
179
|
></dees-statsgrid>
|
|
108
180
|
|
|
181
|
+
<div class="sectionStack">
|
|
182
|
+
${this.renderRulesTable()}
|
|
183
|
+
${this.renderCompiledPolicyTable()}
|
|
184
|
+
${this.renderIpIntelligenceTable()}
|
|
185
|
+
${this.renderAuditTable()}
|
|
186
|
+
</div>
|
|
187
|
+
`;
|
|
188
|
+
}
|
|
189
|
+
renderRulesTable() {
|
|
190
|
+
return html `
|
|
191
|
+
<dees-table
|
|
192
|
+
.heading1=${'Managed Block Rules'}
|
|
193
|
+
.heading2=${'Rules compiled into SmartProxy policy and remote ingress edge firewall snapshots'}
|
|
194
|
+
.data=${this.securityPolicyState.rules}
|
|
195
|
+
.rowKey=${'id'}
|
|
196
|
+
.displayFunction=${(rule) => ({
|
|
197
|
+
'Type': html `<span class="typeBadge">${rule.type}</span>`,
|
|
198
|
+
'Value': rule.value,
|
|
199
|
+
'Match': rule.type === 'organization' ? (rule.matchMode || 'contains') : '-',
|
|
200
|
+
'Reason': rule.reason || '-',
|
|
201
|
+
'Status': html `<span class="statusBadge ${rule.enabled ? 'enabled' : 'disabled'}">${rule.enabled ? 'Enabled' : 'Disabled'}</span>`,
|
|
202
|
+
'Created': this.formatDateTime(rule.createdAt),
|
|
203
|
+
'Updated': this.formatDateTime(rule.updatedAt),
|
|
204
|
+
})}
|
|
205
|
+
.dataActions=${this.getRuleActions()}
|
|
206
|
+
searchable
|
|
207
|
+
.showColumnFilters=${true}
|
|
208
|
+
dataName="rule"
|
|
209
|
+
></dees-table>
|
|
210
|
+
`;
|
|
211
|
+
}
|
|
212
|
+
renderCompiledPolicyTable() {
|
|
213
|
+
const policy = this.securityPolicyState.compiledPolicy || { blockedIps: [], blockedCidrs: [] };
|
|
214
|
+
const rows = [
|
|
215
|
+
...policy.blockedIps.map((value) => ({ type: 'ip', value })),
|
|
216
|
+
...policy.blockedCidrs.map((value) => ({ type: 'cidr', value })),
|
|
217
|
+
];
|
|
218
|
+
return html `
|
|
219
|
+
<dees-table
|
|
220
|
+
.heading1=${'Compiled Enforcement Policy'}
|
|
221
|
+
.heading2=${'Concrete IPs and CIDRs currently sent to SmartProxy and remote ingress'}
|
|
222
|
+
.data=${rows}
|
|
223
|
+
.rowKey=${'value'}
|
|
224
|
+
.displayFunction=${(row) => ({
|
|
225
|
+
'Enforcement Type': html `<span class="typeBadge">${row.type}</span>`,
|
|
226
|
+
'Value': row.value,
|
|
227
|
+
})}
|
|
228
|
+
searchable
|
|
229
|
+
.showColumnFilters=${true}
|
|
230
|
+
dataName="compiled rule"
|
|
231
|
+
></dees-table>
|
|
232
|
+
`;
|
|
233
|
+
}
|
|
234
|
+
renderIpIntelligenceTable() {
|
|
235
|
+
return html `
|
|
236
|
+
<dees-table
|
|
237
|
+
.heading1=${'Observed IP Intelligence'}
|
|
238
|
+
.heading2=${'Public IPs observed in network metrics and enriched for ASN / organization matching'}
|
|
239
|
+
.data=${this.securityPolicyState.ipIntelligence}
|
|
240
|
+
.rowKey=${'ipAddress'}
|
|
241
|
+
.displayFunction=${(record) => ({
|
|
242
|
+
'IP Address': record.ipAddress,
|
|
243
|
+
'ASN': record.asn ? `AS${record.asn}` : '-',
|
|
244
|
+
'ASN Org': record.asnOrg || '-',
|
|
245
|
+
'Registrant Org': record.registrantOrg || '-',
|
|
246
|
+
'Country': record.countryCode || record.country || '-',
|
|
247
|
+
'Network Range': record.networkRange || '-',
|
|
248
|
+
'Abuse Contact': record.abuseContact || '-',
|
|
249
|
+
'Seen': record.seenCount,
|
|
250
|
+
'Last Seen': this.formatDateTime(record.lastSeenAt),
|
|
251
|
+
})}
|
|
252
|
+
.dataActions=${this.getIpIntelligenceActions()}
|
|
253
|
+
searchable
|
|
254
|
+
.showColumnFilters=${true}
|
|
255
|
+
dataName="ip intelligence record"
|
|
256
|
+
></dees-table>
|
|
257
|
+
`;
|
|
258
|
+
}
|
|
259
|
+
renderAuditTable() {
|
|
260
|
+
return html `
|
|
109
261
|
<dees-table
|
|
110
|
-
.heading1=${'
|
|
111
|
-
.heading2=${'
|
|
112
|
-
.data=${
|
|
113
|
-
.
|
|
114
|
-
|
|
115
|
-
'
|
|
262
|
+
.heading1=${'Policy Audit'}
|
|
263
|
+
.heading2=${'Recent security policy changes'}
|
|
264
|
+
.data=${this.securityPolicyState.auditEvents}
|
|
265
|
+
.rowKey=${'id'}
|
|
266
|
+
.displayFunction=${(event) => ({
|
|
267
|
+
'Time': this.formatDateTime(event.createdAt),
|
|
268
|
+
'Action': event.action,
|
|
269
|
+
'Actor': event.actor,
|
|
270
|
+
'Details': this.formatAuditDetails(event.details),
|
|
116
271
|
})}
|
|
117
|
-
|
|
272
|
+
searchable
|
|
273
|
+
.showColumnFilters=${true}
|
|
274
|
+
dataName="audit event"
|
|
275
|
+
></dees-table>
|
|
276
|
+
`;
|
|
277
|
+
}
|
|
278
|
+
getRuleActions() {
|
|
279
|
+
return [
|
|
280
|
+
{
|
|
281
|
+
name: 'Create Rule',
|
|
282
|
+
iconName: 'lucide:plus',
|
|
283
|
+
type: ['header'],
|
|
284
|
+
actionFunc: async () => this.showRuleDialog(),
|
|
285
|
+
},
|
|
286
|
+
{
|
|
287
|
+
name: 'Edit',
|
|
288
|
+
iconName: 'lucide:pencil',
|
|
289
|
+
type: ['inRow', 'contextmenu'],
|
|
290
|
+
actionFunc: async (actionData) => this.showRuleDialog(actionData.item),
|
|
291
|
+
},
|
|
292
|
+
{
|
|
293
|
+
name: 'Enable',
|
|
294
|
+
iconName: 'lucide:play',
|
|
295
|
+
type: ['contextmenu'],
|
|
296
|
+
actionRelevancyCheckFunc: (actionData) => !actionData.item.enabled,
|
|
297
|
+
actionFunc: async (actionData) => {
|
|
298
|
+
const rule = actionData.item;
|
|
299
|
+
await appstate.securityPolicyStatePart.dispatchAction(appstate.updateSecurityBlockRuleAction, {
|
|
300
|
+
id: rule.id,
|
|
301
|
+
enabled: true,
|
|
302
|
+
});
|
|
303
|
+
},
|
|
304
|
+
},
|
|
118
305
|
{
|
|
119
|
-
name: '
|
|
120
|
-
iconName: 'lucide:
|
|
306
|
+
name: 'Disable',
|
|
307
|
+
iconName: 'lucide:pause',
|
|
121
308
|
type: ['contextmenu'],
|
|
122
|
-
|
|
123
|
-
|
|
309
|
+
actionRelevancyCheckFunc: (actionData) => actionData.item.enabled,
|
|
310
|
+
actionFunc: async (actionData) => {
|
|
311
|
+
const rule = actionData.item;
|
|
312
|
+
await appstate.securityPolicyStatePart.dispatchAction(appstate.updateSecurityBlockRuleAction, {
|
|
313
|
+
id: rule.id,
|
|
314
|
+
enabled: false,
|
|
315
|
+
});
|
|
124
316
|
},
|
|
125
317
|
},
|
|
126
318
|
{
|
|
127
|
-
name: '
|
|
319
|
+
name: 'Delete',
|
|
128
320
|
iconName: 'lucide:trash-2',
|
|
129
|
-
type: ['
|
|
130
|
-
actionFunc: async () => {
|
|
131
|
-
|
|
321
|
+
type: ['contextmenu'],
|
|
322
|
+
actionFunc: async (actionData) => {
|
|
323
|
+
const rule = actionData.item;
|
|
324
|
+
if (!window.confirm(`Delete block rule ${rule.type}:${rule.value}?`))
|
|
325
|
+
return;
|
|
326
|
+
await appstate.securityPolicyStatePart.dispatchAction(appstate.deleteSecurityBlockRuleAction, rule.id);
|
|
132
327
|
},
|
|
133
328
|
},
|
|
134
|
-
]
|
|
135
|
-
|
|
136
|
-
|
|
329
|
+
];
|
|
330
|
+
}
|
|
331
|
+
getIpIntelligenceActions() {
|
|
332
|
+
return [
|
|
333
|
+
{
|
|
334
|
+
name: 'Refresh Intelligence',
|
|
335
|
+
iconName: 'lucide:refresh-cw',
|
|
336
|
+
type: ['inRow', 'contextmenu'],
|
|
337
|
+
actionFunc: async (actionData) => {
|
|
338
|
+
const record = actionData.item;
|
|
339
|
+
await appstate.securityPolicyStatePart.dispatchAction(appstate.refreshIpIntelligenceAction, record.ipAddress);
|
|
340
|
+
},
|
|
341
|
+
},
|
|
342
|
+
{
|
|
343
|
+
name: 'Block IP',
|
|
344
|
+
iconName: 'lucide:shield-ban',
|
|
345
|
+
type: ['contextmenu'],
|
|
346
|
+
actionFunc: async (actionData) => {
|
|
347
|
+
const record = actionData.item;
|
|
348
|
+
await this.showRuleDialog(undefined, {
|
|
349
|
+
type: 'ip',
|
|
350
|
+
value: record.ipAddress,
|
|
351
|
+
reason: 'Blocked from IP intelligence table',
|
|
352
|
+
});
|
|
353
|
+
},
|
|
354
|
+
},
|
|
355
|
+
{
|
|
356
|
+
name: 'Block Network Range',
|
|
357
|
+
iconName: 'lucide:network',
|
|
358
|
+
type: ['contextmenu'],
|
|
359
|
+
actionRelevancyCheckFunc: (actionData) => Boolean(actionData.item.networkRange),
|
|
360
|
+
actionFunc: async (actionData) => {
|
|
361
|
+
const record = actionData.item;
|
|
362
|
+
await this.showRuleDialog(undefined, {
|
|
363
|
+
type: 'cidr',
|
|
364
|
+
value: record.networkRange || '',
|
|
365
|
+
reason: 'Blocked network range from IP intelligence table',
|
|
366
|
+
});
|
|
367
|
+
},
|
|
368
|
+
},
|
|
369
|
+
{
|
|
370
|
+
name: 'Block ASN',
|
|
371
|
+
iconName: 'lucide:radio-tower',
|
|
372
|
+
type: ['contextmenu'],
|
|
373
|
+
actionRelevancyCheckFunc: (actionData) => Boolean(actionData.item.asn),
|
|
374
|
+
actionFunc: async (actionData) => {
|
|
375
|
+
const record = actionData.item;
|
|
376
|
+
await this.showRuleDialog(undefined, {
|
|
377
|
+
type: 'asn',
|
|
378
|
+
value: String(record.asn),
|
|
379
|
+
reason: 'Blocked ASN from IP intelligence table',
|
|
380
|
+
});
|
|
381
|
+
},
|
|
382
|
+
},
|
|
383
|
+
{
|
|
384
|
+
name: 'Block Organization',
|
|
385
|
+
iconName: 'lucide:building-2',
|
|
386
|
+
type: ['contextmenu'],
|
|
387
|
+
actionRelevancyCheckFunc: (actionData) => Boolean(actionData.item.asnOrg || actionData.item.registrantOrg),
|
|
388
|
+
actionFunc: async (actionData) => {
|
|
389
|
+
const record = actionData.item;
|
|
390
|
+
await this.showRuleDialog(undefined, {
|
|
391
|
+
type: 'organization',
|
|
392
|
+
value: record.asnOrg || record.registrantOrg || '',
|
|
393
|
+
reason: 'Blocked organization from IP intelligence table',
|
|
394
|
+
});
|
|
395
|
+
},
|
|
396
|
+
},
|
|
397
|
+
];
|
|
398
|
+
}
|
|
399
|
+
async showRuleDialog(rule, defaults = {}) {
|
|
400
|
+
const { DeesModal } = await import('@design.estate/dees-catalog');
|
|
401
|
+
const typeOptions = [
|
|
402
|
+
{ key: 'ip', option: 'IP address' },
|
|
403
|
+
{ key: 'cidr', option: 'CIDR / network range' },
|
|
404
|
+
{ key: 'asn', option: 'ASN' },
|
|
405
|
+
{ key: 'organization', option: 'Organization' },
|
|
406
|
+
];
|
|
407
|
+
const matchModeOptions = [
|
|
408
|
+
{ key: 'contains', option: 'Organization contains value' },
|
|
409
|
+
{ key: 'exact', option: 'Organization exactly matches value' },
|
|
410
|
+
];
|
|
411
|
+
const selectedType = rule?.type || defaults.type || 'ip';
|
|
412
|
+
const selectedMatchMode = rule?.matchMode || defaults.matchMode || 'contains';
|
|
413
|
+
await DeesModal.createAndShow({
|
|
414
|
+
heading: rule ? `Edit Block Rule: ${rule.type}:${rule.value}` : 'Create Block Rule',
|
|
415
|
+
content: html `
|
|
416
|
+
<dees-form>
|
|
417
|
+
${rule ? html `` : html `
|
|
418
|
+
<dees-input-dropdown
|
|
419
|
+
.key=${'type'}
|
|
420
|
+
.label=${'Rule Type'}
|
|
421
|
+
.options=${typeOptions}
|
|
422
|
+
.selectedOption=${typeOptions.find((option) => option.key === selectedType)}
|
|
423
|
+
></dees-input-dropdown>
|
|
424
|
+
`}
|
|
425
|
+
<dees-input-text
|
|
426
|
+
.key=${'value'}
|
|
427
|
+
.label=${'Value'}
|
|
428
|
+
.value=${rule?.value || defaults.value || ''}
|
|
429
|
+
.required=${true}
|
|
430
|
+
></dees-input-text>
|
|
431
|
+
<dees-input-dropdown
|
|
432
|
+
.key=${'matchMode'}
|
|
433
|
+
.label=${'Organization Match Mode'}
|
|
434
|
+
.description=${'Only used for organization rules'}
|
|
435
|
+
.options=${matchModeOptions}
|
|
436
|
+
.selectedOption=${matchModeOptions.find((option) => option.key === selectedMatchMode)}
|
|
437
|
+
></dees-input-dropdown>
|
|
438
|
+
<dees-input-text
|
|
439
|
+
.key=${'reason'}
|
|
440
|
+
.label=${'Reason'}
|
|
441
|
+
.value=${rule?.reason || defaults.reason || ''}
|
|
442
|
+
></dees-input-text>
|
|
443
|
+
<dees-input-checkbox
|
|
444
|
+
.key=${'enabled'}
|
|
445
|
+
.label=${'Enabled'}
|
|
446
|
+
.value=${rule ? rule.enabled : defaults.enabled !== false}
|
|
447
|
+
></dees-input-checkbox>
|
|
448
|
+
</dees-form>
|
|
449
|
+
`,
|
|
450
|
+
menuOptions: [
|
|
451
|
+
{ name: 'Cancel', iconName: 'lucide:x', action: async (modalArg) => modalArg.destroy() },
|
|
452
|
+
{
|
|
453
|
+
name: rule ? 'Save' : 'Create',
|
|
454
|
+
iconName: rule ? 'lucide:check' : 'lucide:plus',
|
|
455
|
+
action: async (modalArg) => {
|
|
456
|
+
const form = modalArg.shadowRoot?.querySelector('.content')?.querySelector('dees-form');
|
|
457
|
+
if (!form)
|
|
458
|
+
return;
|
|
459
|
+
const data = await form.collectFormData();
|
|
460
|
+
const type = (rule?.type || this.getDropdownKey(data.type));
|
|
461
|
+
const value = String(data.value || '').trim();
|
|
462
|
+
if (!type || !value)
|
|
463
|
+
return;
|
|
464
|
+
const matchMode = type === 'organization'
|
|
465
|
+
? this.getDropdownKey(data.matchMode)
|
|
466
|
+
: undefined;
|
|
467
|
+
const payload = {
|
|
468
|
+
value,
|
|
469
|
+
matchMode,
|
|
470
|
+
reason: String(data.reason || '').trim() || undefined,
|
|
471
|
+
enabled: data.enabled !== false,
|
|
472
|
+
};
|
|
473
|
+
if (rule) {
|
|
474
|
+
await appstate.securityPolicyStatePart.dispatchAction(appstate.updateSecurityBlockRuleAction, {
|
|
475
|
+
id: rule.id,
|
|
476
|
+
...payload,
|
|
477
|
+
});
|
|
478
|
+
}
|
|
479
|
+
else {
|
|
480
|
+
await appstate.securityPolicyStatePart.dispatchAction(appstate.createSecurityBlockRuleAction, {
|
|
481
|
+
type,
|
|
482
|
+
...payload,
|
|
483
|
+
});
|
|
484
|
+
}
|
|
485
|
+
await modalArg.destroy();
|
|
486
|
+
},
|
|
487
|
+
},
|
|
488
|
+
],
|
|
489
|
+
});
|
|
490
|
+
}
|
|
491
|
+
getDropdownKey(value) {
|
|
492
|
+
return typeof value === 'string' ? value : value?.key || '';
|
|
137
493
|
}
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
alert('Clearing blocked IPs is not yet supported from the UI.');
|
|
494
|
+
formatDateTime(timestamp) {
|
|
495
|
+
return timestamp ? new Date(timestamp).toLocaleString() : '-';
|
|
141
496
|
}
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
497
|
+
formatAuditDetails(details) {
|
|
498
|
+
const text = JSON.stringify(details);
|
|
499
|
+
return text.length > 160 ? `${text.slice(0, 157)}...` : text;
|
|
145
500
|
}
|
|
146
501
|
static {
|
|
147
502
|
__runInitializers(_classThis, _classExtraInitializers);
|
|
@@ -150,4 +505,4 @@ let OpsViewSecurityBlocked = (() => {
|
|
|
150
505
|
return OpsViewSecurityBlocked = _classThis;
|
|
151
506
|
})();
|
|
152
507
|
export { OpsViewSecurityBlocked };
|
|
153
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3BzLXZpZXctc2VjdXJpdHktYmxvY2tlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3RzX3dlYi9lbGVtZW50cy9zZWN1cml0eS9vcHMtdmlldy1zZWN1cml0eS1ibG9ja2VkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxPQUFPLEtBQUssUUFBUSxNQUFNLG1CQUFtQixDQUFDO0FBQzlDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUvQyxPQUFPLEVBQ0wsV0FBVyxFQUNYLGFBQWEsRUFDYixJQUFJLEVBQ0osS0FBSyxFQUNMLEdBQUcsRUFDSCxVQUFVLEdBRVgsTUFBTSw2QkFBNkIsQ0FBQztBQUNyQyxPQUFPLEVBQW1CLE1BQU0sNkJBQTZCLENBQUM7SUFTakQsc0JBQXNCOzRCQURsQyxhQUFhLENBQUMsMkJBQTJCLENBQUM7Ozs7c0JBQ0MsV0FBVzs7OztzQ0FBbkIsU0FBUSxXQUFXOzs7O3NDQUNwRCxLQUFLLEVBQUU7WUFDUixtTEFBUyxVQUFVLDZCQUFWLFVBQVUsK0ZBQTZEO1lBRmxGLDZLQWdHQzs7OztRQTlGQyxpRkFBNEMsUUFBUSxDQUFDLGNBQWMsQ0FBQyxRQUFRLEVBQUcsRUFBQztRQUFoRixJQUFTLFVBQVUsZ0RBQTZEO1FBQWhGLElBQVMsVUFBVSxzREFBNkQ7UUFFaEY7WUFDRSxLQUFLLEVBQUUsQ0FBQzs7WUFDUixNQUFNLEdBQUcsR0FBRyxRQUFRLENBQUMsY0FBYztpQkFDaEMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUM7aUJBQ2hCLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO2dCQUNmLElBQUksQ0FBQyxVQUFVLEdBQUcsQ0FBQyxDQUFDO1lBQ3RCLENBQUMsQ0FBQyxDQUFDO1lBQ0wsSUFBSSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7U0FDaEM7UUFFTSxNQUFNLENBQUMsTUFBTSxHQUFHO1lBQ3JCLFVBQVUsQ0FBQyxhQUFhO1lBQ3hCLFdBQVc7WUFDWCxHQUFHLENBQUE7Ozs7S0FJRjtTQUNGLENBQUM7UUFFSyxNQUFNO1lBQ1gsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLFVBQVUsQ0FBQyxlQUFlLENBQUM7WUFFaEQsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO2dCQUNiLE9BQU8sSUFBSSxDQUFBOzs7O09BSVYsQ0FBQztZQUNKLENBQUM7WUFFRCxNQUFNLFVBQVUsR0FBYSxPQUFPLENBQUMsVUFBVSxJQUFJLEVBQUUsQ0FBQztZQUV0RCxNQUFNLEtBQUssR0FBaUI7Z0JBQzFCO29CQUNFLEVBQUUsRUFBRSxjQUFjO29CQUNsQixLQUFLLEVBQUUsYUFBYTtvQkFDcEIsS0FBSyxFQUFFLFVBQVUsQ0FBQyxNQUFNO29CQUN4QixJQUFJLEVBQUUsUUFBUTtvQkFDZCxJQUFJLEVBQUUsa0JBQWtCO29CQUN4QixLQUFLLEVBQUUsVUFBVSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsU0FBUztvQkFDcEQsV0FBVyxFQUFFLDZCQUE2QjtpQkFDM0M7YUFDRixDQUFDO1lBRUYsT0FBTyxJQUFJLENBQUE7Ozs7aUJBSUUsS0FBSzt3QkFDRSxHQUFHOzs7O29CQUlQLHNCQUFzQjtvQkFDdEIsd0NBQXdDO2dCQUM1QyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQzsyQkFDckIsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUM7Z0JBQzVCLFlBQVksRUFBRSxJQUFJLENBQUMsRUFBRTtnQkFDckIsUUFBUSxFQUFFLHFCQUFxQjthQUNoQyxDQUFDO3VCQUNhO2dCQUNiO29CQUNFLElBQUksRUFBRSxTQUFTO29CQUNmLFFBQVEsRUFBRSxtQkFBbUI7b0JBQzdCLElBQUksRUFBRSxDQUFDLGFBQXNCLENBQUM7b0JBQzlCLFVBQVUsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLEVBQUU7d0JBQ3pCLE1BQU0sSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7b0JBQ2hDLENBQUM7aUJBQ0Y7Z0JBQ0Q7b0JBQ0UsSUFBSSxFQUFFLFdBQVc7b0JBQ2pCLFFBQVEsRUFBRSxnQkFBZ0I7b0JBQzFCLElBQUksRUFBRSxDQUFDLFFBQWlCLENBQUM7b0JBQ3pCLFVBQVUsRUFBRSxLQUFLLElBQUksRUFBRTt3QkFDckIsTUFBTSxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7b0JBQy9CLENBQUM7aUJBQ0Y7YUFDRjs7S0FFSixDQUFDO1FBQ0osQ0FBQztRQUVPLEtBQUssQ0FBQyxlQUFlO1lBQzNCLDJEQUEyRDtZQUMzRCxLQUFLLENBQUMsd0RBQXdELENBQUMsQ0FBQztRQUNsRSxDQUFDO1FBRU8sS0FBSyxDQUFDLFNBQVMsQ0FBQyxFQUFVO1lBQ2hDLDJEQUEyRDtZQUMzRCxLQUFLLENBQUMsaUJBQWlCLEVBQUUsb0NBQW9DLENBQUMsQ0FBQztRQUNqRSxDQUFDOztZQS9GVSx1REFBc0I7Ozs7O1NBQXRCLHNCQUFzQiJ9
|
|
508
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-security-blocked.js","sourceRoot":"","sources":["../../../../ts_web/elements/security/ops-view-security-blocked.ts"],"names":[],"mappings":"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"}
|
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
|
|
|
@@ -178,6 +178,30 @@ export class SecurityHandler {
|
|
|
178
178
|
),
|
|
179
179
|
);
|
|
180
180
|
|
|
181
|
+
router.addTypedHandler(
|
|
182
|
+
new plugins.typedrequest.TypedHandler<interfaces.requests.IReq_GetCompiledSecurityPolicy>(
|
|
183
|
+
'getCompiledSecurityPolicy',
|
|
184
|
+
async () => {
|
|
185
|
+
const manager = this.opsServerRef.dcRouterRef.securityPolicyManager;
|
|
186
|
+
return {
|
|
187
|
+
policy: manager
|
|
188
|
+
? await manager.compilePolicy()
|
|
189
|
+
: { blockedIps: [], blockedCidrs: [] },
|
|
190
|
+
};
|
|
191
|
+
},
|
|
192
|
+
),
|
|
193
|
+
);
|
|
194
|
+
|
|
195
|
+
router.addTypedHandler(
|
|
196
|
+
new plugins.typedrequest.TypedHandler<interfaces.requests.IReq_ListSecurityPolicyAudit>(
|
|
197
|
+
'listSecurityPolicyAudit',
|
|
198
|
+
async (dataArg) => {
|
|
199
|
+
const manager = this.opsServerRef.dcRouterRef.securityPolicyManager;
|
|
200
|
+
return { events: manager ? await manager.listAuditEvents(dataArg.limit || 100) : [] };
|
|
201
|
+
},
|
|
202
|
+
),
|
|
203
|
+
);
|
|
204
|
+
|
|
181
205
|
const adminRouter = this.opsServerRef.adminRouter;
|
|
182
206
|
|
|
183
207
|
adminRouter.addTypedHandler(
|
|
@@ -226,6 +250,20 @@ export class SecurityHandler {
|
|
|
226
250
|
},
|
|
227
251
|
),
|
|
228
252
|
);
|
|
253
|
+
|
|
254
|
+
adminRouter.addTypedHandler(
|
|
255
|
+
new plugins.typedrequest.TypedHandler<interfaces.requests.IReq_RefreshIpIntelligence>(
|
|
256
|
+
'refreshIpIntelligence',
|
|
257
|
+
async (dataArg) => {
|
|
258
|
+
const manager = this.opsServerRef.dcRouterRef.securityPolicyManager;
|
|
259
|
+
if (!manager) return { success: false, message: 'Security policy manager not initialized' };
|
|
260
|
+
const record = await manager.refreshIpIntelligence(dataArg.ipAddress);
|
|
261
|
+
return record
|
|
262
|
+
? { success: true, record }
|
|
263
|
+
: { success: false, message: 'IP address is invalid or not public' };
|
|
264
|
+
},
|
|
265
|
+
),
|
|
266
|
+
);
|
|
229
267
|
}
|
|
230
268
|
|
|
231
269
|
private async collectSecurityMetrics(): Promise<{
|