3.8.0

changelog.md

@@ -1,5 +1,50 @@
 # Changelog
 
+## 2025-02-21 - 3.8.0 - feat(PortProxy)
+Add active connection tracking and logging in PortProxy
+
+- Implemented a feature to track active incoming connections in PortProxy.
+- Active connections are now logged every 10 seconds for monitoring purposes.
+- Refactored connection handling to ensure proper cleanup and logging.
+
+## 2025-02-21 - 3.7.3 - fix(portproxy)
+Fix handling of connections in PortProxy to improve stability and performance.
+
+- Improved IP normalization and matching
+- Better SNI extraction and handling for TLS
+- Streamlined connection handling with robust error management
+
+## 2025-02-21 - 3.7.2 - fix(PortProxy)
+Improve SNICallback and connection handling in PortProxy
+
+- Fixed SNICallback to create minimal TLS context for SNI.
+- Changed connection setup to use net.connect for raw passthrough.
+
+## 2025-02-21 - 3.7.1 - fix(smartproxy.portproxy)
+Optimize SNI handling by simplifying context creation
+
+- Removed unnecessary SecureContext creation for SNI requests in PortProxy
+- Improved handling of SNI passthrough by acknowledging requests without context creation
+
+## 2025-02-21 - 3.7.0 - feat(PortProxy)
+Add optional source IP preservation support in PortProxy
+
+- Added a feature to optionally preserve the client's source IP when proxying connections.
+- Enhanced test cases to include scenarios for source IP preservation.
+
+## 2025-02-21 - 3.6.0 - feat(PortProxy)
+Add feature to preserve original client IP through chained proxies
+
+- Added support to bind local address in PortProxy to preserve original client IP.
+- Implemented test for chained proxies to ensure client IP is preserved.
+
+## 2025-02-21 - 3.5.0 - feat(PortProxy)
+Enhance PortProxy to support domain-specific target IPs
+
+- Introduced support for domain-specific target IP configurations in PortProxy.
+- Updated connection handling to prioritize domain-specific target IPs if provided.
+- Added tests to verify forwarding based on domain-specific target IPs.
+
 ## 2025-02-21 - 3.4.4 - fix(PortProxy)
 Fixed handling of SNI domain connections and IP allowance checks
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/smartproxy",
-  "version": "3.4.4",
+  "version": "3.8.0",
   "private": false,
   "description": "a proxy for handling high workloads of proxying",
   "main": "dist_ts/index.js",

test/test.portproxy.ts

@@ -95,6 +95,54 @@ tap.test('should forward TCP connections to custom host', async () => {
   await customHostProxy.stop();
 });
 
