@push.rocks/smartproxy 3.37.1 → 3.37.3
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.js +121 -63
- package/dist_ts/classes.snihandler.d.ts +17 -2
- package/dist_ts/classes.snihandler.js +176 -8
- package/package.json +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.portproxy.ts +142 -80
- package/ts/classes.snihandler.ts +195 -7
|
@@ -10,6 +10,8 @@ export class SniHandler {
|
|
|
10
10
|
static { this.TLS_SNI_EXTENSION_TYPE = 0x0000; }
|
|
11
11
|
static { this.TLS_SESSION_TICKET_EXTENSION_TYPE = 0x0023; }
|
|
12
12
|
static { this.TLS_SNI_HOST_NAME_TYPE = 0; }
|
|
13
|
+
static { this.TLS_PSK_EXTENSION_TYPE = 0x0029; } // Pre-Shared Key extension type for TLS 1.3
|
|
14
|
+
static { this.TLS_PSK_KE_MODES_EXTENSION_TYPE = 0x002D; } // PSK Key Exchange Modes
|
|
13
15
|
/**
|
|
14
16
|
* Checks if a buffer contains a TLS handshake message (record type 22)
|
|
15
17
|
* @param buffer - The buffer to check
|
|
@@ -144,6 +146,7 @@ export class SniHandler {
|
|
|
144
146
|
}
|
|
145
147
|
// Track if we found session tickets (for improved resumption handling)
|
|
146
148
|
let hasSessionTicket = false;
|
|
149
|
+
let hasPskExtension = false;
|
|
147
150
|
// Iterate through extensions
|
|
148
151
|
while (pos + 4 <= extensionsEnd) {
|
|
149
152
|
// Parse extension type (2 bytes, big-endian)
|
|
@@ -225,14 +228,21 @@ export class SniHandler {
|
|
|
225
228
|
hasSessionTicket = true;
|
|
226
229
|
pos += extensionLength; // Skip this extension
|
|
227
230
|
}
|
|
231
|
+
else if (extensionType === this.TLS_PSK_EXTENSION_TYPE) {
|
|
232
|
+
// TLS 1.3 PSK extension - mark for resumption support
|
|
233
|
+
log('Found PSK extension (TLS 1.3 resumption indicator)');
|
|
234
|
+
hasPskExtension = true;
|
|
235
|
+
// We'll skip the extension here and process it separately if needed
|
|
236
|
+
pos += extensionLength;
|
|
237
|
+
}
|
|
228
238
|
else {
|
|
229
239
|
// Skip this extension
|
|
230
240
|
pos += extensionLength;
|
|
231
241
|
}
|
|
232
242
|
}
|
|
233
|
-
// Log if we found
|
|
234
|
-
if (hasSessionTicket) {
|
|
235
|
-
log('Session
|
|
243
|
+
// Log if we found session resumption indicators but no SNI
|
|
244
|
+
if (hasSessionTicket || hasPskExtension) {
|
|
245
|
+
log('Session resumption indicators present but no SNI found');
|
|
236
246
|
}
|
|
237
247
|
log('No SNI extension found in ClientHello');
|
|
238
248
|
return undefined;
|
|
@@ -242,12 +252,157 @@ export class SniHandler {
|
|
|
242
252
|
return undefined;
|
|
243
253
|
}
|
|
244
254
|
}
|
|
255
|
+
/**
|
|
256
|
+
* Attempts to extract SNI from the PSK extension in a TLS 1.3 ClientHello.
|
|
257
|
+
*
|
|
258
|
+
* In TLS 1.3, when a client attempts to resume a session, it may include
|
|
259
|
+
* the server name in the PSK identity hint rather than in the SNI extension.
|
|
260
|
+
*
|
|
261
|
+
* @param buffer - The buffer containing the TLS ClientHello message
|
|
262
|
+
* @param enableLogging - Whether to enable detailed debug logging
|
|
263
|
+
* @returns The extracted server name or undefined if not found
|
|
264
|
+
*/
|
|
265
|
+
static extractSNIFromPSKExtension(buffer, enableLogging = false) {
|
|
266
|
+
const log = (message) => {
|
|
267
|
+
if (enableLogging) {
|
|
268
|
+
console.log(`[PSK-SNI Extraction] ${message}`);
|
|
269
|
+
}
|
|
270
|
+
};
|
|
271
|
+
try {
|
|
272
|
+
// Ensure this is a ClientHello
|
|
273
|
+
if (!this.isClientHello(buffer)) {
|
|
274
|
+
log('Not a ClientHello message');
|
|
275
|
+
return undefined;
|
|
276
|
+
}
|
|
277
|
+
// Find the start position of extensions
|
|
278
|
+
let pos = 5; // Start after record header
|
|
279
|
+
// Skip handshake type (1 byte)
|
|
280
|
+
pos += 1;
|
|
281
|
+
// Skip handshake length (3 bytes)
|
|
282
|
+
pos += 3;
|
|
283
|
+
// Skip client version (2 bytes)
|
|
284
|
+
pos += 2;
|
|
285
|
+
// Skip client random (32 bytes)
|
|
286
|
+
pos += 32;
|
|
287
|
+
// Skip session ID
|
|
288
|
+
if (pos + 1 > buffer.length)
|
|
289
|
+
return undefined;
|
|
290
|
+
const sessionIdLength = buffer[pos];
|
|
291
|
+
pos += 1 + sessionIdLength;
|
|
292
|
+
// Skip cipher suites
|
|
293
|
+
if (pos + 2 > buffer.length)
|
|
294
|
+
return undefined;
|
|
295
|
+
const cipherSuitesLength = (buffer[pos] << 8) + buffer[pos + 1];
|
|
296
|
+
pos += 2 + cipherSuitesLength;
|
|
297
|
+
// Skip compression methods
|
|
298
|
+
if (pos + 1 > buffer.length)
|
|
299
|
+
return undefined;
|
|
300
|
+
const compressionMethodsLength = buffer[pos];
|
|
301
|
+
pos += 1 + compressionMethodsLength;
|
|
302
|
+
// Check if we have extensions
|
|
303
|
+
if (pos + 2 > buffer.length) {
|
|
304
|
+
log('No extensions present');
|
|
305
|
+
return undefined;
|
|
306
|
+
}
|
|
307
|
+
// Get extensions length
|
|
308
|
+
const extensionsLength = (buffer[pos] << 8) + buffer[pos + 1];
|
|
309
|
+
pos += 2;
|
|
310
|
+
// Extensions end position
|
|
311
|
+
const extensionsEnd = pos + extensionsLength;
|
|
312
|
+
if (extensionsEnd > buffer.length)
|
|
313
|
+
return undefined;
|
|
314
|
+
// Look for PSK extension
|
|
315
|
+
while (pos + 4 <= extensionsEnd) {
|
|
316
|
+
const extensionType = (buffer[pos] << 8) + buffer[pos + 1];
|
|
317
|
+
pos += 2;
|
|
318
|
+
const extensionLength = (buffer[pos] << 8) + buffer[pos + 1];
|
|
319
|
+
pos += 2;
|
|
320
|
+
if (extensionType === this.TLS_PSK_EXTENSION_TYPE) {
|
|
321
|
+
log('Found PSK extension');
|
|
322
|
+
// PSK extension structure:
|
|
323
|
+
// 2 bytes: identities list length
|
|
324
|
+
if (pos + 2 > extensionsEnd)
|
|
325
|
+
break;
|
|
326
|
+
const identitiesLength = (buffer[pos] << 8) + buffer[pos + 1];
|
|
327
|
+
pos += 2;
|
|
328
|
+
// End of identities list
|
|
329
|
+
const identitiesEnd = pos + identitiesLength;
|
|
330
|
+
if (identitiesEnd > extensionsEnd)
|
|
331
|
+
break;
|
|
332
|
+
// Process each PSK identity
|
|
333
|
+
while (pos + 2 <= identitiesEnd) {
|
|
334
|
+
// Identity length (2 bytes)
|
|
335
|
+
if (pos + 2 > identitiesEnd)
|
|
336
|
+
break;
|
|
337
|
+
const identityLength = (buffer[pos] << 8) + buffer[pos + 1];
|
|
338
|
+
pos += 2;
|
|
339
|
+
if (pos + identityLength > identitiesEnd)
|
|
340
|
+
break;
|
|
341
|
+
// Try to extract hostname from identity
|
|
342
|
+
// Chrome often embeds the hostname in the PSK identity
|
|
343
|
+
// This is a heuristic as there's no standard format
|
|
344
|
+
if (identityLength > 0) {
|
|
345
|
+
const identity = buffer.slice(pos, pos + identityLength);
|
|
346
|
+
// Skip identity bytes
|
|
347
|
+
pos += identityLength;
|
|
348
|
+
// Skip obfuscated ticket age (4 bytes)
|
|
349
|
+
pos += 4;
|
|
350
|
+
// Try to parse the identity as UTF-8
|
|
351
|
+
try {
|
|
352
|
+
const identityStr = identity.toString('utf8');
|
|
353
|
+
log(`PSK identity: ${identityStr}`);
|
|
354
|
+
// Check if the identity contains hostname hints
|
|
355
|
+
// Chrome often embeds the hostname in a known format
|
|
356
|
+
// Try to extract using common patterns
|
|
357
|
+
// Pattern 1: Look for domain name pattern
|
|
358
|
+
const domainPattern = /([a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?/i;
|
|
359
|
+
const domainMatch = identityStr.match(domainPattern);
|
|
360
|
+
if (domainMatch && domainMatch[0]) {
|
|
361
|
+
log(`Found domain in PSK identity: ${domainMatch[0]}`);
|
|
362
|
+
return domainMatch[0];
|
|
363
|
+
}
|
|
364
|
+
// Pattern 2: Chrome sometimes uses a specific format with delimiters
|
|
365
|
+
// This is a heuristic approach since the format isn't standardized
|
|
366
|
+
const parts = identityStr.split('|');
|
|
367
|
+
if (parts.length > 1) {
|
|
368
|
+
for (const part of parts) {
|
|
369
|
+
if (part.includes('.') && !part.includes('/')) {
|
|
370
|
+
const possibleDomain = part.trim();
|
|
371
|
+
if (/^[a-z0-9.-]+$/i.test(possibleDomain)) {
|
|
372
|
+
log(`Found possible domain in PSK delimiter format: ${possibleDomain}`);
|
|
373
|
+
return possibleDomain;
|
|
374
|
+
}
|
|
375
|
+
}
|
|
376
|
+
}
|
|
377
|
+
}
|
|
378
|
+
}
|
|
379
|
+
catch (e) {
|
|
380
|
+
log('Failed to parse PSK identity as UTF-8');
|
|
381
|
+
}
|
|
382
|
+
}
|
|
383
|
+
}
|
|
384
|
+
}
|
|
385
|
+
else {
|
|
386
|
+
// Skip this extension
|
|
387
|
+
pos += extensionLength;
|
|
388
|
+
}
|
|
389
|
+
}
|
|
390
|
+
log('No hostname found in PSK extension');
|
|
391
|
+
return undefined;
|
|
392
|
+
}
|
|
393
|
+
catch (error) {
|
|
394
|
+
log(`Error parsing PSK: ${error instanceof Error ? error.message : String(error)}`);
|
|
395
|
+
return undefined;
|
|
396
|
+
}
|
|
397
|
+
}
|
|
245
398
|
/**
|
|
246
399
|
* Attempts to extract SNI from an initial ClientHello packet and handles
|
|
247
400
|
* session resumption edge cases more robustly than the standard extraction.
|
|
248
401
|
*
|
|
249
|
-
* This method
|
|
250
|
-
*
|
|
402
|
+
* This method handles:
|
|
403
|
+
* 1. Standard SNI extraction
|
|
404
|
+
* 2. TLS 1.3 PSK-based resumption (Chrome, Firefox, etc.)
|
|
405
|
+
* 3. Session ticket-based resumption
|
|
251
406
|
*
|
|
252
407
|
* @param buffer - The buffer containing the TLS ClientHello message
|
|
253
408
|
* @param enableLogging - Whether to enable detailed debug logging
|
|
@@ -257,6 +412,9 @@ export class SniHandler {
|
|
|
257
412
|
// First try the standard SNI extraction
|
|
258
413
|
const standardSni = this.extractSNI(buffer, enableLogging);
|
|
259
414
|
if (standardSni) {
|
|
415
|
+
if (enableLogging) {
|
|
416
|
+
console.log(`[SNI Extraction] Found standard SNI: ${standardSni}`);
|
|
417
|
+
}
|
|
260
418
|
return standardSni;
|
|
261
419
|
}
|
|
262
420
|
// If standard extraction failed and we have a valid ClientHello,
|
|
@@ -265,10 +423,20 @@ export class SniHandler {
|
|
|
265
423
|
if (enableLogging) {
|
|
266
424
|
console.log('[SNI Extraction] Detected ClientHello without standard SNI, possible session resumption');
|
|
267
425
|
}
|
|
268
|
-
//
|
|
269
|
-
|
|
426
|
+
// Try to extract from PSK extension (TLS 1.3 resumption)
|
|
427
|
+
const pskSni = this.extractSNIFromPSKExtension(buffer, enableLogging);
|
|
428
|
+
if (pskSni) {
|
|
429
|
+
if (enableLogging) {
|
|
430
|
+
console.log(`[SNI Extraction] Extracted SNI from PSK extension: ${pskSni}`);
|
|
431
|
+
}
|
|
432
|
+
return pskSni;
|
|
433
|
+
}
|
|
434
|
+
// Could add more browser-specific heuristics here if needed
|
|
435
|
+
if (enableLogging) {
|
|
436
|
+
console.log('[SNI Extraction] Failed to extract SNI from resumption mechanisms');
|
|
437
|
+
}
|
|
270
438
|
}
|
|
271
439
|
return undefined;
|
|
272
440
|
}
|
|
273
441
|
}
|
|
274
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.snihandler.js","sourceRoot":"","sources":["../ts/classes.snihandler.ts"],"names":[],"mappings":"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"}
|
|
442
|
+
//# 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.37.
|
|
3
|
+
"version": "3.37.3",
|
|
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.37.
|
|
6
|
+
version: '3.37.3',
|
|
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
|
@@ -566,44 +566,104 @@ export class PortProxy {
|
|
|
566
566
|
connectionOptions.localAddress = record.remoteIP.replace('::ffff:', '');
|
|
567
567
|
}
|
|
568
568
|
|
|
569
|
+
// Create a safe queue for incoming data using a Buffer array
|
|
570
|
+
// We'll use this to ensure we don't lose data during handler transitions
|
|
571
|
+
const dataQueue: Buffer[] = [];
|
|
572
|
+
let queueSize = 0;
|
|
573
|
+
let processingQueue = false;
|
|
574
|
+
let drainPending = false;
|
|
575
|
+
|
|
576
|
+
// Flag to track if we've switched to the final piping mechanism
|
|
577
|
+
// Once this is true, we no longer buffer data in dataQueue
|
|
578
|
+
let pipingEstablished = false;
|
|
579
|
+
|
|
569
580
|
// Pause the incoming socket to prevent buffer overflows
|
|
581
|
+
// This ensures we control the flow of data until piping is set up
|
|
570
582
|
socket.pause();
|
|
571
583
|
|
|
572
|
-
//
|
|
573
|
-
const
|
|
574
|
-
|
|
575
|
-
|
|
584
|
+
// Function to safely process the data queue without losing events
|
|
585
|
+
const processDataQueue = () => {
|
|
586
|
+
if (processingQueue || dataQueue.length === 0 || pipingEstablished) return;
|
|
587
|
+
|
|
588
|
+
processingQueue = true;
|
|
589
|
+
|
|
590
|
+
try {
|
|
591
|
+
// Process all queued chunks with the current active handler
|
|
592
|
+
while (dataQueue.length > 0) {
|
|
593
|
+
const chunk = dataQueue.shift()!;
|
|
594
|
+
queueSize -= chunk.length;
|
|
595
|
+
|
|
596
|
+
// Once piping is established, we shouldn't get here,
|
|
597
|
+
// but just in case, pass to the outgoing socket directly
|
|
598
|
+
if (pipingEstablished && record.outgoing) {
|
|
599
|
+
record.outgoing.write(chunk);
|
|
600
|
+
continue;
|
|
601
|
+
}
|
|
602
|
+
|
|
603
|
+
// Track bytes received
|
|
604
|
+
record.bytesReceived += chunk.length;
|
|
576
605
|
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
606
|
+
// Check for TLS handshake
|
|
607
|
+
if (!record.isTLS && SniHandler.isTlsHandshake(chunk)) {
|
|
608
|
+
record.isTLS = true;
|
|
580
609
|
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
|
|
584
|
-
|
|
585
|
-
|
|
586
|
-
|
|
610
|
+
if (this.settings.enableTlsDebugLogging) {
|
|
611
|
+
console.log(
|
|
612
|
+
`[${connectionId}] TLS handshake detected in tempDataHandler, ${chunk.length} bytes`
|
|
613
|
+
);
|
|
614
|
+
}
|
|
615
|
+
}
|
|
587
616
|
|
|
588
|
-
|
|
589
|
-
|
|
617
|
+
// Check if adding this chunk would exceed the buffer limit
|
|
618
|
+
const newSize = record.pendingDataSize + chunk.length;
|
|
590
619
|
|
|
591
|
-
|
|
592
|
-
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
596
|
-
|
|
620
|
+
if (this.settings.maxPendingDataSize && newSize > this.settings.maxPendingDataSize) {
|
|
621
|
+
console.log(
|
|
622
|
+
`[${connectionId}] Buffer limit exceeded for connection from ${record.remoteIP}: ${newSize} bytes > ${this.settings.maxPendingDataSize} bytes`
|
|
623
|
+
);
|
|
624
|
+
socket.end(); // Gracefully close the socket
|
|
625
|
+
this.initiateCleanupOnce(record, 'buffer_limit_exceeded');
|
|
626
|
+
return;
|
|
627
|
+
}
|
|
628
|
+
|
|
629
|
+
// Buffer the chunk and update the size counter
|
|
630
|
+
record.pendingData.push(Buffer.from(chunk));
|
|
631
|
+
record.pendingDataSize = newSize;
|
|
632
|
+
this.updateActivity(record);
|
|
633
|
+
}
|
|
634
|
+
} finally {
|
|
635
|
+
processingQueue = false;
|
|
636
|
+
|
|
637
|
+
// If there's a pending drain and we've processed everything,
|
|
638
|
+
// signal we're ready for more data if we haven't established piping yet
|
|
639
|
+
if (drainPending && dataQueue.length === 0 && !pipingEstablished) {
|
|
640
|
+
drainPending = false;
|
|
641
|
+
socket.resume();
|
|
642
|
+
}
|
|
597
643
|
}
|
|
644
|
+
};
|
|
598
645
|
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
|
|
646
|
+
// Unified data handler that safely queues incoming data
|
|
647
|
+
const safeDataHandler = (chunk: Buffer) => {
|
|
648
|
+
// If piping is already established, just let the pipe handle it
|
|
649
|
+
if (pipingEstablished) return;
|
|
650
|
+
|
|
651
|
+
// Add to our queue for orderly processing
|
|
652
|
+
dataQueue.push(Buffer.from(chunk)); // Make a copy to be safe
|
|
653
|
+
queueSize += chunk.length;
|
|
654
|
+
|
|
655
|
+
// If queue is getting large, pause socket until we catch up
|
|
656
|
+
if (this.settings.maxPendingDataSize && queueSize > this.settings.maxPendingDataSize * 0.8) {
|
|
657
|
+
socket.pause();
|
|
658
|
+
drainPending = true;
|
|
659
|
+
}
|
|
660
|
+
|
|
661
|
+
// Process the queue
|
|
662
|
+
processDataQueue();
|
|
603
663
|
};
|
|
604
664
|
|
|
605
|
-
// Add
|
|
606
|
-
socket.on('data',
|
|
665
|
+
// Add our safe data handler
|
|
666
|
+
socket.on('data', safeDataHandler);
|
|
607
667
|
|
|
608
668
|
// Add initial chunk to pending data if present
|
|
609
669
|
if (initialChunk) {
|
|
@@ -776,56 +836,32 @@ export class PortProxy {
|
|
|
776
836
|
// Add the normal error handler for established connections
|
|
777
837
|
targetSocket.on('error', this.handleError('outgoing', record));
|
|
778
838
|
|
|
779
|
-
//
|
|
780
|
-
|
|
781
|
-
|
|
782
|
-
//
|
|
783
|
-
|
|
784
|
-
|
|
785
|
-
|
|
786
|
-
|
|
787
|
-
|
|
788
|
-
return this.initiateCleanupOnce(record, 'write_error');
|
|
789
|
-
}
|
|
790
|
-
|
|
791
|
-
// Now set up piping for future data and resume the socket
|
|
792
|
-
socket.pipe(targetSocket);
|
|
793
|
-
targetSocket.pipe(socket);
|
|
794
|
-
socket.resume(); // Resume the socket after piping is established
|
|
795
|
-
|
|
796
|
-
if (this.settings.enableDetailedLogging) {
|
|
797
|
-
console.log(
|
|
798
|
-
`[${connectionId}] Connection established: ${record.remoteIP} -> ${targetHost}:${connectionOptions.port}` +
|
|
799
|
-
`${
|
|
800
|
-
serverName
|
|
801
|
-
? ` (SNI: ${serverName})`
|
|
802
|
-
: domainConfig
|
|
803
|
-
? ` (Port-based for domain: ${domainConfig.domains.join(', ')})`
|
|
804
|
-
: ''
|
|
805
|
-
}` +
|
|
806
|
-
` TLS: ${record.isTLS ? 'Yes' : 'No'}, Keep-Alive: ${
|
|
807
|
-
record.hasKeepAlive ? 'Yes' : 'No'
|
|
808
|
-
}`
|
|
809
|
-
);
|
|
810
|
-
} else {
|
|
811
|
-
console.log(
|
|
812
|
-
`Connection established: ${record.remoteIP} -> ${targetHost}:${connectionOptions.port}` +
|
|
813
|
-
`${
|
|
814
|
-
serverName
|
|
815
|
-
? ` (SNI: ${serverName})`
|
|
816
|
-
: domainConfig
|
|
817
|
-
? ` (Port-based for domain: ${domainConfig.domains.join(', ')})`
|
|
818
|
-
: ''
|
|
819
|
-
}`
|
|
820
|
-
);
|
|
821
|
-
}
|
|
822
|
-
});
|
|
823
|
-
} else {
|
|
824
|
-
// No pending data, so just set up piping
|
|
839
|
+
// Process any remaining data in the queue before switching to piping
|
|
840
|
+
processDataQueue();
|
|
841
|
+
|
|
842
|
+
// Setup function to establish piping - we'll use this after flushing data
|
|
843
|
+
const setupPiping = () => {
|
|
844
|
+
// Mark that we're switching to piping mode
|
|
845
|
+
pipingEstablished = true;
|
|
846
|
+
|
|
847
|
+
// Setup piping in both directions
|
|
825
848
|
socket.pipe(targetSocket);
|
|
826
849
|
targetSocket.pipe(socket);
|
|
827
|
-
|
|
828
|
-
|
|
850
|
+
|
|
851
|
+
// Resume the socket to ensure data flows
|
|
852
|
+
socket.resume();
|
|
853
|
+
|
|
854
|
+
// Process any data that might be queued in the interim
|
|
855
|
+
if (dataQueue.length > 0) {
|
|
856
|
+
// Write any remaining queued data directly to the target socket
|
|
857
|
+
for (const chunk of dataQueue) {
|
|
858
|
+
targetSocket.write(chunk);
|
|
859
|
+
}
|
|
860
|
+
// Clear the queue
|
|
861
|
+
dataQueue.length = 0;
|
|
862
|
+
queueSize = 0;
|
|
863
|
+
}
|
|
864
|
+
|
|
829
865
|
if (this.settings.enableDetailedLogging) {
|
|
830
866
|
console.log(
|
|
831
867
|
`[${connectionId}] Connection established: ${record.remoteIP} -> ${targetHost}:${connectionOptions.port}` +
|
|
@@ -852,6 +888,23 @@ export class PortProxy {
|
|
|
852
888
|
}`
|
|
853
889
|
);
|
|
854
890
|
}
|
|
891
|
+
};
|
|
892
|
+
|
|
893
|
+
// Flush all pending data to target
|
|
894
|
+
if (record.pendingData.length > 0) {
|
|
895
|
+
const combinedData = Buffer.concat(record.pendingData);
|
|
896
|
+
targetSocket.write(combinedData, (err) => {
|
|
897
|
+
if (err) {
|
|
898
|
+
console.log(`[${connectionId}] Error writing pending data to target: ${err.message}`);
|
|
899
|
+
return this.initiateCleanupOnce(record, 'write_error');
|
|
900
|
+
}
|
|
901
|
+
|
|
902
|
+
// Establish piping now that we've flushed the buffered data
|
|
903
|
+
setupPiping();
|
|
904
|
+
});
|
|
905
|
+
} else {
|
|
906
|
+
// No pending data, just establish piping immediately
|
|
907
|
+
setupPiping();
|
|
855
908
|
}
|
|
856
909
|
|
|
857
910
|
// Clear the buffer now that we've processed it
|
|
@@ -859,6 +912,7 @@ export class PortProxy {
|
|
|
859
912
|
record.pendingDataSize = 0;
|
|
860
913
|
|
|
861
914
|
// Add the renegotiation handler for SNI validation with strict domain enforcement
|
|
915
|
+
// This will be called after we've established piping
|
|
862
916
|
if (serverName) {
|
|
863
917
|
// Define a handler for checking renegotiation with improved detection
|
|
864
918
|
const renegotiationHandler = (renegChunk: Buffer) => {
|
|
@@ -895,8 +949,13 @@ export class PortProxy {
|
|
|
895
949
|
// Store the handler in the connection record so we can remove it during cleanup
|
|
896
950
|
record.renegotiationHandler = renegotiationHandler;
|
|
897
951
|
|
|
898
|
-
//
|
|
952
|
+
// The renegotiation handler is added when piping is established
|
|
953
|
+
// Making it part of setupPiping ensures proper sequencing of event handlers
|
|
899
954
|
socket.on('data', renegotiationHandler);
|
|
955
|
+
|
|
956
|
+
if (this.settings.enableDetailedLogging) {
|
|
957
|
+
console.log(`[${connectionId}] TLS renegotiation handler installed for SNI domain: ${serverName}`);
|
|
958
|
+
}
|
|
900
959
|
}
|
|
901
960
|
|
|
902
961
|
// Set connection timeout with simpler logic
|
|
@@ -1056,13 +1115,16 @@ export class PortProxy {
|
|
|
1056
1115
|
const bytesReceived = record.bytesReceived;
|
|
1057
1116
|
const bytesSent = record.bytesSent;
|
|
1058
1117
|
|
|
1059
|
-
// Remove
|
|
1060
|
-
if (record.
|
|
1118
|
+
// Remove all data handlers (both standard and renegotiation) to make sure we clean up properly
|
|
1119
|
+
if (record.incoming) {
|
|
1061
1120
|
try {
|
|
1062
|
-
|
|
1121
|
+
// Remove our safe data handler
|
|
1122
|
+
record.incoming.removeAllListeners('data');
|
|
1123
|
+
|
|
1124
|
+
// Reset the handler references
|
|
1063
1125
|
record.renegotiationHandler = undefined;
|
|
1064
1126
|
} catch (err) {
|
|
1065
|
-
console.log(`[${record.id}] Error removing
|
|
1127
|
+
console.log(`[${record.id}] Error removing data handlers: ${err}`);
|
|
1066
1128
|
}
|
|
1067
1129
|
}
|
|
1068
1130
|
|