From abcad094d1b54d15ade820ae2fdb4df3a45146ac Mon Sep 17 00:00:00 2001
From: Mary Strodl <ipadlover8322@gmail.com>
Date: Wed, 5 May 2021 20:06:00 -0400
Subject: [PATCH 1/5] network: add support for SOCKS (closes #1375)

---
 client/components/NetworkForm.vue | 72 +++++++++++++++++++++++++++++++
 client/css/style.css              | 12 ++++--
 package.json                      |  2 +-
 src/client.js                     |  6 +++
 src/models/network.js             | 41 ++++++++++++++++++
 5 files changed, 128 insertions(+), 5 deletions(-)

diff --git a/client/components/NetworkForm.vue b/client/components/NetworkForm.vue
index d14f307e..50757d58 100644
--- a/client/components/NetworkForm.vue
+++ b/client/components/NetworkForm.vue
@@ -98,6 +98,78 @@
 						</label>
 					</div>
 				</div>
+
+				<h2>Proxy Settings</h2>
+				<div class="connect-row">
+					<label for="connect:proxyHost">SOCKS Address</label>
+					<div class="input-wrap">
+						<input
+							id="connect:proxyHost"
+							v-model="defaults.proxyHost"
+							class="input"
+							name="proxyHost"
+							aria-label="Proxy host"
+							maxlength="255"
+						/>
+						<span id="connect:proxyPortSeparator">:</span>
+						<input
+							id="connect:proxyPort"
+							v-model="defaults.proxyPort"
+							class="input"
+							type="number"
+							min="1"
+							max="65535"
+							name="proxyPort"
+							aria-label="SOCKS port"
+						/>
+					</div>
+				</div>
+
+				<div class="connect-row">
+					<label for="connect:proxyUsername">Proxy username</label>
+					<input
+						id="connect:proxyUsername"
+						ref="proxyUsernameInput"
+						v-model="defaults.proxyUsername"
+						class="input username"
+						name="proxyUsername"
+						maxlength="100"
+						placeholder="Proxy username"
+					/>
+				</div>
+
+				<div class="connect-row">
+					<label for="connect:proxyPassword">Proxy password</label>
+					<RevealPassword
+						v-slot:default="slotProps"
+						class="input-wrap password-container"
+					>
+						<input
+							id="connect:proxyPassword"
+							ref="proxyPassword"
+							v-model="defaults.proxyPassword"
+							class="input"
+							:type="slotProps.isVisible ? 'text' : 'password'"
+							placeholder="Proxy password"
+							name="password"
+							maxlength="300"
+						/>
+					</RevealPassword>
+				</div>
+
+				<div class="connect-row">
+					<label></label>
+					<div class="input-wrap">
+						<label for="connect:proxyEnabled">
+							<input
+								v-model="defaults.proxyEnabled"
+								type="checkbox"
+								name="proxyEnabled"
+							/>
+							Enable Proxy
+						</label>
+					</div>
+				</div>
 			</template>
 			<template v-else-if="config.lockNetwork && !$store.state.serverConfiguration.public">
 				<h2>Network settings</h2>
diff --git a/client/css/style.css b/client/css/style.css
index 4891253b..760d2dd6 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -1840,19 +1840,23 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
 	margin-top: 6px;
 }
 
-#connect .tls input {
+#connect .tls input,
+#connect input[name="proxyEnabled"] {
 	margin: 3px 10px 0 0;
 }
 
-#connect\:host {
+#connect\:host,
+#connect\:proxyHost {
 	width: 70%;
 }
 
-#connect\:port {
+#connect\:port,
+#connect\:proxyPort {
 	width: 25%;
 }
 
-#connect\:portseparator {
+#connect\:portseparator,
+#connect\:proxyPortSeparator {
 	width: 5%;
 	text-align: center;
 	display: inline-block;
diff --git a/package.json b/package.json
index cd6dc8c8..adfda760 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "file-type": "16.2.0",
     "filenamify": "4.2.0",
     "got": "11.8.1",
-    "irc-framework": "4.9.0",
+    "irc-framework": "github:mstrodl/irc-framework#feature/fix-socks",
     "is-utf8": "0.2.1",
     "ldapjs": "2.2.3",
     "linkify-it": "3.0.2",