+tap.test('should forward connections based on domain-specific target IP', async () => {
+  // Create a second test server on a different port
+  const TEST_SERVER_PORT_2 = TEST_SERVER_PORT + 100;
+  const testServer2 = await createTestServer(TEST_SERVER_PORT_2);
+
+  // Create a proxy with domain-specific target IPs
+  const domainProxy = new PortProxy({
+    fromPort: PROXY_PORT + 2,
+    toPort: TEST_SERVER_PORT,  // default port
+    toHost: 'localhost',       // default host
+    domains: [{
+      domain: 'domain1.test',
+      allowedIPs: ['127.0.0.1'],
+      targetIP: '127.0.0.1'
+    }, {
+      domain: 'domain2.test',
+      allowedIPs: ['127.0.0.1'],
+      targetIP: 'localhost'
+    }],
+    sniEnabled: false, // We'll test without SNI first since this is a TCP proxy test
+    defaultAllowedIPs: ['127.0.0.1']
+  });
+
+  await domainProxy.start();
+
+  // Test default connection (should use default host)
+  const response1 = await createTestClient(PROXY_PORT + 2, TEST_DATA);
+  expect(response1).toEqual(`Echo: ${TEST_DATA}`);
+
+  // Create another proxy with different default host
+  const domainProxy2 = new PortProxy({
+    fromPort: PROXY_PORT + 3,
+    toPort: TEST_SERVER_PORT,
+    toHost: '127.0.0.1',
+    domains: [],
+    sniEnabled: false,
+    defaultAllowedIPs: ['127.0.0.1']
+  });
+
+  await domainProxy2.start();
+  const response2 = await createTestClient(PROXY_PORT + 3, TEST_DATA);
+  expect(response2).toEqual(`Echo: ${TEST_DATA}`);
+
+  await domainProxy.stop();
+  await domainProxy2.stop();
+  await new Promise<void>((resolve) => testServer2.close(() => resolve()));
+});
+
 tap.test('should handle multiple concurrent connections', async () => {
   const concurrentRequests = 5;
   const requests = Array(concurrentRequests).fill(null).map((_, i) => 
@@ -127,6 +175,68 @@ tap.test('should stop port proxy', async () => {
 });
 
 // Cleanup
+tap.test('should support optional source IP preservation in chained proxies', async () => {
+  // Test 1: Without IP preservation (default behavior)
+  const firstProxyDefault = new PortProxy({
+    fromPort: PROXY_PORT + 4,
+    toPort: PROXY_PORT + 5,
+    toHost: 'localhost',
+    domains: [],
+    sniEnabled: false,
+    defaultAllowedIPs: ['127.0.0.1', '::ffff:127.0.0.1']
+  });
+
+  const secondProxyDefault = new PortProxy({
+    fromPort: PROXY_PORT + 5,
+    toPort: TEST_SERVER_PORT,
+    toHost: 'localhost',
+    domains: [],
+    sniEnabled: false,
+    defaultAllowedIPs: ['127.0.0.1', '::ffff:127.0.0.1']
+  });
+
+  await secondProxyDefault.start();
+  await firstProxyDefault.start();
+
+  // This should work because we explicitly allow both IPv4 and IPv6 formats
+  const response1 = await createTestClient(PROXY_PORT + 4, TEST_DATA);
+  expect(response1).toEqual(`Echo: ${TEST_DATA}`);
+
+  await firstProxyDefault.stop();
+  await secondProxyDefault.stop();
+
+  // Test 2: With IP preservation
+  const firstProxyPreserved = new PortProxy({
+    fromPort: PROXY_PORT + 6,
+    toPort: PROXY_PORT + 7,
+    toHost: 'localhost',
+    domains: [],
+    sniEnabled: false,
+    defaultAllowedIPs: ['127.0.0.1'],
+    preserveSourceIP: true
+  });
+
+  const secondProxyPreserved = new PortProxy({
+    fromPort: PROXY_PORT + 7,
+    toPort: TEST_SERVER_PORT,
+    toHost: 'localhost',
+    domains: [],
+    sniEnabled: false,
+    defaultAllowedIPs: ['127.0.0.1'],
+    preserveSourceIP: true
+  });
+
+  await secondProxyPreserved.start();
+  await firstProxyPreserved.start();
+
+  // This should work with just IPv4 because source IP is preserved
+  const response2 = await createTestClient(PROXY_PORT + 6, TEST_DATA);
+  expect(response2).toEqual(`Echo: ${TEST_DATA}`);
+
+  await firstProxyPreserved.stop();
+  await secondProxyPreserved.stop();
+});
+
 tap.test('cleanup port proxy test environment', async () => {
   await new Promise<void>((resolve) => testServer.close(() => resolve()));
 });

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/smartproxy',
-  version: '3.4.4',
+  version: '3.8.0',
   description: 'a proxy for handling high workloads of proxying'
 }

ts/smartproxy.portproxy.ts

@@ -1,28 +1,125 @@
 import * as plugins from './smartproxy.plugins.js';
 
-
-export interface DomainConfig {
-  domain: string;  // glob pattern for domain
-  allowedIPs: string[];  // glob patterns for IPs allowed to access this domain
+export interface IDomainConfig {
+  domain: string;         // glob pattern for domain
+  allowedIPs: string[];   // glob patterns for IPs allowed to access this domain
+  targetIP?: string;      // Optional target IP for this domain
 }
 
-export interface ProxySettings extends plugins.tls.TlsOptions {
+export interface IProxySettings extends plugins.tls.TlsOptions {
   // Port configuration
   fromPort: number;
   toPort: number;
-  toHost?: string;  // Target host to proxy to, defaults to 'localhost'
+  toHost?: string;        // Target host to proxy to, defaults to 'localhost'
 
   // Domain and security settings
-  domains: DomainConfig[];
+  domains: IDomainConfig[];
   sniEnabled?: boolean;
-  defaultAllowedIPs?: string[];  // Optional default IP patterns if no matching domain found
+  defaultAllowedIPs?: string[]; // Optional default IP patterns if no matching domain found
+  preserveSourceIP?: boolean;   // Whether to preserve the client's source IP when proxying
+}
+
+/**
+ * Extract SNI (Server Name Indication) from a TLS ClientHello packet.
+ * Returns the server name if found, or undefined.
+ */
+function extractSNI(buffer: Buffer): string | undefined {
+  let offset = 0;
+  // We need at least 5 bytes for the record header.
+  if (buffer.length < 5) {
+    return undefined;
+  }
+
+  // TLS record header
+  const recordType = buffer.readUInt8(0);
+  if (recordType !== 22) { // 22 = handshake
+    return undefined;
+  }
+  // Read record length
+  const recordLength = buffer.readUInt16BE(3);
+  if (buffer.length < 5 + recordLength) {
+    // Not all data arrived yet; in production you might need to accumulate more data.
+    return undefined;
+  }
+
+  offset = 5;
+  // Handshake message type should be 1 for ClientHello.
+  const handshakeType = buffer.readUInt8(offset);
+  if (handshakeType !== 1) {
+    return undefined;
+  }
+  // Skip handshake header (1 byte type + 3 bytes length)
+  offset += 4;
+
+  // Skip client version (2 bytes) and random (32 bytes)
+  offset += 2 + 32;
+
+  // Session ID
+  const sessionIDLength = buffer.readUInt8(offset);
+  offset += 1 + sessionIDLength;
+
+  // Cipher suites
+  const cipherSuitesLength = buffer.readUInt16BE(offset);
+  offset += 2 + cipherSuitesLength;
+
+  // Compression methods
+  const compressionMethodsLength = buffer.readUInt8(offset);
+  offset += 1 + compressionMethodsLength;
+
+  // Extensions length
+  if (offset + 2 > buffer.length) {
+    return undefined;
+  }
+  const extensionsLength = buffer.readUInt16BE(offset);
+  offset += 2;
+  const extensionsEnd = offset + extensionsLength;
+
+  // Iterate over extensions
+  while (offset + 4 <= extensionsEnd) {
+    const extensionType = buffer.readUInt16BE(offset);
+    const extensionLength = buffer.readUInt16BE(offset + 2);
+    offset += 4;
+
+    // Check for SNI extension (type 0)
+    if (extensionType === 0x0000) {
+      // SNI extension: first 2 bytes are the SNI list length.
+      if (offset + 2 > buffer.length) {
+        return undefined;
+      }
+      const sniListLength = buffer.readUInt16BE(offset);
+      offset += 2;
+      const sniListEnd = offset + sniListLength;
+      // Loop through the list; typically there is one entry.
+      while (offset + 3 < sniListEnd) {
+        const nameType = buffer.readUInt8(offset);
+        offset++;
+        const nameLen = buffer.readUInt16BE(offset);
+        offset += 2;
+        if (nameType === 0) { // host_name
+          if (offset + nameLen > buffer.length) {
+            return undefined;
+          }
+          const serverName = buffer.toString('utf8', offset, offset + nameLen);
+          return serverName;
+        }
+        offset += nameLen;
+      }
+      break;
+    } else {
+      offset += extensionLength;
+    }
+  }
+  return undefined;
 }
 
 export class PortProxy {
-  netServer: plugins.net.Server | plugins.tls.Server;
-  settings: ProxySettings;
+  netServer: plugins.net.Server;
+  settings: IProxySettings;
+  // Track active incoming connections
+  private activeConnections: Set<plugins.net.Socket> = new Set();
+  private connectionLogger: NodeJS.Timeout | null = null;
 
-  constructor(settings: ProxySettings) {
+  constructor(settings: IProxySettings) {
     this.settings = {
       ...settings,
       toHost: settings.toHost || 'localhost'
@@ -40,6 +137,7 @@ export class PortProxy {
       from.destroy();
       to.destroy();
     };
+
     const normalizeIP = (ip: string): string[] => {
       // Handle IPv4-mapped IPv6 addresses
       if (ip.startsWith('::ffff:')) {
@@ -47,7 +145,7 @@ export class PortProxy {
         return [ip, ipv4];
       }
       // Handle IPv4 addresses by adding IPv4-mapped IPv6 variant
-      if (ip.match(/^\d{1,3}(\.\d{1,3}){3}$/)) {
+      if (/^\d{1,3}(\.\d{1,3}){3}$/.test(ip)) {
         return [ip, `::ffff:${ip}`];
       }
       return [ip];
@@ -57,112 +155,142 @@ export class PortProxy {
       // Expand patterns to include both IPv4 and IPv6 variants
       const expandedPatterns = patterns.flatMap(normalizeIP);
       // Check if any variant of the IP matches any expanded pattern
-      return normalizeIP(value).some(ip => 
+      return normalizeIP(value).some(ip =>
         expandedPatterns.some(pattern => plugins.minimatch(ip, pattern))
       );
     };
 
-    const findMatchingDomain = (serverName: string): DomainConfig | undefined => {
+    const findMatchingDomain = (serverName: string): IDomainConfig | undefined => {
       return this.settings.domains.find(config => plugins.minimatch(serverName, config.domain));
     };
 
-    const server = this.settings.sniEnabled
-      ? plugins.tls.createServer({
-          ...this.settings,
-          SNICallback: (serverName: string, cb: (err: Error | null, ctx?: plugins.tls.SecureContext) => void) => {
-            console.log(`SNI request for domain: ${serverName}`);
-            const domainConfig = findMatchingDomain(serverName);
-            if (!domainConfig) {
-              // Always allow SNI for default IPs, even if domain doesn't match
-              console.log(`SNI domain ${serverName} not found, will check IP during connection`);
-            }
-            // Create context with the provided TLS settings
-            const ctx = plugins.tls.createSecureContext(this.settings);
-            cb(null, ctx);
+    // Create a plain net server for TLS passthrough.
+    this.netServer = plugins.net.createServer((socket: plugins.net.Socket) => {
+      const remoteIP = socket.remoteAddress || '';
+      
+      // Track the new incoming connection.
+      this.activeConnections.add(socket);
+      console.log(`New connection from ${remoteIP}. Active connections: ${this.activeConnections.size}`);
+
+      // Flag to ensure cleanup happens only once.
+      let connectionClosed = false;
+      const cleanupOnce = () => {
+        if (!connectionClosed) {
+          connectionClosed = true;
+          cleanUpSockets(socket, to);
+          if (this.activeConnections.has(socket)) {
+            this.activeConnections.delete(socket);
+            console.log(`Connection from ${remoteIP} terminated. Active connections: ${this.activeConnections.size}`);
           }
-        })
-      : plugins.net.createServer();
-    
-    const handleConnection = (from: plugins.net.Socket | plugins.tls.TLSSocket) => {
-      const remoteIP = from.remoteAddress || '';
-      let serverName = '';
-
-      // First check if this IP is in the default allowed list
-      const isDefaultAllowed = this.settings.defaultAllowedIPs && isAllowed(remoteIP, this.settings.defaultAllowedIPs);
-
-      if (this.settings.sniEnabled && from instanceof plugins.tls.TLSSocket) {
-        serverName = (from as any).servername || '';
-        console.log(`TLS Connection from ${remoteIP} for domain: ${serverName}`);
-      }
-
-      // If IP is in defaultAllowedIPs, allow the connection regardless of SNI
-      if (isDefaultAllowed) {
-        console.log(`Connection allowed: IP ${remoteIP} is in default allowed list`);
-      } else if (this.settings.sniEnabled && serverName) {
-        // For SNI connections that aren't in default list, check domain-specific rules
-        const domainConfig = findMatchingDomain(serverName);
-        if (!domainConfig) {
-          console.log(`Connection rejected: No matching domain config for ${serverName} from IP ${remoteIP}`);
-          from.end();
-          return;
         }
-        if (!isAllowed(remoteIP, domainConfig.allowedIPs)) {
-          console.log(`Connection rejected: IP ${remoteIP} not allowed for domain ${serverName}`);
-          from.end();
-          return;
+      };
+
+      let to: plugins.net.Socket;
+
+      const handleError = (side: 'incoming' | 'outgoing') => (err: Error) => {
+        const code = (err as any).code;
+        if (code === 'ECONNRESET') {
+          console.log(`ECONNRESET on ${side} side from ${remoteIP}: ${err.message}`);
+        } else {
+          console.log(`Error on ${side} side from ${remoteIP}: ${err.message}`);
         }
+        cleanupOnce();
+      };
+
+      const handleClose = (side: 'incoming' | 'outgoing') => () => {
+        console.log(`Connection closed on ${side} side from ${remoteIP}`);
+        cleanupOnce();
+      };
+
+      // Setup connection, optionally accepting the initial data chunk.
+      const setupConnection = (serverName: string, initialChunk?: Buffer) => {
+        // Check if the IP is allowed by default.
+        const isDefaultAllowed = this.settings.defaultAllowedIPs && isAllowed(remoteIP, this.settings.defaultAllowedIPs);
+        if (!isDefaultAllowed && serverName) {
+          const domainConfig = findMatchingDomain(serverName);
+          if (!domainConfig) {
+            console.log(`Connection rejected: No matching domain config for ${serverName} from ${remoteIP}`);
+            socket.end();
+            return;
+          }
+          if (!isAllowed(remoteIP, domainConfig.allowedIPs)) {
+            console.log(`Connection rejected: IP ${remoteIP} not allowed for domain ${serverName}`);
+            socket.end();
+            return;
+          }
+        } else if (!isDefaultAllowed && !serverName) {
+          console.log(`Connection rejected: No SNI and IP ${remoteIP} not in default allowed list`);
+          socket.end();
+          return;
+        } else {
+          console.log(`Connection allowed: IP ${remoteIP} is in default allowed list`);
+        }
+
+        // Determine target host.
+        const domainConfig = serverName ? findMatchingDomain(serverName) : undefined;
+        const targetHost = domainConfig?.targetIP || this.settings.toHost!;
+
+        // Create connection options.
+        const connectionOptions: plugins.net.NetConnectOpts = {
+          host: targetHost,
+          port: this.settings.toPort,
+        };
+        if (this.settings.preserveSourceIP) {
+          connectionOptions.localAddress = remoteIP.replace('::ffff:', '');
+        }
+
+        // Establish outgoing connection.
+        to = plugins.net.connect(connectionOptions);
+        console.log(`Connection established: ${remoteIP} -> ${targetHost}:${this.settings.toPort}${serverName ? ` (SNI: ${serverName})` : ''}`);
+        
+        // Push back the initial chunk if provided.
+        if (initialChunk) {
+          socket.unshift(initialChunk);
+        }
+        socket.setTimeout(120000);
+        socket.pipe(to);
+        to.pipe(socket);
+
+        // Attach error and close handlers for both sockets.
+        socket.on('error', handleError('incoming'));
+        to.on('error', handleError('outgoing'));
+        socket.on('close', handleClose('incoming'));
+        to.on('close', handleClose('outgoing'));
+        socket.on('timeout', handleError('incoming'));
+        to.on('timeout', handleError('outgoing'));
+        socket.on('end', handleClose('incoming'));
+        to.on('end', handleClose('outgoing'));
+      };
+
+      // For SNI-enabled connections, peek at the first chunk.
+      if (this.settings.sniEnabled) {
+        socket.once('data', (chunk: Buffer) => {
+          // Try to extract the server name from the ClientHello.
+          const serverName = extractSNI(chunk) || '';
+          console.log(`Received connection from ${remoteIP} with SNI: ${serverName}`);
+          setupConnection(serverName, chunk);
+        });
       } else {
-        // Non-SNI connection and not in default list
-        console.log(`Connection rejected: IP ${remoteIP} not allowed for non-SNI connection`);
-        from.end();
-        return;
+        // For non-SNI connections, simply check defaultAllowedIPs.
+        if (!this.settings.defaultAllowedIPs || !isAllowed(remoteIP, this.settings.defaultAllowedIPs)) {
+          console.log(`Connection rejected: IP ${remoteIP} not allowed for non-SNI connection`);
+          socket.end();
+          return;
+        }
+        setupConnection('');
       }
+    })
+    .on('error', (err: Error) => {
+      console.log(`Server Error: ${err.message}`);
+    })
+    .listen(this.settings.fromPort, () => {
+      console.log(`PortProxy -> OK: Now listening on port ${this.settings.fromPort}${this.settings.sniEnabled ? ' (SNI passthrough enabled)' : ''}`);
+    });
 
-      const to = plugins.net.createConnection({
-        host: this.settings.toHost!,
-        port: this.settings.toPort,
-      });
-      console.log(`Connection established: ${remoteIP} -> ${this.settings.toHost}:${this.settings.toPort}${serverName ? ` (SNI: ${serverName})` : ''}`);
-      from.setTimeout(120000);
-      from.pipe(to);
-      to.pipe(from);
-      from.on('error', () => {
-        cleanUpSockets(from, to);
-      });
-      to.on('error', () => {
-        cleanUpSockets(from, to);
-      });
-      from.on('close', () => {
-        cleanUpSockets(from, to);
-      });
-      to.on('close', () => {
-        cleanUpSockets(from, to);
-      });
-      from.on('timeout', () => {
-        cleanUpSockets(from, to);
-      });
-      to.on('timeout', () => {
-        cleanUpSockets(from, to);
-      });
-      from.on('end', () => {
-        cleanUpSockets(from, to);
-      });
-      to.on('end', () => {
-        cleanUpSockets(from, to);
-      });
-    };
-
-    this.netServer = server
-      .on('connection', handleConnection)
-      .on('secureConnection', handleConnection)
-      .on('tlsClientError', (err, tlsSocket) => {
-        console.log(`TLS Client Error: ${err.message}`);
-      })
-      .on('error', (err) => {
-        console.log(`Server Error: ${err.message}`);
-      })
-      .listen(this.settings.fromPort);
-    console.log(`PortProxy -> OK: Now listening on port ${this.settings.fromPort}${this.settings.sniEnabled ? ' (SNI enabled)' : ''}`);
+    // Log active connection count every 10 seconds.
+    this.connectionLogger = setInterval(() => {
+      console.log(`(Interval Log) Active connections: ${this.activeConnections.size}`);
+    }, 10000);
   }
 
   public async stop() {
@@ -170,6 +298,10 @@ export class PortProxy {
     this.netServer.close(() => {
       done.resolve();
     });
+    if (this.connectionLogger) {
+      clearInterval(this.connectionLogger);
+      this.connectionLogger = null;
+    }
     await done.promise;
   }
-}
+}