From 6221f96ff29acf690ca9045c21a8fc9622cfc589 Mon Sep 17 00:00:00 2001
From: Max Leiter <maxwell.leiter@gmail.com>
Date: Wed, 7 Sep 2022 21:26:29 -0700
Subject: [PATCH 1/3] Disable connecting to the same network multiple times if
 lockNetwork is enabled

---
 client/components/NetworkForm.vue     | 11 ++++++++++-
 client/components/Windows/Connect.vue | 22 ++++++++++++++++++++--
 server/server.ts                      |  6 ++++++
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/client/components/NetworkForm.vue b/client/components/NetworkForm.vue
index 0121484a..07e0d35d 100644
--- a/client/components/NetworkForm.vue
+++ b/client/components/NetworkForm.vue
@@ -400,6 +400,9 @@ the server tab on new connection"
 			</template>
 
 			<div>
+				<div v-if="disabledReason && disabled" class="disabled-reason">
+					{{ disabledReason }}
+				</div>
 				<button type="submit" class="btn" :disabled="disabled ? true : false">
 					<template v-if="defaults.uuid">Save network</template>
 					<template v-else>Connect</template>
@@ -409,7 +412,7 @@ the server tab on new connection"
 	</div>
 </template>
 
-<style>
+<style scoped>
 #connect .connect-auth {
 	display: block;
 	margin-bottom: 10px;
@@ -435,6 +438,11 @@ the server tab on new connection"
 	margin: 0;
 	user-select: text;
 }
+
+.disabled-reason {
+	margin-top: 10px;
+	font-size: 12px;
+}
 </style>
 
 <script lang="ts">
