4.1.6

changelog.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## 2025-03-16 - 4.1.6 - fix(tls)
+Refine TLS ClientHello handling when allowSessionTicket is false by replacing extensive alert timeout logic with a concise warning alert and short delay, encouraging immediate client retry with proper SNI
+
+- Update the TLS alert sending mechanism to use cork/uncork and a short, fixed delay instead of long timeouts
+- Remove redundant event listeners and excessive cleanup logic after sending the alert
+- Improve code clarity and encourage clients (e.g., Chrome) to retry handshake with SNI more responsively
+
+## 2025-03-16 - 4.1.5 - fix(TLS/ConnectionHandler)
+Improve handling of TLS session resumption without SNI by sending an 'unrecognized_name' alert instead of immediately terminating the connection. This change adds a grace period for the client to retry the handshake with proper SNI and cleans up the connection if no valid response is received.
+
+- Send a TLS warning (unrecognized_name alert, code 112) when a ClientHello is received without SNI and session tickets are disallowed.
+- Utilize socket cork/uncork to ensure the alert is sent as a single packet.
+- Add a 5-second alert timeout and a subsequent 30-second grace period to allow clients to initiate a new handshake with SNI.
+- Clean up and terminate the connection if no valid SNI is provided after the grace period, logging appropriate termination reasons.
+
+## 2025-03-15 - 4.1.4 - fix(ConnectionHandler)
+Refactor ConnectionHandler code formatting for improved readability and consistency in log messages and whitespace handling
+
+- Standardized indentation and spacing in method signatures and log statements
+- Aligned inline comments and string concatenations for clarity
+- Minor refactoring of parameter formatting without changing functionality
+
+## 2025-03-15 - 4.1.3 - fix(connectionhandler)
+Improve handling of TLS ClientHello messages when allowSessionTicket is disabled and no SNI is provided by sending a warning alert (unrecognized_name, code 0x70) with a proper callback and delay to ensure the alert is transmitted before closing the connection.
+
+- Replace the fatal alert (0x02/0x40) with a warning alert (0x01/0x70) to notify clients to send SNI.
+- Use socket.write callback to wait 100ms after sending the alert before terminating the connection.
+- Remove the previous short (50ms) delay in favor of a more reliable delay mechanism before cleanup.
+
+## 2025-03-15 - 4.1.2 - fix(connectionhandler)
+Send proper TLS alert before terminating connections when SNI is missing and session tickets are disallowed.
+
+- Added logic to transmit a fatal TLS alert (Handshake Failure) before closing the connection when no SNI is present with allowSessionTicket=false.
+- Introduced a slight 50ms delay after sending the alert to ensure the client receives the alert properly.
+- Applied these changes both for the initial ClientHello and when handling subsequent TLS data.
+
 ## 2025-03-15 - 4.1.1 - fix(tls)
 Enforce strict SNI handling in TLS connections by terminating ClientHello messages lacking SNI when session tickets are disallowed and removing legacy session cache code.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/smartproxy",
-  "version": "4.1.1",
+  "version": "4.1.6",
   "private": false,
   "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.",
   "main": "dist_ts/index.js",

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/smartproxy',
-  version: '4.1.1',
+  version: '4.1.6',
   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.'
 }

ts/classes.pp.connectionhandler.ts

@@ -1,5 +1,9 @@
 import * as plugins from './plugins.js';
-import type { IConnectionRecord, IDomainConfig, IPortProxySettings } from './classes.pp.interfaces.js';
+import type {
+  IConnectionRecord,
+  IDomainConfig,
+  IPortProxySettings,
+} from './classes.pp.interfaces.js';
 import { ConnectionManager } from './classes.pp.connectionmanager.js';
 import { SecurityManager } from './classes.pp.securitymanager.js';
 import { DomainConfigManager } from './classes.pp.domainconfigmanager.js';
