MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-03-31 17:53:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added satellite status to userSessions command.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2022-04-11 13:11:24 -07:00
parent e4ea5495c8
commit 3d3e46f5fa
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meshuser.js
View File

@ -429,7 +429,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
} }
// This is a MeshCentral Satellite message // This is a MeshCentral Satellite message
if (event.action == 'satellite') { if ((obj.satelliteFlags & event.satelliteFlags) != 0) { try { ws.send(JSON.stringify(event)); } catch (ex) { } return; } } if (event.action == 'satellite') { if ((obj.ws.satelliteFlags & event.satelliteFlags) != 0) { try { ws.send(JSON.stringify(event)); } catch (ex) { } return; } }
// Because of the device group "Show Self Events Only", we need to do more checks here. // Because of the device group "Show Self Events Only", we need to do more checks here.
if (id.startsWith('mesh/')) { if (id.startsWith('mesh/')) {
@ -4823,7 +4823,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
} }
case 'satellite': { case 'satellite': {
// Command indicates this is a MeshCentral Satellite session and what featues it supports // Command indicates this is a MeshCentral Satellite session and what featues it supports
if ((command.setFlags != null) && (typeof command.setFlags == 'number')) { obj.satelliteFlags = command.setFlags; } if ((command.setFlags != null) && (typeof command.setFlags == 'number')) { obj.ws.satelliteFlags = command.setFlags; }
if ((command.reqid != null) && (typeof command.satelliteFlags == 'number')) { if ((command.reqid != null) && (typeof command.satelliteFlags == 'number')) {
const event = { action: 'satelliteResponse', subaction: command.subaction, reqid: command.reqid, response: command.response, satelliteFlags: command.satelliteFlags, nolog: 1 } const event = { action: 'satelliteResponse', subaction: command.subaction, reqid: command.reqid, response: command.response, satelliteFlags: command.satelliteFlags, nolog: 1 }
if (typeof command.nodeid == 'string') { event.nodeid = command.nodeid; } if (typeof command.nodeid == 'string') { event.nodeid = command.nodeid; }
@ -6690,7 +6690,9 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
userSessionCount++; userSessionCount++;
cmdData.result += (i + ', ' + parent.wssessions[i].length + ' session' + ((parent.wssessions[i].length > 1) ? 's' : '') + '.\r\n'); cmdData.result += (i + ', ' + parent.wssessions[i].length + ' session' + ((parent.wssessions[i].length > 1) ? 's' : '') + '.\r\n');
for (var j in parent.wssessions[i]) { for (var j in parent.wssessions[i]) {
cmdData.result += ' ' + parent.wssessions[i][j].clientIp + ' --> ' + parent.wssessions[i][j].sessionId + ((parent.wssessions[i][j].xclosed) ? (', CLOSED-' + parent.wssessions[i][j].xclosed):'') + '\r\n'; var extras = "";
if (parent.wssessions[i][j].satelliteFlags) { extras += ', Satellite'; }
cmdData.result += ' ' + parent.wssessions[i][j].clientIp + ' --> ' + parent.wssessions[i][j].sessionId + extras + ((parent.wssessions[i][j].xclosed) ? (', CLOSED-' + parent.wssessions[i][j].xclosed):'') + '\r\n';
} }
} }
} }