@@ -464,6 +472,7 @@ export default defineComponent({
 			required: true,
 		},
 		disabled: Boolean,
+		disabledReason: String,
 	},
 	setup(props) {
 		const store = useStore();
diff --git a/client/components/Windows/Connect.vue b/client/components/Windows/Connect.vue
index 66d2f6e4..aa9957a3 100644
--- a/client/components/Windows/Connect.vue
+++ b/client/components/Windows/Connect.vue
@@ -1,9 +1,14 @@
 <template>
-	<NetworkForm :handle-submit="handleSubmit" :defaults="defaults" :disabled="disabled" />
+	<NetworkForm
+		:disabled-reason="disabledReason"
+		:handle-submit="handleSubmit"
+		:defaults="defaults"
+		:disabled="disabled"
+	/>
 </template>
 
 <script lang="ts">
-import {defineComponent, ref} from "vue";
+import {defineComponent, onMounted, ref} from "vue";
 
 import socket from "../../js/socket";
 import {useStore} from "../../js/store";
@@ -21,12 +26,25 @@ export default defineComponent({
 		const store = useStore();
 
 		const disabled = ref(false);
+		const disabledReason = ref("");
 
 		const handleSubmit = (data: Record<string, any>) => {
 			disabled.value = true;
 			socket.emit("network:new", data);
 		};
 
+		onMounted(() => {
+			if (store.state.serverConfiguration?.lockNetwork) {
+				if (store.state.networks.length > 0) {
+					disabled.value = true;
+					disabledReason.value = "You have already connected and cannot connect again.";
+				} else {
+					disabled.value = false;
+					disabledReason.value = "";
+				}
+			}
+		});
+
 		const parseOverrideParams = (params?: Record<string, string>) => {
 			if (!params) {
 				return {};
diff --git a/server/server.ts b/server/server.ts
index 0eab6cbc..c620e632 100644
--- a/server/server.ts
+++ b/server/server.ts
@@ -478,6 +478,12 @@ function initializeClient(
 	});
 
 	socket.on("network:new", (data) => {
+		if (Config.values.lockNetwork) {
+			if (client.networks.length > 0) {
+				return;
+			}
+		}
+
 		if (_.isPlainObject(data)) {
 			// prevent people from overriding webirc settings
 			data.uuid = null;

From 85f83a7c9aeff7d56e371fadf02b72007ca883c5 Mon Sep 17 00:00:00 2001
From: Max Leiter <maxwell.leiter@gmail.com>
Date: Wed, 7 Sep 2022 21:33:51 -0700
Subject: [PATCH 2/3] Disable connecting to the same network multiple times if
 lockNetwork is enabled

---
 client/components/Windows/Connect.vue |  5 ++++-
 defaults/config.js                    |  9 +++++++++
 server/config.ts                      |  1 +
 server/server.ts                      | 11 +++++++++--
 test/server.ts                        |  1 +
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/client/components/Windows/Connect.vue b/client/components/Windows/Connect.vue
index aa9957a3..a59bc997 100644
--- a/client/components/Windows/Connect.vue
+++ b/client/components/Windows/Connect.vue
@@ -34,7 +34,10 @@ export default defineComponent({
 		};
 
 		onMounted(() => {
-			if (store.state.serverConfiguration?.lockNetwork) {
+			if (
+				store.state.serverConfiguration?.lockNetwork &&
+				store.state.serverConfiguration?.allowMultipleSameHostConnections
+			) {
 				if (store.state.networks.length > 0) {
 					disabled.value = true;
 					disabledReason.value = "You have already connected and cannot connect again.";
diff --git a/defaults/config.js b/defaults/config.js
index 2573c816..8bd81a93 100644
--- a/defaults/config.js
+++ b/defaults/config.js
@@ -285,6 +285,15 @@ module.exports = {
 	// This value is set to `false` by default.
 	lockNetwork: false,
 
+	// ### `sameHostLockedNetworkConnections`
+	//
+	// When set to `true`, users will be able to connect to the configured
+	// network multiple times. This can be useful if you connect to
+	// a bouncer like ZNC. Requires `lockNetwork` to be set to `true`.
+	//
+	// This value is set to `false` by default.
+	allowMultipleSameHostConnections: false,
+
 	// ## User management
 
 	// ### `messageStorage`
diff --git a/server/config.ts b/server/config.ts
index 543a8135..5a2fe1f5 100644
--- a/server/config.ts
+++ b/server/config.ts
@@ -96,6 +96,7 @@ export type ConfigType = {
 	leaveMessage: string;
 	defaults: Defaults;
 	lockNetwork: boolean;
+	allowMultipleSameHostConnections: boolean;
 	messageStorage: string[];
 	useHexIp: boolean;
 	webirc?: WebIRC;
diff --git a/server/server.ts b/server/server.ts
index c620e632..4cac524f 100644
--- a/server/server.ts
+++ b/server/server.ts
@@ -48,7 +48,12 @@ type IndexTemplateConfiguration = ServerConfiguration & {
 
 export type ClientConfiguration = Pick<
 	ConfigType,
-	"public" | "lockNetwork" | "useHexIp" | "prefetch" | "defaults"
+	| "public"
+	| "lockNetwork"
+	| "useHexIp"
+	| "prefetch"
+	| "defaults"
+	| "allowMultipleSameHostConnections"
 > & {
 	fileUpload: boolean;
 	ldapEnabled: boolean;
@@ -478,7 +483,7 @@ function initializeClient(
 	});
 
 	socket.on("network:new", (data) => {
-		if (Config.values.lockNetwork) {
+		if (Config.values.lockNetwork && Config.values.allowMultipleSameHostConnections) {
 			if (client.networks.length > 0) {
 				return;
 			}
@@ -869,6 +874,8 @@ function getClientConfiguration(): ClientConfiguration {
 		"lockNetwork",
 		"useHexIp",
 		"prefetch",
+		"allowMultipleSameHostConnections",
+		// TODO: remove this type cast
 	]) as ClientConfiguration;
 
 	config.fileUpload = Config.values.fileUpload.enable;
diff --git a/test/server.ts b/test/server.ts
index 571a6bcc..89a0341c 100644
--- a/test/server.ts
+++ b/test/server.ts
@@ -131,6 +131,7 @@ describe("Server", function () {
 				expect(data.defaultTheme).to.equal("default");
 				expect(data.themes).to.be.an("array");
 				expect(data.lockNetwork).to.equal(false);
+
 				expect(data.useHexIp).to.equal(false);
 
 				done();

From 5210cfe8e0e9ca1f3078cc61b5a057c131de484a Mon Sep 17 00:00:00 2001
From: Max Leiter <maxwell.leiter@gmail.com>
Date: Wed, 7 Sep 2022 21:34:24 -0700
Subject: [PATCH 3/3] Disable connecting to the same network multiple times if
 lockNetwork is enabled

---
 test/server.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/server.ts b/test/server.ts
index 89a0341c..571a6bcc 100644
--- a/test/server.ts
+++ b/test/server.ts
@@ -131,7 +131,6 @@ describe("Server", function () {
 				expect(data.defaultTheme).to.equal("default");
 				expect(data.themes).to.be.an("array");
 				expect(data.lockNetwork).to.equal(false);
-
 				expect(data.useHexIp).to.equal(false);
 
 				done();