@@ -73,8 +77,8 @@ export class ConnectionHandler {
     if (this.settings.enableDetailedLogging) {
       console.log(
         `[${connectionId}] New connection from ${remoteIP} on port ${localPort}. ` +
-        `Keep-Alive: ${record.hasKeepAlive ? 'Enabled' : 'Disabled'}. ` +
+          `Keep-Alive: ${record.hasKeepAlive ? 'Enabled' : 'Disabled'}. ` +
-        `Active connections: ${this.connectionManager.getConnectionCount()}`
+          `Active connections: ${this.connectionManager.getConnectionCount()}`
       );
     } else {
       console.log(
@@ -94,7 +98,10 @@ export class ConnectionHandler {
   /**
    * Handle a connection that should be forwarded to NetworkProxy
    */
-  private handleNetworkProxyConnection(socket: plugins.net.Socket, record: IConnectionRecord): void {
+  private handleNetworkProxyConnection(
+    socket: plugins.net.Socket,
+    record: IConnectionRecord
+  ): void {
     const connectionId = record.id;
     let initialDataReceived = false;
 
@@ -144,7 +151,7 @@ export class ConnectionHandler {
       if (!this.tlsManager.isTlsHandshake(chunk) && localPort === 443) {
         console.log(
           `[${connectionId}] Non-TLS connection detected on port 443. ` +
-          `Terminating connection - only TLS traffic is allowed on standard HTTPS port.`
+            `Terminating connection - only TLS traffic is allowed on standard HTTPS port.`
         );
         if (record.incomingTerminationReason === null) {
           record.incomingTerminationReason = 'non_tls_blocked';
@@ -159,8 +166,8 @@ export class ConnectionHandler {
       if (this.tlsManager.isTlsHandshake(chunk)) {
         record.isTLS = true;
 
-        // Check session tickets if they're disabled
+        // Check for ClientHello to extract SNI - but don't enforce it for NetworkProxy
-        if (this.settings.allowSessionTicket === false && this.tlsManager.isClientHello(chunk)) {
+        if (this.tlsManager.isClientHello(chunk)) {
           // Create connection info for SNI extraction
           const connInfo = {
             sourceIp: record.remoteIP,
@@ -169,49 +176,46 @@ export class ConnectionHandler {
             destPort: socket.localPort || 0,
           };
 
-          // Extract SNI for domain-specific NetworkProxy handling
+          // Extract SNI for domain-specific NetworkProxy handling if available
           const serverName = this.tlsManager.extractSNI(chunk, connInfo);
 
-          // If allowSessionTicket is false and we can't determine SNI, terminate the connection
+          // For NetworkProxy connections, we'll allow session tickets even without SNI
-          if (!serverName) {
+          // We'll only use the serverName if available to determine the specific NetworkProxy port
-            console.log(
+          if (serverName) {
-              `[${connectionId}] No SNI detected in ClientHello and allowSessionTicket=false. ` +
+            // Save domain config and SNI in connection record
-              `Terminating connection to force new TLS handshake with SNI.`
+            const domainConfig = this.domainConfigManager.findDomainConfig(serverName);
-            );
+            record.domainConfig = domainConfig;
-            if (record.incomingTerminationReason === null) {
+            record.lockedDomain = serverName;
-              record.incomingTerminationReason = 'session_ticket_blocked_no_sni';
-              this.connectionManager.incrementTerminationStat('incoming', 'session_ticket_blocked_no_sni');
-            }
-            socket.end();
-            this.connectionManager.cleanupConnection(record, 'session_ticket_blocked_no_sni');
-            return;
-          }
 
-          // Save domain config and SNI in connection record
+            // Use domain-specific NetworkProxy port if configured
-          const domainConfig = this.domainConfigManager.findDomainConfig(serverName);
+            if (domainConfig && this.domainConfigManager.shouldUseNetworkProxy(domainConfig)) {
-          record.domainConfig = domainConfig;
+              const networkProxyPort = this.domainConfigManager.getNetworkProxyPort(domainConfig);
-          record.lockedDomain = serverName;
 
-          // Use domain-specific NetworkProxy port if configured
+              if (this.settings.enableDetailedLogging) {
-          if (domainConfig && this.domainConfigManager.shouldUseNetworkProxy(domainConfig)) {
+                console.log(
-            const networkProxyPort = this.domainConfigManager.getNetworkProxyPort(domainConfig);
+                  `[${connectionId}] Using domain-specific NetworkProxy for ${serverName} on port ${networkProxyPort}`
+                );
+              }
 
-            if (this.settings.enableDetailedLogging) {
+              // Forward to NetworkProxy with domain-specific port
-              console.log(
+              this.networkProxyBridge.forwardToNetworkProxy(
-                `[${connectionId}] Using domain-specific NetworkProxy for ${serverName} on port ${networkProxyPort}`
+                connectionId,
+                socket,
+                record,
+                chunk,
+                networkProxyPort,
+                (reason) => this.connectionManager.initiateCleanupOnce(record, reason)
               );
+              return;
             }
-
+          } else if (
-            // Forward to NetworkProxy with domain-specific port
+            this.settings.allowSessionTicket === false &&
-            this.networkProxyBridge.forwardToNetworkProxy(
+            this.settings.enableDetailedLogging
-              connectionId,
+          ) {
-              socket,
+            // Log that we're allowing a session resumption without SNI for NetworkProxy
-              record,
+            console.log(
-              chunk,
+              `[${connectionId}] Allowing session resumption without SNI for NetworkProxy forwarding`
-              networkProxyPort,
-              (reason) => this.connectionManager.initiateCleanupOnce(record, reason)
             );
-            return;
           }
         }
 
@@ -226,14 +230,10 @@ export class ConnectionHandler {
         );
       } else {
         // If not TLS, use normal direct connection
-        console.log(`[${connectionId}] Non-TLS connection on NetworkProxy port ${record.localPort}`);
+        console.log(
-        this.setupDirectConnection(
+          `[${connectionId}] Non-TLS connection on NetworkProxy port ${record.localPort}`
-          socket,
-          record,
-          undefined,
-          undefined,
-          chunk
         );
+        this.setupDirectConnection(socket, record, undefined, undefined, chunk);
       }
     });
   }
@@ -351,14 +351,13 @@ export class ConnectionHandler {
       record.domainConfig = domainConfig;
 
       // Check if this domain should use NetworkProxy (domain-specific setting)
-      if (domainConfig && 
+      if (
-          this.domainConfigManager.shouldUseNetworkProxy(domainConfig) && 
+        domainConfig &&
-          this.networkProxyBridge.getNetworkProxy()) {
+        this.domainConfigManager.shouldUseNetworkProxy(domainConfig) &&
-        
+        this.networkProxyBridge.getNetworkProxy()
+      ) {
         if (this.settings.enableDetailedLogging) {
-          console.log(
+          console.log(`[${connectionId}] Domain ${serverName} is configured to use NetworkProxy`);
-            `[${connectionId}] Domain ${serverName} is configured to use NetworkProxy`
-          );
         }
 
         const networkProxyPort = this.domainConfigManager.getNetworkProxyPort(domainConfig);
@@ -384,19 +383,20 @@ export class ConnectionHandler {
         // Skip IP validation if allowedIPs is empty
         if (
           domainConfig.allowedIPs.length > 0 &&
-          !this.securityManager.isIPAuthorized(record.remoteIP, ipRules.allowedIPs, ipRules.blockedIPs)
+          !this.securityManager.isIPAuthorized(
+            record.remoteIP,
+            ipRules.allowedIPs,
+            ipRules.blockedIPs
+          )
         ) {
           return rejectIncomingConnection(
             'rejected',
-            `Connection rejected: IP ${record.remoteIP} not allowed for domain ${domainConfig.domains.join(
+            `Connection rejected: IP ${
-              ', '
+              record.remoteIP
-            )}`
+            } not allowed for domain ${domainConfig.domains.join(', ')}`
           );
         }
-      } else if (
+      } else if (this.settings.defaultAllowedIPs && this.settings.defaultAllowedIPs.length > 0) {
-        this.settings.defaultAllowedIPs &&
-        this.settings.defaultAllowedIPs.length > 0
-      ) {
         if (
           !this.securityManager.isIPAuthorized(
             record.remoteIP,
@@ -467,9 +467,17 @@ export class ConnectionHandler {
         if (forcedDomain) {
           const ipRules = this.domainConfigManager.getEffectiveIPRules(forcedDomain);
 
-          if (!this.securityManager.isIPAuthorized(record.remoteIP, ipRules.allowedIPs, ipRules.blockedIPs)) {
+          if (
+            !this.securityManager.isIPAuthorized(
+              record.remoteIP,
+              ipRules.allowedIPs,
+              ipRules.blockedIPs
+            )
+          ) {
             console.log(
-              `[${connectionId}] Connection from ${record.remoteIP} rejected: IP not allowed for domain ${forcedDomain.domains.join(
+              `[${connectionId}] Connection from ${
+                record.remoteIP
+              } rejected: IP not allowed for domain ${forcedDomain.domains.join(
                 ', '
               )} on port ${localPort}.`
             );
@@ -479,9 +487,9 @@ export class ConnectionHandler {
 
           if (this.settings.enableDetailedLogging) {
             console.log(
-              `[${connectionId}] Port-based connection from ${record.remoteIP} on port ${localPort} matched domain ${forcedDomain.domains.join(
+              `[${connectionId}] Port-based connection from ${
-                ', '
+                record.remoteIP
-              )}.`
+              } on port ${localPort} matched domain ${forcedDomain.domains.join(', ')}.`
             );
           }
 
@@ -509,7 +517,7 @@ export class ConnectionHandler {
         if (!this.tlsManager.isTlsHandshake(chunk) && localPort === 443) {
           console.log(
             `[${connectionId}] Non-TLS connection detected on port 443 in SNI handler. ` +
-            `Terminating connection - only TLS traffic is allowed on standard HTTPS port.`
+              `Terminating connection - only TLS traffic is allowed on standard HTTPS port.`
           );
           if (record.incomingTerminationReason === null) {
             record.incomingTerminationReason = 'non_tls_blocked';
@@ -544,36 +552,83 @@ export class ConnectionHandler {
           serverName = this.tlsManager.extractSNI(chunk, connInfo) || '';
 
           // If allowSessionTicket is false and this is a ClientHello with no SNI, terminate the connection
-          if (this.settings.allowSessionTicket === false && 
+          if (
-              this.tlsManager.isClientHello(chunk) && 
+            this.settings.allowSessionTicket === false &&
-              !serverName) {
+            this.tlsManager.isClientHello(chunk) &&
-            
+            !serverName
-            // Check if this is a session resumption
+          ) {
-            const resumptionInfo = this.tlsManager.handleSessionResumption(
+            // Block ClientHello without SNI when allowSessionTicket is false
-              chunk, 
+            console.log(
-              connectionId,
+              `[${connectionId}] No SNI detected in ClientHello and allowSessionTicket=false. ` +
-              false // No SNI
+              `Sending warning unrecognized_name alert to encourage immediate retry with SNI.`
             );
           
-            if (resumptionInfo.shouldBlock) {
+            // Set the termination reason first
-              console.log(
+            if (record.incomingTerminationReason === null) {
-                `[${connectionId}] Session resumption without SNI detected and allowSessionTicket=false. ` +
+              record.incomingTerminationReason = 'session_ticket_blocked_no_sni';
-                `Terminating connection to force new TLS handshake with SNI.`
+              this.connectionManager.incrementTerminationStat(
+                'incoming',
+                'session_ticket_blocked_no_sni'
               );
-              if (record.incomingTerminationReason === null) {
-                record.incomingTerminationReason = resumptionInfo.reason || 'session_ticket_blocked_no_sni';
-                this.connectionManager.incrementTerminationStat(
-                  'incoming', 
-                  resumptionInfo.reason || 'session_ticket_blocked_no_sni'
-                );
-              }
-              socket.end();
-              this.connectionManager.cleanupConnection(
-                record, 
-                resumptionInfo.reason || 'session_ticket_blocked_no_sni'
-              );
-              return;
             }
+          
+            // Create a warning-level alert for unrecognized_name
+            // This encourages Chrome to retry immediately with SNI
+            const alertData = Buffer.from([
+              0x15, // Alert record type
+              0x03,
+              0x03, // TLS 1.2 version
+              0x00,
+              0x02, // Length
+              0x01, // Warning alert level (not fatal)
+              0x70, // unrecognized_name alert (code 112)
+            ]);
+          
+            try {
+              // Use cork/uncork to ensure the alert is sent as a single packet
+              socket.cork();
+              const writeSuccessful = socket.write(alertData);
+              socket.uncork();
+              
+              // Function to handle the clean socket termination
+              const finishConnection = () => {
+                // First call end() to initiate a graceful close (sends FIN)
+                socket.end();
+                
+                // Allow a short delay for the alert and FIN to be transmitted
+                // before we fully close the socket
+                setTimeout(() => {
+                  if (!socket.destroyed) {
+                    socket.destroy();
+                  }
+                  this.connectionManager.cleanupConnection(record, 'session_ticket_blocked_no_sni');
+                }, 150); // Short delay, but longer than the standard TCP ACK timeout
+              };
+              
+              if (writeSuccessful) {
+                // If the data was successfully written to the kernel buffer,
+                // we can finish the connection after a short delay to ensure transmission
+                setTimeout(finishConnection, 50);
+              } else {
+                // If the kernel buffer was full, wait for the drain event
+                socket.once('drain', () => {
+                  setTimeout(finishConnection, 50);
+                });
+                
+                // Set a safety timeout in case drain never happens
+                setTimeout(() => {
+                  socket.removeAllListeners('drain');
+                  finishConnection();
+                }, 250);
+              }
+            } catch (err) {
+              // If we can't send the alert, fall back to immediate termination
+              console.log(`[${connectionId}] Error sending TLS alert: ${err.message}`);
+              socket.end();
+              this.connectionManager.cleanupConnection(record, 'session_ticket_blocked_no_sni');
+            }
+          
+            return;
           }
         }
 
@@ -628,9 +683,7 @@ export class ConnectionHandler {
       : this.settings.targetIP!;
 
     // Determine target port
-    const targetPort = overridePort !== undefined 
+    const targetPort = overridePort !== undefined ? overridePort : this.settings.toPort;
-      ? overridePort 
-      : this.settings.toPort;
 
     // Setup connection options
     const connectionOptions: plugins.net.NetConnectOpts = {
@@ -903,7 +956,9 @@ export class ConnectionHandler {
         const combinedData = Buffer.concat(record.pendingData);
 
         if (this.settings.enableDetailedLogging) {
-          console.log(`[${connectionId}] Forwarding ${combinedData.length} bytes of initial data to target`);
+          console.log(
+            `[${connectionId}] Forwarding ${combinedData.length} bytes of initial data to target`
+          );
         }
 
         // Write pending data immediately
@@ -1001,15 +1056,12 @@ export class ConnectionHandler {
       }
 
       // Set connection timeout
-      record.cleanupTimer = this.timeoutManager.setupConnectionTimeout(
+      record.cleanupTimer = this.timeoutManager.setupConnectionTimeout(record, (record, reason) => {
-        record,
+        console.log(
-        (record, reason) => {
+          `[${connectionId}] Connection from ${record.remoteIP} exceeded max lifetime, forcing cleanup.`
-          console.log(
+        );
-            `[${connectionId}] Connection from ${record.remoteIP} exceeded max lifetime, forcing cleanup.`
+        this.connectionManager.initiateCleanupOnce(record, reason);
-          );
+      });
-          this.connectionManager.initiateCleanupOnce(record, reason);
-        }
-      );
 
       // Mark TLS handshake as complete for TLS connections
       if (record.isTLS) {