From 5908e84db988a3ab7316fec848b7cd00b64ec94e Mon Sep 17 00:00:00 2001
From: Nathan Rajlich <n@n8.io>
Date: Fri, 5 Apr 2024 23:07:17 -0700
Subject: [PATCH] Remove `net.isIP()` check for TLS `servername` (#312)

Fixes #308.
---
 .changeset/seven-camels-check.md        | 7 +++++++
 packages/https-proxy-agent/src/index.ts | 5 ++---
 packages/pac-proxy-agent/src/index.ts   | 5 +----
 packages/socks-proxy-agent/src/index.ts | 2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/seven-camels-check.md

diff --git a/.changeset/seven-camels-check.md b/.changeset/seven-camels-check.md
new file mode 100644
index 00000000..1040691e
--- /dev/null
+++ 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
index 47da1dc3..272f7790 100644
--- 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
index 9b402dd3..57aa06d5 100644
--- 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
index c6b84db7..7a911d20 100644
--- 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) => {