mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-23 00:13:13 +09:00
Merge pull request #231 from Hornwitser/auth-master
Port socket.io Authentication to master
This commit is contained in:
3 files changed
+30
-4
No files matched your search
+14
-3
@@ -1,15 +1,26 @@
|
|||||||
|
Changelog
|
||||||
|
=========
|
||||||
|
|
||||||
Version 2.0.0
|
Version 2.0.0
|
||||||
=============
|
-------------
|
||||||
|
|
||||||
- Fixed sslCert and sslPrivKey entries being ignored in the config.
|
- Fixed sslCert and sslPrivKey entries being ignored in the config.
|
||||||
- Changed ssl key creation to be done at startup instead of on npm install.
|
- Changed ssl key creation to be done at startup instead of on npm install.
|
||||||
- Added error handling during master startup.
|
- Added error handling during master startup.
|
||||||
|
|
||||||
Breaking Changes
|
### Breaking Changes
|
||||||
----------------
|
|
||||||
- Node.js versions below 10 are no longer supported.
|
- Node.js versions below 10 are no longer supported.
|
||||||
- lib/authenticate no longer requires config to be passed to it. Breaks
|
- lib/authenticate no longer requires config to be passed to it. Breaks
|
||||||
playerManager.
|
playerManager.
|
||||||
- The masterIP and masterPort config entries has been merged into masterURL.
|
- The masterIP and masterPort config entries has been merged into masterURL.
|
||||||
Breaks discordChat, playerManager, serverSelect, trainTeleports and
|
Breaks discordChat, playerManager, serverSelect, trainTeleports and
|
||||||
clusterioModel.
|
clusterioModel.
|
||||||
|
|
||||||
|
|
||||||
|
Version 1.2.1
|
||||||
|
-------------
|
||||||
|
|
||||||
|
### Breaking Changes
|
||||||
|
|
||||||
|
- Added authentication to the socket.io server running on the master.
|
||||||
@@ -603,7 +603,10 @@ async function instanceManagement(instanceconfig) {
|
|||||||
console.log("Started instanceManagement();");
|
console.log("Started instanceManagement();");
|
||||||
|
|
||||||
/* Open websocket connection to master */
|
/* Open websocket connection to master */
|
||||||
var socket = ioClient(config.masterURL);
|
var socket = ioClient(config.masterURL+"?token="+config.masterAuthToken);
|
||||||
|
socket.on("error", err => {
|
||||||
|
console.log("SOCKET | Error: ", err);
|
||||||
|
});
|
||||||
socket.on("hello", data => {
|
socket.on("hello", data => {
|
||||||
console.log("SOCKET | registering slave!");
|
console.log("SOCKET | registering slave!");
|
||||||
socket.emit("registerSlave", {
|
socket.emit("registerSlave", {
|
||||||
|
|||||||
@@ -756,6 +756,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) {
|
io.on('connection', function (socket) {
|
||||||
// cleanup dead sockets from disconnected people
|
// cleanup dead sockets from disconnected people
|
||||||
let terminatedConnections = 0;
|
let terminatedConnections = 0;
|
||||||
|
|||||||
Reference in new issue
Block a user