@serve.zone/dcrouter 13.41.1 → 13.42.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/deno.json +3 -3
- package/dist_serve/bundle.js +1025 -983
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/config/classes.db-seeder.js +29 -2
- package/dist_ts/config/classes.reference-resolver.d.ts +5 -0
- package/dist_ts/config/classes.reference-resolver.js +79 -15
- package/dist_ts/config/classes.route-config-manager.d.ts +5 -1
- package/dist_ts/config/classes.route-config-manager.js +136 -6
- package/dist_ts/config/classes.source-policy-compiler.d.ts +35 -0
- package/dist_ts/config/classes.source-policy-compiler.js +497 -0
- package/dist_ts/config/index.d.ts +1 -0
- package/dist_ts/config/index.js +2 -1
- package/dist_ts_interfaces/data/route-management.d.ts +39 -0
- package/dist_ts_interfaces/data/route-management.js +65 -1
- package/dist_ts_migrations/index.js +67 -1
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/dist_ts_web/elements/network/ops-view-routes.d.ts +2 -0
- package/dist_ts_web/elements/network/ops-view-routes.js +237 -11
- package/dist_ts_web/elements/network/ops-view-sourceprofiles.js +42 -5
- package/package.json +4 -4
- package/readme.md +74 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/config/classes.db-seeder.ts +28 -1
- package/ts/config/classes.reference-resolver.ts +94 -14
- package/ts/config/classes.route-config-manager.ts +162 -5
- package/ts/config/classes.source-policy-compiler.ts +614 -0
- package/ts/config/index.ts +1 -0
- package/ts/readme.md +1 -1
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/elements/network/ops-view-routes.ts +257 -10
- package/ts_web/elements/network/ops-view-sourceprofiles.ts +41 -4
|
@@ -37,6 +37,31 @@ import * as appstate from '../../appstate.js';
|
|
|
37
37
|
import * as interfaces from '../../../dist_ts_interfaces/index.js';
|
|
38
38
|
import { viewHostCss } from '../shared/css.js';
|
|
39
39
|
import {} from '@design.estate/dees-catalog';
|
|
40
|
+
function parseOptionalPositiveInteger(value) {
|
|
41
|
+
const parsed = typeof value === 'number'
|
|
42
|
+
? value
|
|
43
|
+
: typeof value === 'string'
|
|
44
|
+
? parseInt(value.trim(), 10)
|
|
45
|
+
: Number.NaN;
|
|
46
|
+
return Number.isInteger(parsed) && parsed > 0 ? parsed : undefined;
|
|
47
|
+
}
|
|
48
|
+
function buildRateLimitFromFormData(data) {
|
|
49
|
+
if (!Boolean(data.rateLimitEnabled)) {
|
|
50
|
+
return undefined;
|
|
51
|
+
}
|
|
52
|
+
const maxRequests = parseOptionalPositiveInteger(data.rateLimitMaxRequests);
|
|
53
|
+
const window = parseOptionalPositiveInteger(data.rateLimitWindow);
|
|
54
|
+
if (!maxRequests || !window) {
|
|
55
|
+
alert('Rate limit requires positive Max Requests and Window values.');
|
|
56
|
+
return null;
|
|
57
|
+
}
|
|
58
|
+
return {
|
|
59
|
+
enabled: true,
|
|
60
|
+
maxRequests,
|
|
61
|
+
window,
|
|
62
|
+
keyBy: 'ip',
|
|
63
|
+
};
|
|
64
|
+
}
|
|
40
65
|
let OpsViewSourceProfiles = (() => {
|
|
41
66
|
let _classDecorators = [customElement('ops-view-sourceprofiles')];
|
|
42
67
|
let _classDescriptor;
|
|
@@ -169,6 +194,9 @@ let OpsViewSourceProfiles = (() => {
|
|
|
169
194
|
<dees-input-list .key=${'ipAllowList'} .label=${'IP Allow List'} .placeholder=${'Add IP or CIDR...'}></dees-input-list>
|
|
170
195
|
<dees-input-list .key=${'ipBlockList'} .label=${'IP Block List'} .placeholder=${'Add IP or CIDR...'}></dees-input-list>
|
|
171
196
|
<dees-input-text .key=${'maxConnections'} .label=${'Max Connections'}></dees-input-text>
|
|
197
|
+
<dees-input-checkbox .key=${'rateLimitEnabled'} .label=${'Enable Rate Limit'} .description=${'Per source IP. Exceeded requests receive 429.'} .value=${false}></dees-input-checkbox>
|
|
198
|
+
<dees-input-text .key=${'rateLimitMaxRequests'} .label=${'Max Requests'} .description=${'Requests per source IP'}></dees-input-text>
|
|
199
|
+
<dees-input-text .key=${'rateLimitWindow'} .label=${'Window Seconds'}></dees-input-text>
|
|
172
200
|
</dees-form>
|
|
173
201
|
`,
|
|
174
202
|
menuOptions: [
|
|
@@ -182,8 +210,10 @@ let OpsViewSourceProfiles = (() => {
|
|
|
182
210
|
const data = await form.collectFormData();
|
|
183
211
|
const ipAllowList = Array.isArray(data.ipAllowList) ? data.ipAllowList : [];
|
|
184
212
|
const ipBlockList = Array.isArray(data.ipBlockList) ? data.ipBlockList : [];
|
|
185
|
-
const
|
|
186
|
-
const
|
|
213
|
+
const maxConnections = parseOptionalPositiveInteger(data.maxConnections);
|
|
214
|
+
const rateLimit = buildRateLimitFromFormData(data);
|
|
215
|
+
if (rateLimit === null)
|
|
216
|
+
return;
|
|
187
217
|
await appstate.profilesTargetsStatePart.dispatchAction(appstate.createProfileAction, {
|
|
188
218
|
name: String(data.name),
|
|
189
219
|
description: data.description ? String(data.description) : undefined,
|
|
@@ -191,6 +221,7 @@ let OpsViewSourceProfiles = (() => {
|
|
|
191
221
|
...(ipAllowList.length > 0 ? { ipAllowList } : {}),
|
|
192
222
|
...(ipBlockList.length > 0 ? { ipBlockList } : {}),
|
|
193
223
|
...(maxConnections ? { maxConnections } : {}),
|
|
224
|
+
...(rateLimit ? { rateLimit } : {}),
|
|
194
225
|
},
|
|
195
226
|
});
|
|
196
227
|
modalArg.destroy();
|
|
@@ -210,6 +241,9 @@ let OpsViewSourceProfiles = (() => {
|
|
|
210
241
|
<dees-input-list .key=${'ipAllowList'} .label=${'IP Allow List'} .placeholder=${'Add IP or CIDR...'} .value=${profile.security?.ipAllowList || []}></dees-input-list>
|
|
211
242
|
<dees-input-list .key=${'ipBlockList'} .label=${'IP Block List'} .placeholder=${'Add IP or CIDR...'} .value=${profile.security?.ipBlockList || []}></dees-input-list>
|
|
212
243
|
<dees-input-text .key=${'maxConnections'} .label=${'Max Connections'} .value=${String(profile.security?.maxConnections || '')}></dees-input-text>
|
|
244
|
+
<dees-input-checkbox .key=${'rateLimitEnabled'} .label=${'Enable Rate Limit'} .description=${'Per source IP. Exceeded requests receive 429.'} .value=${profile.security?.rateLimit?.enabled === true}></dees-input-checkbox>
|
|
245
|
+
<dees-input-text .key=${'rateLimitMaxRequests'} .label=${'Max Requests'} .description=${'Requests per source IP'} .value=${String(profile.security?.rateLimit?.maxRequests || '')}></dees-input-text>
|
|
246
|
+
<dees-input-text .key=${'rateLimitWindow'} .label=${'Window Seconds'} .value=${String(profile.security?.rateLimit?.window || '')}></dees-input-text>
|
|
213
247
|
</dees-form>
|
|
214
248
|
`,
|
|
215
249
|
menuOptions: [
|
|
@@ -223,8 +257,10 @@ let OpsViewSourceProfiles = (() => {
|
|
|
223
257
|
const data = await form.collectFormData();
|
|
224
258
|
const ipAllowList = Array.isArray(data.ipAllowList) ? data.ipAllowList : [];
|
|
225
259
|
const ipBlockList = Array.isArray(data.ipBlockList) ? data.ipBlockList : [];
|
|
226
|
-
const
|
|
227
|
-
const
|
|
260
|
+
const maxConnections = parseOptionalPositiveInteger(data.maxConnections);
|
|
261
|
+
const rateLimit = buildRateLimitFromFormData(data);
|
|
262
|
+
if (rateLimit === null)
|
|
263
|
+
return;
|
|
228
264
|
await appstate.profilesTargetsStatePart.dispatchAction(appstate.updateProfileAction, {
|
|
229
265
|
id: profile.id,
|
|
230
266
|
name: String(data.name),
|
|
@@ -233,6 +269,7 @@ let OpsViewSourceProfiles = (() => {
|
|
|
233
269
|
ipAllowList,
|
|
234
270
|
ipBlockList,
|
|
235
271
|
...(maxConnections ? { maxConnections } : {}),
|
|
272
|
+
...(rateLimit ? { rateLimit } : {}),
|
|
236
273
|
},
|
|
237
274
|
});
|
|
238
275
|
modalArg.destroy();
|
|
@@ -275,4 +312,4 @@ let OpsViewSourceProfiles = (() => {
|
|
|
275
312
|
return OpsViewSourceProfiles = _classThis;
|
|
276
313
|
})();
|
|
277
314
|
export { OpsViewSourceProfiles };
|
|
278
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-sourceprofiles.js","sourceRoot":"","sources":["../../../../ts_web/elements/network/ops-view-sourceprofiles.ts"],"names":[],"mappings":"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"}
|
|
315
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-sourceprofiles.js","sourceRoot":"","sources":["../../../../ts_web/elements/network/ops-view-sourceprofiles.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.42.0",
|
|
5
5
|
"description": "A multifaceted routing service handling mail and SMS delivery functions.",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"bin": {
|
|
@@ -17,8 +17,8 @@
|
|
|
17
17
|
"devDependencies": {
|
|
18
18
|
"@git.zone/tsbuild": "^4.4.2",
|
|
19
19
|
"@git.zone/tsbundle": "^2.10.4",
|
|
20
|
-
"@git.zone/tsdocker": "^2.4.0",
|
|
21
20
|
"@git.zone/tsdeno": "^1.5.0",
|
|
21
|
+
"@git.zone/tsdocker": "^2.4.0",
|
|
22
22
|
"@git.zone/tsrun": "^2.0.4",
|
|
23
23
|
"@git.zone/tstest": "^3.6.6",
|
|
24
24
|
"@git.zone/tswatch": "^3.3.5",
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
"@push.rocks/smartnetwork": "^4.7.2",
|
|
51
51
|
"@push.rocks/smartpath": "^6.0.0",
|
|
52
52
|
"@push.rocks/smartpromise": "^4.2.4",
|
|
53
|
-
"@push.rocks/smartproxy": "^27.12.
|
|
53
|
+
"@push.rocks/smartproxy": "^27.12.4",
|
|
54
54
|
"@push.rocks/smartradius": "^1.3.0",
|
|
55
55
|
"@push.rocks/smartrequest": "^5.0.3",
|
|
56
56
|
"@push.rocks/smartrx": "^3.0.10",
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
"@push.rocks/taskbuffer": "^8.0.2",
|
|
61
61
|
"@serve.zone/catalog": "^2.12.4",
|
|
62
62
|
"@serve.zone/interfaces": "^5.8.0",
|
|
63
|
-
"@serve.zone/remoteingress": "^4.22.
|
|
63
|
+
"@serve.zone/remoteingress": "^4.22.4",
|
|
64
64
|
"@tsclass/tsclass": "^9.5.1",
|
|
65
65
|
"@types/qrcode": "^1.5.6",
|
|
66
66
|
"lru-cache": "^11.4.0",
|
package/readme.md
CHANGED
|
@@ -146,6 +146,80 @@ dcrouter keeps generated and operator-created routes separate so automation can
|
|
|
146
146
|
|
|
147
147
|
System routes are persisted with stable `systemKey` values. API-created routes are the editable route layer intended for operators and automation.
|
|
148
148
|
|
|
149
|
+
## Route Source Policies
|
|
150
|
+
|
|
151
|
+
API-created route records pass `metadata.sourcePolicy` alongside the SmartProxy route config to express ordered source and path policy variants without duplicating whole routes by hand. A source policy contains ordered `bindings`, each pointing at a source profile id through `sourceProfileRef`. Dashboard presets resolve seeded profile names to ids before saving.
|
|
152
|
+
|
|
153
|
+
Runtime behavior:
|
|
154
|
+
|
|
155
|
+
- Source matching uses the referenced `SourceProfile.security.ipAllowList`.
|
|
156
|
+
- Bindings are evaluated in order and the first matching source profile wins.
|
|
157
|
+
- A matched binding that exceeds its configured rate or connection limit is terminal and returns `429`; dcrouter does not fall through to later bindings.
|
|
158
|
+
- Source-policy rate limits are always keyed by source IP; dcrouter ignores `path` and `header` keying on source-policy binding and path-policy overrides.
|
|
159
|
+
- A public fallback binding must be last and must use `*`, or both `0.0.0.0/0` and `::/0`, in `security.ipAllowList`.
|
|
160
|
+
- Create/update paths reject source policies with missing source profiles, source profiles without source matches, missing final all-source fallback, or any all-source binding that shadows later bindings; persisted invalid policies fail closed at compile time.
|
|
161
|
+
- Server-side caps bound policy expansion to 16 source bindings, 12 path policies per binding, 64 path patterns per path policy, 256 characters and 8 wildcards per custom path pattern, and 512 compiled SmartProxy route-port variants per stored route.
|
|
162
|
+
|
|
163
|
+
Path policies let a source binding override rate limits or connection limits for specific path classes. dcrouter currently ships Gitea-oriented classes: `git-smart-http`, `static`, `normal-html`, `expensive-html`, `raw`, and `archive`. Path-specific variants win over the same binding's fallback; if every path policy is path-specific, dcrouter adds a source-level fallback route for unmatched paths so normal browsing cannot fall through to a later source binding. The Gitea preset keeps `git-smart-http` high-limit and separate from HTML crawling paths so normal `git clone`, `git fetch`, `git push`, and Git LFS traffic are not subject to the lower HTML crawler limits.
|
|
164
|
+
|
|
165
|
+
```typescript
|
|
166
|
+
const trustedProfileId = 'source-profile-id-trusted';
|
|
167
|
+
const publicProfileId = 'source-profile-id-public';
|
|
168
|
+
|
|
169
|
+
const createRoutePayload = {
|
|
170
|
+
route: {
|
|
171
|
+
name: 'public-gitea',
|
|
172
|
+
match: { domains: ['code.example.com'], ports: [443] },
|
|
173
|
+
action: {
|
|
174
|
+
type: 'forward',
|
|
175
|
+
targets: [{ host: '10.10.0.20', port: 3000 }],
|
|
176
|
+
tls: { mode: 'terminate', certificate: 'auto' },
|
|
177
|
+
},
|
|
178
|
+
},
|
|
179
|
+
metadata: {
|
|
180
|
+
sourcePolicy: {
|
|
181
|
+
bindings: [
|
|
182
|
+
{
|
|
183
|
+
sourceProfileRef: trustedProfileId,
|
|
184
|
+
maxConnections: 5000,
|
|
185
|
+
onExceeded: { type: '429' },
|
|
186
|
+
},
|
|
187
|
+
{
|
|
188
|
+
sourceProfileRef: publicProfileId,
|
|
189
|
+
onExceeded: { type: '429' },
|
|
190
|
+
pathPolicies: [
|
|
191
|
+
{
|
|
192
|
+
pathClass: 'git-smart-http',
|
|
193
|
+
rateLimit: { enabled: true, maxRequests: 1200, window: 60, keyBy: 'ip' },
|
|
194
|
+
},
|
|
195
|
+
{
|
|
196
|
+
pathClass: 'static',
|
|
197
|
+
rateLimit: { enabled: true, maxRequests: 600, window: 60, keyBy: 'ip' },
|
|
198
|
+
},
|
|
199
|
+
{
|
|
200
|
+
pathClass: 'raw',
|
|
201
|
+
rateLimit: { enabled: true, maxRequests: 120, window: 60, keyBy: 'ip' },
|
|
202
|
+
},
|
|
203
|
+
{
|
|
204
|
+
pathClass: 'archive',
|
|
205
|
+
rateLimit: { enabled: true, maxRequests: 30, window: 60, keyBy: 'ip' },
|
|
206
|
+
},
|
|
207
|
+
{
|
|
208
|
+
pathClass: 'expensive-html',
|
|
209
|
+
rateLimit: { enabled: true, maxRequests: 30, window: 60, keyBy: 'ip' },
|
|
210
|
+
},
|
|
211
|
+
{
|
|
212
|
+
pathClass: 'normal-html',
|
|
213
|
+
rateLimit: { enabled: true, maxRequests: 120, window: 60, keyBy: 'ip' },
|
|
214
|
+
},
|
|
215
|
+
],
|
|
216
|
+
},
|
|
217
|
+
],
|
|
218
|
+
},
|
|
219
|
+
},
|
|
220
|
+
};
|
|
221
|
+
```
|
|
222
|
+
|
|
149
223
|
## Production-Flavored Example
|
|
150
224
|
|
|
151
225
|
```typescript
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -68,11 +68,38 @@ export class DbSeeder {
|
|
|
68
68
|
}
|
|
69
69
|
|
|
70
70
|
const DEFAULT_PROFILES: Array<NonNullable<ISeedData['profiles']>[number]> = [
|
|
71
|
+
{
|
|
72
|
+
name: 'TRUSTED NETWORKS',
|
|
73
|
+
description: 'Trusted office, VPN, localhost, and private-network sources with high connection allowance',
|
|
74
|
+
security: {
|
|
75
|
+
ipAllowList: ['10.0.0.0/8', '172.16.0.0/12', '192.168.0.0/16', '127.0.0.1', '::1'],
|
|
76
|
+
maxConnections: 5000,
|
|
77
|
+
},
|
|
78
|
+
},
|
|
79
|
+
{
|
|
80
|
+
name: 'AI CRAWLERS',
|
|
81
|
+
description: 'Add verified crawler CIDRs before assigning this profile in a source policy',
|
|
82
|
+
security: {
|
|
83
|
+
ipAllowList: [],
|
|
84
|
+
rateLimit: {
|
|
85
|
+
enabled: true,
|
|
86
|
+
maxRequests: 30,
|
|
87
|
+
window: 60,
|
|
88
|
+
keyBy: 'ip',
|
|
89
|
+
},
|
|
90
|
+
},
|
|
91
|
+
},
|
|
71
92
|
{
|
|
72
93
|
name: 'PUBLIC',
|
|
73
|
-
description: '
|
|
94
|
+
description: 'Public fallback source profile with per-IP request limiting',
|
|
74
95
|
security: {
|
|
75
96
|
ipAllowList: ['*'],
|
|
97
|
+
rateLimit: {
|
|
98
|
+
enabled: true,
|
|
99
|
+
maxRequests: 120,
|
|
100
|
+
window: 60,
|
|
101
|
+
keyBy: 'ip',
|
|
102
|
+
},
|
|
76
103
|
},
|
|
77
104
|
},
|
|
78
105
|
{
|
|
@@ -7,6 +7,7 @@ import type {
|
|
|
7
7
|
IRouteMetadata,
|
|
8
8
|
IRoute,
|
|
9
9
|
IRouteSecurity,
|
|
10
|
+
IRouteSourcePolicy,
|
|
10
11
|
} from '../../ts_interfaces/data/route-management.js';
|
|
11
12
|
|
|
12
13
|
const MAX_INHERITANCE_DEPTH = 5;
|
|
@@ -107,7 +108,7 @@ export class ReferenceResolver {
|
|
|
107
108
|
|
|
108
109
|
// If force-deleting with referencing routes, clear refs but keep resolved values
|
|
109
110
|
if (affectedIds.length > 0) {
|
|
110
|
-
await this.clearProfileRefsOnRoutes(affectedIds);
|
|
111
|
+
await this.clearProfileRefsOnRoutes(id, affectedIds, storedRoutes);
|
|
111
112
|
logger.log('warn', `Force-deleted profile '${profile.name}'; cleared refs on ${affectedIds.length} route(s)`);
|
|
112
113
|
} else {
|
|
113
114
|
logger.log('info', `Deleted source profile '${profile.name}' (${id})`);
|
|
@@ -131,15 +132,22 @@ export class ReferenceResolver {
|
|
|
131
132
|
return [...this.profiles.values()];
|
|
132
133
|
}
|
|
133
134
|
|
|
135
|
+
public resolveSourceProfileSecurity(profileId: string): IRouteSecurity | null {
|
|
136
|
+
const resolvedSecurity = this.resolveSourceProfile(profileId);
|
|
137
|
+
return resolvedSecurity ? this.cloneSecurityFields(resolvedSecurity) : null;
|
|
138
|
+
}
|
|
139
|
+
|
|
134
140
|
public getProfileUsage(storedRoutes: Map<string, IRoute>): Map<string, Array<{ id: string; routeName: string }>> {
|
|
135
141
|
const usage = new Map<string, Array<{ id: string; routeName: string }>>();
|
|
136
142
|
for (const profile of this.profiles.values()) {
|
|
137
143
|
usage.set(profile.id, []);
|
|
138
144
|
}
|
|
139
145
|
for (const [routeId, stored] of storedRoutes) {
|
|
140
|
-
const
|
|
141
|
-
|
|
142
|
-
usage.
|
|
146
|
+
const refs = this.getSourceProfileRefsFromMetadata(stored.metadata);
|
|
147
|
+
for (const ref of refs) {
|
|
148
|
+
if (usage.has(ref)) {
|
|
149
|
+
usage.get(ref)!.push({ id: routeId, routeName: stored.route.name || routeId });
|
|
150
|
+
}
|
|
143
151
|
}
|
|
144
152
|
}
|
|
145
153
|
return usage;
|
|
@@ -151,7 +159,7 @@ export class ReferenceResolver {
|
|
|
151
159
|
): Array<{ id: string; routeName: string }> {
|
|
152
160
|
const routes: Array<{ id: string; routeName: string }> = [];
|
|
153
161
|
for (const [routeId, stored] of storedRoutes) {
|
|
154
|
-
if (stored.metadata
|
|
162
|
+
if (this.metadataUsesSourceProfile(stored.metadata, profileId)) {
|
|
155
163
|
routes.push({ id: routeId, routeName: stored.route.name || routeId });
|
|
156
164
|
}
|
|
157
165
|
}
|
|
@@ -290,7 +298,15 @@ export class ReferenceResolver {
|
|
|
290
298
|
): { route: plugins.smartproxy.IRouteConfig; metadata: IRouteMetadata } {
|
|
291
299
|
const resolvedMetadata: IRouteMetadata = { ...metadata };
|
|
292
300
|
|
|
293
|
-
if (resolvedMetadata.
|
|
301
|
+
if (resolvedMetadata.sourcePolicy?.bindings.length) {
|
|
302
|
+
const resolvedSourcePolicy = this.resolveRouteSourcePolicy(resolvedMetadata.sourcePolicy);
|
|
303
|
+
if (resolvedSourcePolicy) {
|
|
304
|
+
resolvedMetadata.sourcePolicy = resolvedSourcePolicy;
|
|
305
|
+
resolvedMetadata.sourceProfileRef = undefined;
|
|
306
|
+
resolvedMetadata.sourceProfileName = undefined;
|
|
307
|
+
resolvedMetadata.lastResolvedAt = Date.now();
|
|
308
|
+
}
|
|
309
|
+
} else if (resolvedMetadata.sourceProfileRef) {
|
|
294
310
|
const resolvedSecurity = this.resolveSourceProfile(resolvedMetadata.sourceProfileRef);
|
|
295
311
|
if (resolvedSecurity) {
|
|
296
312
|
const profile = this.profiles.get(resolvedMetadata.sourceProfileRef);
|
|
@@ -336,7 +352,7 @@ export class ReferenceResolver {
|
|
|
336
352
|
public async findRoutesByProfileRef(profileId: string): Promise<string[]> {
|
|
337
353
|
const docs = await RouteDoc.findAll();
|
|
338
354
|
return docs
|
|
339
|
-
.filter((doc) => doc.metadata
|
|
355
|
+
.filter((doc) => this.metadataUsesSourceProfile(doc.metadata, profileId))
|
|
340
356
|
.map((doc) => doc.id);
|
|
341
357
|
}
|
|
342
358
|
|
|
@@ -350,7 +366,7 @@ export class ReferenceResolver {
|
|
|
350
366
|
public findRoutesByProfileRefSync(profileId: string, storedRoutes: Map<string, IRoute>): string[] {
|
|
351
367
|
const ids: string[] = [];
|
|
352
368
|
for (const [routeId, stored] of storedRoutes) {
|
|
353
|
-
if (stored.metadata
|
|
369
|
+
if (this.metadataUsesSourceProfile(stored.metadata, profileId)) {
|
|
354
370
|
ids.push(routeId);
|
|
355
371
|
}
|
|
356
372
|
}
|
|
@@ -371,6 +387,41 @@ export class ReferenceResolver {
|
|
|
371
387
|
// Private: source profile resolution with inheritance
|
|
372
388
|
// =========================================================================
|
|
373
389
|
|
|
390
|
+
private resolveRouteSourcePolicy(sourcePolicy: IRouteSourcePolicy): IRouteSourcePolicy | undefined {
|
|
391
|
+
const bindings = sourcePolicy.bindings
|
|
392
|
+
.map((binding) => {
|
|
393
|
+
const profile = this.profiles.get(binding.sourceProfileRef);
|
|
394
|
+
if (!profile) {
|
|
395
|
+
logger.log('warn', `Source profile '${binding.sourceProfileRef}' not found during source policy resolution`);
|
|
396
|
+
return binding;
|
|
397
|
+
}
|
|
398
|
+
return {
|
|
399
|
+
...binding,
|
|
400
|
+
sourceProfileName: profile.name,
|
|
401
|
+
};
|
|
402
|
+
})
|
|
403
|
+
.filter((binding) => binding.sourceProfileRef);
|
|
404
|
+
|
|
405
|
+
return bindings.length > 0 ? { bindings } : undefined;
|
|
406
|
+
}
|
|
407
|
+
|
|
408
|
+
private metadataUsesSourceProfile(metadata: IRouteMetadata | undefined, profileId: string): boolean {
|
|
409
|
+
return this.getSourceProfileRefsFromMetadata(metadata).includes(profileId);
|
|
410
|
+
}
|
|
411
|
+
|
|
412
|
+
private getSourceProfileRefsFromMetadata(metadata: IRouteMetadata | undefined): string[] {
|
|
413
|
+
const refs = new Set<string>();
|
|
414
|
+
if (metadata?.sourceProfileRef) {
|
|
415
|
+
refs.add(metadata.sourceProfileRef);
|
|
416
|
+
}
|
|
417
|
+
for (const binding of metadata?.sourcePolicy?.bindings || []) {
|
|
418
|
+
if (binding.sourceProfileRef) {
|
|
419
|
+
refs.add(binding.sourceProfileRef);
|
|
420
|
+
}
|
|
421
|
+
}
|
|
422
|
+
return [...refs];
|
|
423
|
+
}
|
|
424
|
+
|
|
374
425
|
private resolveSourceProfile(
|
|
375
426
|
profileId: string,
|
|
376
427
|
visited: Set<string> = new Set(),
|
|
@@ -550,21 +601,50 @@ export class ReferenceResolver {
|
|
|
550
601
|
// Private: ref cleanup on force-delete
|
|
551
602
|
// =========================================================================
|
|
552
603
|
|
|
553
|
-
private async clearProfileRefsOnRoutes(
|
|
604
|
+
private async clearProfileRefsOnRoutes(
|
|
605
|
+
profileId: string,
|
|
606
|
+
routeIds: string[],
|
|
607
|
+
storedRoutes?: Map<string, IRoute>,
|
|
608
|
+
): Promise<void> {
|
|
554
609
|
for (const routeId of routeIds) {
|
|
555
610
|
const doc = await RouteDoc.findById(routeId);
|
|
556
611
|
if (doc?.metadata) {
|
|
557
|
-
doc.metadata =
|
|
558
|
-
...doc.metadata,
|
|
559
|
-
sourceProfileRef: undefined,
|
|
560
|
-
sourceProfileName: undefined,
|
|
561
|
-
};
|
|
612
|
+
doc.metadata = this.clearSourceProfileFromMetadata(doc.metadata, profileId);
|
|
562
613
|
doc.updatedAt = Date.now();
|
|
563
614
|
await doc.save();
|
|
564
615
|
}
|
|
616
|
+
|
|
617
|
+
const storedRoute = storedRoutes?.get(routeId);
|
|
618
|
+
if (storedRoute?.metadata) {
|
|
619
|
+
storedRoute.metadata = this.clearSourceProfileFromMetadata(storedRoute.metadata, profileId);
|
|
620
|
+
storedRoute.updatedAt = Date.now();
|
|
621
|
+
}
|
|
565
622
|
}
|
|
566
623
|
}
|
|
567
624
|
|
|
625
|
+
private clearSourceProfileFromMetadata(metadata: IRouteMetadata, profileId: string): IRouteMetadata {
|
|
626
|
+
const sourcePolicy = metadata.sourcePolicy?.bindings?.length
|
|
627
|
+
? {
|
|
628
|
+
bindings: metadata.sourcePolicy.bindings.filter(
|
|
629
|
+
(binding) => binding.sourceProfileRef !== profileId,
|
|
630
|
+
),
|
|
631
|
+
}
|
|
632
|
+
: undefined;
|
|
633
|
+
|
|
634
|
+
const nextMetadata: IRouteMetadata = {
|
|
635
|
+
...metadata,
|
|
636
|
+
sourceProfileRef: metadata.sourceProfileRef === profileId ? undefined : metadata.sourceProfileRef,
|
|
637
|
+
sourceProfileName: metadata.sourceProfileRef === profileId ? undefined : metadata.sourceProfileName,
|
|
638
|
+
sourcePolicy: sourcePolicy?.bindings.length ? sourcePolicy : undefined,
|
|
639
|
+
};
|
|
640
|
+
|
|
641
|
+
if (!nextMetadata.sourceProfileRef && !nextMetadata.sourcePolicy && !nextMetadata.networkTargetRef) {
|
|
642
|
+
nextMetadata.lastResolvedAt = undefined;
|
|
643
|
+
}
|
|
644
|
+
|
|
645
|
+
return nextMetadata;
|
|
646
|
+
}
|
|
647
|
+
|
|
568
648
|
private async clearTargetRefsOnRoutes(routeIds: string[]): Promise<void> {
|
|
569
649
|
for (const routeId of routeIds) {
|
|
570
650
|
const doc = await RouteDoc.findById(routeId);
|