Remove net.isIP() check for TLS servername (TooTallNate#312)

Fixes TooTallNate#308.
mxschmitt · Apr 6, 2024 · 5908e84 · 5908e84
1 parent 28104d2
commit 5908e84
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/.changeset/seven-camels-check.md b/.changeset/seven-camels-check.md
@@ -0,0 +1,7 @@
+---
+"https-proxy-agent": patch
+"pac-proxy-agent": patch
+"socks-proxy-agent": patch
+---
+
+Remove `net.isIP()` check for TLS `servername`
diff --git a/packages/https-proxy-agent/src/index.ts b/packages/https-proxy-agent/src/index.ts
@@ -96,8 +96,7 @@ export class HttpsProxyAgent<Uri extends string> extends Agent {
 				this.connectOpts.servername || this.connectOpts.host;
 			socket = tls.connect({
 				...this.connectOpts,
-				servername:
-					servername && net.isIP(servername) ? undefined : servername,
+				servername,
 			});
 		} else {
 			debug('Creating `net.Socket`: %o', this.connectOpts);
@@ -151,7 +150,7 @@ export class HttpsProxyAgent<Uri extends string> extends Agent {
 				return tls.connect({
 					...omit(opts, 'host', 'path', 'port'),
 					socket,
-					servername: net.isIP(servername) ? undefined : servername,
+					servername,
 				});
 			}
 

diff --git a/packages/pac-proxy-agent/src/index.ts b/packages/pac-proxy-agent/src/index.ts
@@ -240,10 +240,7 @@ export class PacProxyAgent<Uri extends string> extends Agent {
 					const servername = opts.servername || opts.host;
 					socket = tls.connect({
 						...opts,
-						servername:
-							!servername || net.isIP(servername)
-								? undefined
-								: servername,
+						servername,
 					});
 				} else {
 					socket = net.connect(opts);

diff --git a/packages/socks-proxy-agent/src/index.ts b/packages/socks-proxy-agent/src/index.ts
@@ -175,7 +175,7 @@ export class SocksProxyAgent extends Agent {
 			const tlsSocket = tls.connect({
 				...omit(opts, 'host', 'path', 'port'),
 				socket,
-				servername: net.isIP(servername) ? undefined : servername,
+				servername,
 			});
 
 			tlsSocket.once('error', (error) => {