@serve.zone/dcrouter 12.1.0 → 12.2.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 +750 -688
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.dcrouter.d.ts +6 -1
- package/dist_ts/classes.dcrouter.js +11 -3
- package/dist_ts/config/classes.db-seeder.d.ts +25 -0
- package/dist_ts/config/classes.db-seeder.js +69 -0
- package/dist_ts/config/classes.reference-resolver.d.ts +80 -0
- package/dist_ts/config/classes.reference-resolver.js +482 -0
- package/dist_ts/config/classes.route-config-manager.d.ts +13 -3
- package/dist_ts/config/classes.route-config-manager.js +53 -3
- package/dist_ts/config/index.d.ts +2 -0
- package/dist_ts/config/index.js +3 -1
- package/dist_ts/db/documents/classes.network-target.doc.d.ts +15 -0
- package/dist_ts/db/documents/classes.network-target.doc.js +118 -0
- package/dist_ts/db/documents/classes.security-profile.doc.d.ts +16 -0
- package/dist_ts/db/documents/classes.security-profile.doc.js +118 -0
- package/dist_ts/db/documents/classes.stored-route.doc.d.ts +2 -0
- package/dist_ts/db/documents/classes.stored-route.doc.js +8 -2
- package/dist_ts/db/documents/index.d.ts +2 -0
- package/dist_ts/db/documents/index.js +3 -1
- package/dist_ts/opsserver/classes.opsserver.d.ts +2 -0
- package/dist_ts/opsserver/classes.opsserver.js +5 -1
- package/dist_ts/opsserver/handlers/index.d.ts +2 -0
- package/dist_ts/opsserver/handlers/index.js +3 -1
- package/dist_ts/opsserver/handlers/network-target.handler.d.ts +10 -0
- package/dist_ts/opsserver/handlers/network-target.handler.js +117 -0
- package/dist_ts/opsserver/handlers/route-management.handler.js +3 -2
- package/dist_ts/opsserver/handlers/security-profile.handler.d.ts +10 -0
- package/dist_ts/opsserver/handlers/security-profile.handler.js +119 -0
- package/dist_ts_interfaces/data/route-management.d.ts +48 -1
- package/dist_ts_interfaces/requests/index.d.ts +2 -0
- package/dist_ts_interfaces/requests/index.js +3 -1
- package/dist_ts_interfaces/requests/network-targets.d.ts +102 -0
- package/dist_ts_interfaces/requests/network-targets.js +2 -0
- package/dist_ts_interfaces/requests/route-management.d.ts +3 -1
- package/dist_ts_interfaces/requests/security-profiles.d.ts +102 -0
- package/dist_ts_interfaces/requests/security-profiles.js +2 -0
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/dist_ts_web/appstate.d.ts +43 -0
- package/dist_ts_web/appstate.js +176 -2
- package/dist_ts_web/elements/index.d.ts +2 -0
- package/dist_ts_web/elements/index.js +3 -1
- package/dist_ts_web/elements/ops-dashboard.js +13 -1
- package/dist_ts_web/elements/ops-view-networktargets.d.ts +17 -0
- package/dist_ts_web/elements/ops-view-networktargets.js +246 -0
- package/dist_ts_web/elements/ops-view-securityprofiles.d.ts +17 -0
- package/dist_ts_web/elements/ops-view-securityprofiles.js +275 -0
- package/dist_ts_web/router.d.ts +1 -1
- package/dist_ts_web/router.js +2 -2
- package/package.json +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.dcrouter.ts +19 -1
- package/ts/config/classes.db-seeder.ts +95 -0
- package/ts/config/classes.reference-resolver.ts +576 -0
- package/ts/config/classes.route-config-manager.ts +64 -1
- package/ts/config/index.ts +3 -1
- package/ts/db/documents/classes.network-target.doc.ts +48 -0
- package/ts/db/documents/classes.security-profile.doc.ts +49 -0
- package/ts/db/documents/classes.stored-route.doc.ts +4 -0
- package/ts/db/documents/index.ts +2 -0
- package/ts/opsserver/classes.opsserver.ts +4 -0
- package/ts/opsserver/handlers/index.ts +3 -1
- package/ts/opsserver/handlers/network-target.handler.ts +167 -0
- package/ts/opsserver/handlers/route-management.handler.ts +2 -1
- package/ts/opsserver/handlers/security-profile.handler.ts +169 -0
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/appstate.ts +243 -1
- package/ts_web/elements/index.ts +2 -0
- package/ts_web/elements/ops-dashboard.ts +12 -0
- package/ts_web/elements/ops-view-networktargets.ts +214 -0
- package/ts_web/elements/ops-view-securityprofiles.ts +242 -0
- package/ts_web/router.ts +1 -1
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
import * as plugins from '../plugins.js';
|
|
2
|
+
import type { ISecurityProfile, INetworkTarget, IRouteMetadata, IStoredRoute, IRouteSecurity } from '../../dist_ts_interfaces/data/route-management.js';
|
|
3
|
+
export declare class ReferenceResolver {
|
|
4
|
+
private profiles;
|
|
5
|
+
private targets;
|
|
6
|
+
initialize(): Promise<void>;
|
|
7
|
+
createProfile(data: {
|
|
8
|
+
name: string;
|
|
9
|
+
description?: string;
|
|
10
|
+
security: IRouteSecurity;
|
|
11
|
+
extendsProfiles?: string[];
|
|
12
|
+
createdBy: string;
|
|
13
|
+
}): Promise<string>;
|
|
14
|
+
updateProfile(id: string, patch: Partial<Omit<ISecurityProfile, 'id' | 'createdAt' | 'createdBy'>>): Promise<{
|
|
15
|
+
affectedRouteIds: string[];
|
|
16
|
+
}>;
|
|
17
|
+
deleteProfile(id: string, force: boolean, storedRoutes?: Map<string, IStoredRoute>): Promise<{
|
|
18
|
+
success: boolean;
|
|
19
|
+
message?: string;
|
|
20
|
+
}>;
|
|
21
|
+
getProfile(id: string): ISecurityProfile | undefined;
|
|
22
|
+
getProfileByName(name: string): ISecurityProfile | undefined;
|
|
23
|
+
listProfiles(): ISecurityProfile[];
|
|
24
|
+
getProfileUsage(storedRoutes: Map<string, IStoredRoute>): Map<string, Array<{
|
|
25
|
+
id: string;
|
|
26
|
+
routeName: string;
|
|
27
|
+
}>>;
|
|
28
|
+
getProfileUsageForId(profileId: string, storedRoutes: Map<string, IStoredRoute>): Array<{
|
|
29
|
+
id: string;
|
|
30
|
+
routeName: string;
|
|
31
|
+
}>;
|
|
32
|
+
createTarget(data: {
|
|
33
|
+
name: string;
|
|
34
|
+
description?: string;
|
|
35
|
+
host: string | string[];
|
|
36
|
+
port: number;
|
|
37
|
+
createdBy: string;
|
|
38
|
+
}): Promise<string>;
|
|
39
|
+
updateTarget(id: string, patch: Partial<Omit<INetworkTarget, 'id' | 'createdAt' | 'createdBy'>>): Promise<{
|
|
40
|
+
affectedRouteIds: string[];
|
|
41
|
+
}>;
|
|
42
|
+
deleteTarget(id: string, force: boolean, storedRoutes?: Map<string, IStoredRoute>): Promise<{
|
|
43
|
+
success: boolean;
|
|
44
|
+
message?: string;
|
|
45
|
+
}>;
|
|
46
|
+
getTarget(id: string): INetworkTarget | undefined;
|
|
47
|
+
getTargetByName(name: string): INetworkTarget | undefined;
|
|
48
|
+
listTargets(): INetworkTarget[];
|
|
49
|
+
getTargetUsageForId(targetId: string, storedRoutes: Map<string, IStoredRoute>): Array<{
|
|
50
|
+
id: string;
|
|
51
|
+
routeName: string;
|
|
52
|
+
}>;
|
|
53
|
+
/**
|
|
54
|
+
* Resolve references for a single route.
|
|
55
|
+
* Materializes security profile and/or network target into the route's fields.
|
|
56
|
+
* Returns the resolved route and updated metadata.
|
|
57
|
+
*/
|
|
58
|
+
resolveRoute(route: plugins.smartproxy.IRouteConfig, metadata?: IRouteMetadata): {
|
|
59
|
+
route: plugins.smartproxy.IRouteConfig;
|
|
60
|
+
metadata: IRouteMetadata;
|
|
61
|
+
};
|
|
62
|
+
findRoutesByProfileRef(profileId: string): Promise<string[]>;
|
|
63
|
+
findRoutesByTargetRef(targetId: string): Promise<string[]>;
|
|
64
|
+
findRoutesByProfileRefSync(profileId: string, storedRoutes: Map<string, IStoredRoute>): string[];
|
|
65
|
+
findRoutesByTargetRefSync(targetId: string, storedRoutes: Map<string, IStoredRoute>): string[];
|
|
66
|
+
private resolveSecurityProfile;
|
|
67
|
+
/**
|
|
68
|
+
* Merge two IRouteSecurity objects.
|
|
69
|
+
* `override` values take precedence over `base` values.
|
|
70
|
+
* For ipAllowList/ipBlockList: union arrays and deduplicate.
|
|
71
|
+
* For scalar/object fields: override wins if present.
|
|
72
|
+
*/
|
|
73
|
+
private mergeSecurityFields;
|
|
74
|
+
private loadProfiles;
|
|
75
|
+
private loadTargets;
|
|
76
|
+
private persistProfile;
|
|
77
|
+
private persistTarget;
|
|
78
|
+
private clearProfileRefsOnRoutes;
|
|
79
|
+
private clearTargetRefsOnRoutes;
|
|
80
|
+
}
|
|
@@ -0,0 +1,482 @@
|
|
|
1
|
+
import * as plugins from '../plugins.js';
|
|
2
|
+
import { logger } from '../logger.js';
|
|
3
|
+
import { SecurityProfileDoc, NetworkTargetDoc, StoredRouteDoc } from '../db/index.js';
|
|
4
|
+
const MAX_INHERITANCE_DEPTH = 5;
|
|
5
|
+
export class ReferenceResolver {
|
|
6
|
+
profiles = new Map();
|
|
7
|
+
targets = new Map();
|
|
8
|
+
// =========================================================================
|
|
9
|
+
// Lifecycle
|
|
10
|
+
// =========================================================================
|
|
11
|
+
async initialize() {
|
|
12
|
+
await this.loadProfiles();
|
|
13
|
+
await this.loadTargets();
|
|
14
|
+
}
|
|
15
|
+
// =========================================================================
|
|
16
|
+
// Profile CRUD
|
|
17
|
+
// =========================================================================
|
|
18
|
+
async createProfile(data) {
|
|
19
|
+
const id = plugins.uuid.v4();
|
|
20
|
+
const now = Date.now();
|
|
21
|
+
const profile = {
|
|
22
|
+
id,
|
|
23
|
+
name: data.name,
|
|
24
|
+
description: data.description,
|
|
25
|
+
security: data.security,
|
|
26
|
+
extendsProfiles: data.extendsProfiles,
|
|
27
|
+
createdAt: now,
|
|
28
|
+
updatedAt: now,
|
|
29
|
+
createdBy: data.createdBy,
|
|
30
|
+
};
|
|
31
|
+
this.profiles.set(id, profile);
|
|
32
|
+
await this.persistProfile(profile);
|
|
33
|
+
logger.log('info', `Created security profile '${profile.name}' (${id})`);
|
|
34
|
+
return id;
|
|
35
|
+
}
|
|
36
|
+
async updateProfile(id, patch) {
|
|
37
|
+
const profile = this.profiles.get(id);
|
|
38
|
+
if (!profile) {
|
|
39
|
+
throw new Error(`Security profile '${id}' not found`);
|
|
40
|
+
}
|
|
41
|
+
if (patch.name !== undefined)
|
|
42
|
+
profile.name = patch.name;
|
|
43
|
+
if (patch.description !== undefined)
|
|
44
|
+
profile.description = patch.description;
|
|
45
|
+
if (patch.security !== undefined)
|
|
46
|
+
profile.security = patch.security;
|
|
47
|
+
if (patch.extendsProfiles !== undefined)
|
|
48
|
+
profile.extendsProfiles = patch.extendsProfiles;
|
|
49
|
+
profile.updatedAt = Date.now();
|
|
50
|
+
await this.persistProfile(profile);
|
|
51
|
+
logger.log('info', `Updated security profile '${profile.name}' (${id})`);
|
|
52
|
+
// Find routes referencing this profile
|
|
53
|
+
const affectedRouteIds = await this.findRoutesByProfileRef(id);
|
|
54
|
+
return { affectedRouteIds };
|
|
55
|
+
}
|
|
56
|
+
async deleteProfile(id, force, storedRoutes) {
|
|
57
|
+
const profile = this.profiles.get(id);
|
|
58
|
+
if (!profile) {
|
|
59
|
+
return { success: false, message: `Security profile '${id}' not found` };
|
|
60
|
+
}
|
|
61
|
+
// Check usage
|
|
62
|
+
const affectedIds = storedRoutes
|
|
63
|
+
? this.findRoutesByProfileRefSync(id, storedRoutes)
|
|
64
|
+
: await this.findRoutesByProfileRef(id);
|
|
65
|
+
if (affectedIds.length > 0 && !force) {
|
|
66
|
+
return {
|
|
67
|
+
success: false,
|
|
68
|
+
message: `Profile '${profile.name}' is in use by ${affectedIds.length} route(s). Use force=true to delete.`,
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
// Delete from DB
|
|
72
|
+
const doc = await SecurityProfileDoc.findById(id);
|
|
73
|
+
if (doc)
|
|
74
|
+
await doc.delete();
|
|
75
|
+
this.profiles.delete(id);
|
|
76
|
+
// If force-deleting with referencing routes, clear refs but keep resolved values
|
|
77
|
+
if (affectedIds.length > 0) {
|
|
78
|
+
await this.clearProfileRefsOnRoutes(affectedIds);
|
|
79
|
+
logger.log('warn', `Force-deleted profile '${profile.name}'; cleared refs on ${affectedIds.length} route(s)`);
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
logger.log('info', `Deleted security profile '${profile.name}' (${id})`);
|
|
83
|
+
}
|
|
84
|
+
return { success: true };
|
|
85
|
+
}
|
|
86
|
+
getProfile(id) {
|
|
87
|
+
return this.profiles.get(id);
|
|
88
|
+
}
|
|
89
|
+
getProfileByName(name) {
|
|
90
|
+
for (const profile of this.profiles.values()) {
|
|
91
|
+
if (profile.name === name)
|
|
92
|
+
return profile;
|
|
93
|
+
}
|
|
94
|
+
return undefined;
|
|
95
|
+
}
|
|
96
|
+
listProfiles() {
|
|
97
|
+
return [...this.profiles.values()];
|
|
98
|
+
}
|
|
99
|
+
getProfileUsage(storedRoutes) {
|
|
100
|
+
const usage = new Map();
|
|
101
|
+
for (const profile of this.profiles.values()) {
|
|
102
|
+
usage.set(profile.id, []);
|
|
103
|
+
}
|
|
104
|
+
for (const [routeId, stored] of storedRoutes) {
|
|
105
|
+
const ref = stored.metadata?.securityProfileRef;
|
|
106
|
+
if (ref && usage.has(ref)) {
|
|
107
|
+
usage.get(ref).push({ id: routeId, routeName: stored.route.name || routeId });
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
return usage;
|
|
111
|
+
}
|
|
112
|
+
getProfileUsageForId(profileId, storedRoutes) {
|
|
113
|
+
const routes = [];
|
|
114
|
+
for (const [routeId, stored] of storedRoutes) {
|
|
115
|
+
if (stored.metadata?.securityProfileRef === profileId) {
|
|
116
|
+
routes.push({ id: routeId, routeName: stored.route.name || routeId });
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
return routes;
|
|
120
|
+
}
|
|
121
|
+
// =========================================================================
|
|
122
|
+
// Target CRUD
|
|
123
|
+
// =========================================================================
|
|
124
|
+
async createTarget(data) {
|
|
125
|
+
const id = plugins.uuid.v4();
|
|
126
|
+
const now = Date.now();
|
|
127
|
+
const target = {
|
|
128
|
+
id,
|
|
129
|
+
name: data.name,
|
|
130
|
+
description: data.description,
|
|
131
|
+
host: data.host,
|
|
132
|
+
port: data.port,
|
|
133
|
+
createdAt: now,
|
|
134
|
+
updatedAt: now,
|
|
135
|
+
createdBy: data.createdBy,
|
|
136
|
+
};
|
|
137
|
+
this.targets.set(id, target);
|
|
138
|
+
await this.persistTarget(target);
|
|
139
|
+
logger.log('info', `Created network target '${target.name}' (${id})`);
|
|
140
|
+
return id;
|
|
141
|
+
}
|
|
142
|
+
async updateTarget(id, patch) {
|
|
143
|
+
const target = this.targets.get(id);
|
|
144
|
+
if (!target) {
|
|
145
|
+
throw new Error(`Network target '${id}' not found`);
|
|
146
|
+
}
|
|
147
|
+
if (patch.name !== undefined)
|
|
148
|
+
target.name = patch.name;
|
|
149
|
+
if (patch.description !== undefined)
|
|
150
|
+
target.description = patch.description;
|
|
151
|
+
if (patch.host !== undefined)
|
|
152
|
+
target.host = patch.host;
|
|
153
|
+
if (patch.port !== undefined)
|
|
154
|
+
target.port = patch.port;
|
|
155
|
+
target.updatedAt = Date.now();
|
|
156
|
+
await this.persistTarget(target);
|
|
157
|
+
logger.log('info', `Updated network target '${target.name}' (${id})`);
|
|
158
|
+
const affectedRouteIds = await this.findRoutesByTargetRef(id);
|
|
159
|
+
return { affectedRouteIds };
|
|
160
|
+
}
|
|
161
|
+
async deleteTarget(id, force, storedRoutes) {
|
|
162
|
+
const target = this.targets.get(id);
|
|
163
|
+
if (!target) {
|
|
164
|
+
return { success: false, message: `Network target '${id}' not found` };
|
|
165
|
+
}
|
|
166
|
+
const affectedIds = storedRoutes
|
|
167
|
+
? this.findRoutesByTargetRefSync(id, storedRoutes)
|
|
168
|
+
: await this.findRoutesByTargetRef(id);
|
|
169
|
+
if (affectedIds.length > 0 && !force) {
|
|
170
|
+
return {
|
|
171
|
+
success: false,
|
|
172
|
+
message: `Target '${target.name}' is in use by ${affectedIds.length} route(s). Use force=true to delete.`,
|
|
173
|
+
};
|
|
174
|
+
}
|
|
175
|
+
const doc = await NetworkTargetDoc.findById(id);
|
|
176
|
+
if (doc)
|
|
177
|
+
await doc.delete();
|
|
178
|
+
this.targets.delete(id);
|
|
179
|
+
if (affectedIds.length > 0) {
|
|
180
|
+
await this.clearTargetRefsOnRoutes(affectedIds);
|
|
181
|
+
logger.log('warn', `Force-deleted target '${target.name}'; cleared refs on ${affectedIds.length} route(s)`);
|
|
182
|
+
}
|
|
183
|
+
else {
|
|
184
|
+
logger.log('info', `Deleted network target '${target.name}' (${id})`);
|
|
185
|
+
}
|
|
186
|
+
return { success: true };
|
|
187
|
+
}
|
|
188
|
+
getTarget(id) {
|
|
189
|
+
return this.targets.get(id);
|
|
190
|
+
}
|
|
191
|
+
getTargetByName(name) {
|
|
192
|
+
for (const target of this.targets.values()) {
|
|
193
|
+
if (target.name === name)
|
|
194
|
+
return target;
|
|
195
|
+
}
|
|
196
|
+
return undefined;
|
|
197
|
+
}
|
|
198
|
+
listTargets() {
|
|
199
|
+
return [...this.targets.values()];
|
|
200
|
+
}
|
|
201
|
+
getTargetUsageForId(targetId, storedRoutes) {
|
|
202
|
+
const routes = [];
|
|
203
|
+
for (const [routeId, stored] of storedRoutes) {
|
|
204
|
+
if (stored.metadata?.networkTargetRef === targetId) {
|
|
205
|
+
routes.push({ id: routeId, routeName: stored.route.name || routeId });
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
return routes;
|
|
209
|
+
}
|
|
210
|
+
// =========================================================================
|
|
211
|
+
// Resolution
|
|
212
|
+
// =========================================================================
|
|
213
|
+
/**
|
|
214
|
+
* Resolve references for a single route.
|
|
215
|
+
* Materializes security profile and/or network target into the route's fields.
|
|
216
|
+
* Returns the resolved route and updated metadata.
|
|
217
|
+
*/
|
|
218
|
+
resolveRoute(route, metadata) {
|
|
219
|
+
const resolvedMetadata = { ...metadata };
|
|
220
|
+
if (resolvedMetadata.securityProfileRef) {
|
|
221
|
+
const resolvedSecurity = this.resolveSecurityProfile(resolvedMetadata.securityProfileRef);
|
|
222
|
+
if (resolvedSecurity) {
|
|
223
|
+
const profile = this.profiles.get(resolvedMetadata.securityProfileRef);
|
|
224
|
+
// Merge: profile provides base, route's inline values override
|
|
225
|
+
route = {
|
|
226
|
+
...route,
|
|
227
|
+
security: this.mergeSecurityFields(resolvedSecurity, route.security),
|
|
228
|
+
};
|
|
229
|
+
resolvedMetadata.securityProfileName = profile?.name;
|
|
230
|
+
resolvedMetadata.lastResolvedAt = Date.now();
|
|
231
|
+
}
|
|
232
|
+
else {
|
|
233
|
+
logger.log('warn', `Security profile '${resolvedMetadata.securityProfileRef}' not found during resolution`);
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
if (resolvedMetadata.networkTargetRef) {
|
|
237
|
+
const target = this.targets.get(resolvedMetadata.networkTargetRef);
|
|
238
|
+
if (target) {
|
|
239
|
+
route = {
|
|
240
|
+
...route,
|
|
241
|
+
action: {
|
|
242
|
+
...route.action,
|
|
243
|
+
targets: [{
|
|
244
|
+
host: target.host,
|
|
245
|
+
port: target.port,
|
|
246
|
+
}],
|
|
247
|
+
},
|
|
248
|
+
};
|
|
249
|
+
resolvedMetadata.networkTargetName = target.name;
|
|
250
|
+
resolvedMetadata.lastResolvedAt = Date.now();
|
|
251
|
+
}
|
|
252
|
+
else {
|
|
253
|
+
logger.log('warn', `Network target '${resolvedMetadata.networkTargetRef}' not found during resolution`);
|
|
254
|
+
}
|
|
255
|
+
}
|
|
256
|
+
return { route, metadata: resolvedMetadata };
|
|
257
|
+
}
|
|
258
|
+
// =========================================================================
|
|
259
|
+
// Reference lookup helpers
|
|
260
|
+
// =========================================================================
|
|
261
|
+
async findRoutesByProfileRef(profileId) {
|
|
262
|
+
const docs = await StoredRouteDoc.findAll();
|
|
263
|
+
return docs
|
|
264
|
+
.filter((doc) => doc.metadata?.securityProfileRef === profileId)
|
|
265
|
+
.map((doc) => doc.id);
|
|
266
|
+
}
|
|
267
|
+
async findRoutesByTargetRef(targetId) {
|
|
268
|
+
const docs = await StoredRouteDoc.findAll();
|
|
269
|
+
return docs
|
|
270
|
+
.filter((doc) => doc.metadata?.networkTargetRef === targetId)
|
|
271
|
+
.map((doc) => doc.id);
|
|
272
|
+
}
|
|
273
|
+
findRoutesByProfileRefSync(profileId, storedRoutes) {
|
|
274
|
+
const ids = [];
|
|
275
|
+
for (const [routeId, stored] of storedRoutes) {
|
|
276
|
+
if (stored.metadata?.securityProfileRef === profileId) {
|
|
277
|
+
ids.push(routeId);
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
return ids;
|
|
281
|
+
}
|
|
282
|
+
findRoutesByTargetRefSync(targetId, storedRoutes) {
|
|
283
|
+
const ids = [];
|
|
284
|
+
for (const [routeId, stored] of storedRoutes) {
|
|
285
|
+
if (stored.metadata?.networkTargetRef === targetId) {
|
|
286
|
+
ids.push(routeId);
|
|
287
|
+
}
|
|
288
|
+
}
|
|
289
|
+
return ids;
|
|
290
|
+
}
|
|
291
|
+
// =========================================================================
|
|
292
|
+
// Private: security profile resolution with inheritance
|
|
293
|
+
// =========================================================================
|
|
294
|
+
resolveSecurityProfile(profileId, visited = new Set(), depth = 0) {
|
|
295
|
+
if (depth > MAX_INHERITANCE_DEPTH) {
|
|
296
|
+
logger.log('warn', `Max inheritance depth (${MAX_INHERITANCE_DEPTH}) exceeded resolving profile '${profileId}'`);
|
|
297
|
+
return null;
|
|
298
|
+
}
|
|
299
|
+
if (visited.has(profileId)) {
|
|
300
|
+
logger.log('warn', `Circular inheritance detected for profile '${profileId}'`);
|
|
301
|
+
return null;
|
|
302
|
+
}
|
|
303
|
+
const profile = this.profiles.get(profileId);
|
|
304
|
+
if (!profile)
|
|
305
|
+
return null;
|
|
306
|
+
visited.add(profileId);
|
|
307
|
+
// Start with an empty base
|
|
308
|
+
let baseSecurity = {};
|
|
309
|
+
// Resolve parent profiles first (top-down, later overrides earlier)
|
|
310
|
+
if (profile.extendsProfiles?.length) {
|
|
311
|
+
for (const parentId of profile.extendsProfiles) {
|
|
312
|
+
const parentSecurity = this.resolveSecurityProfile(parentId, new Set(visited), depth + 1);
|
|
313
|
+
if (parentSecurity) {
|
|
314
|
+
baseSecurity = this.mergeSecurityFields(baseSecurity, parentSecurity);
|
|
315
|
+
}
|
|
316
|
+
}
|
|
317
|
+
}
|
|
318
|
+
// Apply this profile's security on top
|
|
319
|
+
return this.mergeSecurityFields(baseSecurity, profile.security);
|
|
320
|
+
}
|
|
321
|
+
/**
|
|
322
|
+
* Merge two IRouteSecurity objects.
|
|
323
|
+
* `override` values take precedence over `base` values.
|
|
324
|
+
* For ipAllowList/ipBlockList: union arrays and deduplicate.
|
|
325
|
+
* For scalar/object fields: override wins if present.
|
|
326
|
+
*/
|
|
327
|
+
mergeSecurityFields(base, override) {
|
|
328
|
+
if (!base && !override)
|
|
329
|
+
return {};
|
|
330
|
+
if (!base)
|
|
331
|
+
return { ...override };
|
|
332
|
+
if (!override)
|
|
333
|
+
return { ...base };
|
|
334
|
+
const merged = { ...base };
|
|
335
|
+
// IP lists: union
|
|
336
|
+
if (override.ipAllowList || base.ipAllowList) {
|
|
337
|
+
merged.ipAllowList = [...new Set([
|
|
338
|
+
...(base.ipAllowList || []),
|
|
339
|
+
...(override.ipAllowList || []),
|
|
340
|
+
])];
|
|
341
|
+
}
|
|
342
|
+
if (override.ipBlockList || base.ipBlockList) {
|
|
343
|
+
merged.ipBlockList = [...new Set([
|
|
344
|
+
...(base.ipBlockList || []),
|
|
345
|
+
...(override.ipBlockList || []),
|
|
346
|
+
])];
|
|
347
|
+
}
|
|
348
|
+
// Scalar/object fields: override wins
|
|
349
|
+
if (override.maxConnections !== undefined)
|
|
350
|
+
merged.maxConnections = override.maxConnections;
|
|
351
|
+
if (override.rateLimit !== undefined)
|
|
352
|
+
merged.rateLimit = override.rateLimit;
|
|
353
|
+
if (override.authentication !== undefined)
|
|
354
|
+
merged.authentication = override.authentication;
|
|
355
|
+
if (override.basicAuth !== undefined)
|
|
356
|
+
merged.basicAuth = override.basicAuth;
|
|
357
|
+
if (override.jwtAuth !== undefined)
|
|
358
|
+
merged.jwtAuth = override.jwtAuth;
|
|
359
|
+
return merged;
|
|
360
|
+
}
|
|
361
|
+
// =========================================================================
|
|
362
|
+
// Private: persistence
|
|
363
|
+
// =========================================================================
|
|
364
|
+
async loadProfiles() {
|
|
365
|
+
const docs = await SecurityProfileDoc.findAll();
|
|
366
|
+
for (const doc of docs) {
|
|
367
|
+
if (doc.id) {
|
|
368
|
+
this.profiles.set(doc.id, {
|
|
369
|
+
id: doc.id,
|
|
370
|
+
name: doc.name,
|
|
371
|
+
description: doc.description,
|
|
372
|
+
security: doc.security,
|
|
373
|
+
extendsProfiles: doc.extendsProfiles,
|
|
374
|
+
createdAt: doc.createdAt,
|
|
375
|
+
updatedAt: doc.updatedAt,
|
|
376
|
+
createdBy: doc.createdBy,
|
|
377
|
+
});
|
|
378
|
+
}
|
|
379
|
+
}
|
|
380
|
+
if (this.profiles.size > 0) {
|
|
381
|
+
logger.log('info', `Loaded ${this.profiles.size} security profile(s) from storage`);
|
|
382
|
+
}
|
|
383
|
+
}
|
|
384
|
+
async loadTargets() {
|
|
385
|
+
const docs = await NetworkTargetDoc.findAll();
|
|
386
|
+
for (const doc of docs) {
|
|
387
|
+
if (doc.id) {
|
|
388
|
+
this.targets.set(doc.id, {
|
|
389
|
+
id: doc.id,
|
|
390
|
+
name: doc.name,
|
|
391
|
+
description: doc.description,
|
|
392
|
+
host: doc.host,
|
|
393
|
+
port: doc.port,
|
|
394
|
+
createdAt: doc.createdAt,
|
|
395
|
+
updatedAt: doc.updatedAt,
|
|
396
|
+
createdBy: doc.createdBy,
|
|
397
|
+
});
|
|
398
|
+
}
|
|
399
|
+
}
|
|
400
|
+
if (this.targets.size > 0) {
|
|
401
|
+
logger.log('info', `Loaded ${this.targets.size} network target(s) from storage`);
|
|
402
|
+
}
|
|
403
|
+
}
|
|
404
|
+
async persistProfile(profile) {
|
|
405
|
+
const existingDoc = await SecurityProfileDoc.findById(profile.id);
|
|
406
|
+
if (existingDoc) {
|
|
407
|
+
existingDoc.name = profile.name;
|
|
408
|
+
existingDoc.description = profile.description;
|
|
409
|
+
existingDoc.security = profile.security;
|
|
410
|
+
existingDoc.extendsProfiles = profile.extendsProfiles;
|
|
411
|
+
existingDoc.updatedAt = profile.updatedAt;
|
|
412
|
+
await existingDoc.save();
|
|
413
|
+
}
|
|
414
|
+
else {
|
|
415
|
+
const doc = new SecurityProfileDoc();
|
|
416
|
+
doc.id = profile.id;
|
|
417
|
+
doc.name = profile.name;
|
|
418
|
+
doc.description = profile.description;
|
|
419
|
+
doc.security = profile.security;
|
|
420
|
+
doc.extendsProfiles = profile.extendsProfiles;
|
|
421
|
+
doc.createdAt = profile.createdAt;
|
|
422
|
+
doc.updatedAt = profile.updatedAt;
|
|
423
|
+
doc.createdBy = profile.createdBy;
|
|
424
|
+
await doc.save();
|
|
425
|
+
}
|
|
426
|
+
}
|
|
427
|
+
async persistTarget(target) {
|
|
428
|
+
const existingDoc = await NetworkTargetDoc.findById(target.id);
|
|
429
|
+
if (existingDoc) {
|
|
430
|
+
existingDoc.name = target.name;
|
|
431
|
+
existingDoc.description = target.description;
|
|
432
|
+
existingDoc.host = target.host;
|
|
433
|
+
existingDoc.port = target.port;
|
|
434
|
+
existingDoc.updatedAt = target.updatedAt;
|
|
435
|
+
await existingDoc.save();
|
|
436
|
+
}
|
|
437
|
+
else {
|
|
438
|
+
const doc = new NetworkTargetDoc();
|
|
439
|
+
doc.id = target.id;
|
|
440
|
+
doc.name = target.name;
|
|
441
|
+
doc.description = target.description;
|
|
442
|
+
doc.host = target.host;
|
|
443
|
+
doc.port = target.port;
|
|
444
|
+
doc.createdAt = target.createdAt;
|
|
445
|
+
doc.updatedAt = target.updatedAt;
|
|
446
|
+
doc.createdBy = target.createdBy;
|
|
447
|
+
await doc.save();
|
|
448
|
+
}
|
|
449
|
+
}
|
|
450
|
+
// =========================================================================
|
|
451
|
+
// Private: ref cleanup on force-delete
|
|
452
|
+
// =========================================================================
|
|
453
|
+
async clearProfileRefsOnRoutes(routeIds) {
|
|
454
|
+
for (const routeId of routeIds) {
|
|
455
|
+
const doc = await StoredRouteDoc.findById(routeId);
|
|
456
|
+
if (doc?.metadata) {
|
|
457
|
+
doc.metadata = {
|
|
458
|
+
...doc.metadata,
|
|
459
|
+
securityProfileRef: undefined,
|
|
460
|
+
securityProfileName: undefined,
|
|
461
|
+
};
|
|
462
|
+
doc.updatedAt = Date.now();
|
|
463
|
+
await doc.save();
|
|
464
|
+
}
|
|
465
|
+
}
|
|
466
|
+
}
|
|
467
|
+
async clearTargetRefsOnRoutes(routeIds) {
|
|
468
|
+
for (const routeId of routeIds) {
|
|
469
|
+
const doc = await StoredRouteDoc.findById(routeId);
|
|
470
|
+
if (doc?.metadata) {
|
|
471
|
+
doc.metadata = {
|
|
472
|
+
...doc.metadata,
|
|
473
|
+
networkTargetRef: undefined,
|
|
474
|
+
networkTargetName: undefined,
|
|
475
|
+
};
|
|
476
|
+
doc.updatedAt = Date.now();
|
|
477
|
+
await doc.save();
|
|
478
|
+
}
|
|
479
|
+
}
|
|
480
|
+
}
|
|
481
|
+
}
|
|
482
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.reference-resolver.js","sourceRoot":"","sources":["../../../ts/config/classes.reference-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,19 @@
|
|
|
1
1
|
import * as plugins from '../plugins.js';
|
|
2
|
-
import type { IMergedRoute, IRouteWarning } from '../../dist_ts_interfaces/data/route-management.js';
|
|
2
|
+
import type { IStoredRoute, IMergedRoute, IRouteWarning, IRouteMetadata } from '../../dist_ts_interfaces/data/route-management.js';
|
|
3
3
|
import { type IHttp3Config } from '../http3/index.js';
|
|
4
|
+
import type { ReferenceResolver } from './classes.reference-resolver.js';
|
|
4
5
|
export declare class RouteConfigManager {
|
|
5
6
|
private getHardcodedRoutes;
|
|
6
7
|
private getSmartProxy;
|
|
7
8
|
private getHttp3Config?;
|
|
8
9
|
private getVpnAllowList?;
|
|
10
|
+
private referenceResolver?;
|
|
9
11
|
private storedRoutes;
|
|
10
12
|
private overrides;
|
|
11
13
|
private warnings;
|
|
12
|
-
constructor(getHardcodedRoutes: () => plugins.smartproxy.IRouteConfig[], getSmartProxy: () => plugins.smartproxy.SmartProxy | undefined, getHttp3Config?: (() => IHttp3Config | undefined) | undefined, getVpnAllowList?: ((tags?: string[]) => string[]) | undefined);
|
|
14
|
+
constructor(getHardcodedRoutes: () => plugins.smartproxy.IRouteConfig[], getSmartProxy: () => plugins.smartproxy.SmartProxy | undefined, getHttp3Config?: (() => IHttp3Config | undefined) | undefined, getVpnAllowList?: ((tags?: string[]) => string[]) | undefined, referenceResolver?: ReferenceResolver | undefined);
|
|
15
|
+
/** Expose stored routes map for reference resolution lookups. */
|
|
16
|
+
getStoredRoutes(): Map<string, IStoredRoute>;
|
|
13
17
|
/**
|
|
14
18
|
* Load persisted routes and overrides, compute warnings, apply to SmartProxy.
|
|
15
19
|
*/
|
|
@@ -18,10 +22,11 @@ export declare class RouteConfigManager {
|
|
|
18
22
|
routes: IMergedRoute[];
|
|
19
23
|
warnings: IRouteWarning[];
|
|
20
24
|
};
|
|
21
|
-
createRoute(route: plugins.smartproxy.IRouteConfig, createdBy: string, enabled?: boolean): Promise<string>;
|
|
25
|
+
createRoute(route: plugins.smartproxy.IRouteConfig, createdBy: string, enabled?: boolean, metadata?: IRouteMetadata): Promise<string>;
|
|
22
26
|
updateRoute(id: string, patch: {
|
|
23
27
|
route?: Partial<plugins.smartproxy.IRouteConfig>;
|
|
24
28
|
enabled?: boolean;
|
|
29
|
+
metadata?: Partial<IRouteMetadata>;
|
|
25
30
|
}): Promise<boolean>;
|
|
26
31
|
deleteRoute(id: string): Promise<boolean>;
|
|
27
32
|
toggleRoute(id: string, enabled: boolean): Promise<boolean>;
|
|
@@ -32,5 +37,10 @@ export declare class RouteConfigManager {
|
|
|
32
37
|
private persistRoute;
|
|
33
38
|
private computeWarnings;
|
|
34
39
|
private logWarnings;
|
|
40
|
+
/**
|
|
41
|
+
* Re-resolve specific routes by ID (after a profile or target is updated).
|
|
42
|
+
* Persists each route and calls applyRoutes() once at the end.
|
|
43
|
+
*/
|
|
44
|
+
reResolveRoutes(routeIds: string[]): Promise<void>;
|
|
35
45
|
applyRoutes(): Promise<void>;
|
|
36
46
|
}
|