@push.rocks/smartproxy 3.37.3 → 3.39.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/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.portproxy.d.ts +3 -0
- package/dist_ts/classes.portproxy.js +75 -9
- package/dist_ts/classes.snihandler.d.ts +74 -2
- package/dist_ts/classes.snihandler.js +261 -17
- package/package.json +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.portproxy.ts +113 -9
- package/ts/classes.snihandler.ts +333 -16
|
@@ -1,17 +1,24 @@
|
|
|
1
1
|
import { Buffer } from 'buffer';
|
|
2
2
|
/**
|
|
3
3
|
* SNI (Server Name Indication) handler for TLS connections.
|
|
4
|
-
* Provides robust extraction of SNI values from TLS ClientHello messages
|
|
4
|
+
* Provides robust extraction of SNI values from TLS ClientHello messages
|
|
5
|
+
* with support for fragmented packets, TLS 1.3 resumption, and Chrome-specific
|
|
6
|
+
* connection behaviors.
|
|
5
7
|
*/
|
|
6
8
|
export class SniHandler {
|
|
7
9
|
// TLS record types and constants
|
|
8
10
|
static { this.TLS_HANDSHAKE_RECORD_TYPE = 22; }
|
|
11
|
+
static { this.TLS_APPLICATION_DATA_TYPE = 23; } // TLS Application Data record type
|
|
9
12
|
static { this.TLS_CLIENT_HELLO_HANDSHAKE_TYPE = 1; }
|
|
10
13
|
static { this.TLS_SNI_EXTENSION_TYPE = 0x0000; }
|
|
11
14
|
static { this.TLS_SESSION_TICKET_EXTENSION_TYPE = 0x0023; }
|
|
12
15
|
static { this.TLS_SNI_HOST_NAME_TYPE = 0; }
|
|
13
16
|
static { this.TLS_PSK_EXTENSION_TYPE = 0x0029; } // Pre-Shared Key extension type for TLS 1.3
|
|
14
17
|
static { this.TLS_PSK_KE_MODES_EXTENSION_TYPE = 0x002D; } // PSK Key Exchange Modes
|
|
18
|
+
static { this.TLS_EARLY_DATA_EXTENSION_TYPE = 0x002A; } // Early Data (0-RTT) extension
|
|
19
|
+
// Buffer for handling fragmented ClientHello messages
|
|
20
|
+
static { this.fragmentedBuffers = new Map(); }
|
|
21
|
+
static { this.fragmentTimeout = 1000; } // ms to wait for fragments before cleanup
|
|
15
22
|
/**
|
|
16
23
|
* Checks if a buffer contains a TLS handshake message (record type 22)
|
|
17
24
|
* @param buffer - The buffer to check
|
|
@@ -20,6 +27,91 @@ export class SniHandler {
|
|
|
20
27
|
static isTlsHandshake(buffer) {
|
|
21
28
|
return buffer.length > 0 && buffer[0] === this.TLS_HANDSHAKE_RECORD_TYPE;
|
|
22
29
|
}
|
|
30
|
+
/**
|
|
31
|
+
* Checks if a buffer contains TLS application data (record type 23)
|
|
32
|
+
* @param buffer - The buffer to check
|
|
33
|
+
* @returns true if the buffer starts with a TLS application data record type
|
|
34
|
+
*/
|
|
35
|
+
static isTlsApplicationData(buffer) {
|
|
36
|
+
return buffer.length > 0 && buffer[0] === this.TLS_APPLICATION_DATA_TYPE;
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Creates a connection ID based on source/destination information
|
|
40
|
+
* Used to track fragmented ClientHello messages across multiple packets
|
|
41
|
+
*
|
|
42
|
+
* @param connectionInfo - Object containing connection identifiers (IP/port)
|
|
43
|
+
* @returns A string ID for the connection
|
|
44
|
+
*/
|
|
45
|
+
static createConnectionId(connectionInfo) {
|
|
46
|
+
const { sourceIp, sourcePort, destIp, destPort } = connectionInfo;
|
|
47
|
+
return `${sourceIp}:${sourcePort}-${destIp}:${destPort}`;
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* Handles potential fragmented ClientHello messages by buffering and reassembling
|
|
51
|
+
* TLS record fragments that might span multiple TCP packets.
|
|
52
|
+
*
|
|
53
|
+
* @param buffer - The current buffer fragment
|
|
54
|
+
* @param connectionId - Unique identifier for the connection
|
|
55
|
+
* @param enableLogging - Whether to enable logging
|
|
56
|
+
* @returns A complete buffer if reassembly is successful, or undefined if more fragments are needed
|
|
57
|
+
*/
|
|
58
|
+
static handleFragmentedClientHello(buffer, connectionId, enableLogging = false) {
|
|
59
|
+
const log = (message) => {
|
|
60
|
+
if (enableLogging) {
|
|
61
|
+
console.log(`[SNI Fragment] ${message}`);
|
|
62
|
+
}
|
|
63
|
+
};
|
|
64
|
+
// Check if we've seen this connection before
|
|
65
|
+
if (!this.fragmentedBuffers.has(connectionId)) {
|
|
66
|
+
// New connection, start with this buffer
|
|
67
|
+
this.fragmentedBuffers.set(connectionId, buffer);
|
|
68
|
+
// Set timeout to clean up if we don't get a complete ClientHello
|
|
69
|
+
setTimeout(() => {
|
|
70
|
+
if (this.fragmentedBuffers.has(connectionId)) {
|
|
71
|
+
this.fragmentedBuffers.delete(connectionId);
|
|
72
|
+
log(`Connection ${connectionId} timed out waiting for complete ClientHello`);
|
|
73
|
+
}
|
|
74
|
+
}, this.fragmentTimeout);
|
|
75
|
+
// Evaluate if this buffer already contains a complete ClientHello
|
|
76
|
+
try {
|
|
77
|
+
if (buffer.length >= 5) {
|
|
78
|
+
const recordLength = (buffer[3] << 8) + buffer[4];
|
|
79
|
+
if (buffer.length >= recordLength + 5) {
|
|
80
|
+
log(`Initial buffer contains complete ClientHello, length: ${buffer.length}`);
|
|
81
|
+
return buffer;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
catch (e) {
|
|
86
|
+
log(`Error checking initial buffer completeness: ${e}`);
|
|
87
|
+
}
|
|
88
|
+
log(`Started buffering connection ${connectionId}, initial size: ${buffer.length}`);
|
|
89
|
+
return undefined; // Need more fragments
|
|
90
|
+
}
|
|
91
|
+
else {
|
|
92
|
+
// Existing connection, append this buffer
|
|
93
|
+
const existingBuffer = this.fragmentedBuffers.get(connectionId);
|
|
94
|
+
const newBuffer = Buffer.concat([existingBuffer, buffer]);
|
|
95
|
+
this.fragmentedBuffers.set(connectionId, newBuffer);
|
|
96
|
+
log(`Appended to buffer for ${connectionId}, new size: ${newBuffer.length}`);
|
|
97
|
+
// Check if we now have a complete ClientHello
|
|
98
|
+
try {
|
|
99
|
+
if (newBuffer.length >= 5) {
|
|
100
|
+
const recordLength = (newBuffer[3] << 8) + newBuffer[4];
|
|
101
|
+
if (newBuffer.length >= recordLength + 5) {
|
|
102
|
+
log(`Assembled complete ClientHello, length: ${newBuffer.length}`);
|
|
103
|
+
// Complete message received, remove from tracking
|
|
104
|
+
this.fragmentedBuffers.delete(connectionId);
|
|
105
|
+
return newBuffer;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
catch (e) {
|
|
110
|
+
log(`Error checking reassembled buffer completeness: ${e}`);
|
|
111
|
+
}
|
|
112
|
+
return undefined; // Still need more fragments
|
|
113
|
+
}
|
|
114
|
+
}
|
|
23
115
|
/**
|
|
24
116
|
* Checks if a buffer contains a TLS ClientHello message
|
|
25
117
|
* @param buffer - The buffer to check
|
|
@@ -395,6 +487,78 @@ export class SniHandler {
|
|
|
395
487
|
return undefined;
|
|
396
488
|
}
|
|
397
489
|
}
|
|
490
|
+
/**
|
|
491
|
+
* Checks if the buffer contains TLS 1.3 early data (0-RTT)
|
|
492
|
+
* @param buffer - The buffer to check
|
|
493
|
+
* @param enableLogging - Whether to enable logging
|
|
494
|
+
* @returns true if early data is detected
|
|
495
|
+
*/
|
|
496
|
+
static hasEarlyData(buffer, enableLogging = false) {
|
|
497
|
+
const log = (message) => {
|
|
498
|
+
if (enableLogging) {
|
|
499
|
+
console.log(`[Early Data] ${message}`);
|
|
500
|
+
}
|
|
501
|
+
};
|
|
502
|
+
try {
|
|
503
|
+
// Check if this is a valid ClientHello first
|
|
504
|
+
if (!this.isClientHello(buffer)) {
|
|
505
|
+
return false;
|
|
506
|
+
}
|
|
507
|
+
// Find the extensions section
|
|
508
|
+
let pos = 5; // Start after record header
|
|
509
|
+
// Skip handshake type (1 byte)
|
|
510
|
+
pos += 1;
|
|
511
|
+
// Skip handshake length (3 bytes)
|
|
512
|
+
pos += 3;
|
|
513
|
+
// Skip client version (2 bytes)
|
|
514
|
+
pos += 2;
|
|
515
|
+
// Skip client random (32 bytes)
|
|
516
|
+
pos += 32;
|
|
517
|
+
// Skip session ID
|
|
518
|
+
if (pos + 1 > buffer.length)
|
|
519
|
+
return false;
|
|
520
|
+
const sessionIdLength = buffer[pos];
|
|
521
|
+
pos += 1 + sessionIdLength;
|
|
522
|
+
// Skip cipher suites
|
|
523
|
+
if (pos + 2 > buffer.length)
|
|
524
|
+
return false;
|
|
525
|
+
const cipherSuitesLength = (buffer[pos] << 8) + buffer[pos + 1];
|
|
526
|
+
pos += 2 + cipherSuitesLength;
|
|
527
|
+
// Skip compression methods
|
|
528
|
+
if (pos + 1 > buffer.length)
|
|
529
|
+
return false;
|
|
530
|
+
const compressionMethodsLength = buffer[pos];
|
|
531
|
+
pos += 1 + compressionMethodsLength;
|
|
532
|
+
// Check if we have extensions
|
|
533
|
+
if (pos + 2 > buffer.length)
|
|
534
|
+
return false;
|
|
535
|
+
// Get extensions length
|
|
536
|
+
const extensionsLength = (buffer[pos] << 8) + buffer[pos + 1];
|
|
537
|
+
pos += 2;
|
|
538
|
+
// Extensions end position
|
|
539
|
+
const extensionsEnd = pos + extensionsLength;
|
|
540
|
+
if (extensionsEnd > buffer.length)
|
|
541
|
+
return false;
|
|
542
|
+
// Look for early data extension
|
|
543
|
+
while (pos + 4 <= extensionsEnd) {
|
|
544
|
+
const extensionType = (buffer[pos] << 8) + buffer[pos + 1];
|
|
545
|
+
pos += 2;
|
|
546
|
+
const extensionLength = (buffer[pos] << 8) + buffer[pos + 1];
|
|
547
|
+
pos += 2;
|
|
548
|
+
if (extensionType === this.TLS_EARLY_DATA_EXTENSION_TYPE) {
|
|
549
|
+
log('Early Data (0-RTT) extension detected');
|
|
550
|
+
return true;
|
|
551
|
+
}
|
|
552
|
+
// Skip to next extension
|
|
553
|
+
pos += extensionLength;
|
|
554
|
+
}
|
|
555
|
+
return false;
|
|
556
|
+
}
|
|
557
|
+
catch (error) {
|
|
558
|
+
log(`Error checking for early data: ${error}`);
|
|
559
|
+
return false;
|
|
560
|
+
}
|
|
561
|
+
}
|
|
398
562
|
/**
|
|
399
563
|
* Attempts to extract SNI from an initial ClientHello packet and handles
|
|
400
564
|
* session resumption edge cases more robustly than the standard extraction.
|
|
@@ -403,40 +567,120 @@ export class SniHandler {
|
|
|
403
567
|
* 1. Standard SNI extraction
|
|
404
568
|
* 2. TLS 1.3 PSK-based resumption (Chrome, Firefox, etc.)
|
|
405
569
|
* 3. Session ticket-based resumption
|
|
570
|
+
* 4. Fragmented ClientHello messages
|
|
571
|
+
* 5. TLS 1.3 Early Data (0-RTT)
|
|
572
|
+
* 6. Chrome's connection racing behaviors
|
|
406
573
|
*
|
|
407
574
|
* @param buffer - The buffer containing the TLS ClientHello message
|
|
575
|
+
* @param connectionInfo - Optional connection information for fragment handling
|
|
408
576
|
* @param enableLogging - Whether to enable detailed debug logging
|
|
409
577
|
* @returns The extracted server name or undefined if not found
|
|
410
578
|
*/
|
|
411
|
-
static extractSNIWithResumptionSupport(buffer, enableLogging = false) {
|
|
412
|
-
|
|
413
|
-
const standardSni = this.extractSNI(buffer, enableLogging);
|
|
414
|
-
if (standardSni) {
|
|
579
|
+
static extractSNIWithResumptionSupport(buffer, connectionInfo, enableLogging = false) {
|
|
580
|
+
const log = (message) => {
|
|
415
581
|
if (enableLogging) {
|
|
416
|
-
console.log(`[SNI Extraction]
|
|
582
|
+
console.log(`[SNI Extraction] ${message}`);
|
|
583
|
+
}
|
|
584
|
+
};
|
|
585
|
+
// Check if we need to handle fragmented packets
|
|
586
|
+
let processBuffer = buffer;
|
|
587
|
+
if (connectionInfo) {
|
|
588
|
+
const connectionId = this.createConnectionId(connectionInfo);
|
|
589
|
+
const reassembledBuffer = this.handleFragmentedClientHello(buffer, connectionId, enableLogging);
|
|
590
|
+
if (!reassembledBuffer) {
|
|
591
|
+
log(`Waiting for more fragments on connection ${connectionId}`);
|
|
592
|
+
return undefined; // Need more fragments to complete ClientHello
|
|
417
593
|
}
|
|
594
|
+
processBuffer = reassembledBuffer;
|
|
595
|
+
log(`Using reassembled buffer of length ${processBuffer.length}`);
|
|
596
|
+
}
|
|
597
|
+
// First try the standard SNI extraction
|
|
598
|
+
const standardSni = this.extractSNI(processBuffer, enableLogging);
|
|
599
|
+
if (standardSni) {
|
|
600
|
+
log(`Found standard SNI: ${standardSni}`);
|
|
418
601
|
return standardSni;
|
|
419
602
|
}
|
|
603
|
+
// Check for TLS 1.3 early data (0-RTT)
|
|
604
|
+
const hasEarly = this.hasEarlyData(processBuffer, enableLogging);
|
|
605
|
+
if (hasEarly) {
|
|
606
|
+
log('TLS 1.3 Early Data detected, using special handling');
|
|
607
|
+
// In 0-RTT, Chrome often relies on server remembering the SNI from previous sessions
|
|
608
|
+
// We could implement session tracking here if necessary
|
|
609
|
+
}
|
|
420
610
|
// If standard extraction failed and we have a valid ClientHello,
|
|
421
611
|
// this might be a session resumption with non-standard format
|
|
422
|
-
if (this.isClientHello(
|
|
423
|
-
|
|
424
|
-
console.log('[SNI Extraction] Detected ClientHello without standard SNI, possible session resumption');
|
|
425
|
-
}
|
|
612
|
+
if (this.isClientHello(processBuffer)) {
|
|
613
|
+
log('Detected ClientHello without standard SNI, possible session resumption');
|
|
426
614
|
// Try to extract from PSK extension (TLS 1.3 resumption)
|
|
427
|
-
const pskSni = this.extractSNIFromPSKExtension(
|
|
615
|
+
const pskSni = this.extractSNIFromPSKExtension(processBuffer, enableLogging);
|
|
428
616
|
if (pskSni) {
|
|
429
|
-
|
|
430
|
-
console.log(`[SNI Extraction] Extracted SNI from PSK extension: ${pskSni}`);
|
|
431
|
-
}
|
|
617
|
+
log(`Extracted SNI from PSK extension: ${pskSni}`);
|
|
432
618
|
return pskSni;
|
|
433
619
|
}
|
|
434
|
-
//
|
|
620
|
+
// Special handling for Chrome connection racing
|
|
621
|
+
// Chrome often opens multiple connections in parallel with different
|
|
622
|
+
// characteristics to improve performance
|
|
623
|
+
// Here we would look for specific patterns in ClientHello that indicate
|
|
624
|
+
// it's part of a connection race
|
|
625
|
+
// Detect if this is likely a secondary connection in a race
|
|
626
|
+
// by examining the cipher suites and extensions
|
|
627
|
+
// This would require session state tracking across connections
|
|
628
|
+
log('Failed to extract SNI from resumption mechanisms');
|
|
629
|
+
}
|
|
630
|
+
return undefined;
|
|
631
|
+
}
|
|
632
|
+
/**
|
|
633
|
+
* Main entry point for SNI extraction that handles all edge cases.
|
|
634
|
+
* This should be called for each TLS packet received from a client.
|
|
635
|
+
*
|
|
636
|
+
* The method uses connection tracking to handle fragmented ClientHello
|
|
637
|
+
* messages and various TLS 1.3 behaviors, including Chrome's connection
|
|
638
|
+
* racing patterns.
|
|
639
|
+
*
|
|
640
|
+
* @param buffer - The buffer containing TLS data
|
|
641
|
+
* @param connectionInfo - Connection metadata (IPs and ports)
|
|
642
|
+
* @param enableLogging - Whether to enable detailed debug logging
|
|
643
|
+
* @param cachedSni - Optional cached SNI from previous connections (for racing detection)
|
|
644
|
+
* @returns The extracted server name or undefined if not found or more data needed
|
|
645
|
+
*/
|
|
646
|
+
static processTlsPacket(buffer, connectionInfo, enableLogging = false, cachedSni) {
|
|
647
|
+
const log = (message) => {
|
|
435
648
|
if (enableLogging) {
|
|
436
|
-
console.log(
|
|
649
|
+
console.log(`[TLS Packet] ${message}`);
|
|
437
650
|
}
|
|
651
|
+
};
|
|
652
|
+
// Add timestamp if not provided
|
|
653
|
+
if (!connectionInfo.timestamp) {
|
|
654
|
+
connectionInfo.timestamp = Date.now();
|
|
655
|
+
}
|
|
656
|
+
// Check if this is a TLS handshake
|
|
657
|
+
if (!this.isTlsHandshake(buffer) && !this.isTlsApplicationData(buffer)) {
|
|
658
|
+
log('Not a TLS handshake or application data packet');
|
|
659
|
+
return undefined;
|
|
660
|
+
}
|
|
661
|
+
// Create connection ID for tracking
|
|
662
|
+
const connectionId = this.createConnectionId(connectionInfo);
|
|
663
|
+
log(`Processing TLS packet for connection ${connectionId}, buffer length: ${buffer.length}`);
|
|
664
|
+
// Handle special case: if we already have a cached SNI from a previous
|
|
665
|
+
// connection from the same client IP within a short time window,
|
|
666
|
+
// this might be a connection racing situation
|
|
667
|
+
if (cachedSni && this.isTlsApplicationData(buffer)) {
|
|
668
|
+
log(`Using cached SNI from connection racing: ${cachedSni}`);
|
|
669
|
+
return cachedSni;
|
|
670
|
+
}
|
|
671
|
+
// Try to extract SNI with full resumption support and fragment handling
|
|
672
|
+
const sni = this.extractSNIWithResumptionSupport(buffer, connectionInfo, enableLogging);
|
|
673
|
+
if (sni) {
|
|
674
|
+
log(`Successfully extracted SNI: ${sni}`);
|
|
675
|
+
return sni;
|
|
676
|
+
}
|
|
677
|
+
// If we couldn't extract an SNI, check if this is a valid ClientHello
|
|
678
|
+
// If it is, but we couldn't get an SNI, it might be a fragment or
|
|
679
|
+
// a connection race situation
|
|
680
|
+
if (this.isClientHello(buffer)) {
|
|
681
|
+
log('Valid ClientHello detected, but no SNI extracted - might need more data');
|
|
438
682
|
}
|
|
439
683
|
return undefined;
|
|
440
684
|
}
|
|
441
685
|
}
|
|
442
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.snihandler.js","sourceRoot":"","sources":["../ts/classes.snihandler.ts"],"names":[],"mappings":"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"}
|
|
686
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.snihandler.js","sourceRoot":"","sources":["../ts/classes.snihandler.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.
|
|
3
|
+
"version": "3.39.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A powerful proxy package that effectively handles high traffic, with features such as SSL/TLS support, port proxying, WebSocket handling, dynamic routing with authentication options, and automatic ACME certificate management.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartproxy',
|
|
6
|
-
version: '3.
|
|
6
|
+
version: '3.39.0',
|
|
7
7
|
description: 'A powerful proxy package that effectively handles high traffic, with features such as SSL/TLS support, port proxying, WebSocket handling, dynamic routing with authentication options, and automatic ACME certificate management.'
|
|
8
8
|
}
|
package/ts/classes.portproxy.ts
CHANGED
|
@@ -11,6 +11,10 @@ export interface IDomainConfig {
|
|
|
11
11
|
portRanges?: Array<{ from: number; to: number }>; // Optional port ranges
|
|
12
12
|
// Allow domain-specific timeout override
|
|
13
13
|
connectionTimeout?: number; // Connection timeout override (ms)
|
|
14
|
+
|
|
15
|
+
// NetworkProxy integration options for this specific domain
|
|
16
|
+
useNetworkProxy?: boolean; // Whether to use NetworkProxy for this domain
|
|
17
|
+
networkProxyPort?: number; // Override default NetworkProxy port for this domain
|
|
14
18
|
}
|
|
15
19
|
|
|
16
20
|
/** Port proxy settings including global allowed port ranges */
|
|
@@ -452,12 +456,14 @@ export class PortProxy {
|
|
|
452
456
|
* @param socket - The incoming client socket
|
|
453
457
|
* @param record - The connection record
|
|
454
458
|
* @param initialData - Initial data chunk (TLS ClientHello)
|
|
459
|
+
* @param customProxyPort - Optional custom port for NetworkProxy (for domain-specific settings)
|
|
455
460
|
*/
|
|
456
461
|
private forwardToNetworkProxy(
|
|
457
462
|
connectionId: string,
|
|
458
463
|
socket: plugins.net.Socket,
|
|
459
464
|
record: IConnectionRecord,
|
|
460
|
-
initialData: Buffer
|
|
465
|
+
initialData: Buffer,
|
|
466
|
+
customProxyPort?: number
|
|
461
467
|
): void {
|
|
462
468
|
// Ensure NetworkProxy is initialized
|
|
463
469
|
if (!this.networkProxy) {
|
|
@@ -475,7 +481,8 @@ export class PortProxy {
|
|
|
475
481
|
);
|
|
476
482
|
}
|
|
477
483
|
|
|
478
|
-
|
|
484
|
+
// Use the custom port if provided, otherwise use the default NetworkProxy port
|
|
485
|
+
const proxyPort = customProxyPort || this.networkProxy.getListeningPort();
|
|
479
486
|
const proxyHost = 'localhost'; // Assuming NetworkProxy runs locally
|
|
480
487
|
|
|
481
488
|
if (this.settings.enableDetailedLogging) {
|
|
@@ -920,7 +927,15 @@ export class PortProxy {
|
|
|
920
927
|
if (SniHandler.isClientHello(renegChunk)) {
|
|
921
928
|
try {
|
|
922
929
|
// Extract SNI from ClientHello
|
|
923
|
-
|
|
930
|
+
// Create a connection info object for the existing connection
|
|
931
|
+
const connInfo = {
|
|
932
|
+
sourceIp: record.remoteIP,
|
|
933
|
+
sourcePort: record.incoming.remotePort || 0,
|
|
934
|
+
destIp: record.incoming.localAddress || '',
|
|
935
|
+
destPort: record.incoming.localPort || 0
|
|
936
|
+
};
|
|
937
|
+
|
|
938
|
+
const newSNI = SniHandler.extractSNIWithResumptionSupport(renegChunk, connInfo, this.settings.enableTlsDebugLogging);
|
|
924
939
|
|
|
925
940
|
// Skip if no SNI was found
|
|
926
941
|
if (!newSNI) return;
|
|
@@ -1478,9 +1493,12 @@ export class PortProxy {
|
|
|
1478
1493
|
);
|
|
1479
1494
|
}
|
|
1480
1495
|
|
|
1481
|
-
// Check if this connection should be forwarded directly to NetworkProxy
|
|
1482
|
-
|
|
1483
|
-
|
|
1496
|
+
// Check if this connection should be forwarded directly to NetworkProxy
|
|
1497
|
+
// First check port-based forwarding settings
|
|
1498
|
+
let shouldUseNetworkProxy = this.settings.useNetworkProxy &&
|
|
1499
|
+
this.settings.useNetworkProxy.includes(localPort);
|
|
1500
|
+
|
|
1501
|
+
// We'll look for domain-specific settings after SNI extraction
|
|
1484
1502
|
|
|
1485
1503
|
if (shouldUseNetworkProxy) {
|
|
1486
1504
|
// For NetworkProxy ports, we want to capture the TLS handshake and forward directly
|
|
@@ -1523,7 +1541,48 @@ export class PortProxy {
|
|
|
1523
1541
|
if (SniHandler.isTlsHandshake(chunk)) {
|
|
1524
1542
|
connectionRecord.isTLS = true;
|
|
1525
1543
|
|
|
1526
|
-
//
|
|
1544
|
+
// Try to extract SNI for domain-specific NetworkProxy handling
|
|
1545
|
+
const connInfo = {
|
|
1546
|
+
sourceIp: remoteIP,
|
|
1547
|
+
sourcePort: socket.remotePort || 0,
|
|
1548
|
+
destIp: socket.localAddress || '',
|
|
1549
|
+
destPort: socket.localPort || 0
|
|
1550
|
+
};
|
|
1551
|
+
|
|
1552
|
+
// Extract SNI to check for domain-specific NetworkProxy settings
|
|
1553
|
+
const serverName = SniHandler.processTlsPacket(
|
|
1554
|
+
chunk,
|
|
1555
|
+
connInfo,
|
|
1556
|
+
this.settings.enableTlsDebugLogging
|
|
1557
|
+
);
|
|
1558
|
+
|
|
1559
|
+
if (serverName) {
|
|
1560
|
+
// If we got an SNI, check for domain-specific NetworkProxy settings
|
|
1561
|
+
const domainConfig = this.settings.domainConfigs.find((config) =>
|
|
1562
|
+
config.domains.some((d) => plugins.minimatch(serverName, d))
|
|
1563
|
+
);
|
|
1564
|
+
|
|
1565
|
+
// Save domain config and SNI in connection record
|
|
1566
|
+
connectionRecord.domainConfig = domainConfig;
|
|
1567
|
+
connectionRecord.lockedDomain = serverName;
|
|
1568
|
+
|
|
1569
|
+
// Use domain-specific NetworkProxy port if configured
|
|
1570
|
+
if (domainConfig?.useNetworkProxy) {
|
|
1571
|
+
const networkProxyPort = domainConfig.networkProxyPort || this.settings.networkProxyPort;
|
|
1572
|
+
|
|
1573
|
+
if (this.settings.enableDetailedLogging) {
|
|
1574
|
+
console.log(
|
|
1575
|
+
`[${connectionId}] Using domain-specific NetworkProxy for ${serverName} on port ${networkProxyPort}`
|
|
1576
|
+
);
|
|
1577
|
+
}
|
|
1578
|
+
|
|
1579
|
+
// Forward to NetworkProxy with domain-specific port
|
|
1580
|
+
this.forwardToNetworkProxy(connectionId, socket, connectionRecord, chunk, networkProxyPort);
|
|
1581
|
+
return;
|
|
1582
|
+
}
|
|
1583
|
+
}
|
|
1584
|
+
|
|
1585
|
+
// Forward directly to NetworkProxy without domain-specific settings
|
|
1527
1586
|
this.forwardToNetworkProxy(connectionId, socket, connectionRecord, chunk);
|
|
1528
1587
|
} else {
|
|
1529
1588
|
// If not TLS, use normal direct connection
|
|
@@ -1590,7 +1649,15 @@ export class PortProxy {
|
|
|
1590
1649
|
`[${connectionId}] TLS handshake detected from ${remoteIP}, ${chunk.length} bytes`
|
|
1591
1650
|
);
|
|
1592
1651
|
// Try to extract SNI and log detailed debug info
|
|
1593
|
-
|
|
1652
|
+
// Create connection info for debug logging
|
|
1653
|
+
const debugConnInfo = {
|
|
1654
|
+
sourceIp: remoteIP,
|
|
1655
|
+
sourcePort: socket.remotePort || 0,
|
|
1656
|
+
destIp: socket.localAddress || '',
|
|
1657
|
+
destPort: socket.localPort || 0
|
|
1658
|
+
};
|
|
1659
|
+
|
|
1660
|
+
SniHandler.extractSNIWithResumptionSupport(chunk, debugConnInfo, true);
|
|
1594
1661
|
}
|
|
1595
1662
|
}
|
|
1596
1663
|
});
|
|
@@ -1641,6 +1708,29 @@ export class PortProxy {
|
|
|
1641
1708
|
|
|
1642
1709
|
// Save domain config in connection record
|
|
1643
1710
|
connectionRecord.domainConfig = domainConfig;
|
|
1711
|
+
|
|
1712
|
+
// Check if this domain should use NetworkProxy (domain-specific setting)
|
|
1713
|
+
if (domainConfig?.useNetworkProxy && this.networkProxy) {
|
|
1714
|
+
if (this.settings.enableDetailedLogging) {
|
|
1715
|
+
console.log(
|
|
1716
|
+
`[${connectionId}] Domain ${serverName} is configured to use NetworkProxy`
|
|
1717
|
+
);
|
|
1718
|
+
}
|
|
1719
|
+
|
|
1720
|
+
const networkProxyPort = domainConfig.networkProxyPort || this.settings.networkProxyPort;
|
|
1721
|
+
|
|
1722
|
+
if (initialChunk && connectionRecord.isTLS) {
|
|
1723
|
+
// For TLS connections with initial chunk, forward to NetworkProxy
|
|
1724
|
+
this.forwardToNetworkProxy(
|
|
1725
|
+
connectionId,
|
|
1726
|
+
socket,
|
|
1727
|
+
connectionRecord,
|
|
1728
|
+
initialChunk,
|
|
1729
|
+
networkProxyPort // Pass the domain-specific NetworkProxy port if configured
|
|
1730
|
+
);
|
|
1731
|
+
return; // Skip normal connection setup
|
|
1732
|
+
}
|
|
1733
|
+
}
|
|
1644
1734
|
|
|
1645
1735
|
// IP validation is skipped if allowedIPs is empty
|
|
1646
1736
|
if (domainConfig) {
|
|
@@ -1797,7 +1887,21 @@ export class PortProxy {
|
|
|
1797
1887
|
);
|
|
1798
1888
|
}
|
|
1799
1889
|
|
|
1800
|
-
|
|
1890
|
+
// Create connection info object for SNI extraction
|
|
1891
|
+
const connInfo = {
|
|
1892
|
+
sourceIp: remoteIP,
|
|
1893
|
+
sourcePort: socket.remotePort || 0,
|
|
1894
|
+
destIp: socket.localAddress || '',
|
|
1895
|
+
destPort: socket.localPort || 0
|
|
1896
|
+
};
|
|
1897
|
+
|
|
1898
|
+
// Use the new processTlsPacket method for comprehensive handling
|
|
1899
|
+
serverName = SniHandler.processTlsPacket(
|
|
1900
|
+
chunk,
|
|
1901
|
+
connInfo,
|
|
1902
|
+
this.settings.enableTlsDebugLogging,
|
|
1903
|
+
connectionRecord.lockedDomain // Pass any previously negotiated domain as a hint
|
|
1904
|
+
) || '';
|
|
1801
1905
|
}
|
|
1802
1906
|
|
|
1803
1907
|
// Lock the connection to the negotiated SNI.
|