From 0c45e57732fd7937cc91a436ff5d01fb4cb580cd Mon Sep 17 00:00:00 2001
From: Hornwitser <github@hornwitser.no>
Date: Tue, 10 Sep 2019 23:35:01 +0200
Subject: [PATCH] Add authentication to socket.io server

Authenticate connections made to the socket.io server via a token query
parameter that's validated in a similar manner to the x-access-token for
HTTP requests.
---
 CHANGELOG.md |  9 +++++++++
 client.js    |  5 ++++-
 master.js    | 12 ++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..67bf6e9a
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,9 @@
+Changelog
+=========
+
+Version 1.2.1
+-------------
+
+### Breaking Changes
+
+- Added authentication to the socket.io server running on the master.
diff --git a/client.js b/client.js
index 6434ba22..f814dfc4 100644
--- a/client.js
+++ b/client.js
@@ -570,7 +570,10 @@ async function instanceManagement(instanceconfig) {
     console.log("Started instanceManagement();");
 
     /* Open websocket connection to master */
-	var socket = ioClient("http://"+config.masterIP+":"+config.masterPort);
+	var socket = ioClient("http://"+config.masterIP+":"+config.masterPort+"?token="+config.masterAuthToken);
+	socket.on("error", err => {
+		console.log("SOCKET | Error: ", err);
+	});
 	socket.on("hello", data => {
 		console.log("SOCKET | registering slave!");
 		socket.emit("registerSlave", {
diff --git a/master.js b/master.js
index db1ef173..568f2e66 100644
--- a/master.js
+++ b/master.js
@@ -921,6 +921,18 @@ class wsSlave {
 	}
 }
 
+io.use((socket, next) => {
+	let token = socket.handshake.query.token;
+	authenticate.check(token).then((result) => {
+		if (result.ok) {
+			next();
+		} else {
+			console.error(`SOCKET | authentication failed for ${socket.handshake.address}`);
+			next(new Error(result.msg));
+		}
+	});
+});
+
 io.on('connection', function (socket) {
 	// cleanup dead sockets from disconnected people
 	let terminatedConnections = 0;