diff --git a/src/client.js b/src/client.js
index be37533b..fe905c81 100644
--- a/src/client.js
+++ b/src/client.js
@@ -257,6 +257,12 @@ Client.prototype.connect = function (args, isStartup = false) {
 		commands: args.commands || [],
 		channels: channels,
 		ignoreList: args.ignoreList ? args.ignoreList : [],
+
+		proxyEnabled: !!args.proxyEnabled,
+		proxyHost: String(args.proxyHost || ""),
+		proxyPort: parseInt(args.proxyPort, 10),
+		proxyUsername: String(args.proxyUsername || ""),
+		proxyPassword: String(args.proxyPassword || ""),
 	});
 
 	// Set network lobby channel id
diff --git a/src/models/network.js b/src/models/network.js
index 621f7e1d..13879fb2 100644
--- a/src/models/network.js
+++ b/src/models/network.js
@@ -46,6 +46,13 @@ function Network(attr) {
 			PREFIX: ["!", "@", "%", "+"],
 			NETWORK: "",
 		},
+
+		proxyHost: "",
+		proxyPort: 1080,
+		proxyUsername: "",
+		proxyPassword: "",
+		proxyEnabled: false,
+
 		chanCache: [],
 		ignoreList: [],
 		keepNick: null,
@@ -90,6 +97,12 @@ Network.prototype.validate = function (client) {
 	this.saslAccount = cleanString(this.saslAccount);
 	this.saslPassword = cleanString(this.saslPassword);
 
+	this.proxyHost = cleanString(this.proxyHost);
+	this.proxyPort = this.proxyPort || 1080;
+	this.proxyUsername = cleanString(this.proxyUsername);
+	this.proxyPassword = cleanString(this.proxyPassword);
+	this.proxyEnabled = !!this.proxyEnabled;
+
 	if (!this.port) {
 		this.port = this.tls ? 6697 : 6667;
 	}
@@ -208,6 +221,17 @@ Network.prototype.setIrcFrameworkOptions = function (client) {
 	this.irc.options.webirc = this.createWebIrc(client);
 	this.irc.options.client_certificate = null;
 
+	if (this.proxyEnabled) {
+		this.irc.options.socks = {
+			host: this.proxyHost,
+			port: this.proxyPort,
+			user: this.proxyUsername,
+			pass: this.proxyPassword,
+		};
+	} else {
+		delete this.irc.options.socks;
+	}
+
 	if (!this.sasl) {
 		delete this.irc.options.sasl_mechanism;
 		delete this.irc.options.account;
@@ -274,6 +298,12 @@ Network.prototype.edit = function (client, args) {
 	this.saslAccount = String(args.saslAccount || "");
 	this.saslPassword = String(args.saslPassword || "");
 
+	this.proxyHost = String(args.proxyHost || "");
+	this.proxyPort = parseInt(args.proxyPort, 10);
+	this.proxyUsername = String(args.proxyUsername || "");
+	this.proxyPassword = String(args.proxyPassword || "");
+	this.proxyEnabled = !!args.proxyEnabled;
+
 	// Split commands into an array
 	this.commands = String(args.commands || "")
 		.replace(/\r\n|\r|\n/g, "\n")
@@ -455,6 +485,12 @@ Network.prototype.exportForEdit = function () {
 		"saslAccount",
 		"saslPassword",
 		"commands",
+
+		"proxyEnabled",
+		"proxyHost",
+		"proxyPort",
+		"proxyUsername",
+		"proxyPassword",
 	];
 
 	if (!Helper.config.lockNetwork) {
@@ -491,6 +527,11 @@ Network.prototype.export = function () {
 		"saslPassword",
 		"commands",
 		"ignoreList",
+
+		"proxyHost",
+		"proxyPort",
+		"proxyUsername",
+		"proxyEnabled",
 	]);
 
 	network.channels = this.channels

From 9b4f55bdb6ba1a3e055b06e5abcdd9babcc6dabe Mon Sep 17 00:00:00 2001
From: Mary Strodl <ipadlover8322@gmail.com>
Date: Wed, 5 May 2021 20:26:01 -0400
Subject: [PATCH 2/5] Update lockfiles

---
 yarn.lock | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index da8bc1ee..bfef786a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4406,20 +4406,19 @@ interpret@^2.2.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
-ipaddr.js@0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-0.1.3.tgz#27a9ca37f148d2102b0ef191ccbf2c51a8f025c6"
-  integrity sha1-J6nKN/FI0hArDvGRzL8sUajwJcY=
+ip@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
 
 ipaddr.js@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
-irc-framework@4.9.0:
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/irc-framework/-/irc-framework-4.9.0.tgz#7c27a20d87099e47f32023edf1cab6da6d7a05b9"
-  integrity sha512-cUYMnnKwcNpXtEw/CXnEwUtglmaWZbfu0E/0iI7bENC3bASPNfcvcyTsFQcdknpnoFLyh5kXpQCjPBWKTbOQAQ==
+"irc-framework@github:mstrodl/irc-framework#feature/fix-socks":
+  version "4.10.0"
+  resolved "https://codeload.github.com/mstrodl/irc-framework/tar.gz/ee974c211ecfa21e0053faf1021b2aa53b023357"
   dependencies:
     core-js "^3.6.5"
     eventemitter3 "^4.0.3"
@@ -4429,7 +4428,7 @@ irc-framework@4.9.0:
     lodash "^4.17.15"
     middleware-handler "^0.2.0"
     regenerator-runtime "^0.13.5"
-    socksjs "^0.5.0"
+    socks "^2.6.1"
 
 is-absolute-url@^2.0.0:
   version "2.1.0"
@@ -7592,6 +7591,11 @@ slice-ansi@^4.0.0:
     astral-regex "^2.0.0"
     is-fullwidth-code-point "^3.0.0"
 
+smart-buffer@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba"
+  integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==
+
 socket.io-adapter@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz#edc5dc36602f2985918d631c1399215e97a1b527"
@@ -7634,12 +7638,13 @@ socket.io@3.1.2:
     socket.io-adapter "~2.1.0"
     socket.io-parser "~4.0.3"
 
-socksjs@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/socksjs/-/socksjs-0.5.0.tgz#77b005e32d1bfc96e560fedd5d7eedcf120f87e3"
-  integrity sha1-d7AF4y0b/JblYP7dXX7tzxIPh+M=
+socks@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e"
+  integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==
   dependencies:
-    ipaddr.js "0.1.3"
+    ip "^1.1.5"
+    smart-buffer "^4.1.0"
 
 sortablejs@1.10.2:
   version "1.10.2"

From 3f984fad4befd391359ab764d1f9fde16fa01b4a Mon Sep 17 00:00:00 2001
From: Mary Strodl <ipadlover8322@gmail.com>
Date: Wed, 5 May 2021 20:37:54 -0400
Subject: [PATCH 3/5] network: fix test

---
 test/models/network.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/models/network.js b/test/models/network.js
index 6d6d8119..a887b570 100644
--- a/test/models/network.js
+++ b/test/models/network.js
@@ -46,6 +46,10 @@ describe("Network", function () {
 				saslPassword: "testpassword",
 				commands: [],
 				nick: "chillin`",
+				proxyEnabled: false,
+				proxyHost: "",
+				proxyPort: 1080,
+				proxyUsername: "",
 				channels: [
 					{name: "#thelounge", key: ""},
 					{name: "&foobar", key: ""},

From a3f0314f6bacf84520ec2ddb6927dec25052ab16 Mon Sep 17 00:00:00 2001
From: Mary Strodl <ipadlover8322@gmail.com>
Date: Tue, 15 Jun 2021 13:52:39 -0400
Subject: [PATCH 4/5] NetworkForm: only show proxy options if enabled

---
 client/components/NetworkForm.vue | 116 +++++++++++++++---------------
 1 file changed, 59 insertions(+), 57 deletions(-)

diff --git a/client/components/NetworkForm.vue b/client/components/NetworkForm.vue
index 50757d58..354fe7b4 100644
--- a/client/components/NetworkForm.vue
+++ b/client/components/NetworkForm.vue
@@ -100,63 +100,6 @@
 				</div>
 
 				<h2>Proxy Settings</h2>
-				<div class="connect-row">
-					<label for="connect:proxyHost">SOCKS Address</label>
-					<div class="input-wrap">
-						<input
-							id="connect:proxyHost"
-							v-model="defaults.proxyHost"
-							class="input"
-							name="proxyHost"
-							aria-label="Proxy host"
-							maxlength="255"
-						/>
-						<span id="connect:proxyPortSeparator">:</span>
-						<input
-							id="connect:proxyPort"
-							v-model="defaults.proxyPort"
-							class="input"
-							type="number"
-							min="1"
-							max="65535"
-							name="proxyPort"
-							aria-label="SOCKS port"
-						/>
-					</div>
-				</div>
-
-				<div class="connect-row">
-					<label for="connect:proxyUsername">Proxy username</label>
-					<input
-						id="connect:proxyUsername"
-						ref="proxyUsernameInput"
-						v-model="defaults.proxyUsername"
-						class="input username"
-						name="proxyUsername"
-						maxlength="100"
-						placeholder="Proxy username"
-					/>
-				</div>
-
-				<div class="connect-row">
-					<label for="connect:proxyPassword">Proxy password</label>
-					<RevealPassword
-						v-slot:default="slotProps"
-						class="input-wrap password-container"
-					>
-						<input
-							id="connect:proxyPassword"
-							ref="proxyPassword"
-							v-model="defaults.proxyPassword"
-							class="input"
-							:type="slotProps.isVisible ? 'text' : 'password'"
-							placeholder="Proxy password"
-							name="password"
-							maxlength="300"
-						/>
-					</RevealPassword>
-				</div>
-
 				<div class="connect-row">
 					<label></label>
 					<div class="input-wrap">
@@ -164,12 +107,71 @@
 							<input
 								v-model="defaults.proxyEnabled"
 								type="checkbox"
+								id="connect:proxyEnabled"
 								name="proxyEnabled"
 							/>
 							Enable Proxy
 						</label>
 					</div>
 				</div>
+				<template v-if="defaults.proxyEnabled">
+					<div class="connect-row">
+						<label for="connect:proxyHost">SOCKS Address</label>
+						<div class="input-wrap">
+							<input
+								id="connect:proxyHost"
+								v-model="defaults.proxyHost"
+								class="input"
+								name="proxyHost"
+								aria-label="Proxy host"
+								maxlength="255"
+							/>
+							<span id="connect:proxyPortSeparator">:</span>
+							<input
+								id="connect:proxyPort"
+								v-model="defaults.proxyPort"
+								class="input"
+								type="number"
+								min="1"
+								max="65535"
+								name="proxyPort"
+								aria-label="SOCKS port"
+							/>
+						</div>
+					</div>
+
+					<div class="connect-row">
+						<label for="connect:proxyUsername">Proxy username</label>
+						<input
+							id="connect:proxyUsername"
+							ref="proxyUsernameInput"
+							v-model="defaults.proxyUsername"
+							class="input username"
+							name="proxyUsername"
+							maxlength="100"
+							placeholder="Proxy username"
+						/>
+					</div>
+
+					<div class="connect-row">
+						<label for="connect:proxyPassword">Proxy password</label>
+						<RevealPassword
+							v-slot:default="slotProps"
+							class="input-wrap password-container"
+						>
+							<input
+								id="connect:proxyPassword"
+								ref="proxyPassword"
+								v-model="defaults.proxyPassword"
+								class="input"
+								:type="slotProps.isVisible ? 'text' : 'password'"
+								placeholder="Proxy password"
+								name="password"
+								maxlength="300"
+							/>
+						</RevealPassword>
+					</div>
+				</template>
 			</template>
 			<template v-else-if="config.lockNetwork && !$store.state.serverConfiguration.public">
 				<h2>Network settings</h2>

From e7a8476cfe8156f673f3466068cf1c4ce241b655 Mon Sep 17 00:00:00 2001
From: Mary Strodl <ipadlover8322@gmail.com>
Date: Tue, 15 Jun 2021 13:55:54 -0400
Subject: [PATCH 5/5] NetworkForm: lint

---
 client/components/NetworkForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/NetworkForm.vue b/client/components/NetworkForm.vue
index 354fe7b4..a05cfe97 100644
--- a/client/components/NetworkForm.vue
+++ b/client/components/NetworkForm.vue
@@ -105,9 +105,9 @@
 					<div class="input-wrap">
 						<label for="connect:proxyEnabled">
 							<input
+								id="connect:proxyEnabled"
 								v-model="defaults.proxyEnabled"
 								type="checkbox"
-								id="connect:proxyEnabled"
 								name="proxyEnabled"
 							/>
 							Enable Proxy