@serve.zone/dcrouter 13.17.2 → 13.17.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.
@@ -55,7 +55,7 @@ function setupFormVisibility(formEl) {
55
55
  const vlanIdGroup = contentEl.querySelector('.vlanIdGroup');
56
56
  const aclGroup = contentEl.querySelector('.aclGroup');
57
57
  if (hostIpGroup)
58
- hostIpGroup.style.display = show; // always show (forceTarget is always on)
58
+ hostIpGroup.style.display = show;
59
59
  if (hostIpDetails)
60
60
  hostIpDetails.style.display = data.useHostIp ? show : 'none';
61
61
  if (staticIpGroup)
@@ -426,7 +426,7 @@ let OpsViewVpn = (() => {
426
426
  const data = await form.collectFormData();
427
427
  if (!data.clientId)
428
428
  return;
429
- const targetProfileIds = this.resolveProfileNamesToIds(Array.isArray(data.targetProfileNames) ? data.targetProfileNames : []);
429
+ const targetProfileIds = this.resolveProfileLabelsToIds(Array.isArray(data.targetProfileNames) ? data.targetProfileNames : []);
430
430
  // Apply conditional logic based on checkbox states
431
431
  const useHostIp = data.useHostIp ?? false;
432
432
  const useDhcp = useHostIp && (data.useDhcp ?? false);
@@ -444,10 +444,10 @@ let OpsViewVpn = (() => {
444
444
  clientId: data.clientId,
445
445
  description: data.description || undefined,
446
446
  targetProfileIds,
447
- useHostIp: useHostIp || undefined,
448
- useDhcp: useDhcp || undefined,
447
+ useHostIp,
448
+ useDhcp,
449
449
  staticIp,
450
- forceVlan: forceVlan || undefined,
450
+ forceVlan,
451
451
  vlanId,
452
452
  destinationAllowList,
453
453
  destinationBlockList,
@@ -513,7 +513,7 @@ let OpsViewVpn = (() => {
513
513
  <div class="infoItem"><span class="infoLabel">Transport</span><span class="infoValue">${conn.transport}</span></div>
514
514
  ` : ''}
515
515
  <div class="infoItem"><span class="infoLabel">Description</span><span class="infoValue">${client.description || '-'}</span></div>
516
- <div class="infoItem"><span class="infoLabel">Target Profiles</span><span class="infoValue">${this.resolveProfileIdsToNames(client.targetProfileIds)?.join(', ') || '-'}</span></div>
516
+ <div class="infoItem"><span class="infoLabel">Target Profiles</span><span class="infoValue">${this.resolveProfileIdsToLabels(client.targetProfileIds)?.join(', ') || '-'}</span></div>
517
517
  <div class="infoItem"><span class="infoLabel">Routing</span><span class="infoValue">${client.useHostIp ? 'Host IP' : 'SmartProxy'}</span></div>
518
518
  ${client.useHostIp ? html `
519
519
  <div class="infoItem"><span class="infoLabel">Host IP</span><span class="infoValue">${client.useDhcp ? 'DHCP' : client.staticIp ? `Static: ${client.staticIp}` : 'Not configured'}</span></div>
@@ -671,7 +671,7 @@ let OpsViewVpn = (() => {
671
671
  const client = actionData.item;
672
672
  const { DeesModal } = await import('@design.estate/dees-catalog');
673
673
  const currentDescription = client.description ?? '';
674
- const currentTargetProfileNames = this.resolveProfileIdsToNames(client.targetProfileIds) || [];
674
+ const currentTargetProfileNames = this.resolveProfileIdsToLabels(client.targetProfileIds) || [];
675
675
  const profileCandidates = this.getTargetProfileCandidates();
676
676
  const currentUseHostIp = client.useHostIp ?? false;
677
677
  const currentUseDhcp = client.useDhcp ?? false;
@@ -718,7 +718,7 @@ let OpsViewVpn = (() => {
718
718
  if (!form)
719
719
  return;
720
720
  const data = await form.collectFormData();
721
- const targetProfileIds = this.resolveProfileNamesToIds(Array.isArray(data.targetProfileNames) ? data.targetProfileNames : []);
721
+ const targetProfileIds = this.resolveProfileLabelsToIds(Array.isArray(data.targetProfileNames) ? data.targetProfileNames : []);
722
722
  // Apply conditional logic based on checkbox states
723
723
  const useHostIp = data.useHostIp ?? false;
724
724
  const useDhcp = useHostIp && (data.useDhcp ?? false);
@@ -736,10 +736,10 @@ let OpsViewVpn = (() => {
736
736
  clientId: client.clientId,
737
737
  description: data.description || undefined,
738
738
  targetProfileIds,
739
- useHostIp: useHostIp || undefined,
740
- useDhcp: useDhcp || undefined,
739
+ useHostIp,
740
+ useDhcp,
741
741
  staticIp,
742
- forceVlan: forceVlan || undefined,
742
+ forceVlan,
743
743
  vlanId,
744
744
  destinationAllowList,
745
745
  destinationBlockList,
@@ -826,41 +826,46 @@ let OpsViewVpn = (() => {
826
826
  `;
827
827
  }
828
828
  /**
829
- * Build autocomplete candidates from loaded target profiles.
830
- * viewKey = profile name (displayed), payload = { id } (carried for resolution).
829
+ * Build stable profile labels for list inputs.
831
830
  */
832
- getTargetProfileCandidates() {
831
+ getTargetProfileChoices() {
833
832
  const profileState = appstate.targetProfilesStatePart.getState();
834
833
  const profiles = profileState?.profiles || [];
835
- return profiles.map((p) => ({ viewKey: p.name, payload: { id: p.id } }));
834
+ const nameCounts = new Map();
835
+ for (const profile of profiles) {
836
+ nameCounts.set(profile.name, (nameCounts.get(profile.name) || 0) + 1);
837
+ }
838
+ return profiles.map((profile) => ({
839
+ id: profile.id,
840
+ label: (nameCounts.get(profile.name) || 0) > 1
841
+ ? `${profile.name} (${profile.id})`
842
+ : profile.name,
843
+ }));
844
+ }
845
+ getTargetProfileCandidates() {
846
+ return this.getTargetProfileChoices().map((profile) => ({ viewKey: profile.label }));
836
847
  }
837
848
  /**
838
- * Convert profile IDs to profile names (for populating edit form values).
849
+ * Convert profile IDs to form labels (for populating edit form values).
839
850
  */
840
- resolveProfileIdsToNames(ids) {
851
+ resolveProfileIdsToLabels(ids) {
841
852
  if (!ids?.length)
842
853
  return undefined;
843
- const profileState = appstate.targetProfilesStatePart.getState();
844
- const profiles = profileState?.profiles || [];
854
+ const choices = this.getTargetProfileChoices();
855
+ const labelsById = new Map(choices.map((profile) => [profile.id, profile.label]));
845
856
  return ids.map((id) => {
846
- const profile = profiles.find((p) => p.id === id);
847
- return profile?.name || id;
857
+ return labelsById.get(id) || id;
848
858
  });
849
859
  }
850
860
  /**
851
- * Convert profile names back to IDs (for saving form data).
852
- * Uses the dees-input-list candidates' payload when available.
861
+ * Convert profile form labels back to IDs.
853
862
  */
854
- resolveProfileNamesToIds(names) {
855
- if (!names.length)
856
- return undefined;
857
- const profileState = appstate.targetProfilesStatePart.getState();
858
- const profiles = profileState?.profiles || [];
859
- return names
860
- .map((name) => {
861
- const profile = profiles.find((p) => p.name === name);
862
- return profile?.id;
863
- })
863
+ resolveProfileLabelsToIds(labels) {
864
+ if (!labels.length)
865
+ return [];
866
+ const labelsToIds = new Map(this.getTargetProfileChoices().map((profile) => [profile.label, profile.id]));
867
+ return labels
868
+ .map((label) => labelsToIds.get(label))
864
869
  .filter((id) => !!id);
865
870
  }
866
871
  static {
@@ -870,4 +875,4 @@ let OpsViewVpn = (() => {
870
875
  return OpsViewVpn = _classThis;
871
876
  })();
872
877
  export { OpsViewVpn };
873
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-vpn.js","sourceRoot":"","sources":["../../../../ts_web/elements/network/ops-view-vpn.ts"],"names":[],"mappings":"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"}
878
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-vpn.js","sourceRoot":"","sources":["../../../../ts_web/elements/network/ops-view-vpn.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.17.2",
4
+ "version": "13.17.5",
5
5
  "description": "A multifaceted routing service handling mail and SMS delivery functions.",
6
6
  "type": "module",
7
7
  "exports": {
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/dcrouter',
6
- version: '13.17.2',
6
+ version: '13.17.5',
7
7
  description: 'A multifaceted routing service handling mail and SMS delivery functions.'
8
8
  }
@@ -547,7 +547,9 @@ export class DcRouter {
547
547
  await this.referenceResolver.initialize();
548
548
 
549
549
  // Initialize target profile manager
550
- this.targetProfileManager = new TargetProfileManager();
550
+ this.targetProfileManager = new TargetProfileManager(
551
+ () => this.routeConfigManager?.getRoutes() || new Map(),
552
+ );
551
553
  await this.targetProfileManager.initialize();
552
554
 
553
555
  this.routeConfigManager = new RouteConfigManager(
@@ -560,7 +562,10 @@ export class DcRouter {
560
562
  return [];
561
563
  }
562
564
  return this.targetProfileManager.getMatchingClientIps(
563
- route, routeId, this.vpnManager.listClients(),
565
+ route,
566
+ routeId,
567
+ this.vpnManager.listClients(),
568
+ this.routeConfigManager?.getRoutes() || new Map(),
564
569
  );
565
570
  }
566
571
  : undefined,
@@ -583,6 +588,7 @@ export class DcRouter {
583
588
  this.seedEmailRoutes as import('../ts_interfaces/data/remoteingress.js').IDcRouterRouteConfig[],
584
589
  this.seedDnsRoutes as import('../ts_interfaces/data/remoteingress.js').IDcRouterRouteConfig[],
585
590
  );
591
+ await this.targetProfileManager.normalizeAllRouteRefs();
586
592
 
587
593
  // Seed default profiles/targets if DB is empty and seeding is enabled
588
594
  const seeder = new DbSeeder(this.referenceResolver);
@@ -2283,8 +2289,11 @@ export class DcRouter {
2283
2289
 
2284
2290
  // Resolve DNS A records for matched domains (with caching)
2285
2291
  for (const domain of domains) {
2286
- const stripped = domain.replace(/^\*\./, '');
2287
- const resolvedIps = await this.resolveVpnDomainIPs(stripped);
2292
+ if (this.isWildcardVpnDomain(domain)) {
2293
+ this.logSkippedWildcardAllowedIp(domain);
2294
+ continue;
2295
+ }
2296
+ const resolvedIps = await this.resolveVpnDomainIPs(domain);
2288
2297
  for (const ip of resolvedIps) {
2289
2298
  ips.add(`${ip}/32`);
2290
2299
  }
@@ -2303,6 +2312,8 @@ export class DcRouter {
2303
2312
 
2304
2313
  /** Cache for DNS-resolved IPs of VPN-gated domains. TTL: 5 minutes. */
2305
2314
  private vpnDomainIpCache = new Map<string, { ips: string[]; expiresAt: number }>();
2315
+ /** Deduplicate wildcard-resolution warnings for WireGuard AllowedIPs generation. */
2316
+ private warnedWildcardVpnDomains = new Set<string>();
2306
2317
 
2307
2318
  /**
2308
2319
  * Resolve a domain's A record(s) for VPN AllowedIPs, with a 5-minute cache.
@@ -2328,6 +2339,19 @@ export class DcRouter {
2328
2339
  }
2329
2340
  }
2330
2341
 
2342
+ private isWildcardVpnDomain(domain: string): boolean {
2343
+ return domain.includes('*');
2344
+ }
2345
+
2346
+ private logSkippedWildcardAllowedIp(domain: string): void {
2347
+ if (this.warnedWildcardVpnDomains.has(domain)) return;
2348
+ this.warnedWildcardVpnDomains.add(domain);
2349
+ logger.log(
2350
+ 'warn',
2351
+ `VPN: Skipping wildcard domain '${domain}' for WireGuard AllowedIPs; wildcard patterns must be resolved to concrete hostnames by matching routes.`,
2352
+ );
2353
+ }
2354
+
2331
2355
  // VPN security injection is now handled dynamically by RouteConfigManager.applyRoutes()
2332
2356
  // via the getVpnAllowList callback — no longer a separate method here.
2333
2357
 
@@ -13,6 +13,10 @@ import type { IRoute } from '../../ts_interfaces/data/route-management.js';
13
13
  export class TargetProfileManager {
14
14
  private profiles = new Map<string, ITargetProfile>();
15
15
 
16
+ constructor(
17
+ private getAllRoutes?: () => Map<string, IRoute>,
18
+ ) {}
19
+
16
20
  // =========================================================================
17
21
  // Lifecycle
18
22
  // =========================================================================
@@ -43,13 +47,14 @@ export class TargetProfileManager {
43
47
  const id = plugins.uuid.v4();
44
48
  const now = Date.now();
45
49
 
50
+ const routeRefs = this.normalizeRouteRefs(data.routeRefs);
46
51
  const profile: ITargetProfile = {
47
52
  id,
48
53
  name: data.name,
49
54
  description: data.description,
50
55
  domains: data.domains,
51
56
  targets: data.targets,
52
- routeRefs: data.routeRefs,
57
+ routeRefs,
53
58
  createdAt: now,
54
59
  updatedAt: now,
55
60
  createdBy: data.createdBy,
@@ -70,11 +75,19 @@ export class TargetProfileManager {
70
75
  throw new Error(`Target profile '${id}' not found`);
71
76
  }
72
77
 
78
+ if (patch.name !== undefined && patch.name !== profile.name) {
79
+ for (const existing of this.profiles.values()) {
80
+ if (existing.id !== id && existing.name === patch.name) {
81
+ throw new Error(`Target profile with name '${patch.name}' already exists (id: ${existing.id})`);
82
+ }
83
+ }
84
+ }
85
+
73
86
  if (patch.name !== undefined) profile.name = patch.name;
74
87
  if (patch.description !== undefined) profile.description = patch.description;
75
88
  if (patch.domains !== undefined) profile.domains = patch.domains;
76
89
  if (patch.targets !== undefined) profile.targets = patch.targets;
77
- if (patch.routeRefs !== undefined) profile.routeRefs = patch.routeRefs;
90
+ if (patch.routeRefs !== undefined) profile.routeRefs = this.normalizeRouteRefs(patch.routeRefs);
78
91
  profile.updatedAt = Date.now();
79
92
 
80
93
  await this.persistProfile(profile);
@@ -127,6 +140,29 @@ export class TargetProfileManager {
127
140
  return this.profiles.get(id);
128
141
  }
129
142
 
143
+ /**
144
+ * Normalize stored route references to route IDs when they can be resolved
145
+ * uniquely against the current route registry.
146
+ */
147
+ public async normalizeAllRouteRefs(): Promise<void> {
148
+ const allRoutes = this.getAllRoutes?.();
149
+ if (!allRoutes?.size) return;
150
+
151
+ for (const profile of this.profiles.values()) {
152
+ const normalizedRouteRefs = this.normalizeRouteRefsAgainstRoutes(
153
+ profile.routeRefs,
154
+ allRoutes,
155
+ 'bestEffort',
156
+ );
157
+ if (this.sameStringArray(profile.routeRefs, normalizedRouteRefs)) continue;
158
+
159
+ profile.routeRefs = normalizedRouteRefs;
160
+ profile.updatedAt = Date.now();
161
+ await this.persistProfile(profile);
162
+ logger.log('info', `Normalized route refs for target profile '${profile.name}' (${profile.id})`);
163
+ }
164
+ }
165
+
130
166
  public listProfiles(): ITargetProfile[] {
131
167
  return [...this.profiles.values()];
132
168
  }
@@ -178,9 +214,11 @@ export class TargetProfileManager {
178
214
  route: IDcRouterRouteConfig,
179
215
  routeId: string | undefined,
180
216
  clients: VpnClientDoc[],
217
+ allRoutes: Map<string, IRoute> = new Map(),
181
218
  ): Array<string | { ip: string; domains: string[] }> {
182
219
  const entries: Array<string | { ip: string; domains: string[] }> = [];
183
220
  const routeDomains: string[] = (route.match as any)?.domains || [];
221
+ const routeNameIndex = this.buildRouteNameIndex(allRoutes);
184
222
 
185
223
  for (const client of clients) {
186
224
  if (!client.enabled || !client.assignedIp) continue;
@@ -194,7 +232,13 @@ export class TargetProfileManager {
194
232
  const profile = this.profiles.get(profileId);
195
233
  if (!profile) continue;
196
234
 
197
- const matchResult = this.routeMatchesProfileDetailed(route, routeId, profile, routeDomains);
235
+ const matchResult = this.routeMatchesProfileDetailed(
236
+ route,
237
+ routeId,
238
+ profile,
239
+ routeDomains,
240
+ routeNameIndex,
241
+ );
198
242
  if (matchResult === 'full') {
199
243
  fullAccess = true;
200
244
  break; // No need to check more profiles
@@ -224,6 +268,7 @@ export class TargetProfileManager {
224
268
  ): { domains: string[]; targetIps: string[] } {
225
269
  const domains = new Set<string>();
226
270
  const targetIps = new Set<string>();
271
+ const routeNameIndex = this.buildRouteNameIndex(allRoutes);
227
272
 
228
273
  // Collect all access specifiers from assigned profiles
229
274
  for (const profileId of targetProfileIds) {
@@ -247,7 +292,12 @@ export class TargetProfileManager {
247
292
  // Route references: scan all routes
248
293
  for (const [routeId, route] of allRoutes) {
249
294
  if (!route.enabled) continue;
250
- if (this.routeMatchesProfile(route.route as IDcRouterRouteConfig, routeId, profile)) {
295
+ if (this.routeMatchesProfile(
296
+ route.route as IDcRouterRouteConfig,
297
+ routeId,
298
+ profile,
299
+ routeNameIndex,
300
+ )) {
251
301
  const routeDomains = (route.route.match as any)?.domains;
252
302
  if (Array.isArray(routeDomains)) {
253
303
  for (const d of routeDomains) {
@@ -275,9 +325,16 @@ export class TargetProfileManager {
275
325
  route: IDcRouterRouteConfig,
276
326
  routeId: string | undefined,
277
327
  profile: ITargetProfile,
328
+ routeNameIndex: Map<string, string[]>,
278
329
  ): boolean {
279
330
  const routeDomains: string[] = (route.match as any)?.domains || [];
280
- const result = this.routeMatchesProfileDetailed(route, routeId, profile, routeDomains);
331
+ const result = this.routeMatchesProfileDetailed(
332
+ route,
333
+ routeId,
334
+ profile,
335
+ routeDomains,
336
+ routeNameIndex,
337
+ );
281
338
  return result !== 'none';
282
339
  }
283
340
 
@@ -294,11 +351,17 @@ export class TargetProfileManager {
294
351
  routeId: string | undefined,
295
352
  profile: ITargetProfile,
296
353
  routeDomains: string[],
354
+ routeNameIndex: Map<string, string[]>,
297
355
  ): 'full' | { type: 'scoped'; domains: string[] } | 'none' {
298
356
  // 1. Route reference match → full access
299
357
  if (profile.routeRefs?.length) {
300
358
  if (routeId && profile.routeRefs.includes(routeId)) return 'full';
301
- if (route.name && profile.routeRefs.includes(route.name)) return 'full';
359
+ if (routeId && route.name && profile.routeRefs.includes(route.name)) {
360
+ const matchingRouteIds = routeNameIndex.get(route.name) || [];
361
+ if (matchingRouteIds.length === 1 && matchingRouteIds[0] === routeId) {
362
+ return 'full';
363
+ }
364
+ }
302
365
  }
303
366
 
304
367
  // 2. Domain match
@@ -362,6 +425,66 @@ export class TargetProfileManager {
362
425
  return false;
363
426
  }
364
427
 
428
+ private normalizeRouteRefs(routeRefs?: string[]): string[] | undefined {
429
+ const allRoutes = this.getAllRoutes?.() || new Map<string, IRoute>();
430
+ return this.normalizeRouteRefsAgainstRoutes(routeRefs, allRoutes, 'strict');
431
+ }
432
+
433
+ private normalizeRouteRefsAgainstRoutes(
434
+ routeRefs: string[] | undefined,
435
+ allRoutes: Map<string, IRoute>,
436
+ mode: 'strict' | 'bestEffort',
437
+ ): string[] | undefined {
438
+ if (!routeRefs?.length) return undefined;
439
+ if (!allRoutes.size) return [...new Set(routeRefs)];
440
+
441
+ const routeNameIndex = this.buildRouteNameIndex(allRoutes);
442
+ const normalizedRefs = new Set<string>();
443
+
444
+ for (const routeRef of routeRefs) {
445
+ if (allRoutes.has(routeRef)) {
446
+ normalizedRefs.add(routeRef);
447
+ continue;
448
+ }
449
+
450
+ const matchingRouteIds = routeNameIndex.get(routeRef) || [];
451
+ if (matchingRouteIds.length === 1) {
452
+ normalizedRefs.add(matchingRouteIds[0]);
453
+ continue;
454
+ }
455
+
456
+ if (mode === 'bestEffort') {
457
+ normalizedRefs.add(routeRef);
458
+ continue;
459
+ }
460
+
461
+ if (matchingRouteIds.length > 1) {
462
+ throw new Error(`Route reference '${routeRef}' is ambiguous; use a route ID instead`);
463
+ }
464
+ throw new Error(`Route reference '${routeRef}' not found`);
465
+ }
466
+
467
+ return [...normalizedRefs];
468
+ }
469
+
470
+ private buildRouteNameIndex(allRoutes: Map<string, IRoute>): Map<string, string[]> {
471
+ const routeNameIndex = new Map<string, string[]>();
472
+ for (const [routeId, route] of allRoutes) {
473
+ const routeName = route.route.name;
474
+ if (!routeName) continue;
475
+ const matchingRouteIds = routeNameIndex.get(routeName) || [];
476
+ matchingRouteIds.push(routeId);
477
+ routeNameIndex.set(routeName, matchingRouteIds);
478
+ }
479
+ return routeNameIndex;
480
+ }
481
+
482
+ private sameStringArray(left?: string[], right?: string[]): boolean {
483
+ if (!left?.length && !right?.length) return true;
484
+ if (!left || !right || left.length !== right.length) return false;
485
+ return left.every((value, index) => value === right[index]);
486
+ }
487
+
365
488
  // =========================================================================
366
489
  // Private: persistence
367
490
  // =========================================================================