MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-26 15:15:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge fixes.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2021-07-07 19:35:15 -07:00
parent 7cc14c281d
commit 27ceb05e07
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
meshuser.js
View File

@ -1510,19 +1510,15 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
if (cmdargs.length == 0) break; if (cmdargs.length == 0) break;
const cmd = cmdargs[0].toLowerCase(); const cmd = cmdargs[0].toLowerCase();
cmdargs = parseArgs(cmdargs); cmdargs = parseArgs(cmdargs);
var cmdData = { result: '', command: command, cmdargs: cmdargs };
try { // Find the command in the lookup table and run it.
consoleCommands[cmd](cmdData); var cmdData = serverUserCommand[cmd], r = '';;
} catch (e) { if (cmdData != null) {
if (consoleCommands[cmd] == null) try { r = cmdData[0](cmdargs); } catch (ex) { r = '' + ex; }
cmdData.result = 'Unknown command \"' + cmd + '\", type \"help\" for list of available commands.'; } else { r = 'Unknown command \"' + cmd + '\", type \"help\" for list of available commands.'; }
else
console.log(e);
}
if (cmdData.result != null && cmdData.result != '') { // Send back the command result
try { ws.send(JSON.stringify({ action: 'serverconsole', value: cmdData.result, tag: command.tag })); } catch (ex) { } } if (r != '') { try { ws.send(JSON.stringify({ action: 'serverconsole', value: r, tag: command.tag })); } catch (ex) { } }
break; break;
} }
case 'msg': case 'msg':
@ -6142,7 +6138,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
} }
} }
const serverUserCommand = { const serverUserCommands = {
'acceleratorsstats': [serverUserCommandAcceleratorsStats, "Show data on work being offloaded to other CPU's"], 'acceleratorsstats': [serverUserCommandAcceleratorsStats, "Show data on work being offloaded to other CPU's"],
'agentissues': [serverUserCommandAgentIssues, ""], 'agentissues': [serverUserCommandAgentIssues, ""],
'agentstats': [serverUserCommandAgentStats, ""], 'agentstats': [serverUserCommandAgentStats, ""],
@ -6196,7 +6192,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
function serverUserCommandHelp(cmdargs) { function serverUserCommandHelp(cmdargs) {
var r, fin = '', f = '', availcommands = []; var r, fin = '', f = '', availcommands = [];
for (var i in serverUserCommand) { availcommands.push(i); } for (var i in serverUserCommands) { availcommands.push(i); }
availcommands = availcommands.sort(); availcommands = availcommands.sort();
while (availcommands.length > 0) { if (f.length > 80) { fin += (f + ',\r\n'); f = ''; } f += (((f != '') ? ', ' : ' ') + availcommands.shift()); } while (availcommands.length > 0) { if (f.length > 80) { fin += (f + ',\r\n'); f = ''; } f += (((f != '') ? ', ' : ' ') + availcommands.shift()); }
if (f != '') { fin += f; } if (f != '') { fin += f; }
@ -6204,7 +6200,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
r = 'Available commands: \r\n' + fin + '\r\nType help <command> for details.'; r = 'Available commands: \r\n' + fin + '\r\nType help <command> for details.';
} else { } else {
var cmd2 = cmdargs['_'][0].toLowerCase(); var cmd2 = cmdargs['_'][0].toLowerCase();
var cmddata = serverUserCommand[cmd2]; var cmddata = serverUserCommands[cmd2];
if (cmddata) { if (cmddata[1] == '') { r = "No help available for this command."; } else { r = cmddata[1]; } } else { r = "This command does not exist."; } if (cmddata) { if (cmddata[1] == '') { r = "No help available for this command."; } else { r = cmddata[1]; } } else { r = "This command does not exist."; }
} }
return r; return r;