@serve.zone/dcrouter 13.34.0 → 13.35.0

package/dist_ts_web/elements/network/ops-view-targetprofiles.js

@@ -129,7 +129,7 @@ let OpsViewTargetProfiles = (() => {
                 'Route Refs': profile.routeRefs?.length
                     ? html `${profile.routeRefs.map(r => html `<span class="tagBadge">${this.formatRouteRef(r)}</span>`)}`
                     : '-',
-                'Client Source IP Routes': profile.allowRoutesByClientSourceIp ? 'Yes' : 'No',
+                'Source-Policy Route Grants': profile.allowRoutesByClientSourceIp ? 'Yes' : 'No',
                 Created: new Date(profile.createdAt).toLocaleDateString(),
             })}
           .dataActions=${[
@@ -244,7 +244,7 @@ let OpsViewTargetProfiles = (() => {
           <dees-input-list .key=${'domains'} .label=${'Domains'} .placeholder=${'e.g. *.example.com'} .allowFreeform=${true}></dees-input-list>
           <dees-input-list .key=${'targets'} .label=${'Targets'} .description=${'Format: ip:port, e.g. 10.0.0.1:443'} .placeholder=${'e.g. 10.0.0.1:443'} .allowFreeform=${true}></dees-input-list>
           <dees-input-list .key=${'routeRefs'} .label=${'Route Refs'} .placeholder=${'Type to search routes...'} .candidates=${routeCandidates} .allowFreeform=${true}></dees-input-list>
-          <dees-input-checkbox .key=${'allowRoutesByClientSourceIp'} .label=${'Allow routes by VPN client source IP'} .description=${'Also grant access to non-VPN-only routes that would allow the client\'s real connecting IP'} .value=${false}></dees-input-checkbox>
+          <dees-input-checkbox .key=${'allowRoutesByClientSourceIp'} .label=${'Allow source-policy route grants'} .description=${'Grant these VPN clients to source-policy routes; SmartProxy still checks their real connecting IP per connection'} .value=${false}></dees-input-checkbox>
         </dees-form>
       `,
                 menuOptions: [
@@ -303,7 +303,7 @@ let OpsViewTargetProfiles = (() => {
           <dees-input-list .key=${'domains'} .label=${'Domains'} .placeholder=${'e.g. *.example.com'} .allowFreeform=${true} .value=${currentDomains}></dees-input-list>
           <dees-input-list .key=${'targets'} .label=${'Targets'} .description=${'Format: ip:port, e.g. 10.0.0.1:443'} .placeholder=${'e.g. 10.0.0.1:443'} .allowFreeform=${true} .value=${currentTargets}></dees-input-list>
           <dees-input-list .key=${'routeRefs'} .label=${'Route Refs'} .placeholder=${'Type to search routes...'} .candidates=${routeCandidates} .allowFreeform=${true} .value=${currentRouteRefs}></dees-input-list>
-          <dees-input-checkbox .key=${'allowRoutesByClientSourceIp'} .label=${'Allow routes by VPN client source IP'} .description=${'Also grant access to non-VPN-only routes that would allow the client\'s real connecting IP'} .value=${profile.allowRoutesByClientSourceIp === true}></dees-input-checkbox>
+          <dees-input-checkbox .key=${'allowRoutesByClientSourceIp'} .label=${'Allow source-policy route grants'} .description=${'Grant these VPN clients to source-policy routes; SmartProxy still checks their real connecting IP per connection'} .value=${profile.allowRoutesByClientSourceIp === true}></dees-input-checkbox>
         </dees-form>
       `,
                 menuOptions: [
@@ -463,4 +463,4 @@ let OpsViewTargetProfiles = (() => {
     return OpsViewTargetProfiles = _classThis;
 })();
 export { OpsViewTargetProfiles };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-targetprofiles.js","sourceRoot":"","sources":["../../../../ts_web/elements/network/ops-view-targetprofiles.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-targetprofiles.js","sourceRoot":"","sources":["../../../../ts_web/elements/network/ops-view-targetprofiles.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@serve.zone/dcrouter",
   "private": false,
-  "version": "13.34.0",
+  "version": "13.35.0",
   "description": "A multifaceted routing service handling mail and SMS delivery functions.",
   "type": "module",
   "exports": {
@@ -12,13 +12,13 @@
   "author": "Task Venture Capital GmbH",
   "license": "MIT",
   "devDependencies": {
-    "@git.zone/tsbuild": "^4.4.1",
+    "@git.zone/tsbuild": "^4.4.2",
     "@git.zone/tsbundle": "^2.10.4",
-    "@git.zone/tsdocker": "^2.3.0",
+    "@git.zone/tsdocker": "^2.4.0",
     "@git.zone/tsrun": "^2.0.4",
     "@git.zone/tstest": "^3.6.6",
     "@git.zone/tswatch": "^3.3.5",
-    "@types/node": "^25.9.0"
+    "@types/node": "^25.9.1"
   },
   "dependencies": {
     "@api.global/typedrequest": "^3.3.1",
@@ -46,13 +46,13 @@
     "@push.rocks/smartnetwork": "^4.7.2",
     "@push.rocks/smartpath": "^6.0.0",
     "@push.rocks/smartpromise": "^4.2.4",
-    "@push.rocks/smartproxy": "^27.10.3",
+    "@push.rocks/smartproxy": "^27.11.0",
     "@push.rocks/smartradius": "^1.1.2",
     "@push.rocks/smartrequest": "^5.0.3",
     "@push.rocks/smartrx": "^3.0.10",
     "@push.rocks/smartstate": "^2.3.1",
     "@push.rocks/smartunique": "^3.0.9",
-    "@push.rocks/smartvpn": "1.19.4",
+    "@push.rocks/smartvpn": "1.20.0",
     "@push.rocks/taskbuffer": "^8.0.2",
     "@serve.zone/catalog": "^2.12.4",
     "@serve.zone/interfaces": "^5.8.0",

package/readme.md

@@ -198,9 +198,9 @@ await router.start();
 
 ## VPN Target Profiles
 
-Target profiles define what a VPN client can reach through `domains`, direct `targets`, and `routeRefs`. Set `allowRoutesByClientSourceIp: true` on a target profile when a VPN client should also reach non-`vpnOnly` routes that would have allowed the client's real connecting IP without the VPN.
+Target profiles define what a VPN client can reach through `domains`, direct `targets`, and `routeRefs`. Set `allowRoutesByClientSourceIp: true` on a target profile when a VPN client should also be granted to routes whose source policy is meant to evaluate the client's real connecting IP.
 
-dcrouter evaluates the live source IP reported by the VPN transport, such as `remoteAddr` or the WireGuard peer endpoint. If the route source policy allows that real IP, dcrouter injects the client's assigned VPN IP into SmartProxy for that route. The source-IP grant is live-only and is removed or updated when the VPN client disconnects or changes peer endpoint.
+dcrouter maps target profiles to SmartProxy VPN client grants. SmartVPN forwards both the real client source IP and authenticated VPN metadata through trusted PROXY v2 headers, so SmartProxy checks source policy and VPN client authorization separately for each connection. Route `security.ipAllowList` and `security.ipBlockList` stay the source of truth for real source-IP policy; `vpnOnly` adds the requirement for authenticated VPN metadata and a matching VPN client grant.
 
 ```typescript
 const targetProfile = {

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@serve.zone/dcrouter',
-  version: '13.34.0',
+  version: '13.35.0',
   description: 'A multifaceted routing service handling mail and SMS delivery functions.'
 }

package/ts/classes.dcrouter.ts

@@ -26,7 +26,7 @@ import { RadiusServer, type IRadiusServerConfig } from './radius/index.js';
 import { RemoteIngressManager, TunnelManager } from './remoteingress/index.js';
 import { VpnManager, type IVpnManagerConfig } from './vpn/index.js';
 import { RouteConfigManager, ApiTokenManager, GatewayClientManager, ReferenceResolver, DbSeeder, TargetProfileManager } from './config/index.js';
-import type { TIpAllowEntry } from './config/classes.route-config-manager.js';
+import type { TVpnClientAllowEntry } from './config/classes.route-config-manager.js';
 import { SecurityLogger, ContentScanner, IPReputationChecker, SecurityPolicyManager } from './security/index.js';
 import { type IHttp3Config, augmentRoutesWithHttp3 } from './http3/index.js';
 import { DnsManager } from './dns/manager.dns.js';
@@ -605,7 +605,7 @@ export class DcRouter {
             this.routeConfigManager = new RouteConfigManager(
               () => this.smartProxy,
               () => this.options.http3,
-              this.createVpnRouteAllowListResolver(),
+              this.createVpnClientAccessResolver(),
               this.referenceResolver,
               // Sync routes to RemoteIngressManager whenever routes change,
               // then push updated derived ports to the Rust hub binary
@@ -2399,10 +2399,10 @@ export class DcRouter {
   /**
    * Set up VPN server for VPN-based route access control.
    */
-  private createVpnRouteAllowListResolver(): ((
+  private createVpnClientAccessResolver(): ((
     route: import('../ts_interfaces/data/remoteingress.js').IDcRouterRouteConfig,
     routeId?: string,
-  ) => TIpAllowEntry[]) | undefined {
+  ) => TVpnClientAllowEntry[]) | undefined {
     if (!this.options.vpnConfig?.enabled) {
       return undefined;
     }
@@ -2416,12 +2416,11 @@ export class DcRouter {
         return [];
       }
 
-      return this.targetProfileManager.getMatchingClientIps(
+      return this.targetProfileManager.getMatchingVpnClients(
         route,
         routeId,
         this.vpnManager.listClients(),
         this.routeConfigManager?.getRoutes() || new Map(),
-        this.vpnManager.getClientSourceIpMap(),
       );
     };
   }
@@ -2453,22 +2452,21 @@ export class DcRouter {
       bridgeIpRangeStart: this.options.vpnConfig.bridgeIpRangeStart,
       bridgeIpRangeEnd: this.options.vpnConfig.bridgeIpRangeEnd,
       onClientChanged: () => {
-        // Re-apply routes so profile-based ipAllowLists get updated
+        // Re-apply routes so profile-based VPN client grants get updated
         // (serialized by RouteConfigManager's mutex — safe as fire-and-forget)
         this.routeConfigManager?.applyRoutes().catch((err) => {
           logger.log('warn', `Failed to re-apply routes after VPN client change: ${err?.message || err}`);
         });
       },
       onClientSourceIpsChanged: () => {
-        this.routeConfigManager?.applyRoutes().catch((err) => {
-          logger.log('warn', `Failed to re-apply routes after VPN client source IP change: ${err?.message || err}`);
-        });
+        // SmartProxy now receives the real source IP per connection via PROXY v2.
+        // Source-IP changes are reflected in status/UI only; route config is static.
       },
       getClientDirectTargets: (targetProfileIds: string[]) => {
         if (!this.targetProfileManager) return [];
         return this.targetProfileManager.getDirectTargetIps(targetProfileIds);
       },
-      getClientAllowedIPs: async (targetProfileIds: string[], clientId?: string, sourceIp?: string) => {
+      getClientAllowedIPs: async (targetProfileIds: string[], clientId?: string, _sourceIp?: string) => {
         const subnet = this.options.vpnConfig?.subnet || '10.8.0.0/24';
         const ips = new Set<string>([subnet]);
 
@@ -2479,7 +2477,6 @@ export class DcRouter {
         const { domains, targetIps } = this.targetProfileManager.getClientAccessSpec(
           targetProfileIds,
           allRoutes,
-          sourceIp,
         );
 
         // Add target IPs directly
@@ -2506,7 +2503,7 @@ export class DcRouter {
     await this.vpnManager.start();
 
     // Re-apply routes now that VPN clients are loaded — ensures vpnOnly routes
-    // get correct profile-based ipAllowLists
+    // get correct profile-based VPN client grants.
     await this.routeConfigManager?.applyRoutes();
   }
 
@@ -2602,7 +2599,7 @@ export class DcRouter {
     this.options.vpnConfig = config;
     this.vpnDomainIpCache.clear();
     this.warnedWildcardVpnDomains.clear();
-    this.routeConfigManager?.setVpnClientIpsResolver(this.createVpnRouteAllowListResolver());
+    this.routeConfigManager?.setVpnClientAccessResolver(this.createVpnClientAccessResolver());
 
     if (this.options.vpnConfig?.enabled) {
       await this.setupVpnServer();

package/ts/config/classes.route-config-manager.ts

@@ -11,8 +11,7 @@ import type { IDcRouterRouteConfig } from '../../ts_interfaces/data/remoteingres
 import { type IHttp3Config, augmentRouteWithHttp3 } from '../http3/index.js';
 import type { ReferenceResolver } from './classes.reference-resolver.js';
 
-/** An IP allow entry: plain IP/CIDR or domain-scoped. */
-export type TIpAllowEntry = string | { ip: string; domains: string[] };
+export type TVpnClientAllowEntry = string | { clientId: string; domains: string[] };
 
 export interface IRouteMutationResult {
   success: boolean;
@@ -57,7 +56,7 @@ export class RouteConfigManager {
   constructor(
     private getSmartProxy: () => plugins.smartproxy.SmartProxy | undefined,
     private getHttp3Config?: () => IHttp3Config | undefined,
-    private getVpnClientIpsForRoute?: (route: IDcRouterRouteConfig, routeId?: string) => TIpAllowEntry[],
+    private getVpnClientAccessForRoute?: (route: IDcRouterRouteConfig, routeId?: string) => TVpnClientAllowEntry[],
     private referenceResolver?: ReferenceResolver,
     private onRoutesApplied?: (routes: plugins.smartproxy.IRouteConfig[]) => void | Promise<void>,
     private getRuntimeRoutes?: () => plugins.smartproxy.IRouteConfig[],
@@ -73,10 +72,10 @@ export class RouteConfigManager {
     return this.routes.get(id);
   }
 
-  public setVpnClientIpsResolver(
-    resolver?: (route: IDcRouterRouteConfig, routeId?: string) => TIpAllowEntry[],
+  public setVpnClientAccessResolver(
+    resolver?: (route: IDcRouterRouteConfig, routeId?: string) => TVpnClientAllowEntry[],
   ): void {
-    this.getVpnClientIpsForRoute = resolver;
+    this.getVpnClientAccessForRoute = resolver;
   }
 
   /**
@@ -608,49 +607,42 @@ export class RouteConfigManager {
     routeId?: string,
   ): plugins.smartproxy.IRouteConfig {
     const dcRoute = route as IDcRouterRouteConfig;
-    const vpnEntries = this.getVpnClientIpsForRoute?.(dcRoute, routeId) || [];
+    const vpnEntries = this.getVpnClientAccessForRoute?.(dcRoute, routeId) || [];
 
-    if (!dcRoute.vpnOnly) {
-      const existingAllowList = route.security?.ipAllowList;
-      if (!Array.isArray(existingAllowList) || existingAllowList.length === 0 || vpnEntries.length === 0) {
-        return route;
-      }
-
-      return {
-        ...route,
-        security: {
-          ...route.security,
-          ipAllowList: this.mergeIpAllowEntries(existingAllowList as TIpAllowEntry[], vpnEntries),
-        },
-      };
+    if (!dcRoute.vpnOnly && vpnEntries.length === 0) {
+      return route;
     }
 
-    const existingBlockList = route.security?.ipBlockList || [];
-    const ipBlockList = vpnEntries.length
-      ? existingBlockList
-      : [...new Set([...existingBlockList, '*'])];
+    const existingVpnSecurity = route.security?.vpn || {};
+    const mergedAllowedClients = this.mergeVpnClientAllowEntries(
+      existingVpnSecurity.allowedClients || [],
+      vpnEntries,
+    );
 
     return {
       ...route,
       security: {
         ...route.security,
-        ipAllowList: vpnEntries,
-        ipBlockList,
+        vpn: {
+          ...existingVpnSecurity,
+          required: dcRoute.vpnOnly ? true : existingVpnSecurity.required,
+          allowedClients: mergedAllowedClients,
+        },
       },
     };
   }
 
-  private mergeIpAllowEntries(
-    existingEntries: TIpAllowEntry[],
-    vpnEntries: TIpAllowEntry[],
-  ): TIpAllowEntry[] {
-    const merged: TIpAllowEntry[] = [];
+  private mergeVpnClientAllowEntries(
+    existingEntries: TVpnClientAllowEntry[],
+    vpnEntries: TVpnClientAllowEntry[],
+  ): TVpnClientAllowEntry[] {
+    const merged: TVpnClientAllowEntry[] = [];
     const seen = new Set<string>();
 
     for (const entry of [...existingEntries, ...vpnEntries]) {
       const key = typeof entry === 'string'
-        ? `ip:${entry}`
-        : `domain:${entry.ip}:${[...entry.domains].sort().join(',')}`;
+        ? `client:${entry}`
+        : `domain:${entry.clientId}:${[...entry.domains].sort().join(',')}`;
       if (seen.has(key)) continue;
       seen.add(key);
       merged.push(entry);