Add metadata to the relay connection for user -> device tracking Update server console command 'relays' to display friendly information
Add metadata to the relay connection for user -> device tracking Update server console command 'relays' to display friendly information
Ryan Blenis committed
Apr 13, 2020 at 19:44 UTC
fb05db7712e9319a1f3cd9c88baf6b08c75e058b
2 files changed
+11
-7
meshrelay.js
+10
-7
@@ -20,6 +20,7 @@ module.exports.CreateMeshRelay = function (parent, ws, req, domain, user, cookie
20
obj.user = user;
21
obj.ruserid = null;
22
obj.req = req; // Used in multi-server.js
23
+ obj.metadata = {};
24
25
// Check relay authentication
26
if ((user == null) && (obj.req.query != null) && (obj.req.query.rauth != null)) {
@@ -191,7 +192,7 @@ module.exports.CreateMeshRelay = function (parent, ws, req, domain, user, cookie
192
193
relayinfo.peer1.ws.peer = relayinfo.peer2.ws;
194
relayinfo.peer2.ws.peer = relayinfo.peer1.ws;
194
-
195
+
196
// Remove the timeout
197
if (relayinfo.timeout) { clearTimeout(relayinfo.timeout); delete relayinfo.timeout; }
198
@@ -203,7 +204,7 @@ module.exports.CreateMeshRelay = function (parent, ws, req, domain, user, cookie
204
parent.db.Get(obj.req.query.nodeid, function (err, nodes) {
205
var xusername = '', xdevicename = '', xdevicename2 = null;
206
if ((nodes != null) && (nodes.length == 1)) { xdevicename2 = nodes[0].name; xdevicename = '-' + parent.common.makeFilename(nodes[0].name); }
206
-
207
+
208
// Get the username and make it acceptable as a filename
209
if (sessionUser._id) { xusername = '-' + parent.common.makeFilename(sessionUser._id.split('/')[2]); }
210
@@ -268,7 +269,7 @@ module.exports.CreateMeshRelay = function (parent, ws, req, domain, user, cookie
269
} else {
270
// Wait for other relay connection
271
ws._socket.pause(); // Hold traffic until the other connection
271
- parent.wsrelays[obj.id] = { peer1: obj, state: 1, timeout: setTimeout(function () { closeBothSides(); }, 30000) };
272
+ parent.wsrelays[obj.id] = { peer1: obj, state: 1, metadata: obj.metadata, timeout: setTimeout(function () { closeBothSides(); }, 30000) };
273
parent.parent.debug('relay', 'Relay holding: ' + obj.id + ' (' + cleanRemoteAddr(obj.req.ip) + ') ' + (obj.authenticated ? 'Authenticated' : ''));
274
275
// Check if a peer server has this connection
@@ -417,10 +418,11 @@ module.exports.CreateMeshRelay = function (parent, ws, req, domain, user, cookie
418
parent.db.Get(cookie.nodeid, function (err, docs) {
419
if (docs.length == 0) { console.log('ERR: Node not found'); try { obj.close(); } catch (e) { } return; } // Disconnect websocket
420
const node = docs[0];
420
-
421
+
422
// Check if this user has permission to manage this computer
423
if ((parent.GetNodeRights(user, node.meshid, node._id) & MESHRIGHT_REMOTECONTROL) == 0) { console.log('ERR: Access denied (1)'); try { obj.close(); } catch (e) { } return; }
423
-
424
+ obj.metadata.peer2 = { name: node.name };
425
+ obj.metadata.authUser = user;
426
// Send connection request to agent
427
const rcookie = parent.parent.encodeCookie({ ruserid: user._id }, parent.parent.loginCookieEncryptionKey);
428
if (obj.id == undefined) { obj.id = ('' + Math.random()).substring(2); } // If there is no connection id, generate one.
@@ -435,10 +437,11 @@ module.exports.CreateMeshRelay = function (parent, ws, req, domain, user, cookie
437
parent.db.Get(obj.req.query.nodeid, function (err, docs) {
438
if (docs.length == 0) { console.log('ERR: Node not found'); try { obj.close(); } catch (e) { } return; } // Disconnect websocket
439
const node = docs[0];
438
-
440
+
441
// Check if this user has permission to manage this computer
442
if ((parent.GetNodeRights(user, node.meshid, node._id) & MESHRIGHT_REMOTECONTROL) == 0) { console.log('ERR: Access denied (2)'); try { obj.close(); } catch (e) { } return; }
441
-
443
+ obj.metadata.peer2 = { name: node.name };
444
+ obj.metadata.authUser = user;
445
// Send connection request to agent
446
if (obj.id == null) { obj.id = ('' + Math.random()).substring(2); } // If there is no connection id, generate one.
447
const rcookie = parent.parent.encodeCookie({ ruserid: user._id }, parent.parent.loginCookieEncryptionKey);
meshuser.js
+1
@@ -1034,6 +1034,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
1034
r += 'id: ' + i + ', state: ' + parent.wsrelays[i].state;
1035
if (parent.wsrelays[i].peer1 != null) { r += ', peer1: ' + cleanRemoteAddr(parent.wsrelays[i].peer1.req.ip); }
1036
if (parent.wsrelays[i].peer2 != null) { r += ', peer2: ' + cleanRemoteAddr(parent.wsrelays[i].peer2.req.ip); }
1037
+ if (parent.wsrelays[i].metadata != null) { r += ', ' + parent.wsrelays[i].metadata.authUser._id + ' connected to ' + parent.wsrelays[i].metadata.peer2.name; }
1038
r += '\r\n';
1039
}
1040
if (r == '') { r = 'No relays.'; }