From dd9769b814a5e2f1fecfc2bbbceb8a6b9419964b Mon Sep 17 00:00:00 2001 From: Juergen Kunz Date: Mon, 30 Mar 2026 08:59:38 +0000 Subject: [PATCH] feat(docs): document VPN access control and add OpsServer VPN navigation --- changelog.md | 7 +++ readme.md | 110 ++++++++++++++++++++++++++++++++++- ts/00_commitinfo_data.ts | 2 +- ts_interfaces/readme.md | 23 +++++++- ts_web/00_commitinfo_data.ts | 2 +- ts_web/readme.md | 17 ++++++ ts_web/router.ts | 2 +- 7 files changed, 156 insertions(+), 7 deletions(-) diff --git a/changelog.md b/changelog.md index 47101fa..0de4480 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,12 @@ # Changelog +## 2026-03-30 - 11.14.0 - feat(docs) +document VPN access control and add OpsServer VPN navigation + +- Adds comprehensive README documentation for VPN access control, configuration, operating modes, and client management +- Updates TypeScript interface documentation with VPN-related route, client, status, telemetry, and API request types +- Extends web dashboard documentation and router view list to include VPN management + ## 2026-03-30 - 11.13.0 - feat(vpn) add VPN server management and route-based VPN access control diff --git a/readme.md b/readme.md index d236de8..127a2e3 100644 --- a/readme.md +++ b/readme.md @@ -4,7 +4,7 @@ **dcrouter: The all-in-one gateway for your datacenter.** 🚀 -A comprehensive traffic routing solution that provides unified gateway capabilities for HTTP/HTTPS, TCP/SNI, email (SMTP), DNS, RADIUS, and remote edge ingress — all from a single process. Designed for enterprises requiring robust traffic management, automatic TLS certificate provisioning, distributed edge networking, and enterprise-grade email infrastructure. +A comprehensive traffic routing solution that provides unified gateway capabilities for HTTP/HTTPS, TCP/SNI, email (SMTP), DNS, RADIUS, VPN, and remote edge ingress — all from a single process. Designed for enterprises requiring robust traffic management, automatic TLS certificate provisioning, VPN-based access control, distributed edge networking, and enterprise-grade email infrastructure. ## Issue Reporting and Security @@ -23,6 +23,7 @@ For reporting bugs, issues, or security vulnerabilities, please visit [community - [DNS Server](#dns-server) - [RADIUS Server](#radius-server) - [Remote Ingress](#remote-ingress) +- [VPN Access Control](#vpn-access-control) - [Certificate Management](#certificate-management) - [Storage & Caching](#storage--caching) - [Security Features](#security-features) @@ -73,6 +74,14 @@ For reporting bugs, issues, or security vulnerabilities, please visit [community - **Real-time status monitoring** — connected/disconnected state, public IP, active tunnels, heartbeat tracking - **OpsServer dashboard** with enable/disable, edit, secret regeneration, token copy, and delete actions +### 🔐 VPN Access Control (powered by [smartvpn](https://code.foss.global/push.rocks/smartvpn)) +- **WireGuard + native transports** — standard WireGuard clients (iOS, Android, macOS, Windows, Linux) plus custom WebSocket/QUIC tunnels +- **Route-level VPN gating** — mark any route with `vpn: { required: true }` to restrict access to VPN clients only +- **Rootless operation** — auto-detects privileges: kernel TUN when running as root, userspace NAT (smoltcp) when not +- **Client management** — create, enable, disable, rotate keys, export WireGuard `.conf` files via OpsServer API +- **IP-based enforcement** — VPN clients get IPs from a configurable subnet; SmartProxy enforces `ipAllowList` per route +- **PROXY protocol v2** — in socket mode, the NAT engine sends PP v2 on outbound connections to preserve VPN client identity + ### ⚡ High Performance - **Rust-powered proxy engine** via SmartProxy for maximum throughput - **Rust-powered MTA engine** via smartmta (TypeScript + Rust hybrid) for reliable email delivery @@ -89,7 +98,7 @@ For reporting bugs, issues, or security vulnerabilities, please visit [community ### 🖥️ OpsServer Dashboard - **Web-based management interface** with real-time monitoring - **JWT authentication** with session persistence -- **Live views** for connections, email queues, DNS queries, RADIUS sessions, certificates, remote ingress edges, and security events +- **Live views** for connections, email queues, DNS queries, RADIUS sessions, certificates, remote ingress edges, VPN clients, and security events - **Domain-centric certificate overview** with backoff status and one-click reprovisioning - **Remote ingress management** with connection token generation and one-click copy - **Read-only configuration display** — DcRouter is configured through code @@ -248,6 +257,13 @@ const router = new DcRouter({ hubDomain: 'hub.example.com', }, + // VPN — restrict sensitive routes to VPN clients + vpnConfig: { + enabled: true, + serverEndpoint: 'vpn.example.com', + wgListenPort: 51820, + }, + // Persistent storage storage: { fsPath: '/var/lib/dcrouter/data' }, @@ -276,6 +292,7 @@ graph TB DNS[DNS Queries] RAD[RADIUS Clients] EDGE[Edge Nodes] + VPN[VPN Clients] end subgraph "DcRouter Core" @@ -285,6 +302,7 @@ graph TB DS[SmartDNS Server
Rust-powered] RS[SmartRadius Server] RI[RemoteIngress Hub
Rust data plane] + VS[SmartVPN Server
Rust data plane] CM[Certificate Manager
smartacme v9] OS[OpsServer Dashboard] MM[Metrics Manager] @@ -305,12 +323,14 @@ graph TB DNS --> DS RAD --> RS EDGE --> RI + VPN --> VS DC --> SP DC --> ES DC --> DS DC --> RS DC --> RI + DC --> VS DC --> CM DC --> OS DC --> MM @@ -428,6 +448,17 @@ interface IDcRouterOptions { }; }; + // ── VPN ─────────────────────────────────────────────────────── + /** VPN server for route-level access control */ + vpnConfig?: { + enabled?: boolean; // default: false + subnet?: string; // default: '10.8.0.0/24' + wgListenPort?: number; // default: 51820 + dns?: string[]; // DNS servers pushed to VPN clients + serverEndpoint?: string; // Hostname in generated client configs + forwardingMode?: 'tun' | 'socket'; // default: auto-detect (root → tun, else socket) + }; + // ── HTTP/3 (QUIC) ──────────────────────────────────────────── /** HTTP/3 config — enabled by default on qualifying HTTPS routes */ http3?: { @@ -975,6 +1006,78 @@ The OpsServer Remote Ingress view provides: | **Copy Token** | Generate and copy a base64url connection token to clipboard | | **Delete** | Remove the edge registration | +## VPN Access Control + +DcRouter integrates [`@push.rocks/smartvpn`](https://code.foss.global/push.rocks/smartvpn) to provide VPN-based route access control. VPN clients connect via standard WireGuard or native WebSocket/QUIC transports, receive an IP from a configurable subnet, and can then access routes that are restricted to VPN-only traffic. + +### How It Works + +1. **SmartVPN daemon** runs inside dcrouter with a Rust data plane (WireGuard via `boringtun`, custom protocol via Noise IK) +2. Clients connect and get assigned an IP from the VPN subnet (e.g. `10.8.0.0/24`) +3. Routes with `vpn: { required: true }` get `security.ipAllowList` automatically injected with the VPN subnet +4. SmartProxy enforces the allowlist — only VPN-sourced traffic is accepted on those routes + +### Two Operating Modes + +| Mode | Root Required? | How It Works | +|------|---------------|-------------| +| **TUN** (`forwardingMode: 'tun'`) | Yes | Kernel TUN device — VPN traffic enters the network stack with real VPN IPs | +| **Socket** (`forwardingMode: 'socket'`) | No | Userspace NAT via smoltcp — outbound connections send PROXY protocol v2 to preserve VPN client IPs | + +DcRouter auto-detects: if running as root, it uses TUN mode; otherwise, it falls back to socket mode. You can override this with the `forwardingMode` option. + +### Configuration + +```typescript +const router = new DcRouter({ + vpnConfig: { + enabled: true, + subnet: '10.8.0.0/24', // VPN client IP pool (default) + wgListenPort: 51820, // WireGuard UDP port (default) + serverEndpoint: 'vpn.example.com', // Hostname in generated client configs + dns: ['1.1.1.1', '8.8.8.8'], // DNS servers pushed to clients + // forwardingMode: 'socket', // Override auto-detection + }, + smartProxyConfig: { + routes: [ + // This route is VPN-only — non-VPN clients are blocked + { + name: 'admin-panel', + match: { domains: ['admin.example.com'], ports: [443] }, + action: { + type: 'forward', + targets: [{ host: '192.168.1.50', port: 8080 }], + tls: { mode: 'terminate', certificate: 'auto' }, + }, + vpn: { required: true }, // 🔐 Only VPN clients can access this + }, + // This route is public — anyone can access it + { + name: 'public-site', + match: { domains: ['example.com'], ports: [443] }, + action: { + type: 'forward', + targets: [{ host: '192.168.1.10', port: 80 }], + tls: { mode: 'terminate', certificate: 'auto' }, + }, + }, + ], + }, +}); +``` + +### Client Management via OpsServer API + +Once the VPN server is running, you can manage clients through the OpsServer dashboard or API: + +- **Create client** — generates WireGuard keypairs, assigns IP, returns a ready-to-use `.conf` file +- **Enable / Disable** — toggle client access without deleting +- **Rotate keys** — generate fresh keypairs (invalidates old ones) +- **Export config** — re-export in WireGuard or SmartVPN format +- **Telemetry** — per-client bytes sent/received, keepalives, rate limiting + +Standard WireGuard clients on any platform (iOS, Android, macOS, Windows, Linux) can connect using the generated `.conf` file or QR code — no custom VPN software needed. + ## Certificate Management DcRouter uses [`@push.rocks/smartacme`](https://code.foss.global/push.rocks/smartacme) v9 for ACME certificate provisioning. smartacme v9 brings significant improvements over previous versions: @@ -1458,6 +1561,7 @@ The container exposes all service ports: | 1812, 1813 | UDP | RADIUS auth/acct | | 3000 | TCP | OpsServer dashboard | | 8443 | TCP | Remote ingress tunnels | +| 51820 | UDP | WireGuard VPN | | 29000–30000 | TCP | Dynamic port range | ### Building the Image @@ -1471,7 +1575,7 @@ The Docker build supports multi-platform (`linux/amd64`, `linux/arm64`) via [tsd ## License and Legal Information -This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [license](./license) file. +This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [LICENSE](./LICENSE) file. **Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file. diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index 92e1eb4..707f3fb 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@serve.zone/dcrouter', - version: '11.13.0', + version: '11.14.0', description: 'A multifaceted routing service handling mail and SMS delivery functions.' } diff --git a/ts_interfaces/readme.md b/ts_interfaces/readme.md index d4665c5..e0b2b64 100644 --- a/ts_interfaces/readme.md +++ b/ts_interfaces/readme.md @@ -96,7 +96,15 @@ interface IIdentity { | `IRemoteIngress` | Edge registration: id, name, secret, listenPorts, enabled, autoDerivePorts, tags | | `IRemoteIngressStatus` | Runtime status: connected, publicIp, activeTunnels, lastHeartbeat | | `IRouteRemoteIngress` | Route-level config: enabled flag and optional edgeFilter | -| `IDcRouterRouteConfig` | Extended SmartProxy route config with optional `remoteIngress` property | +| `IDcRouterRouteConfig` | Extended SmartProxy route config with optional `remoteIngress` and `vpn` properties | +| `IRouteVpn` | Route-level VPN config: `required` flag to restrict access to VPN clients | + +#### VPN Interfaces +| Interface | Description | +|-----------|-------------| +| `IVpnClient` | Client registration: clientId, enabled, tags, description, assignedIp, timestamps | +| `IVpnServerStatus` | Server status: running, forwardingMode, subnet, wgListenPort, publicKeys, client counts | +| `IVpnClientTelemetry` | Per-client metrics: bytes sent/received, packets dropped, keepalives, rate limits | ### Request Interfaces (`requests`) @@ -205,6 +213,19 @@ interface ICertificateInfo { | `IReq_GetRemoteIngressStatus` | `getRemoteIngressStatus` | Runtime status of all edges | | `IReq_GetRemoteIngressConnectionToken` | `getRemoteIngressConnectionToken` | Generate a connection token | +#### 🔐 VPN +| Interface | Method | Description | +|-----------|--------|-------------| +| `IReq_GetVpnClients` | `getVpnClients` | List all registered VPN clients | +| `IReq_GetVpnStatus` | `getVpnStatus` | VPN server status | +| `IReq_CreateVpnClient` | `createVpnClient` | Create a new VPN client (returns WireGuard config) | +| `IReq_DeleteVpnClient` | `deleteVpnClient` | Remove a VPN client | +| `IReq_EnableVpnClient` | `enableVpnClient` | Enable a disabled client | +| `IReq_DisableVpnClient` | `disableVpnClient` | Disable a client | +| `IReq_RotateVpnClientKey` | `rotateVpnClientKey` | Generate new keys for a client | +| `IReq_ExportVpnClientConfig` | `exportVpnClientConfig` | Export WireGuard or SmartVPN config | +| `IReq_GetVpnClientTelemetry` | `getVpnClientTelemetry` | Per-client traffic metrics | + #### 📡 RADIUS | Interface | Method | Description | |-----------|--------|-------------| diff --git a/ts_web/00_commitinfo_data.ts b/ts_web/00_commitinfo_data.ts index 92e1eb4..707f3fb 100644 --- a/ts_web/00_commitinfo_data.ts +++ b/ts_web/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@serve.zone/dcrouter', - version: '11.13.0', + version: '11.14.0', description: 'A multifaceted routing service handling mail and SMS delivery functions.' } diff --git a/ts_web/readme.md b/ts_web/readme.md index ae48733..f121175 100644 --- a/ts_web/readme.md +++ b/ts_web/readme.md @@ -50,6 +50,13 @@ For reporting bugs, issues, or security vulnerabilities, please visit [community - **Connection token generation** — one-click "Copy Token" for easy edge provisioning - Enable/disable, edit, secret regeneration, and delete actions +### 🔐 VPN Management +- VPN server status with forwarding mode, subnet, and WireGuard port +- Client registration table with create, enable/disable, and delete actions +- WireGuard config download and clipboard copy on client creation +- Per-client telemetry (bytes sent/received, keepalives) +- Server public key display for manual client configuration + ### 📜 Log Viewer - Real-time log streaming - Filter by log level (error, warning, info, debug) @@ -100,6 +107,7 @@ ts_web/ ├── ops-view-emails.ts # Email queue management ├── ops-view-certificates.ts # Certificate overview & reprovisioning ├── ops-view-remoteingress.ts # Remote ingress edge management + ├── ops-view-vpn.ts # VPN client management ├── ops-view-logs.ts # Log viewer ├── ops-view-routes.ts # Route & API token management ├── ops-view-config.ts # Configuration display @@ -124,6 +132,7 @@ The app uses `@push.rocks/smartstate` v2.3+ with multiple state parts, scheduled | `emailOpsStatePart` | Soft | Email queues, bounces, suppression list | | `certificateStatePart` | Soft | Certificate list, summary, loading state | | `remoteIngressStatePart` | Soft | Edge list, statuses, new edge secret | +| `vpnStatePart` | Soft | VPN clients, server status, new client config | ### Tab Visibility Optimization @@ -173,6 +182,13 @@ regenerateRemoteIngressSecretAction(id) // New secret toggleRemoteIngressAction(id, enabled) // Enable/disable clearNewEdgeSecretAction() // Dismiss secret banner fetchConnectionToken(edgeId) // Get connection token (standalone function) + +// VPN +fetchVpnAction() // Clients + server status +createVpnClientAction(data) // Create new VPN client +deleteVpnClientAction(clientId) // Remove VPN client +toggleVpnClientAction(id, enabled) // Enable/disable +clearNewClientConfigAction() // Dismiss config banner ``` ### Client-Side Routing @@ -187,6 +203,7 @@ fetchConnectionToken(edgeId) // Get connection token (standalone function) /emails/security → Security incidents /certificates → Certificate management /remoteingress → Remote ingress edge management +/vpn → VPN client management /routes → Route & API token management /logs → Log viewer /configuration → System configuration diff --git a/ts_web/router.ts b/ts_web/router.ts index cb5805f..95bbfd9 100644 --- a/ts_web/router.ts +++ b/ts_web/router.ts @@ -3,7 +3,7 @@ import * as appstate from './appstate.js'; const SmartRouter = plugins.domtools.plugins.smartrouter.SmartRouter; -export const validViews = ['overview', 'network', 'emails', 'logs', 'routes', 'apitokens', 'configuration', 'security', 'certificates', 'remoteingress'] as const; +export const validViews = ['overview', 'network', 'emails', 'logs', 'routes', 'apitokens', 'configuration', 'security', 'certificates', 'remoteingress', 'vpn'] as const; export type TValidView = typeof validViews[number];