@serve.zone/dcrouter 11.0.4 → 11.0.5
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/package.json +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/dist_ts/00_commitinfo_data.d.ts +0 -8
- package/dist_ts/00_commitinfo_data.js +0 -9
- package/dist_ts/cache/classes.cache.cleaner.d.ts +0 -47
- package/dist_ts/cache/classes.cache.cleaner.js +0 -130
- package/dist_ts/cache/documents/classes.cached.email.d.ts +0 -125
- package/dist_ts/cache/documents/classes.cached.email.js +0 -337
- package/dist_ts/cache/documents/classes.cached.ip.reputation.d.ts +0 -119
- package/dist_ts/cache/documents/classes.cached.ip.reputation.js +0 -323
- package/dist_ts/cache/documents/index.d.ts +0 -2
- package/dist_ts/cache/documents/index.js +0 -3
- package/dist_ts/cache/index.d.ts +0 -4
- package/dist_ts/cache/index.js +0 -7
- package/dist_ts/classes.cert-provision-scheduler.d.ts +0 -53
- package/dist_ts/classes.cert-provision-scheduler.js +0 -110
- package/dist_ts/classes.dcrouter.d.ts +0 -337
- package/dist_ts/classes.dcrouter.js +0 -1405
- package/dist_ts/classes.storage-cert-manager.d.ts +0 -18
- package/dist_ts/classes.storage-cert-manager.js +0 -43
- package/dist_ts/config/classes.api-token-manager.d.ts +0 -46
- package/dist_ts/config/classes.api-token-manager.js +0 -150
- package/dist_ts/config/classes.route-config-manager.d.ts +0 -35
- package/dist_ts/config/classes.route-config-manager.js +0 -231
- package/dist_ts/config/index.d.ts +0 -3
- package/dist_ts/config/index.js +0 -5
- package/dist_ts/config/validator.d.ts +0 -104
- package/dist_ts/config/validator.js +0 -152
- package/dist_ts/errors/base.errors.d.ts +0 -224
- package/dist_ts/errors/base.errors.js +0 -320
- package/dist_ts/errors/error-handler.d.ts +0 -98
- package/dist_ts/errors/error-handler.js +0 -282
- package/dist_ts/errors/error.codes.d.ts +0 -115
- package/dist_ts/errors/error.codes.js +0 -136
- package/dist_ts/errors/index.d.ts +0 -54
- package/dist_ts/errors/index.js +0 -136
- package/dist_ts/errors/reputation.errors.d.ts +0 -183
- package/dist_ts/errors/reputation.errors.js +0 -292
- package/dist_ts/index.d.ts +0 -7
- package/dist_ts/index.js +0 -11
- package/dist_ts/logger.d.ts +0 -21
- package/dist_ts/logger.js +0 -81
- package/dist_ts/monitoring/classes.metricscache.d.ts +0 -32
- package/dist_ts/monitoring/classes.metricscache.js +0 -63
- package/dist_ts/monitoring/classes.metricsmanager.d.ts +0 -178
- package/dist_ts/monitoring/classes.metricsmanager.js +0 -642
- package/dist_ts/monitoring/index.d.ts +0 -1
- package/dist_ts/monitoring/index.js +0 -2
- package/dist_ts/opsserver/classes.opsserver.d.ts +0 -37
- package/dist_ts/opsserver/classes.opsserver.js +0 -85
- package/dist_ts/opsserver/handlers/admin.handler.d.ts +0 -31
- package/dist_ts/opsserver/handlers/admin.handler.js +0 -180
- package/dist_ts/opsserver/handlers/api-token.handler.d.ts +0 -6
- package/dist_ts/opsserver/handlers/api-token.handler.js +0 -62
- package/dist_ts/opsserver/handlers/certificate.handler.d.ts +0 -32
- package/dist_ts/opsserver/handlers/certificate.handler.js +0 -421
- package/dist_ts/opsserver/handlers/config.handler.d.ts +0 -7
- package/dist_ts/opsserver/handlers/config.handler.js +0 -192
- package/dist_ts/opsserver/handlers/email-ops.handler.d.ts +0 -30
- package/dist_ts/opsserver/handlers/email-ops.handler.js +0 -227
- package/dist_ts/opsserver/handlers/index.d.ts +0 -11
- package/dist_ts/opsserver/handlers/index.js +0 -12
- package/dist_ts/opsserver/handlers/logs.handler.d.ts +0 -25
- package/dist_ts/opsserver/handlers/logs.handler.js +0 -256
- package/dist_ts/opsserver/handlers/radius.handler.d.ts +0 -6
- package/dist_ts/opsserver/handlers/radius.handler.js +0 -295
- package/dist_ts/opsserver/handlers/remoteingress.handler.d.ts +0 -6
- package/dist_ts/opsserver/handlers/remoteingress.handler.js +0 -156
- package/dist_ts/opsserver/handlers/route-management.handler.d.ts +0 -14
- package/dist_ts/opsserver/handlers/route-management.handler.js +0 -117
- package/dist_ts/opsserver/handlers/security.handler.d.ts +0 -9
- package/dist_ts/opsserver/handlers/security.handler.js +0 -231
- package/dist_ts/opsserver/handlers/stats.handler.d.ts +0 -11
- package/dist_ts/opsserver/handlers/stats.handler.js +0 -399
- package/dist_ts/opsserver/helpers/guards.d.ts +0 -27
- package/dist_ts/opsserver/helpers/guards.js +0 -43
- package/dist_ts/opsserver/index.d.ts +0 -1
- package/dist_ts/opsserver/index.js +0 -2
- package/dist_ts/paths.d.ts +0 -26
- package/dist_ts/paths.js +0 -45
- package/dist_ts/plugins.d.ts +0 -79
- package/dist_ts/plugins.js +0 -113
- package/dist_ts/radius/classes.accounting.manager.d.ts +0 -218
- package/dist_ts/radius/classes.accounting.manager.js +0 -417
- package/dist_ts/radius/classes.radius.server.d.ts +0 -171
- package/dist_ts/radius/classes.radius.server.js +0 -385
- package/dist_ts/radius/classes.vlan.manager.d.ts +0 -128
- package/dist_ts/radius/classes.vlan.manager.js +0 -279
- package/dist_ts/radius/index.d.ts +0 -13
- package/dist_ts/radius/index.js +0 -14
- package/dist_ts/remoteingress/classes.remoteingress-manager.d.ts +0 -82
- package/dist_ts/remoteingress/classes.remoteingress-manager.js +0 -227
- package/dist_ts/remoteingress/classes.tunnel-manager.d.ts +0 -59
- package/dist_ts/remoteingress/classes.tunnel-manager.js +0 -165
- package/dist_ts/remoteingress/index.d.ts +0 -2
- package/dist_ts/remoteingress/index.js +0 -3
- package/dist_ts/security/classes.contentscanner.d.ts +0 -164
- package/dist_ts/security/classes.contentscanner.js +0 -642
- package/dist_ts/security/classes.ipreputationchecker.d.ts +0 -160
- package/dist_ts/security/classes.ipreputationchecker.js +0 -537
- package/dist_ts/security/classes.securitylogger.d.ts +0 -144
- package/dist_ts/security/classes.securitylogger.js +0 -233
- package/dist_ts/security/index.d.ts +0 -3
- package/dist_ts/security/index.js +0 -4
- package/dist_ts/sms/classes.smsservice.d.ts +0 -15
- package/dist_ts/sms/classes.smsservice.js +0 -72
- package/dist_ts/sms/config/sms.config.d.ts +0 -93
- package/dist_ts/sms/config/sms.config.js +0 -2
- package/dist_ts/sms/config/sms.schema.d.ts +0 -5
- package/dist_ts/sms/config/sms.schema.js +0 -121
- package/dist_ts/sms/index.d.ts +0 -1
- package/dist_ts/sms/index.js +0 -2
- package/dist_ts/storage/classes.storagemanager.d.ts +0 -83
- package/dist_ts/storage/classes.storagemanager.js +0 -350
- package/dist_ts/storage/index.d.ts +0 -1
- package/dist_ts/storage/index.js +0 -3
|
@@ -1,279 +0,0 @@
|
|
|
1
|
-
import * as plugins from '../plugins.js';
|
|
2
|
-
import { logger } from '../logger.js';
|
|
3
|
-
/**
|
|
4
|
-
* Manages MAC address to VLAN mappings with support for:
|
|
5
|
-
* - Exact MAC address matching
|
|
6
|
-
* - OUI (vendor prefix) pattern matching
|
|
7
|
-
* - Wildcard patterns
|
|
8
|
-
* - Default VLAN for unknown devices
|
|
9
|
-
*/
|
|
10
|
-
export class VlanManager {
|
|
11
|
-
mappings = new Map();
|
|
12
|
-
config;
|
|
13
|
-
storageManager;
|
|
14
|
-
// Cache for normalized MAC lookups
|
|
15
|
-
normalizedMacCache = new Map();
|
|
16
|
-
constructor(config, storageManager) {
|
|
17
|
-
this.config = {
|
|
18
|
-
defaultVlan: config?.defaultVlan ?? 1,
|
|
19
|
-
allowUnknownMacs: config?.allowUnknownMacs ?? true,
|
|
20
|
-
storagePrefix: config?.storagePrefix ?? '/radius/vlan-mappings',
|
|
21
|
-
};
|
|
22
|
-
this.storageManager = storageManager;
|
|
23
|
-
}
|
|
24
|
-
/**
|
|
25
|
-
* Initialize the VLAN manager and load persisted mappings
|
|
26
|
-
*/
|
|
27
|
-
async initialize() {
|
|
28
|
-
if (this.storageManager) {
|
|
29
|
-
await this.loadMappings();
|
|
30
|
-
}
|
|
31
|
-
logger.log('info', `VlanManager initialized with ${this.mappings.size} mappings, default VLAN: ${this.config.defaultVlan}`);
|
|
32
|
-
}
|
|
33
|
-
/**
|
|
34
|
-
* Normalize a MAC address to lowercase with colons
|
|
35
|
-
* Accepts formats: 00:11:22:33:44:55, 00-11-22-33-44-55, 001122334455
|
|
36
|
-
*/
|
|
37
|
-
normalizeMac(mac) {
|
|
38
|
-
// Check cache first
|
|
39
|
-
const cached = this.normalizedMacCache.get(mac);
|
|
40
|
-
if (cached) {
|
|
41
|
-
return cached;
|
|
42
|
-
}
|
|
43
|
-
// Remove all separators and convert to lowercase
|
|
44
|
-
const cleaned = mac.toLowerCase().replace(/[-:]/g, '');
|
|
45
|
-
// Format with colons
|
|
46
|
-
const normalized = cleaned.match(/.{1,2}/g)?.join(':') || mac.toLowerCase();
|
|
47
|
-
// Cache the result
|
|
48
|
-
this.normalizedMacCache.set(mac, normalized);
|
|
49
|
-
// Prevent unbounded cache growth
|
|
50
|
-
if (this.normalizedMacCache.size > 10000) {
|
|
51
|
-
const iterator = this.normalizedMacCache.keys();
|
|
52
|
-
for (let i = 0; i < 1000; i++) {
|
|
53
|
-
this.normalizedMacCache.delete(iterator.next().value);
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
return normalized;
|
|
57
|
-
}
|
|
58
|
-
/**
|
|
59
|
-
* Check if a MAC address matches a pattern
|
|
60
|
-
* Supports:
|
|
61
|
-
* - Exact match: "00:11:22:33:44:55"
|
|
62
|
-
* - OUI match: "00:11:22" (matches any device with this vendor prefix)
|
|
63
|
-
* - Wildcard: "*" (matches all)
|
|
64
|
-
*/
|
|
65
|
-
macMatchesPattern(mac, pattern) {
|
|
66
|
-
const normalizedMac = this.normalizeMac(mac);
|
|
67
|
-
const normalizedPattern = this.normalizeMac(pattern);
|
|
68
|
-
// Wildcard matches all
|
|
69
|
-
if (pattern === '*') {
|
|
70
|
-
return true;
|
|
71
|
-
}
|
|
72
|
-
// Exact match
|
|
73
|
-
if (normalizedMac === normalizedPattern) {
|
|
74
|
-
return true;
|
|
75
|
-
}
|
|
76
|
-
// OUI/prefix match (pattern is shorter than full MAC)
|
|
77
|
-
if (normalizedPattern.length < 17 && normalizedMac.startsWith(normalizedPattern)) {
|
|
78
|
-
return true;
|
|
79
|
-
}
|
|
80
|
-
return false;
|
|
81
|
-
}
|
|
82
|
-
/**
|
|
83
|
-
* Add or update a MAC to VLAN mapping
|
|
84
|
-
*/
|
|
85
|
-
async addMapping(mapping) {
|
|
86
|
-
const normalizedMac = this.normalizeMac(mapping.mac);
|
|
87
|
-
const now = Date.now();
|
|
88
|
-
const existingMapping = this.mappings.get(normalizedMac);
|
|
89
|
-
const fullMapping = {
|
|
90
|
-
...mapping,
|
|
91
|
-
mac: normalizedMac,
|
|
92
|
-
createdAt: existingMapping?.createdAt || now,
|
|
93
|
-
updatedAt: now,
|
|
94
|
-
};
|
|
95
|
-
this.mappings.set(normalizedMac, fullMapping);
|
|
96
|
-
// Persist to storage
|
|
97
|
-
if (this.storageManager) {
|
|
98
|
-
await this.saveMappings();
|
|
99
|
-
}
|
|
100
|
-
logger.log('info', `VLAN mapping ${existingMapping ? 'updated' : 'added'}: ${normalizedMac} -> VLAN ${mapping.vlan}`);
|
|
101
|
-
return fullMapping;
|
|
102
|
-
}
|
|
103
|
-
/**
|
|
104
|
-
* Remove a MAC to VLAN mapping
|
|
105
|
-
*/
|
|
106
|
-
async removeMapping(mac) {
|
|
107
|
-
const normalizedMac = this.normalizeMac(mac);
|
|
108
|
-
const removed = this.mappings.delete(normalizedMac);
|
|
109
|
-
if (removed && this.storageManager) {
|
|
110
|
-
await this.saveMappings();
|
|
111
|
-
logger.log('info', `VLAN mapping removed: ${normalizedMac}`);
|
|
112
|
-
}
|
|
113
|
-
return removed;
|
|
114
|
-
}
|
|
115
|
-
/**
|
|
116
|
-
* Get a specific mapping by MAC
|
|
117
|
-
*/
|
|
118
|
-
getMapping(mac) {
|
|
119
|
-
return this.mappings.get(this.normalizeMac(mac));
|
|
120
|
-
}
|
|
121
|
-
/**
|
|
122
|
-
* Get all mappings
|
|
123
|
-
*/
|
|
124
|
-
getAllMappings() {
|
|
125
|
-
return Array.from(this.mappings.values());
|
|
126
|
-
}
|
|
127
|
-
/**
|
|
128
|
-
* Determine VLAN assignment for a MAC address
|
|
129
|
-
* Returns the most specific matching rule (exact > OUI > wildcard > default)
|
|
130
|
-
*/
|
|
131
|
-
assignVlan(mac) {
|
|
132
|
-
const normalizedMac = this.normalizeMac(mac);
|
|
133
|
-
// First, try exact match
|
|
134
|
-
const exactMatch = this.mappings.get(normalizedMac);
|
|
135
|
-
if (exactMatch && exactMatch.enabled) {
|
|
136
|
-
return {
|
|
137
|
-
assigned: true,
|
|
138
|
-
vlan: exactMatch.vlan,
|
|
139
|
-
matchedRule: exactMatch,
|
|
140
|
-
isDefault: false,
|
|
141
|
-
};
|
|
142
|
-
}
|
|
143
|
-
// Try OUI/prefix matches (sorted by specificity - longer patterns first)
|
|
144
|
-
const patternMatches = [];
|
|
145
|
-
for (const mapping of this.mappings.values()) {
|
|
146
|
-
if (mapping.enabled && mapping.mac !== normalizedMac && this.macMatchesPattern(normalizedMac, mapping.mac)) {
|
|
147
|
-
patternMatches.push(mapping);
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
// Sort by pattern length (most specific first)
|
|
151
|
-
patternMatches.sort((a, b) => b.mac.length - a.mac.length);
|
|
152
|
-
if (patternMatches.length > 0) {
|
|
153
|
-
const bestMatch = patternMatches[0];
|
|
154
|
-
return {
|
|
155
|
-
assigned: true,
|
|
156
|
-
vlan: bestMatch.vlan,
|
|
157
|
-
matchedRule: bestMatch,
|
|
158
|
-
isDefault: false,
|
|
159
|
-
};
|
|
160
|
-
}
|
|
161
|
-
// No match - use default VLAN if allowed
|
|
162
|
-
if (this.config.allowUnknownMacs) {
|
|
163
|
-
return {
|
|
164
|
-
assigned: true,
|
|
165
|
-
vlan: this.config.defaultVlan,
|
|
166
|
-
isDefault: true,
|
|
167
|
-
};
|
|
168
|
-
}
|
|
169
|
-
// Unknown MAC and not allowed
|
|
170
|
-
return {
|
|
171
|
-
assigned: false,
|
|
172
|
-
vlan: 0,
|
|
173
|
-
isDefault: false,
|
|
174
|
-
};
|
|
175
|
-
}
|
|
176
|
-
/**
|
|
177
|
-
* Bulk import mappings
|
|
178
|
-
*/
|
|
179
|
-
async importMappings(mappings) {
|
|
180
|
-
let imported = 0;
|
|
181
|
-
for (const mapping of mappings) {
|
|
182
|
-
await this.addMapping(mapping);
|
|
183
|
-
imported++;
|
|
184
|
-
}
|
|
185
|
-
logger.log('info', `Imported ${imported} VLAN mappings`);
|
|
186
|
-
return imported;
|
|
187
|
-
}
|
|
188
|
-
/**
|
|
189
|
-
* Export all mappings
|
|
190
|
-
*/
|
|
191
|
-
exportMappings() {
|
|
192
|
-
return this.getAllMappings();
|
|
193
|
-
}
|
|
194
|
-
/**
|
|
195
|
-
* Update configuration
|
|
196
|
-
*/
|
|
197
|
-
updateConfig(config) {
|
|
198
|
-
if (config.defaultVlan !== undefined) {
|
|
199
|
-
this.config.defaultVlan = config.defaultVlan;
|
|
200
|
-
}
|
|
201
|
-
if (config.allowUnknownMacs !== undefined) {
|
|
202
|
-
this.config.allowUnknownMacs = config.allowUnknownMacs;
|
|
203
|
-
}
|
|
204
|
-
logger.log('info', `VlanManager config updated: defaultVlan=${this.config.defaultVlan}, allowUnknown=${this.config.allowUnknownMacs}`);
|
|
205
|
-
}
|
|
206
|
-
/**
|
|
207
|
-
* Get current configuration
|
|
208
|
-
*/
|
|
209
|
-
getConfig() {
|
|
210
|
-
return { ...this.config };
|
|
211
|
-
}
|
|
212
|
-
/**
|
|
213
|
-
* Get statistics
|
|
214
|
-
*/
|
|
215
|
-
getStats() {
|
|
216
|
-
let exactMatches = 0;
|
|
217
|
-
let ouiPatterns = 0;
|
|
218
|
-
let wildcardPatterns = 0;
|
|
219
|
-
let enabledMappings = 0;
|
|
220
|
-
for (const mapping of this.mappings.values()) {
|
|
221
|
-
if (mapping.enabled) {
|
|
222
|
-
enabledMappings++;
|
|
223
|
-
}
|
|
224
|
-
if (mapping.mac === '*') {
|
|
225
|
-
wildcardPatterns++;
|
|
226
|
-
}
|
|
227
|
-
else if (mapping.mac.length < 17) {
|
|
228
|
-
// OUI patterns are shorter than full MAC (17 chars with colons)
|
|
229
|
-
ouiPatterns++;
|
|
230
|
-
}
|
|
231
|
-
else {
|
|
232
|
-
exactMatches++;
|
|
233
|
-
}
|
|
234
|
-
}
|
|
235
|
-
return {
|
|
236
|
-
totalMappings: this.mappings.size,
|
|
237
|
-
enabledMappings,
|
|
238
|
-
exactMatches,
|
|
239
|
-
ouiPatterns,
|
|
240
|
-
wildcardPatterns,
|
|
241
|
-
};
|
|
242
|
-
}
|
|
243
|
-
/**
|
|
244
|
-
* Load mappings from storage
|
|
245
|
-
*/
|
|
246
|
-
async loadMappings() {
|
|
247
|
-
if (!this.storageManager) {
|
|
248
|
-
return;
|
|
249
|
-
}
|
|
250
|
-
try {
|
|
251
|
-
const data = await this.storageManager.getJSON(this.config.storagePrefix);
|
|
252
|
-
if (data && Array.isArray(data)) {
|
|
253
|
-
for (const mapping of data) {
|
|
254
|
-
this.mappings.set(this.normalizeMac(mapping.mac), mapping);
|
|
255
|
-
}
|
|
256
|
-
logger.log('info', `Loaded ${data.length} VLAN mappings from storage`);
|
|
257
|
-
}
|
|
258
|
-
}
|
|
259
|
-
catch (error) {
|
|
260
|
-
logger.log('warn', `Failed to load VLAN mappings from storage: ${error.message}`);
|
|
261
|
-
}
|
|
262
|
-
}
|
|
263
|
-
/**
|
|
264
|
-
* Save mappings to storage
|
|
265
|
-
*/
|
|
266
|
-
async saveMappings() {
|
|
267
|
-
if (!this.storageManager) {
|
|
268
|
-
return;
|
|
269
|
-
}
|
|
270
|
-
try {
|
|
271
|
-
const mappings = Array.from(this.mappings.values());
|
|
272
|
-
await this.storageManager.setJSON(this.config.storagePrefix, mappings);
|
|
273
|
-
}
|
|
274
|
-
catch (error) {
|
|
275
|
-
logger.log('error', `Failed to save VLAN mappings to storage: ${error.message}`);
|
|
276
|
-
}
|
|
277
|
-
}
|
|
278
|
-
}
|
|
279
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.vlan.manager.js","sourceRoot":"","sources":["../../../ts/radius/classes.vlan.manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* RADIUS module for DcRouter
|
|
3
|
-
*
|
|
4
|
-
* Provides:
|
|
5
|
-
* - MAC Authentication Bypass (MAB) for network device authentication
|
|
6
|
-
* - VLAN assignment based on MAC addresses
|
|
7
|
-
* - OUI (vendor prefix) pattern matching for device categorization
|
|
8
|
-
* - RADIUS accounting for session tracking and billing
|
|
9
|
-
* - Integration with StorageManager for persistence
|
|
10
|
-
*/
|
|
11
|
-
export * from './classes.radius.server.js';
|
|
12
|
-
export * from './classes.vlan.manager.js';
|
|
13
|
-
export * from './classes.accounting.manager.js';
|
package/dist_ts/radius/index.js
DELETED
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* RADIUS module for DcRouter
|
|
3
|
-
*
|
|
4
|
-
* Provides:
|
|
5
|
-
* - MAC Authentication Bypass (MAB) for network device authentication
|
|
6
|
-
* - VLAN assignment based on MAC addresses
|
|
7
|
-
* - OUI (vendor prefix) pattern matching for device categorization
|
|
8
|
-
* - RADIUS accounting for session tracking and billing
|
|
9
|
-
* - Integration with StorageManager for persistence
|
|
10
|
-
*/
|
|
11
|
-
export * from './classes.radius.server.js';
|
|
12
|
-
export * from './classes.vlan.manager.js';
|
|
13
|
-
export * from './classes.accounting.manager.js';
|
|
14
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9yYWRpdXMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7OztHQVNHO0FBRUgsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLDJCQUEyQixDQUFDO0FBQzFDLGNBQWMsaUNBQWlDLENBQUMifQ==
|
|
@@ -1,82 +0,0 @@
|
|
|
1
|
-
import type { StorageManager } from '../storage/classes.storagemanager.js';
|
|
2
|
-
import type { IRemoteIngress, IDcRouterRouteConfig } from '../../dist_ts_interfaces/data/remoteingress.js';
|
|
3
|
-
/**
|
|
4
|
-
* Manages CRUD for remote ingress edge registrations.
|
|
5
|
-
* Persists edge configs via StorageManager and provides
|
|
6
|
-
* the allowed edges list for the Rust hub.
|
|
7
|
-
*/
|
|
8
|
-
export declare class RemoteIngressManager {
|
|
9
|
-
private storageManager;
|
|
10
|
-
private edges;
|
|
11
|
-
private routes;
|
|
12
|
-
constructor(storageManager: StorageManager);
|
|
13
|
-
/**
|
|
14
|
-
* Load all edge registrations from storage into memory.
|
|
15
|
-
*/
|
|
16
|
-
initialize(): Promise<void>;
|
|
17
|
-
/**
|
|
18
|
-
* Store the current route configs for port derivation.
|
|
19
|
-
*/
|
|
20
|
-
setRoutes(routes: IDcRouterRouteConfig[]): void;
|
|
21
|
-
/**
|
|
22
|
-
* Derive listen ports for an edge from routes tagged with remoteIngress.enabled.
|
|
23
|
-
* When a route specifies edgeFilter, only edges whose id or tags match get that route's ports.
|
|
24
|
-
* When edgeFilter is absent, the route applies to all edges.
|
|
25
|
-
*/
|
|
26
|
-
derivePortsForEdge(edgeId: string, edgeTags?: string[]): number[];
|
|
27
|
-
/**
|
|
28
|
-
* Get the effective listen ports for an edge.
|
|
29
|
-
* Manual ports are always included. Auto-derived ports are added (union) when autoDerivePorts is true.
|
|
30
|
-
*/
|
|
31
|
-
getEffectiveListenPorts(edge: IRemoteIngress): number[];
|
|
32
|
-
/**
|
|
33
|
-
* Get manual and derived port breakdown for an edge (used in API responses).
|
|
34
|
-
* Derived ports exclude any ports already present in the manual list.
|
|
35
|
-
*/
|
|
36
|
-
getPortBreakdown(edge: IRemoteIngress): {
|
|
37
|
-
manual: number[];
|
|
38
|
-
derived: number[];
|
|
39
|
-
};
|
|
40
|
-
/**
|
|
41
|
-
* Create a new edge registration.
|
|
42
|
-
*/
|
|
43
|
-
createEdge(name: string, listenPorts?: number[], tags?: string[], autoDerivePorts?: boolean): Promise<IRemoteIngress>;
|
|
44
|
-
/**
|
|
45
|
-
* Get an edge by ID.
|
|
46
|
-
*/
|
|
47
|
-
getEdge(id: string): IRemoteIngress | undefined;
|
|
48
|
-
/**
|
|
49
|
-
* Get all edge registrations.
|
|
50
|
-
*/
|
|
51
|
-
getAllEdges(): IRemoteIngress[];
|
|
52
|
-
/**
|
|
53
|
-
* Update an edge registration.
|
|
54
|
-
*/
|
|
55
|
-
updateEdge(id: string, updates: {
|
|
56
|
-
name?: string;
|
|
57
|
-
listenPorts?: number[];
|
|
58
|
-
autoDerivePorts?: boolean;
|
|
59
|
-
enabled?: boolean;
|
|
60
|
-
tags?: string[];
|
|
61
|
-
}): Promise<IRemoteIngress | null>;
|
|
62
|
-
/**
|
|
63
|
-
* Delete an edge registration.
|
|
64
|
-
*/
|
|
65
|
-
deleteEdge(id: string): Promise<boolean>;
|
|
66
|
-
/**
|
|
67
|
-
* Regenerate the secret for an edge.
|
|
68
|
-
*/
|
|
69
|
-
regenerateSecret(id: string): Promise<string | null>;
|
|
70
|
-
/**
|
|
71
|
-
* Verify an edge's secret using constant-time comparison.
|
|
72
|
-
*/
|
|
73
|
-
verifySecret(id: string, secret: string): boolean;
|
|
74
|
-
/**
|
|
75
|
-
* Get the list of allowed edges (enabled only) for the Rust hub.
|
|
76
|
-
*/
|
|
77
|
-
getAllowedEdges(): Array<{
|
|
78
|
-
id: string;
|
|
79
|
-
secret: string;
|
|
80
|
-
listenPorts: number[];
|
|
81
|
-
}>;
|
|
82
|
-
}
|
|
@@ -1,227 +0,0 @@
|
|
|
1
|
-
import * as plugins from '../plugins.js';
|
|
2
|
-
const STORAGE_PREFIX = '/remote-ingress/';
|
|
3
|
-
/**
|
|
4
|
-
* Flatten a port range (number | number[] | Array<{from, to}>) to a sorted unique number array.
|
|
5
|
-
*/
|
|
6
|
-
function extractPorts(portRange) {
|
|
7
|
-
const ports = new Set();
|
|
8
|
-
if (typeof portRange === 'number') {
|
|
9
|
-
ports.add(portRange);
|
|
10
|
-
}
|
|
11
|
-
else if (Array.isArray(portRange)) {
|
|
12
|
-
for (const entry of portRange) {
|
|
13
|
-
if (typeof entry === 'number') {
|
|
14
|
-
ports.add(entry);
|
|
15
|
-
}
|
|
16
|
-
else if (typeof entry === 'object' && 'from' in entry && 'to' in entry) {
|
|
17
|
-
for (let p = entry.from; p <= entry.to; p++) {
|
|
18
|
-
ports.add(p);
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
return [...ports].sort((a, b) => a - b);
|
|
24
|
-
}
|
|
25
|
-
/**
|
|
26
|
-
* Manages CRUD for remote ingress edge registrations.
|
|
27
|
-
* Persists edge configs via StorageManager and provides
|
|
28
|
-
* the allowed edges list for the Rust hub.
|
|
29
|
-
*/
|
|
30
|
-
export class RemoteIngressManager {
|
|
31
|
-
storageManager;
|
|
32
|
-
edges = new Map();
|
|
33
|
-
routes = [];
|
|
34
|
-
constructor(storageManager) {
|
|
35
|
-
this.storageManager = storageManager;
|
|
36
|
-
}
|
|
37
|
-
/**
|
|
38
|
-
* Load all edge registrations from storage into memory.
|
|
39
|
-
*/
|
|
40
|
-
async initialize() {
|
|
41
|
-
const keys = await this.storageManager.list(STORAGE_PREFIX);
|
|
42
|
-
for (const key of keys) {
|
|
43
|
-
const edge = await this.storageManager.getJSON(key);
|
|
44
|
-
if (edge) {
|
|
45
|
-
// Migration: old edges without autoDerivePorts default to true
|
|
46
|
-
if (edge.autoDerivePorts === undefined) {
|
|
47
|
-
edge.autoDerivePorts = true;
|
|
48
|
-
await this.storageManager.setJSON(key, edge);
|
|
49
|
-
}
|
|
50
|
-
this.edges.set(edge.id, edge);
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
/**
|
|
55
|
-
* Store the current route configs for port derivation.
|
|
56
|
-
*/
|
|
57
|
-
setRoutes(routes) {
|
|
58
|
-
this.routes = routes;
|
|
59
|
-
}
|
|
60
|
-
/**
|
|
61
|
-
* Derive listen ports for an edge from routes tagged with remoteIngress.enabled.
|
|
62
|
-
* When a route specifies edgeFilter, only edges whose id or tags match get that route's ports.
|
|
63
|
-
* When edgeFilter is absent, the route applies to all edges.
|
|
64
|
-
*/
|
|
65
|
-
derivePortsForEdge(edgeId, edgeTags) {
|
|
66
|
-
const ports = new Set();
|
|
67
|
-
for (const route of this.routes) {
|
|
68
|
-
if (!route.remoteIngress?.enabled)
|
|
69
|
-
continue;
|
|
70
|
-
// Apply edge filter if present
|
|
71
|
-
const filter = route.remoteIngress.edgeFilter;
|
|
72
|
-
if (filter && filter.length > 0) {
|
|
73
|
-
const idMatch = filter.includes(edgeId);
|
|
74
|
-
const tagMatch = edgeTags?.some((tag) => filter.includes(tag)) ?? false;
|
|
75
|
-
if (!idMatch && !tagMatch)
|
|
76
|
-
continue;
|
|
77
|
-
}
|
|
78
|
-
// Extract ports from the route match
|
|
79
|
-
if (route.match?.ports) {
|
|
80
|
-
for (const p of extractPorts(route.match.ports)) {
|
|
81
|
-
ports.add(p);
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
return [...ports].sort((a, b) => a - b);
|
|
86
|
-
}
|
|
87
|
-
/**
|
|
88
|
-
* Get the effective listen ports for an edge.
|
|
89
|
-
* Manual ports are always included. Auto-derived ports are added (union) when autoDerivePorts is true.
|
|
90
|
-
*/
|
|
91
|
-
getEffectiveListenPorts(edge) {
|
|
92
|
-
const manualPorts = edge.listenPorts || [];
|
|
93
|
-
const shouldDerive = edge.autoDerivePorts !== false;
|
|
94
|
-
if (!shouldDerive)
|
|
95
|
-
return [...manualPorts].sort((a, b) => a - b);
|
|
96
|
-
const derivedPorts = this.derivePortsForEdge(edge.id, edge.tags);
|
|
97
|
-
return [...new Set([...manualPorts, ...derivedPorts])].sort((a, b) => a - b);
|
|
98
|
-
}
|
|
99
|
-
/**
|
|
100
|
-
* Get manual and derived port breakdown for an edge (used in API responses).
|
|
101
|
-
* Derived ports exclude any ports already present in the manual list.
|
|
102
|
-
*/
|
|
103
|
-
getPortBreakdown(edge) {
|
|
104
|
-
const manual = edge.listenPorts || [];
|
|
105
|
-
const shouldDerive = edge.autoDerivePorts !== false;
|
|
106
|
-
if (!shouldDerive)
|
|
107
|
-
return { manual, derived: [] };
|
|
108
|
-
const manualSet = new Set(manual);
|
|
109
|
-
const allDerived = this.derivePortsForEdge(edge.id, edge.tags);
|
|
110
|
-
const derived = allDerived.filter((p) => !manualSet.has(p));
|
|
111
|
-
return { manual, derived };
|
|
112
|
-
}
|
|
113
|
-
/**
|
|
114
|
-
* Create a new edge registration.
|
|
115
|
-
*/
|
|
116
|
-
async createEdge(name, listenPorts = [], tags, autoDerivePorts = true) {
|
|
117
|
-
const id = plugins.uuid.v4();
|
|
118
|
-
const secret = plugins.crypto.randomBytes(32).toString('hex');
|
|
119
|
-
const now = Date.now();
|
|
120
|
-
const edge = {
|
|
121
|
-
id,
|
|
122
|
-
name,
|
|
123
|
-
secret,
|
|
124
|
-
listenPorts,
|
|
125
|
-
enabled: true,
|
|
126
|
-
autoDerivePorts,
|
|
127
|
-
tags: tags || [],
|
|
128
|
-
createdAt: now,
|
|
129
|
-
updatedAt: now,
|
|
130
|
-
};
|
|
131
|
-
await this.storageManager.setJSON(`${STORAGE_PREFIX}${id}`, edge);
|
|
132
|
-
this.edges.set(id, edge);
|
|
133
|
-
return edge;
|
|
134
|
-
}
|
|
135
|
-
/**
|
|
136
|
-
* Get an edge by ID.
|
|
137
|
-
*/
|
|
138
|
-
getEdge(id) {
|
|
139
|
-
return this.edges.get(id);
|
|
140
|
-
}
|
|
141
|
-
/**
|
|
142
|
-
* Get all edge registrations.
|
|
143
|
-
*/
|
|
144
|
-
getAllEdges() {
|
|
145
|
-
return Array.from(this.edges.values());
|
|
146
|
-
}
|
|
147
|
-
/**
|
|
148
|
-
* Update an edge registration.
|
|
149
|
-
*/
|
|
150
|
-
async updateEdge(id, updates) {
|
|
151
|
-
const edge = this.edges.get(id);
|
|
152
|
-
if (!edge) {
|
|
153
|
-
return null;
|
|
154
|
-
}
|
|
155
|
-
if (updates.name !== undefined)
|
|
156
|
-
edge.name = updates.name;
|
|
157
|
-
if (updates.listenPorts !== undefined)
|
|
158
|
-
edge.listenPorts = updates.listenPorts;
|
|
159
|
-
if (updates.autoDerivePorts !== undefined)
|
|
160
|
-
edge.autoDerivePorts = updates.autoDerivePorts;
|
|
161
|
-
if (updates.enabled !== undefined)
|
|
162
|
-
edge.enabled = updates.enabled;
|
|
163
|
-
if (updates.tags !== undefined)
|
|
164
|
-
edge.tags = updates.tags;
|
|
165
|
-
edge.updatedAt = Date.now();
|
|
166
|
-
await this.storageManager.setJSON(`${STORAGE_PREFIX}${id}`, edge);
|
|
167
|
-
this.edges.set(id, edge);
|
|
168
|
-
return edge;
|
|
169
|
-
}
|
|
170
|
-
/**
|
|
171
|
-
* Delete an edge registration.
|
|
172
|
-
*/
|
|
173
|
-
async deleteEdge(id) {
|
|
174
|
-
if (!this.edges.has(id)) {
|
|
175
|
-
return false;
|
|
176
|
-
}
|
|
177
|
-
await this.storageManager.delete(`${STORAGE_PREFIX}${id}`);
|
|
178
|
-
this.edges.delete(id);
|
|
179
|
-
return true;
|
|
180
|
-
}
|
|
181
|
-
/**
|
|
182
|
-
* Regenerate the secret for an edge.
|
|
183
|
-
*/
|
|
184
|
-
async regenerateSecret(id) {
|
|
185
|
-
const edge = this.edges.get(id);
|
|
186
|
-
if (!edge) {
|
|
187
|
-
return null;
|
|
188
|
-
}
|
|
189
|
-
edge.secret = plugins.crypto.randomBytes(32).toString('hex');
|
|
190
|
-
edge.updatedAt = Date.now();
|
|
191
|
-
await this.storageManager.setJSON(`${STORAGE_PREFIX}${id}`, edge);
|
|
192
|
-
this.edges.set(id, edge);
|
|
193
|
-
return edge.secret;
|
|
194
|
-
}
|
|
195
|
-
/**
|
|
196
|
-
* Verify an edge's secret using constant-time comparison.
|
|
197
|
-
*/
|
|
198
|
-
verifySecret(id, secret) {
|
|
199
|
-
const edge = this.edges.get(id);
|
|
200
|
-
if (!edge) {
|
|
201
|
-
return false;
|
|
202
|
-
}
|
|
203
|
-
const expected = Buffer.from(edge.secret);
|
|
204
|
-
const provided = Buffer.from(secret);
|
|
205
|
-
if (expected.length !== provided.length) {
|
|
206
|
-
return false;
|
|
207
|
-
}
|
|
208
|
-
return plugins.crypto.timingSafeEqual(expected, provided);
|
|
209
|
-
}
|
|
210
|
-
/**
|
|
211
|
-
* Get the list of allowed edges (enabled only) for the Rust hub.
|
|
212
|
-
*/
|
|
213
|
-
getAllowedEdges() {
|
|
214
|
-
const result = [];
|
|
215
|
-
for (const edge of this.edges.values()) {
|
|
216
|
-
if (edge.enabled) {
|
|
217
|
-
result.push({
|
|
218
|
-
id: edge.id,
|
|
219
|
-
secret: edge.secret,
|
|
220
|
-
listenPorts: this.getEffectiveListenPorts(edge),
|
|
221
|
-
});
|
|
222
|
-
}
|
|
223
|
-
}
|
|
224
|
-
return result;
|
|
225
|
-
}
|
|
226
|
-
}
|
|
227
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.remoteingress-manager.js","sourceRoot":"","sources":["../../../ts/remoteingress/classes.remoteingress-manager.ts"],"names":[],"mappings":"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"}
|