@push.rocks/smartproxy 19.6.16 → 20.0.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/dist_ts/core/utils/shared-security-manager.js +30 -5
- package/dist_ts/proxies/http-proxy/request-handler.d.ts +4 -0
- package/dist_ts/proxies/http-proxy/request-handler.js +104 -21
- package/dist_ts/proxies/http-proxy/websocket-handler.d.ts +4 -0
- package/dist_ts/proxies/http-proxy/websocket-handler.js +78 -8
- package/dist_ts/proxies/smart-proxy/certificate-manager.d.ts +17 -1
- package/dist_ts/proxies/smart-proxy/certificate-manager.js +84 -10
- package/dist_ts/proxies/smart-proxy/models/interfaces.d.ts +5 -0
- package/dist_ts/proxies/smart-proxy/models/route-types.d.ts +19 -2
- package/dist_ts/proxies/smart-proxy/models/route-types.js +1 -1
- package/dist_ts/proxies/smart-proxy/nftables-manager.js +14 -11
- package/dist_ts/proxies/smart-proxy/route-connection-handler.d.ts +4 -0
- package/dist_ts/proxies/smart-proxy/route-connection-handler.js +112 -28
- package/dist_ts/proxies/smart-proxy/smart-proxy.js +9 -1
- package/dist_ts/proxies/smart-proxy/utils/route-helpers.js +23 -23
- package/dist_ts/proxies/smart-proxy/utils/route-patterns.js +13 -13
- package/dist_ts/proxies/smart-proxy/utils/route-utils.js +4 -7
- package/dist_ts/proxies/smart-proxy/utils/route-validators.js +41 -25
- package/package.json +1 -1
- package/readme.hints.md +51 -1
- package/readme.md +105 -2
- package/readme.plan.md +154 -53
- package/ts/core/utils/shared-security-manager.ts +33 -4
- package/ts/proxies/http-proxy/request-handler.ts +124 -21
- package/ts/proxies/http-proxy/websocket-handler.ts +96 -8
- package/ts/proxies/smart-proxy/certificate-manager.ts +98 -13
- package/ts/proxies/smart-proxy/models/interfaces.ts +6 -0
- package/ts/proxies/smart-proxy/models/route-types.ts +34 -8
- package/ts/proxies/smart-proxy/nftables-manager.ts +14 -10
- package/ts/proxies/smart-proxy/route-connection-handler.ts +132 -28
- package/ts/proxies/smart-proxy/smart-proxy.ts +10 -0
- package/ts/proxies/smart-proxy/utils/route-helpers.ts +14 -14
- package/ts/proxies/smart-proxy/utils/route-patterns.ts +6 -6
- package/ts/proxies/smart-proxy/utils/route-utils.ts +3 -6
- package/ts/proxies/smart-proxy/utils/route-validators.ts +38 -21
|
@@ -94,32 +94,45 @@ export function validateRouteAction(action) {
|
|
|
94
94
|
else if (!['forward', 'socket-handler'].includes(action.type)) {
|
|
95
95
|
errors.push(`Invalid action type: ${action.type}`);
|
|
96
96
|
}
|
|
97
|
-
// Validate
|
|
97
|
+
// Validate targets for 'forward' action
|
|
98
98
|
if (action.type === 'forward') {
|
|
99
|
-
if (!action.
|
|
100
|
-
errors.push('
|
|
99
|
+
if (!action.targets || !Array.isArray(action.targets) || action.targets.length === 0) {
|
|
100
|
+
errors.push('Targets array is required for forward action');
|
|
101
101
|
}
|
|
102
102
|
else {
|
|
103
|
-
// Validate target
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
typeof
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
103
|
+
// Validate each target
|
|
104
|
+
action.targets.forEach((target, index) => {
|
|
105
|
+
// Validate target host
|
|
106
|
+
if (!target.host) {
|
|
107
|
+
errors.push(`Target[${index}] host is required`);
|
|
108
|
+
}
|
|
109
|
+
else if (typeof target.host !== 'string' &&
|
|
110
|
+
!Array.isArray(target.host) &&
|
|
111
|
+
typeof target.host !== 'function') {
|
|
112
|
+
errors.push(`Target[${index}] host must be a string, array of strings, or function`);
|
|
113
|
+
}
|
|
114
|
+
// Validate target port
|
|
115
|
+
if (target.port === undefined) {
|
|
116
|
+
errors.push(`Target[${index}] port is required`);
|
|
117
|
+
}
|
|
118
|
+
else if (typeof target.port !== 'number' &&
|
|
119
|
+
typeof target.port !== 'function' &&
|
|
120
|
+
target.port !== 'preserve') {
|
|
121
|
+
errors.push(`Target[${index}] port must be a number, 'preserve', or a function`);
|
|
122
|
+
}
|
|
123
|
+
else if (typeof target.port === 'number' && !isValidPort(target.port)) {
|
|
124
|
+
errors.push(`Target[${index}] port must be between 1 and 65535`);
|
|
125
|
+
}
|
|
126
|
+
// Validate match criteria if present
|
|
127
|
+
if (target.match) {
|
|
128
|
+
if (target.match.ports && !Array.isArray(target.match.ports)) {
|
|
129
|
+
errors.push(`Target[${index}] match.ports must be an array`);
|
|
130
|
+
}
|
|
131
|
+
if (target.match.method && !Array.isArray(target.match.method)) {
|
|
132
|
+
errors.push(`Target[${index}] match.method must be an array`);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
});
|
|
123
136
|
}
|
|
124
137
|
// Validate TLS options for forward actions
|
|
125
138
|
if (action.tls) {
|
|
@@ -219,7 +232,10 @@ export function hasRequiredPropertiesForAction(route, actionType) {
|
|
|
219
232
|
}
|
|
220
233
|
switch (actionType) {
|
|
221
234
|
case 'forward':
|
|
222
|
-
return !!route.action.
|
|
235
|
+
return !!route.action.targets &&
|
|
236
|
+
Array.isArray(route.action.targets) &&
|
|
237
|
+
route.action.targets.length > 0 &&
|
|
238
|
+
route.action.targets.every(t => t.host && t.port !== undefined);
|
|
223
239
|
case 'socket-handler':
|
|
224
240
|
return !!route.action.socketHandler && typeof route.action.socketHandler === 'function';
|
|
225
241
|
default:
|
|
@@ -240,4 +256,4 @@ export function assertValidRoute(route) {
|
|
|
240
256
|
}
|
|
241
257
|
return route;
|
|
242
258
|
}
|
|
243
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-validators.js","sourceRoot":"","sources":["../../../../ts/proxies/smart-proxy/utils/route-validators.ts"],"names":[],"mappings":"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"}
|
|
259
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-validators.js","sourceRoot":"","sources":["../../../../ts/proxies/smart-proxy/utils/route-validators.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartproxy",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "20.0.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A powerful proxy package with unified route-based configuration for high traffic management. Features include SSL/TLS support, flexible routing patterns, WebSocket handling, advanced security options, and automatic ACME certificate management.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
package/readme.hints.md
CHANGED
|
@@ -295,4 +295,54 @@ You'll see:
|
|
|
295
295
|
- During attacks or high-volume scenarios, logs are flushed more frequently
|
|
296
296
|
- If 50+ events occur within 1 second, immediate flush is triggered
|
|
297
297
|
- Prevents memory buildup during flooding attacks
|
|
298
|
-
- Maintains real-time visibility during incidents
|
|
298
|
+
- Maintains real-time visibility during incidents
|
|
299
|
+
|
|
300
|
+
## Custom Certificate Provision Function
|
|
301
|
+
|
|
302
|
+
The `certProvisionFunction` feature has been implemented to allow users to provide their own certificate generation logic.
|
|
303
|
+
|
|
304
|
+
### Implementation Details
|
|
305
|
+
|
|
306
|
+
1. **Type Definition**: The function must return `Promise<TSmartProxyCertProvisionObject>` where:
|
|
307
|
+
- `TSmartProxyCertProvisionObject = plugins.tsclass.network.ICert | 'http01'`
|
|
308
|
+
- Return `'http01'` to fallback to Let's Encrypt
|
|
309
|
+
- Return a certificate object for custom certificates
|
|
310
|
+
|
|
311
|
+
2. **Certificate Manager Changes**:
|
|
312
|
+
- Added `certProvisionFunction` property to CertificateManager
|
|
313
|
+
- Modified `provisionAcmeCertificate()` to check custom function first
|
|
314
|
+
- Custom certificates are stored with source type 'custom'
|
|
315
|
+
- Expiry date extraction currently defaults to 90 days
|
|
316
|
+
|
|
317
|
+
3. **Configuration Options**:
|
|
318
|
+
- `certProvisionFunction`: The custom provision function
|
|
319
|
+
- `certProvisionFallbackToAcme`: Whether to fallback to ACME on error (default: true)
|
|
320
|
+
|
|
321
|
+
4. **Usage Example**:
|
|
322
|
+
```typescript
|
|
323
|
+
new SmartProxy({
|
|
324
|
+
certProvisionFunction: async (domain: string) => {
|
|
325
|
+
if (domain === 'internal.example.com') {
|
|
326
|
+
return {
|
|
327
|
+
cert: customCert,
|
|
328
|
+
key: customKey,
|
|
329
|
+
ca: customCA
|
|
330
|
+
} as unknown as TSmartProxyCertProvisionObject;
|
|
331
|
+
}
|
|
332
|
+
return 'http01'; // Use Let's Encrypt
|
|
333
|
+
},
|
|
334
|
+
certProvisionFallbackToAcme: true
|
|
335
|
+
})
|
|
336
|
+
```
|
|
337
|
+
|
|
338
|
+
5. **Testing Notes**:
|
|
339
|
+
- Type assertions through `unknown` are needed in tests due to strict interface typing
|
|
340
|
+
- Mock certificate objects work for testing but need proper type casting
|
|
341
|
+
- The actual certificate parsing for expiry dates would need a proper X.509 parser
|
|
342
|
+
|
|
343
|
+
### Future Improvements
|
|
344
|
+
|
|
345
|
+
1. Implement proper certificate expiry date extraction using X.509 parsing
|
|
346
|
+
2. Add support for returning expiry date with custom certificates
|
|
347
|
+
3. Consider adding validation for custom certificate format
|
|
348
|
+
4. Add events/hooks for certificate provisioning lifecycle
|
package/readme.md
CHANGED
|
@@ -2336,14 +2336,117 @@ sequenceDiagram
|
|
|
2336
2336
|
• Efficient SNI extraction
|
|
2337
2337
|
• Minimal overhead routing
|
|
2338
2338
|
|
|
2339
|
-
## Certificate
|
|
2339
|
+
## Certificate Management
|
|
2340
|
+
|
|
2341
|
+
### Custom Certificate Provision Function
|
|
2342
|
+
|
|
2343
|
+
SmartProxy supports a custom certificate provision function that allows you to provide your own certificate generation logic while maintaining compatibility with Let's Encrypt:
|
|
2344
|
+
|
|
2345
|
+
```typescript
|
|
2346
|
+
const proxy = new SmartProxy({
|
|
2347
|
+
certProvisionFunction: async (domain: string): Promise<TSmartProxyCertProvisionObject> => {
|
|
2348
|
+
// Option 1: Return a custom certificate
|
|
2349
|
+
if (domain === 'internal.example.com') {
|
|
2350
|
+
return {
|
|
2351
|
+
cert: customCertPEM,
|
|
2352
|
+
key: customKeyPEM,
|
|
2353
|
+
ca: customCAPEM // Optional CA chain
|
|
2354
|
+
};
|
|
2355
|
+
}
|
|
2356
|
+
|
|
2357
|
+
// Option 2: Fallback to Let's Encrypt
|
|
2358
|
+
return 'http01';
|
|
2359
|
+
},
|
|
2360
|
+
|
|
2361
|
+
// Control fallback behavior when custom provision fails
|
|
2362
|
+
certProvisionFallbackToAcme: true, // Default: true
|
|
2363
|
+
|
|
2364
|
+
routes: [...]
|
|
2365
|
+
});
|
|
2366
|
+
```
|
|
2367
|
+
|
|
2368
|
+
**Key Features:**
|
|
2369
|
+
- Called for any route with `certificate: 'auto'`
|
|
2370
|
+
- Return custom certificate object or `'http01'` to use Let's Encrypt
|
|
2371
|
+
- Participates in automatic renewal cycle (checked every 12 hours)
|
|
2372
|
+
- Custom certificates stored with source type 'custom' for tracking
|
|
2373
|
+
|
|
2374
|
+
**Configuration Options:**
|
|
2375
|
+
- `certProvisionFunction`: Async function that receives domain and returns certificate or 'http01'
|
|
2376
|
+
- `certProvisionFallbackToAcme`: Whether to fallback to Let's Encrypt if custom provision fails (default: true)
|
|
2377
|
+
|
|
2378
|
+
**Advanced Example with Certificate Manager:**
|
|
2379
|
+
|
|
2380
|
+
```typescript
|
|
2381
|
+
const certManager = new MyCertificateManager();
|
|
2382
|
+
|
|
2383
|
+
const proxy = new SmartProxy({
|
|
2384
|
+
certProvisionFunction: async (domain: string) => {
|
|
2385
|
+
try {
|
|
2386
|
+
// Check if we have a custom certificate for this domain
|
|
2387
|
+
if (await certManager.hasCustomCert(domain)) {
|
|
2388
|
+
const cert = await certManager.getCertificate(domain);
|
|
2389
|
+
return {
|
|
2390
|
+
cert: cert.certificate,
|
|
2391
|
+
key: cert.privateKey,
|
|
2392
|
+
ca: cert.chain
|
|
2393
|
+
};
|
|
2394
|
+
}
|
|
2395
|
+
|
|
2396
|
+
// Use Let's Encrypt for public domains
|
|
2397
|
+
if (domain.endsWith('.example.com')) {
|
|
2398
|
+
return 'http01';
|
|
2399
|
+
}
|
|
2400
|
+
|
|
2401
|
+
// Generate self-signed for internal domains
|
|
2402
|
+
if (domain.endsWith('.internal')) {
|
|
2403
|
+
const selfSigned = await certManager.generateSelfSigned(domain);
|
|
2404
|
+
return {
|
|
2405
|
+
cert: selfSigned.cert,
|
|
2406
|
+
key: selfSigned.key,
|
|
2407
|
+
ca: ''
|
|
2408
|
+
};
|
|
2409
|
+
}
|
|
2410
|
+
|
|
2411
|
+
// Default to Let's Encrypt
|
|
2412
|
+
return 'http01';
|
|
2413
|
+
} catch (error) {
|
|
2414
|
+
console.error(`Certificate provision failed for ${domain}:`, error);
|
|
2415
|
+
// Will fallback to Let's Encrypt if certProvisionFallbackToAcme is true
|
|
2416
|
+
throw error;
|
|
2417
|
+
}
|
|
2418
|
+
},
|
|
2419
|
+
|
|
2420
|
+
certProvisionFallbackToAcme: true,
|
|
2421
|
+
|
|
2422
|
+
routes: [
|
|
2423
|
+
// Routes that use automatic certificates
|
|
2424
|
+
{
|
|
2425
|
+
match: { ports: 443, domains: ['app.example.com', '*.internal'] },
|
|
2426
|
+
action: {
|
|
2427
|
+
type: 'forward',
|
|
2428
|
+
target: { host: 'localhost', port: 8080 },
|
|
2429
|
+
tls: { mode: 'terminate', certificate: 'auto' }
|
|
2430
|
+
}
|
|
2431
|
+
}
|
|
2432
|
+
]
|
|
2433
|
+
});
|
|
2434
|
+
```
|
|
2435
|
+
|
|
2436
|
+
### Certificate Events
|
|
2340
2437
|
|
|
2341
2438
|
Listen for certificate events via EventEmitter:
|
|
2342
2439
|
- **SmartProxy**:
|
|
2343
2440
|
- `certificate` (domain, publicKey, privateKey, expiryDate, source, isRenewal)
|
|
2344
2441
|
- Events from CertManager are propagated
|
|
2345
2442
|
|
|
2346
|
-
|
|
2443
|
+
```typescript
|
|
2444
|
+
proxy.on('certificate', (domain, cert, key, expiryDate, source, isRenewal) => {
|
|
2445
|
+
console.log(`Certificate ${isRenewal ? 'renewed' : 'provisioned'} for ${domain}`);
|
|
2446
|
+
console.log(`Source: ${source}`); // 'acme', 'static', or 'custom'
|
|
2447
|
+
console.log(`Expires: ${expiryDate}`);
|
|
2448
|
+
});
|
|
2449
|
+
```
|
|
2347
2450
|
|
|
2348
2451
|
## SmartProxy: Common Use Cases
|
|
2349
2452
|
|
package/readme.plan.md
CHANGED
|
@@ -1,53 +1,154 @@
|
|
|
1
|
-
# SmartProxy
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
-
|
|
16
|
-
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
- [x] Update
|
|
22
|
-
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
- [x]
|
|
26
|
-
- [x]
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
- [x]
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
- [x]
|
|
38
|
-
- [x]
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
- [x]
|
|
44
|
-
- [
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
-
|
|
50
|
-
-
|
|
51
|
-
-
|
|
52
|
-
|
|
53
|
-
|
|
1
|
+
# SmartProxy Enhanced Routing Plan
|
|
2
|
+
|
|
3
|
+
## Goal
|
|
4
|
+
Implement enhanced routing structure with multiple targets per route, sub-matching capabilities, and target-specific overrides to enable more elegant and DRY configurations.
|
|
5
|
+
|
|
6
|
+
## Key Changes
|
|
7
|
+
|
|
8
|
+
### 1. Update Route Target Interface
|
|
9
|
+
- Add `match` property to `IRouteTarget` for sub-matching within routes
|
|
10
|
+
- Add target-specific override properties (tls, websocket, loadBalancing, etc.)
|
|
11
|
+
- Add priority field for controlling match order
|
|
12
|
+
|
|
13
|
+
### 2. Update Route Action Interface
|
|
14
|
+
- Remove singular `target` property
|
|
15
|
+
- Use only `targets` array (single target = array with one element)
|
|
16
|
+
- Maintain backwards compatibility during migration
|
|
17
|
+
|
|
18
|
+
### 3. Implementation Steps
|
|
19
|
+
|
|
20
|
+
#### Phase 1: Type Updates
|
|
21
|
+
- [x] Update `IRouteTarget` interface in `route-types.ts`
|
|
22
|
+
- Add `match?: ITargetMatch` property
|
|
23
|
+
- Add override properties (tls, websocket, etc.)
|
|
24
|
+
- Add `priority?: number` field
|
|
25
|
+
- [x] Create `ITargetMatch` interface for sub-matching criteria
|
|
26
|
+
- [x] Update `IRouteAction` to use only `targets: IRouteTarget[]`
|
|
27
|
+
|
|
28
|
+
#### Phase 2: Route Resolution Logic
|
|
29
|
+
- [x] Update route matching logic to handle multiple targets
|
|
30
|
+
- [x] Implement target sub-matching algorithm:
|
|
31
|
+
1. Sort targets by priority (highest first)
|
|
32
|
+
2. For each target with a match property, check if request matches
|
|
33
|
+
3. Use first matching target, or fallback to target without match
|
|
34
|
+
- [x] Ensure target-specific settings override route-level settings
|
|
35
|
+
|
|
36
|
+
#### Phase 3: Code Migration
|
|
37
|
+
- [x] Find all occurrences of `action.target` and update to use `action.targets`
|
|
38
|
+
- [x] Update route helpers and utilities
|
|
39
|
+
- [x] Update certificate manager to handle multiple targets
|
|
40
|
+
- [x] Update connection handlers
|
|
41
|
+
|
|
42
|
+
#### Phase 4: Testing
|
|
43
|
+
- [x] Update existing tests to use new format
|
|
44
|
+
- [ ] Add tests for multi-target scenarios
|
|
45
|
+
- [ ] Add tests for sub-matching logic
|
|
46
|
+
- [ ] Add tests for setting overrides
|
|
47
|
+
|
|
48
|
+
#### Phase 5: Documentation
|
|
49
|
+
- [ ] Update type documentation
|
|
50
|
+
- [ ] Add examples of new routing patterns
|
|
51
|
+
- [ ] Document migration path for existing configs
|
|
52
|
+
|
|
53
|
+
## Example Configurations
|
|
54
|
+
|
|
55
|
+
### Before (Current)
|
|
56
|
+
```typescript
|
|
57
|
+
// Need separate routes for different ports/paths
|
|
58
|
+
[
|
|
59
|
+
{
|
|
60
|
+
match: { domains: ['api.example.com'], ports: [80] },
|
|
61
|
+
action: {
|
|
62
|
+
type: 'forward',
|
|
63
|
+
target: { host: 'backend', port: 8080 },
|
|
64
|
+
tls: { mode: 'terminate' }
|
|
65
|
+
}
|
|
66
|
+
},
|
|
67
|
+
{
|
|
68
|
+
match: { domains: ['api.example.com'], ports: [443] },
|
|
69
|
+
action: {
|
|
70
|
+
type: 'forward',
|
|
71
|
+
target: { host: 'backend', port: 8081 },
|
|
72
|
+
tls: { mode: 'passthrough' }
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
]
|
|
76
|
+
```
|
|
77
|
+
|
|
78
|
+
### After (Enhanced)
|
|
79
|
+
```typescript
|
|
80
|
+
// Single route with multiple targets
|
|
81
|
+
{
|
|
82
|
+
match: { domains: ['api.example.com'], ports: [80, 443] },
|
|
83
|
+
action: {
|
|
84
|
+
type: 'forward',
|
|
85
|
+
targets: [
|
|
86
|
+
{
|
|
87
|
+
match: { ports: [80] },
|
|
88
|
+
host: 'backend',
|
|
89
|
+
port: 8080,
|
|
90
|
+
tls: { mode: 'terminate' }
|
|
91
|
+
},
|
|
92
|
+
{
|
|
93
|
+
match: { ports: [443] },
|
|
94
|
+
host: 'backend',
|
|
95
|
+
port: 8081,
|
|
96
|
+
tls: { mode: 'passthrough' }
|
|
97
|
+
}
|
|
98
|
+
]
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
```
|
|
102
|
+
|
|
103
|
+
### Advanced Example
|
|
104
|
+
```typescript
|
|
105
|
+
{
|
|
106
|
+
match: { domains: ['app.example.com'], ports: [443] },
|
|
107
|
+
action: {
|
|
108
|
+
type: 'forward',
|
|
109
|
+
tls: { mode: 'terminate', certificate: 'auto' }, // Route-level default
|
|
110
|
+
websocket: { enabled: true }, // Route-level default
|
|
111
|
+
targets: [
|
|
112
|
+
{
|
|
113
|
+
match: { path: '/api/v2/*' },
|
|
114
|
+
host: 'api-v2',
|
|
115
|
+
port: 8082,
|
|
116
|
+
priority: 10
|
|
117
|
+
},
|
|
118
|
+
{
|
|
119
|
+
match: { path: '/api/*', headers: { 'X-Version': 'v1' } },
|
|
120
|
+
host: 'api-v1',
|
|
121
|
+
port: 8081,
|
|
122
|
+
priority: 5
|
|
123
|
+
},
|
|
124
|
+
{
|
|
125
|
+
match: { path: '/ws/*' },
|
|
126
|
+
host: 'websocket-server',
|
|
127
|
+
port: 8090,
|
|
128
|
+
websocket: {
|
|
129
|
+
enabled: true,
|
|
130
|
+
rewritePath: '/' // Strip /ws prefix
|
|
131
|
+
}
|
|
132
|
+
},
|
|
133
|
+
{
|
|
134
|
+
// Default target (no match property)
|
|
135
|
+
host: 'web-backend',
|
|
136
|
+
port: 8080
|
|
137
|
+
}
|
|
138
|
+
]
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
```
|
|
142
|
+
|
|
143
|
+
## Benefits
|
|
144
|
+
1. **DRY Configuration**: No need to duplicate common settings across routes
|
|
145
|
+
2. **Flexibility**: Different backends for different ports/paths within same domain
|
|
146
|
+
3. **Clarity**: All routing for a domain in one place
|
|
147
|
+
4. **Performance**: Single route lookup instead of multiple
|
|
148
|
+
5. **Backwards Compatible**: Can migrate gradually
|
|
149
|
+
|
|
150
|
+
## Migration Strategy
|
|
151
|
+
1. Keep support for `target` temporarily with deprecation warning
|
|
152
|
+
2. Auto-convert `target` to `targets: [target]` internally
|
|
153
|
+
3. Update documentation with migration examples
|
|
154
|
+
4. Remove `target` support in next major version
|
|
@@ -13,7 +13,8 @@ import {
|
|
|
13
13
|
trackConnection,
|
|
14
14
|
removeConnection,
|
|
15
15
|
cleanupExpiredRateLimits,
|
|
16
|
-
parseBasicAuthHeader
|
|
16
|
+
parseBasicAuthHeader,
|
|
17
|
+
normalizeIP
|
|
17
18
|
} from './security-utils.js';
|
|
18
19
|
|
|
19
20
|
/**
|
|
@@ -78,7 +79,15 @@ export class SharedSecurityManager {
|
|
|
78
79
|
* @returns Number of connections from this IP
|
|
79
80
|
*/
|
|
80
81
|
public getConnectionCountByIP(ip: string): number {
|
|
81
|
-
|
|
82
|
+
// Check all normalized variants of the IP
|
|
83
|
+
const variants = normalizeIP(ip);
|
|
84
|
+
for (const variant of variants) {
|
|
85
|
+
const info = this.connectionsByIP.get(variant);
|
|
86
|
+
if (info) {
|
|
87
|
+
return info.connections.size;
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
return 0;
|
|
82
91
|
}
|
|
83
92
|
|
|
84
93
|
/**
|
|
@@ -88,7 +97,19 @@ export class SharedSecurityManager {
|
|
|
88
97
|
* @param connectionId - The connection ID to associate
|
|
89
98
|
*/
|
|
90
99
|
public trackConnectionByIP(ip: string, connectionId: string): void {
|
|
91
|
-
|
|
100
|
+
// Check if any variant already exists
|
|
101
|
+
const variants = normalizeIP(ip);
|
|
102
|
+
let existingKey: string | null = null;
|
|
103
|
+
|
|
104
|
+
for (const variant of variants) {
|
|
105
|
+
if (this.connectionsByIP.has(variant)) {
|
|
106
|
+
existingKey = variant;
|
|
107
|
+
break;
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
// Use existing key or the original IP
|
|
112
|
+
trackConnection(existingKey || ip, connectionId, this.connectionsByIP);
|
|
92
113
|
}
|
|
93
114
|
|
|
94
115
|
/**
|
|
@@ -98,7 +119,15 @@ export class SharedSecurityManager {
|
|
|
98
119
|
* @param connectionId - The connection ID to remove
|
|
99
120
|
*/
|
|
100
121
|
public removeConnectionByIP(ip: string, connectionId: string): void {
|
|
101
|
-
|
|
122
|
+
// Check all variants to find where the connection is tracked
|
|
123
|
+
const variants = normalizeIP(ip);
|
|
124
|
+
|
|
125
|
+
for (const variant of variants) {
|
|
126
|
+
if (this.connectionsByIP.has(variant)) {
|
|
127
|
+
removeConnection(variant, connectionId, this.connectionsByIP);
|
|
128
|
+
break;
|
|
129
|
+
}
|
|
130
|
+
}
|
|
102
131
|
}
|
|
103
132
|
|
|
104
133
|
/**
|