@push.rocks/smartproxy 15.0.2 → 16.0.2
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_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/certificate/index.d.ts +10 -4
- package/dist_ts/certificate/index.js +5 -7
- package/dist_ts/certificate/models/certificate-types.d.ts +35 -15
- package/dist_ts/certificate/providers/cert-provisioner.d.ts +41 -15
- package/dist_ts/certificate/providers/cert-provisioner.js +201 -41
- package/dist_ts/forwarding/config/forwarding-types.d.ts +40 -76
- package/dist_ts/forwarding/config/forwarding-types.js +19 -18
- package/dist_ts/forwarding/config/index.d.ts +4 -2
- package/dist_ts/forwarding/config/index.js +5 -3
- package/dist_ts/forwarding/handlers/base-handler.js +3 -1
- package/dist_ts/forwarding/index.d.ts +5 -6
- package/dist_ts/forwarding/index.js +3 -3
- package/dist_ts/http/models/http-types.js +1 -1
- package/dist_ts/http/port80/acme-interfaces.d.ts +30 -0
- package/dist_ts/http/port80/acme-interfaces.js +46 -1
- package/dist_ts/http/port80/port80-handler.d.ts +17 -2
- package/dist_ts/http/port80/port80-handler.js +49 -11
- package/dist_ts/proxies/smart-proxy/models/interfaces.d.ts +2 -61
- package/dist_ts/proxies/smart-proxy/models/interfaces.js +5 -4
- package/dist_ts/proxies/smart-proxy/models/route-types.d.ts +118 -4
- package/dist_ts/proxies/smart-proxy/network-proxy-bridge.d.ts +70 -4
- package/dist_ts/proxies/smart-proxy/network-proxy-bridge.js +193 -43
- package/dist_ts/proxies/smart-proxy/route-connection-handler.d.ts +2 -5
- package/dist_ts/proxies/smart-proxy/route-connection-handler.js +25 -146
- package/dist_ts/proxies/smart-proxy/route-helpers/index.d.ts +7 -0
- package/dist_ts/proxies/smart-proxy/route-helpers/index.js +9 -0
- package/dist_ts/proxies/smart-proxy/route-helpers.d.ts +54 -1
- package/dist_ts/proxies/smart-proxy/route-helpers.js +102 -1
- package/dist_ts/proxies/smart-proxy/route-manager.d.ts +3 -9
- package/dist_ts/proxies/smart-proxy/route-manager.js +3 -115
- package/dist_ts/proxies/smart-proxy/smart-proxy.d.ts +72 -10
- package/dist_ts/proxies/smart-proxy/smart-proxy.js +135 -268
- package/dist_ts/proxies/smart-proxy/timeout-manager.js +3 -3
- package/dist_ts/proxies/smart-proxy/utils/index.d.ts +12 -0
- package/dist_ts/proxies/smart-proxy/utils/index.js +19 -0
- package/dist_ts/proxies/smart-proxy/utils/route-helpers.d.ts +174 -0
- package/dist_ts/proxies/smart-proxy/utils/route-helpers.js +332 -0
- package/dist_ts/proxies/smart-proxy/utils/route-migration-utils.d.ts +51 -0
- package/dist_ts/proxies/smart-proxy/utils/route-migration-utils.js +124 -0
- package/dist_ts/proxies/smart-proxy/utils/route-patterns.d.ts +131 -0
- package/dist_ts/proxies/smart-proxy/utils/route-patterns.js +217 -0
- package/dist_ts/proxies/smart-proxy/utils/route-utils.d.ts +79 -0
- package/dist_ts/proxies/smart-proxy/utils/route-utils.js +266 -0
- package/dist_ts/proxies/smart-proxy/utils/route-validators.d.ts +73 -0
- package/dist_ts/proxies/smart-proxy/utils/route-validators.js +242 -0
- package/package.json +1 -1
- package/readme.md +139 -111
- package/readme.plan.md +164 -312
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/certificate/index.ts +17 -9
- package/ts/certificate/models/certificate-types.ts +37 -16
- package/ts/certificate/providers/cert-provisioner.ts +247 -54
- package/ts/forwarding/config/forwarding-types.ts +79 -107
- package/ts/forwarding/config/index.ts +4 -2
- package/ts/forwarding/handlers/base-handler.ts +4 -2
- package/ts/forwarding/index.ts +3 -2
- package/ts/http/models/http-types.ts +0 -1
- package/ts/http/port80/acme-interfaces.ts +84 -0
- package/ts/http/port80/port80-handler.ts +61 -15
- package/ts/proxies/smart-proxy/models/interfaces.ts +7 -64
- package/ts/proxies/smart-proxy/models/route-types.ts +152 -22
- package/ts/proxies/smart-proxy/network-proxy-bridge.ts +226 -55
- package/ts/proxies/smart-proxy/route-connection-handler.ts +36 -205
- package/ts/proxies/smart-proxy/route-helpers/index.ts +9 -0
- package/ts/proxies/smart-proxy/route-helpers.ts +165 -11
- package/ts/proxies/smart-proxy/route-manager.ts +3 -130
- package/ts/proxies/smart-proxy/smart-proxy.ts +157 -329
- package/ts/proxies/smart-proxy/timeout-manager.ts +2 -2
- package/ts/proxies/smart-proxy/utils/index.ts +40 -0
- package/ts/proxies/smart-proxy/utils/route-helpers.ts +455 -0
- package/ts/proxies/smart-proxy/utils/route-migration-utils.ts +165 -0
- package/ts/proxies/smart-proxy/utils/route-patterns.ts +309 -0
- package/ts/proxies/smart-proxy/utils/route-utils.ts +330 -0
- package/ts/proxies/smart-proxy/utils/route-validators.ts +269 -0
- package/ts/forwarding/config/domain-config.ts +0 -28
- package/ts/forwarding/config/domain-manager.ts +0 -283
- package/ts/proxies/smart-proxy/connection-handler.ts +0 -1240
- package/ts/proxies/smart-proxy/port-range-manager.ts +0 -211
- /package/ts/proxies/smart-proxy/{domain-config-manager.ts → domain-config-manager.ts.bak} +0 -0
|
@@ -2,7 +2,7 @@ import type { IAcmeOptions } from '../../../certificate/models/certificate-types
|
|
|
2
2
|
/**
|
|
3
3
|
* Supported action types for route configurations
|
|
4
4
|
*/
|
|
5
|
-
export type TRouteActionType = 'forward' | 'redirect' | 'block';
|
|
5
|
+
export type TRouteActionType = 'forward' | 'redirect' | 'block' | 'static';
|
|
6
6
|
/**
|
|
7
7
|
* TLS handling modes for route configurations
|
|
8
8
|
*/
|
|
@@ -23,6 +23,7 @@ export interface IRouteMatch {
|
|
|
23
23
|
path?: string;
|
|
24
24
|
clientIp?: string[];
|
|
25
25
|
tlsVersion?: string[];
|
|
26
|
+
headers?: Record<string, string | RegExp>;
|
|
26
27
|
}
|
|
27
28
|
/**
|
|
28
29
|
* Target configuration for forwarding
|
|
@@ -49,6 +50,24 @@ export interface IRouteRedirect {
|
|
|
49
50
|
to: string;
|
|
50
51
|
status: 301 | 302 | 307 | 308;
|
|
51
52
|
}
|
|
53
|
+
/**
|
|
54
|
+
* Authentication options
|
|
55
|
+
*/
|
|
56
|
+
export interface IRouteAuthentication {
|
|
57
|
+
type: 'basic' | 'digest' | 'oauth' | 'jwt';
|
|
58
|
+
credentials?: {
|
|
59
|
+
username: string;
|
|
60
|
+
password: string;
|
|
61
|
+
}[];
|
|
62
|
+
realm?: string;
|
|
63
|
+
jwtSecret?: string;
|
|
64
|
+
jwtIssuer?: string;
|
|
65
|
+
oauthProvider?: string;
|
|
66
|
+
oauthClientId?: string;
|
|
67
|
+
oauthClientSecret?: string;
|
|
68
|
+
oauthRedirectUri?: string;
|
|
69
|
+
[key: string]: any;
|
|
70
|
+
}
|
|
52
71
|
/**
|
|
53
72
|
* Security options for route actions
|
|
54
73
|
*/
|
|
@@ -56,9 +75,29 @@ export interface IRouteSecurity {
|
|
|
56
75
|
allowedIps?: string[];
|
|
57
76
|
blockedIps?: string[];
|
|
58
77
|
maxConnections?: number;
|
|
59
|
-
authentication?:
|
|
60
|
-
|
|
61
|
-
|
|
78
|
+
authentication?: IRouteAuthentication;
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* Static file server configuration
|
|
82
|
+
*/
|
|
83
|
+
export interface IRouteStaticFiles {
|
|
84
|
+
root: string;
|
|
85
|
+
index?: string[];
|
|
86
|
+
headers?: Record<string, string>;
|
|
87
|
+
directory?: string;
|
|
88
|
+
indexFiles?: string[];
|
|
89
|
+
cacheControl?: string;
|
|
90
|
+
expires?: number;
|
|
91
|
+
followSymlinks?: boolean;
|
|
92
|
+
disableDirectoryListing?: boolean;
|
|
93
|
+
}
|
|
94
|
+
/**
|
|
95
|
+
* Test route response configuration
|
|
96
|
+
*/
|
|
97
|
+
export interface IRouteTestResponse {
|
|
98
|
+
status: number;
|
|
99
|
+
headers: Record<string, string>;
|
|
100
|
+
body: string;
|
|
62
101
|
}
|
|
63
102
|
/**
|
|
64
103
|
* Advanced options for route actions
|
|
@@ -67,6 +106,30 @@ export interface IRouteAdvanced {
|
|
|
67
106
|
timeout?: number;
|
|
68
107
|
headers?: Record<string, string>;
|
|
69
108
|
keepAlive?: boolean;
|
|
109
|
+
staticFiles?: IRouteStaticFiles;
|
|
110
|
+
testResponse?: IRouteTestResponse;
|
|
111
|
+
}
|
|
112
|
+
/**
|
|
113
|
+
* WebSocket configuration
|
|
114
|
+
*/
|
|
115
|
+
export interface IRouteWebSocket {
|
|
116
|
+
enabled: boolean;
|
|
117
|
+
pingInterval?: number;
|
|
118
|
+
pingTimeout?: number;
|
|
119
|
+
maxPayloadSize?: number;
|
|
120
|
+
}
|
|
121
|
+
/**
|
|
122
|
+
* Load balancing configuration
|
|
123
|
+
*/
|
|
124
|
+
export interface IRouteLoadBalancing {
|
|
125
|
+
algorithm: 'round-robin' | 'least-connections' | 'ip-hash';
|
|
126
|
+
healthCheck?: {
|
|
127
|
+
path: string;
|
|
128
|
+
interval: number;
|
|
129
|
+
timeout: number;
|
|
130
|
+
unhealthyThreshold: number;
|
|
131
|
+
healthyThreshold: number;
|
|
132
|
+
};
|
|
70
133
|
}
|
|
71
134
|
/**
|
|
72
135
|
* Action configuration for route handling
|
|
@@ -76,19 +139,70 @@ export interface IRouteAction {
|
|
|
76
139
|
target?: IRouteTarget;
|
|
77
140
|
tls?: IRouteTls;
|
|
78
141
|
redirect?: IRouteRedirect;
|
|
142
|
+
static?: IRouteStaticFiles;
|
|
143
|
+
websocket?: IRouteWebSocket;
|
|
144
|
+
loadBalancing?: IRouteLoadBalancing;
|
|
79
145
|
security?: IRouteSecurity;
|
|
80
146
|
advanced?: IRouteAdvanced;
|
|
81
147
|
}
|
|
148
|
+
/**
|
|
149
|
+
* Rate limiting configuration
|
|
150
|
+
*/
|
|
151
|
+
export interface IRouteRateLimit {
|
|
152
|
+
enabled: boolean;
|
|
153
|
+
maxRequests: number;
|
|
154
|
+
window: number;
|
|
155
|
+
keyBy?: 'ip' | 'path' | 'header';
|
|
156
|
+
headerName?: string;
|
|
157
|
+
errorMessage?: string;
|
|
158
|
+
}
|
|
159
|
+
/**
|
|
160
|
+
* Security features for routes
|
|
161
|
+
*/
|
|
162
|
+
export interface IRouteSecurity {
|
|
163
|
+
rateLimit?: IRouteRateLimit;
|
|
164
|
+
basicAuth?: {
|
|
165
|
+
enabled: boolean;
|
|
166
|
+
users: Array<{
|
|
167
|
+
username: string;
|
|
168
|
+
password: string;
|
|
169
|
+
}>;
|
|
170
|
+
realm?: string;
|
|
171
|
+
excludePaths?: string[];
|
|
172
|
+
};
|
|
173
|
+
jwtAuth?: {
|
|
174
|
+
enabled: boolean;
|
|
175
|
+
secret: string;
|
|
176
|
+
algorithm?: string;
|
|
177
|
+
issuer?: string;
|
|
178
|
+
audience?: string;
|
|
179
|
+
expiresIn?: number;
|
|
180
|
+
excludePaths?: string[];
|
|
181
|
+
};
|
|
182
|
+
ipAllowList?: string[];
|
|
183
|
+
ipBlockList?: string[];
|
|
184
|
+
}
|
|
185
|
+
/**
|
|
186
|
+
* Headers configuration
|
|
187
|
+
*/
|
|
188
|
+
export interface IRouteHeaders {
|
|
189
|
+
request?: Record<string, string>;
|
|
190
|
+
response?: Record<string, string>;
|
|
191
|
+
}
|
|
82
192
|
/**
|
|
83
193
|
* The core unified configuration interface
|
|
84
194
|
*/
|
|
85
195
|
export interface IRouteConfig {
|
|
196
|
+
id?: string;
|
|
86
197
|
match: IRouteMatch;
|
|
87
198
|
action: IRouteAction;
|
|
199
|
+
headers?: IRouteHeaders;
|
|
200
|
+
security?: IRouteSecurity;
|
|
88
201
|
name?: string;
|
|
89
202
|
description?: string;
|
|
90
203
|
priority?: number;
|
|
91
204
|
tags?: string[];
|
|
205
|
+
enabled?: boolean;
|
|
92
206
|
}
|
|
93
207
|
/**
|
|
94
208
|
* Unified SmartProxy options with routes-based configuration
|
|
@@ -3,8 +3,17 @@ import { NetworkProxy } from '../network-proxy/index.js';
|
|
|
3
3
|
import { Port80Handler } from '../../http/port80/port80-handler.js';
|
|
4
4
|
import type { ICertificateData } from '../../certificate/models/certificate-types.js';
|
|
5
5
|
import type { IConnectionRecord, ISmartProxyOptions } from './models/interfaces.js';
|
|
6
|
+
import type { IRouteConfig } from './models/route-types.js';
|
|
6
7
|
/**
|
|
7
8
|
* Manages NetworkProxy integration for TLS termination
|
|
9
|
+
*
|
|
10
|
+
* NetworkProxyBridge connects SmartProxy with NetworkProxy to handle TLS termination.
|
|
11
|
+
* It directly maps route configurations to NetworkProxy configuration format and manages
|
|
12
|
+
* certificate provisioning through Port80Handler when ACME is enabled.
|
|
13
|
+
*
|
|
14
|
+
* It is used by SmartProxy for routes that have:
|
|
15
|
+
* - TLS mode of 'terminate' or 'terminate-and-reencrypt'
|
|
16
|
+
* - Certificate set to 'auto' or custom certificate
|
|
8
17
|
*/
|
|
9
18
|
export declare class NetworkProxyBridge {
|
|
10
19
|
private settings;
|
|
@@ -44,19 +53,76 @@ export declare class NetworkProxyBridge {
|
|
|
44
53
|
*/
|
|
45
54
|
stop(): Promise<void>;
|
|
46
55
|
/**
|
|
47
|
-
* Register domains with Port80Handler
|
|
56
|
+
* Register domains from routes with Port80Handler for certificate management
|
|
57
|
+
*
|
|
58
|
+
* Extracts domains from routes that require TLS termination and registers them
|
|
59
|
+
* with the Port80Handler for certificate issuance and renewal.
|
|
60
|
+
*
|
|
61
|
+
* @param routes The route configurations to extract domains from
|
|
48
62
|
*/
|
|
49
|
-
registerDomainsWithPort80Handler(
|
|
63
|
+
registerDomainsWithPort80Handler(routes: IRouteConfig[]): void;
|
|
64
|
+
/**
|
|
65
|
+
* Finds the route reference for a given domain
|
|
66
|
+
*
|
|
67
|
+
* @param domain The domain to find a route reference for
|
|
68
|
+
* @param routes The routes to search
|
|
69
|
+
* @returns The route reference if found, undefined otherwise
|
|
70
|
+
*/
|
|
71
|
+
private findRouteReferenceForDomain;
|
|
50
72
|
/**
|
|
51
73
|
* Forwards a TLS connection to a NetworkProxy for handling
|
|
52
74
|
*/
|
|
53
75
|
forwardToNetworkProxy(connectionId: string, socket: plugins.net.Socket, record: IConnectionRecord, initialData: Buffer, customProxyPort?: number, onError?: (reason: string) => void): void;
|
|
54
76
|
/**
|
|
55
|
-
* Synchronizes
|
|
77
|
+
* Synchronizes routes to NetworkProxy
|
|
78
|
+
*
|
|
79
|
+
* This method directly maps route configurations to NetworkProxy format and updates
|
|
80
|
+
* the NetworkProxy with these configurations. It handles:
|
|
81
|
+
*
|
|
82
|
+
* - Extracting domain, target, and certificate information from routes
|
|
83
|
+
* - Converting TLS mode settings to NetworkProxy configuration
|
|
84
|
+
* - Applying security and advanced settings
|
|
85
|
+
* - Registering domains for ACME certificate provisioning when needed
|
|
86
|
+
*
|
|
87
|
+
* @param routes The route configurations to sync to NetworkProxy
|
|
88
|
+
*/
|
|
89
|
+
syncRoutesToNetworkProxy(routes: IRouteConfig[]): Promise<void>;
|
|
90
|
+
/**
|
|
91
|
+
* Map routes directly to NetworkProxy configuration format
|
|
92
|
+
*
|
|
93
|
+
* This method directly maps route configurations to NetworkProxy's format
|
|
94
|
+
* without any intermediate domain-based representation. It processes each route
|
|
95
|
+
* and creates appropriate NetworkProxy configs for domains that require TLS termination.
|
|
96
|
+
*
|
|
97
|
+
* @param routes Array of route configurations to map
|
|
98
|
+
* @param defaultCertPair Default certificate to use if no custom certificate is specified
|
|
99
|
+
* @returns Array of NetworkProxy configurations
|
|
100
|
+
*/
|
|
101
|
+
mapRoutesToNetworkProxyConfigs(routes: IRouteConfig[], defaultCertPair: {
|
|
102
|
+
key: string;
|
|
103
|
+
cert: string;
|
|
104
|
+
}): plugins.tsclass.network.IReverseProxyConfig[];
|
|
105
|
+
/**
|
|
106
|
+
* @deprecated This method is kept for backward compatibility.
|
|
107
|
+
* Use mapRoutesToNetworkProxyConfigs() instead.
|
|
108
|
+
*/
|
|
109
|
+
convertRoutesToNetworkProxyConfigs(routes: IRouteConfig[], defaultCertPair: {
|
|
110
|
+
key: string;
|
|
111
|
+
cert: string;
|
|
112
|
+
}): plugins.tsclass.network.IReverseProxyConfig[];
|
|
113
|
+
/**
|
|
114
|
+
* @deprecated This method is deprecated and will be removed in a future version.
|
|
115
|
+
* Use syncRoutesToNetworkProxy() instead.
|
|
116
|
+
*
|
|
117
|
+
* This legacy method exists only for backward compatibility and
|
|
118
|
+
* simply forwards to syncRoutesToNetworkProxy().
|
|
56
119
|
*/
|
|
57
120
|
syncDomainConfigsToNetworkProxy(): Promise<void>;
|
|
58
121
|
/**
|
|
59
122
|
* Request a certificate for a specific domain
|
|
123
|
+
*
|
|
124
|
+
* @param domain The domain to request a certificate for
|
|
125
|
+
* @param routeName Optional route name to associate with this certificate
|
|
60
126
|
*/
|
|
61
|
-
requestCertificate(domain: string): Promise<boolean>;
|
|
127
|
+
requestCertificate(domain: string, routeName?: string): Promise<boolean>;
|
|
62
128
|
}
|
|
@@ -5,6 +5,14 @@ import { Port80HandlerEvents } from '../../core/models/common-types.js';
|
|
|
5
5
|
import { subscribeToPort80Handler } from '../../core/utils/event-utils.js';
|
|
6
6
|
/**
|
|
7
7
|
* Manages NetworkProxy integration for TLS termination
|
|
8
|
+
*
|
|
9
|
+
* NetworkProxyBridge connects SmartProxy with NetworkProxy to handle TLS termination.
|
|
10
|
+
* It directly maps route configurations to NetworkProxy configuration format and manages
|
|
11
|
+
* certificate provisioning through Port80Handler when ACME is enabled.
|
|
12
|
+
*
|
|
13
|
+
* It is used by SmartProxy for routes that have:
|
|
14
|
+
* - TLS mode of 'terminate' or 'terminate-and-reencrypt'
|
|
15
|
+
* - Certificate set to 'auto' or custom certificate
|
|
8
16
|
*/
|
|
9
17
|
export class NetworkProxyBridge {
|
|
10
18
|
constructor(settings) {
|
|
@@ -46,8 +54,8 @@ export class NetworkProxyBridge {
|
|
|
46
54
|
if (this.port80Handler) {
|
|
47
55
|
this.networkProxy.setExternalPort80Handler(this.port80Handler);
|
|
48
56
|
}
|
|
49
|
-
//
|
|
50
|
-
await this.
|
|
57
|
+
// Apply route configurations to NetworkProxy
|
|
58
|
+
await this.syncRoutesToNetworkProxy(this.settings.routes || []);
|
|
51
59
|
}
|
|
52
60
|
}
|
|
53
61
|
/**
|
|
@@ -128,25 +136,50 @@ export class NetworkProxyBridge {
|
|
|
128
136
|
}
|
|
129
137
|
}
|
|
130
138
|
/**
|
|
131
|
-
* Register domains with Port80Handler
|
|
139
|
+
* Register domains from routes with Port80Handler for certificate management
|
|
140
|
+
*
|
|
141
|
+
* Extracts domains from routes that require TLS termination and registers them
|
|
142
|
+
* with the Port80Handler for certificate issuance and renewal.
|
|
143
|
+
*
|
|
144
|
+
* @param routes The route configurations to extract domains from
|
|
132
145
|
*/
|
|
133
|
-
registerDomainsWithPort80Handler(
|
|
146
|
+
registerDomainsWithPort80Handler(routes) {
|
|
134
147
|
if (!this.port80Handler) {
|
|
135
148
|
console.log('Cannot register domains - Port80Handler not initialized');
|
|
136
149
|
return;
|
|
137
150
|
}
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
151
|
+
// Extract domains from routes that require TLS termination
|
|
152
|
+
const domainsToRegister = new Set();
|
|
153
|
+
for (const route of routes) {
|
|
154
|
+
// Skip routes without domains or TLS configuration
|
|
155
|
+
if (!route.match.domains || !route.action.tls)
|
|
142
156
|
continue;
|
|
157
|
+
// Only register domains for routes that terminate TLS
|
|
158
|
+
if (route.action.tls.mode !== 'terminate' && route.action.tls.mode !== 'terminate-and-reencrypt')
|
|
159
|
+
continue;
|
|
160
|
+
// Extract domains from route
|
|
161
|
+
const domains = Array.isArray(route.match.domains)
|
|
162
|
+
? route.match.domains
|
|
163
|
+
: [route.match.domains];
|
|
164
|
+
// Add each domain to the set (avoiding duplicates)
|
|
165
|
+
for (const domain of domains) {
|
|
166
|
+
// Skip wildcards
|
|
167
|
+
if (domain.includes('*')) {
|
|
168
|
+
console.log(`Skipping wildcard domain for ACME: ${domain}`);
|
|
169
|
+
continue;
|
|
170
|
+
}
|
|
171
|
+
domainsToRegister.add(domain);
|
|
143
172
|
}
|
|
144
|
-
|
|
173
|
+
}
|
|
174
|
+
// Register each unique domain with Port80Handler
|
|
175
|
+
for (const domain of domainsToRegister) {
|
|
145
176
|
try {
|
|
146
177
|
this.port80Handler.addDomain({
|
|
147
178
|
domainName: domain,
|
|
148
179
|
sslRedirect: true,
|
|
149
|
-
acmeMaintenance: true
|
|
180
|
+
acmeMaintenance: true,
|
|
181
|
+
// Include route reference if we can find it
|
|
182
|
+
routeReference: this.findRouteReferenceForDomain(domain, routes)
|
|
150
183
|
});
|
|
151
184
|
console.log(`Registered domain with Port80Handler: ${domain}`);
|
|
152
185
|
}
|
|
@@ -155,6 +188,30 @@ export class NetworkProxyBridge {
|
|
|
155
188
|
}
|
|
156
189
|
}
|
|
157
190
|
}
|
|
191
|
+
/**
|
|
192
|
+
* Finds the route reference for a given domain
|
|
193
|
+
*
|
|
194
|
+
* @param domain The domain to find a route reference for
|
|
195
|
+
* @param routes The routes to search
|
|
196
|
+
* @returns The route reference if found, undefined otherwise
|
|
197
|
+
*/
|
|
198
|
+
findRouteReferenceForDomain(domain, routes) {
|
|
199
|
+
// Find the first route that matches this domain
|
|
200
|
+
for (const route of routes) {
|
|
201
|
+
if (!route.match.domains)
|
|
202
|
+
continue;
|
|
203
|
+
const domains = Array.isArray(route.match.domains)
|
|
204
|
+
? route.match.domains
|
|
205
|
+
: [route.match.domains];
|
|
206
|
+
if (domains.includes(domain)) {
|
|
207
|
+
return {
|
|
208
|
+
routeId: undefined, // No explicit IDs in our current routes
|
|
209
|
+
routeName: route.name
|
|
210
|
+
};
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
return undefined;
|
|
214
|
+
}
|
|
158
215
|
/**
|
|
159
216
|
* Forwards a TLS connection to a NetworkProxy for handling
|
|
160
217
|
*/
|
|
@@ -206,9 +263,19 @@ export class NetworkProxyBridge {
|
|
|
206
263
|
});
|
|
207
264
|
}
|
|
208
265
|
/**
|
|
209
|
-
* Synchronizes
|
|
266
|
+
* Synchronizes routes to NetworkProxy
|
|
267
|
+
*
|
|
268
|
+
* This method directly maps route configurations to NetworkProxy format and updates
|
|
269
|
+
* the NetworkProxy with these configurations. It handles:
|
|
270
|
+
*
|
|
271
|
+
* - Extracting domain, target, and certificate information from routes
|
|
272
|
+
* - Converting TLS mode settings to NetworkProxy configuration
|
|
273
|
+
* - Applying security and advanced settings
|
|
274
|
+
* - Registering domains for ACME certificate provisioning when needed
|
|
275
|
+
*
|
|
276
|
+
* @param routes The route configurations to sync to NetworkProxy
|
|
210
277
|
*/
|
|
211
|
-
async
|
|
278
|
+
async syncRoutesToNetworkProxy(routes) {
|
|
212
279
|
if (!this.networkProxy) {
|
|
213
280
|
console.log('Cannot sync configurations - NetworkProxy not initialized');
|
|
214
281
|
return;
|
|
@@ -217,9 +284,9 @@ export class NetworkProxyBridge {
|
|
|
217
284
|
// Get SSL certificates from assets
|
|
218
285
|
// Import fs directly since it's not in plugins
|
|
219
286
|
const fs = await import('fs');
|
|
220
|
-
let
|
|
287
|
+
let defaultCertPair;
|
|
221
288
|
try {
|
|
222
|
-
|
|
289
|
+
defaultCertPair = {
|
|
223
290
|
key: fs.readFileSync('assets/certs/key.pem', 'utf8'),
|
|
224
291
|
cert: fs.readFileSync('assets/certs/cert.pem', 'utf8'),
|
|
225
292
|
};
|
|
@@ -229,42 +296,110 @@ export class NetworkProxyBridge {
|
|
|
229
296
|
console.log('Using empty certificate placeholders - ACME will generate proper certificates if enabled');
|
|
230
297
|
// Use empty placeholders - NetworkProxy will use its internal defaults
|
|
231
298
|
// or ACME will generate proper ones if enabled
|
|
232
|
-
|
|
299
|
+
defaultCertPair = {
|
|
233
300
|
key: '',
|
|
234
301
|
cert: '',
|
|
235
302
|
};
|
|
236
303
|
}
|
|
237
|
-
//
|
|
238
|
-
const proxyConfigs = this.
|
|
239
|
-
//
|
|
240
|
-
const acmeEnabled = !!this.settings.acme?.enabled;
|
|
241
|
-
if (acmeEnabled) {
|
|
242
|
-
const acmeEligibleDomains = proxyConfigs
|
|
243
|
-
.filter((config) => !config.hostName.includes('*')) // Exclude wildcards
|
|
244
|
-
.map((config) => config.hostName);
|
|
245
|
-
if (acmeEligibleDomains.length > 0) {
|
|
246
|
-
console.log(`Domains eligible for ACME certificates: ${acmeEligibleDomains.join(', ')}`);
|
|
247
|
-
// Register these domains with Port80Handler if available
|
|
248
|
-
if (this.port80Handler) {
|
|
249
|
-
this.registerDomainsWithPort80Handler(acmeEligibleDomains);
|
|
250
|
-
}
|
|
251
|
-
}
|
|
252
|
-
else {
|
|
253
|
-
console.log('No domains eligible for ACME certificates found in configuration');
|
|
254
|
-
}
|
|
255
|
-
}
|
|
256
|
-
// Update NetworkProxy with the converted configs
|
|
304
|
+
// Map routes directly to NetworkProxy configs
|
|
305
|
+
const proxyConfigs = this.mapRoutesToNetworkProxyConfigs(routes, defaultCertPair);
|
|
306
|
+
// Update the proxy configs
|
|
257
307
|
await this.networkProxy.updateProxyConfigs(proxyConfigs);
|
|
258
|
-
console.log(`
|
|
308
|
+
console.log(`Synced ${proxyConfigs.length} configurations to NetworkProxy`);
|
|
309
|
+
// Register domains with Port80Handler for certificate issuance
|
|
310
|
+
if (this.port80Handler) {
|
|
311
|
+
this.registerDomainsWithPort80Handler(routes);
|
|
312
|
+
}
|
|
259
313
|
}
|
|
260
314
|
catch (err) {
|
|
261
|
-
console.log(`
|
|
315
|
+
console.log(`Error syncing routes to NetworkProxy: ${err}`);
|
|
262
316
|
}
|
|
263
317
|
}
|
|
318
|
+
/**
|
|
319
|
+
* Map routes directly to NetworkProxy configuration format
|
|
320
|
+
*
|
|
321
|
+
* This method directly maps route configurations to NetworkProxy's format
|
|
322
|
+
* without any intermediate domain-based representation. It processes each route
|
|
323
|
+
* and creates appropriate NetworkProxy configs for domains that require TLS termination.
|
|
324
|
+
*
|
|
325
|
+
* @param routes Array of route configurations to map
|
|
326
|
+
* @param defaultCertPair Default certificate to use if no custom certificate is specified
|
|
327
|
+
* @returns Array of NetworkProxy configurations
|
|
328
|
+
*/
|
|
329
|
+
mapRoutesToNetworkProxyConfigs(routes, defaultCertPair) {
|
|
330
|
+
const configs = [];
|
|
331
|
+
for (const route of routes) {
|
|
332
|
+
// Skip routes without domains
|
|
333
|
+
if (!route.match.domains)
|
|
334
|
+
continue;
|
|
335
|
+
// Skip non-forward routes
|
|
336
|
+
if (route.action.type !== 'forward')
|
|
337
|
+
continue;
|
|
338
|
+
// Skip routes without TLS configuration
|
|
339
|
+
if (!route.action.tls || !route.action.target)
|
|
340
|
+
continue;
|
|
341
|
+
// Skip routes that don't require TLS termination
|
|
342
|
+
if (route.action.tls.mode !== 'terminate' && route.action.tls.mode !== 'terminate-and-reencrypt')
|
|
343
|
+
continue;
|
|
344
|
+
// Get domains from route
|
|
345
|
+
const domains = Array.isArray(route.match.domains)
|
|
346
|
+
? route.match.domains
|
|
347
|
+
: [route.match.domains];
|
|
348
|
+
// Create a config for each domain
|
|
349
|
+
for (const domain of domains) {
|
|
350
|
+
// Get certificate
|
|
351
|
+
let certKey = defaultCertPair.key;
|
|
352
|
+
let certCert = defaultCertPair.cert;
|
|
353
|
+
// Use custom certificate if specified
|
|
354
|
+
if (route.action.tls.certificate !== 'auto' && typeof route.action.tls.certificate === 'object') {
|
|
355
|
+
certKey = route.action.tls.certificate.key;
|
|
356
|
+
certCert = route.action.tls.certificate.cert;
|
|
357
|
+
}
|
|
358
|
+
// Determine target hosts and ports
|
|
359
|
+
const targetHosts = Array.isArray(route.action.target.host)
|
|
360
|
+
? route.action.target.host
|
|
361
|
+
: [route.action.target.host];
|
|
362
|
+
const targetPort = route.action.target.port;
|
|
363
|
+
// Create the NetworkProxy config
|
|
364
|
+
const config = {
|
|
365
|
+
hostName: domain,
|
|
366
|
+
privateKey: certKey,
|
|
367
|
+
publicKey: certCert,
|
|
368
|
+
destinationIps: targetHosts,
|
|
369
|
+
destinationPorts: [targetPort]
|
|
370
|
+
// Note: We can't include additional metadata as it's not supported in the interface
|
|
371
|
+
};
|
|
372
|
+
configs.push(config);
|
|
373
|
+
}
|
|
374
|
+
}
|
|
375
|
+
return configs;
|
|
376
|
+
}
|
|
377
|
+
/**
|
|
378
|
+
* @deprecated This method is kept for backward compatibility.
|
|
379
|
+
* Use mapRoutesToNetworkProxyConfigs() instead.
|
|
380
|
+
*/
|
|
381
|
+
convertRoutesToNetworkProxyConfigs(routes, defaultCertPair) {
|
|
382
|
+
return this.mapRoutesToNetworkProxyConfigs(routes, defaultCertPair);
|
|
383
|
+
}
|
|
384
|
+
/**
|
|
385
|
+
* @deprecated This method is deprecated and will be removed in a future version.
|
|
386
|
+
* Use syncRoutesToNetworkProxy() instead.
|
|
387
|
+
*
|
|
388
|
+
* This legacy method exists only for backward compatibility and
|
|
389
|
+
* simply forwards to syncRoutesToNetworkProxy().
|
|
390
|
+
*/
|
|
391
|
+
async syncDomainConfigsToNetworkProxy() {
|
|
392
|
+
console.log('DEPRECATED: Method syncDomainConfigsToNetworkProxy will be removed in a future version.');
|
|
393
|
+
console.log('Please use syncRoutesToNetworkProxy() instead for direct route-based configuration.');
|
|
394
|
+
await this.syncRoutesToNetworkProxy(this.settings.routes || []);
|
|
395
|
+
}
|
|
264
396
|
/**
|
|
265
397
|
* Request a certificate for a specific domain
|
|
398
|
+
*
|
|
399
|
+
* @param domain The domain to request a certificate for
|
|
400
|
+
* @param routeName Optional route name to associate with this certificate
|
|
266
401
|
*/
|
|
267
|
-
async requestCertificate(domain) {
|
|
402
|
+
async requestCertificate(domain, routeName) {
|
|
268
403
|
// Delegate to Port80Handler if available
|
|
269
404
|
if (this.port80Handler) {
|
|
270
405
|
try {
|
|
@@ -274,12 +409,27 @@ export class NetworkProxyBridge {
|
|
|
274
409
|
console.log(`Certificate already exists for ${domain}`);
|
|
275
410
|
return true;
|
|
276
411
|
}
|
|
277
|
-
//
|
|
278
|
-
|
|
412
|
+
// Build the domain options
|
|
413
|
+
const domainOptions = {
|
|
279
414
|
domainName: domain,
|
|
280
415
|
sslRedirect: true,
|
|
281
|
-
acmeMaintenance: true
|
|
282
|
-
}
|
|
416
|
+
acmeMaintenance: true,
|
|
417
|
+
};
|
|
418
|
+
// Add route reference if available
|
|
419
|
+
if (routeName) {
|
|
420
|
+
domainOptions.routeReference = {
|
|
421
|
+
routeName
|
|
422
|
+
};
|
|
423
|
+
}
|
|
424
|
+
else {
|
|
425
|
+
// Try to find a route reference from the current routes
|
|
426
|
+
const routeReference = this.findRouteReferenceForDomain(domain, this.settings.routes || []);
|
|
427
|
+
if (routeReference) {
|
|
428
|
+
domainOptions.routeReference = routeReference;
|
|
429
|
+
}
|
|
430
|
+
}
|
|
431
|
+
// Register the domain for certificate issuance
|
|
432
|
+
this.port80Handler.addDomain(domainOptions);
|
|
283
433
|
console.log(`Domain ${domain} registered for certificate issuance`);
|
|
284
434
|
return true;
|
|
285
435
|
}
|
|
@@ -313,4 +463,4 @@ export class NetworkProxyBridge {
|
|
|
313
463
|
}
|
|
314
464
|
}
|
|
315
465
|
}
|
|
316
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"network-proxy-bridge.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/network-proxy-bridge.ts"],"names":[],"mappings":"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"}
|
|
466
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"network-proxy-bridge.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/network-proxy-bridge.ts"],"names":[],"mappings":"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"}
|