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

Merge pull request #601 from ryanblenis/plugin

Browse Source 
Expand pluginHandler support for plugins
This commit is contained in:
Ylian Saint-Hilaire 2019-10-25 01:10:52 -07:00 committed by GitHub
commit ad2542aa38
3 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
agents/meshcore.js
View File

@ -819,15 +819,7 @@ function createMeshCore(agent) {
case 'ping': { mesh.SendCommand('{"action":"pong"}'); break; } case 'ping': { mesh.SendCommand('{"action":"pong"}'); break; }
case 'pong': { break; } case 'pong': { break; }
case 'plugin': { case 'plugin': {
if (typeof data.pluginaction == 'string') { try { require(data.plugin).consoleaction(data, data.rights, data.sessionid, this); } catch (e) { throw e; }
try {
MeshServerLog('Plugin called', data);
// Not yet implemented
// require(data.plugin.name).serveraction(data);
} catch (e) {
MeshServerLog('Error calling plugin', data);
}
}
break; break;
} }
default: default:

10
agents/meshcore.min.js vendored
View File

@ -819,15 +819,7 @@ function createMeshCore(agent) {
case 'ping': { mesh.SendCommand('{"action":"pong"}'); break; } case 'ping': { mesh.SendCommand('{"action":"pong"}'); break; }
case 'pong': { break; } case 'pong': { break; }
case 'plugin': { case 'plugin': {
if (typeof data.pluginaction == 'string') { try { require(data.plugin).consoleaction(data, data.rights, data.sessionid, this); } catch (e) { throw e; }
try {
MeshServerLog('Plugin called', data);
// Not yet implemented
// require(data.plugin.name).serveraction(data);
} catch (e) {
MeshServerLog('Error calling plugin', data);
}
}
break; break;
} }
default: default:

6
meshuser.js
View File

@ -50,6 +50,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
var obj = {}; var obj = {};
obj.user = user; obj.user = user;
obj.domain = domain; obj.domain = domain;
obj.ws = ws;
// Server side Intel AMT stack // Server side Intel AMT stack
const WsmanComm = require('./amt/amt-wsman-comm.js'); const WsmanComm = require('./amt/amt-wsman-comm.js');
@ -3105,7 +3106,10 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
if (command.routeToNode === true) { if (command.routeToNode === true) {
routeCommandToNode(command); routeCommandToNode(command);
} else { } else {
// TODO try {
var pluginHandler = require('./pluginHandler.js').pluginHandler(parent.parent);
pluginHandler.plugins[command.plugin].serveraction(command, obj, parent);
} catch (e) { console.log('Error loading plugin handler (' + e + ')'); }
} }
break; break;