From 51437519540d951c747d2b6e63c6d8ca1643a97b Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Fri, 25 Oct 2019 01:16:00 -0700 Subject: [PATCH] Plugin and meshcmd fixes. --- agents/meshcmd.js | 7 ++++--- agents/meshcmd.min.js | 7 ++++--- meshuser.js | 36 +++++++++++++++++------------------- views/default.handlebars | 2 +- webserver.js | 1 + 5 files changed, 27 insertions(+), 26 deletions(-) diff --git a/agents/meshcmd.js b/agents/meshcmd.js index a7a848d1..01e82364 100644 --- a/agents/meshcmd.js +++ b/agents/meshcmd.js @@ -141,6 +141,7 @@ function run(argv) { if ((typeof args.serverid) == 'string') { settings.serverid = args.serverid; } if ((typeof args.serverhttpshash) == 'string') { settings.serverhttpshash = args.serverhttpshash; } if ((typeof args.remoteport) == 'string') { settings.remoteport = parseInt(args.remoteport); } + if ((typeof args.remotetarget) == 'string') { settings.remotetarget = args.remotetarget; } if ((typeof args.out) == 'string') { settings.output = args.out; } if ((typeof args.output) == 'string') { settings.output = args.output; } if ((typeof args.debug) == 'string') { settings.debuglevel = parseInt(args.debug); } @@ -2049,10 +2050,10 @@ function startRouter() { tcpserver.on('error', function (e) { console.log('ERROR: ' + JSON.stringify(e)); exit(0); return; }); tcpserver.listen(settings.localport, function () { // We started listening. - if (settings.remotename == null) { + if (settings.remotetarget == null) { console.log('Redirecting local port ' + settings.localport + ' to remote port ' + settings.remoteport + '.'); } else { - console.log('Redirecting local port ' + settings.localport + ' to ' + settings.remotename + ':' + settings.remoteport + '.'); + console.log('Redirecting local port ' + settings.localport + ' to ' + settings.remotetarget + ':' + settings.remoteport + '.'); } console.log('Press ctrl-c to exit.'); @@ -2069,7 +2070,7 @@ function OnTcpClientConnected(c) { c.on('end', function () { disconnectTunnel(this, this.websocket, 'Client closed'); }); c.pause(); try { - options = http.parseUri(settings.serverurl + '?user=' + settings.username + '&pass=' + settings.password + '&nodeid=' + settings.remotenodeid + '&tcpport=' + settings.remoteport); + options = http.parseUri(settings.serverurl + '?user=' + settings.username + '&pass=' + settings.password + '&nodeid=' + settings.remotenodeid + '&tcpport=' + settings.remoteport + (settings.remotetarget == null ? '' : '&tcpaddr=' + settings.remotetarget)); } catch (e) { console.log('Unable to parse \"serverUrl\".'); process.exit(1); return; } options.checkServerIdentity = onVerifyServer; options.rejectUnauthorized = false; diff --git a/agents/meshcmd.min.js b/agents/meshcmd.min.js index a7a848d1..01e82364 100644 --- a/agents/meshcmd.min.js +++ b/agents/meshcmd.min.js @@ -141,6 +141,7 @@ function run(argv) { if ((typeof args.serverid) == 'string') { settings.serverid = args.serverid; } if ((typeof args.serverhttpshash) == 'string') { settings.serverhttpshash = args.serverhttpshash; } if ((typeof args.remoteport) == 'string') { settings.remoteport = parseInt(args.remoteport); } + if ((typeof args.remotetarget) == 'string') { settings.remotetarget = args.remotetarget; } if ((typeof args.out) == 'string') { settings.output = args.out; } if ((typeof args.output) == 'string') { settings.output = args.output; } if ((typeof args.debug) == 'string') { settings.debuglevel = parseInt(args.debug); } @@ -2049,10 +2050,10 @@ function startRouter() { tcpserver.on('error', function (e) { console.log('ERROR: ' + JSON.stringify(e)); exit(0); return; }); tcpserver.listen(settings.localport, function () { // We started listening. - if (settings.remotename == null) { + if (settings.remotetarget == null) { console.log('Redirecting local port ' + settings.localport + ' to remote port ' + settings.remoteport + '.'); } else { - console.log('Redirecting local port ' + settings.localport + ' to ' + settings.remotename + ':' + settings.remoteport + '.'); + console.log('Redirecting local port ' + settings.localport + ' to ' + settings.remotetarget + ':' + settings.remoteport + '.'); } console.log('Press ctrl-c to exit.'); @@ -2069,7 +2070,7 @@ function OnTcpClientConnected(c) { c.on('end', function () { disconnectTunnel(this, this.websocket, 'Client closed'); }); c.pause(); try { - options = http.parseUri(settings.serverurl + '?user=' + settings.username + '&pass=' + settings.password + '&nodeid=' + settings.remotenodeid + '&tcpport=' + settings.remoteport); + options = http.parseUri(settings.serverurl + '?user=' + settings.username + '&pass=' + settings.password + '&nodeid=' + settings.remotenodeid + '&tcpport=' + settings.remoteport + (settings.remotetarget == null ? '' : '&tcpaddr=' + settings.remotetarget)); } catch (e) { console.log('Unable to parse \"serverUrl\".'); process.exit(1); return; } options.checkServerIdentity = onVerifyServer; options.rejectUnauthorized = false; diff --git a/meshuser.js b/meshuser.js index 872cf75c..7abbf91b 100644 --- a/meshuser.js +++ b/meshuser.js @@ -611,7 +611,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use try { fs.mkdirSync(path); } catch (e) { } try { fs.mkdirSync(path + "/" + command.newfolder); } catch (e) { } } - } + } else if (command.fileop == 'delete') { // Delete a file if (common.validateArray(command.delfiles, 1) == false) return; @@ -669,7 +669,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use switch (cmd) { case 'help': { - r = 'Available commands: help, info, versions, args, resetserver, showconfig, usersessions, tasklimiter, setmaxtasks, cores,\r\n' + r = 'Available commands: help, info, versions, args, resetserver, showconfig, usersessions, tasklimiter, setmaxtasks, cores,\r\n' r += 'migrationagents, agentstats, webstats, mpsstats, swarmstats, acceleratorsstats, updatecheck, serverupdate, nodeconfig,\r\n'; r += 'heapdump, relays, autobackup, backupconfig, dupagents, dispatchtable.'; break; @@ -735,7 +735,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use } case 'info': { var info = process.memoryUsage(); - info.dbType = ['None','NeDB','MongoJS','MongoDB'][parent.db.databaseType]; + info.dbType = ['None', 'NeDB', 'MongoJS', 'MongoDB'][parent.db.databaseType]; if (parent.db.databaseType == 3) { info.dbChangeStream = parent.db.changeStream; } try { info.platform = process.platform; } catch (ex) { } try { info.arch = process.arch; } catch (ex) { } @@ -813,7 +813,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use if (config.domains[i].yubikey && config.domains[i].yubikey.secret) { config.domains[i].yubikey.secret = '(present)'; } } } - + r = JSON.stringify(removeAllUnderScore(config), null, 4); break; } @@ -1335,7 +1335,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use if (command.email != null) { newuser.email = command.email.toLowerCase(); if (command.emailVerified === true) { newuser.emailVerified = true; } } // Email if (command.resetNextLogin === true) { newuser.passchange = -1; } else { newuser.passchange = Math.floor(Date.now() / 1000); } if (user.groups) { newuser.groups = user.groups; } // New accounts are automatically part of our groups (Realms). - + parent.users[newuserid] = newuser; // Create a user, generate a salt and hash the password @@ -1862,7 +1862,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use if (unknownUsers.length > 0) { // Send error back, user not found. - displayNotificationMessage('User' + ((unknownUsers.length > 1)?'s':'') + ' ' + EscapeHtml(unknownUsers.join(', ')) + ' not found.', 'Device Group', 'ServerNotify'); + displayNotificationMessage('User' + ((unknownUsers.length > 1) ? 's' : '') + ' ' + EscapeHtml(unknownUsers.join(', ')) + ' not found.', 'Device Group', 'ServerNotify'); } if (command.responseid != null) { try { ws.send(JSON.stringify({ action: 'addmeshuser', responseid: command.responseid, result: 'ok', removed: removedCount, failed: failCount })); } catch (ex) { } } @@ -2483,8 +2483,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use case 'inviteAgent': { var err = null, mesh = null; - try - { + try { if ((parent.parent.mailserver == null) || (args.lanonly == true)) { err = 'Unsupported feature'; } // This operation requires the email server else if ((parent.parent.certificates.CommonName == null) || (parent.parent.certificates.CommonName.indexOf('.') == -1)) { err = 'Unsupported feature'; } // Server name must be configured else if (common.validateString(command.meshid, 1, 1024) == false) { err = 'Invalid group identifier'; } // Check meshid @@ -3034,7 +3033,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use db.Get(nodeid, function (err, nodes) { if ((nodes == null) || (nodes.length != 1)) { if (command.responseid != null) { try { ws.send(JSON.stringify({ action: 'getmqttlogin', responseid: command.responseid, result: 'Invalid node id' })); } catch (ex) { } return; } } var node = nodes[0]; - + // Get the device group for this node var mesh = parent.meshes[node.meshid]; if (mesh) { @@ -3071,11 +3070,11 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use if (common.validateString(command.nodeid, 1, 1024) == false) break; // Check nodeid if (common.validateInt(command.mode, 0, 3) == false) break; // Check connection mode // Validate if communication mode is possible - if (command.mode == null || command.mode==0) { + if (command.mode == null || command.mode == 0) { break; //unsupported } else if (command.mode == 1) { var state = parent.parent.GetConnectivityState(command.nodeid); - if ( (state == null) || (state.connectivity & 4)==0 ) break; + if ((state == null) || (state.connectivity & 4) == 0) break; } else if (command.mode == 2) { if (parent.parent.mpsserver.ciraConnections[command.nodeid] == null) break; } else if (command.mode == 3) { @@ -3101,18 +3100,17 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use break; } case 'plugin': { + if (parent.parent.pluginHandler == null) break; // If the plugin's are not supported, reject this command. command.userid = user._id; - if (command.routeToNode === true) { - routeCommandToNode(command); + routeCommandToNode(command); } else { - 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 + ')'); } + 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; } default: { // Unknown user action diff --git a/views/default.handlebars b/views/default.handlebars index b9b32bef..30698e71 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -4687,7 +4687,7 @@ var x = ''; if (nodeids.length > 1) { x = format("Are you sure you want to uninstall the selected {0} agents?", nodeids.length); } else { x = "Are you sure you want to uninstall selected agent?"; } x += '

'; - if (nodeids.length > 1) { x += "This will not remove the devices from the server, but the devices will not longer be able to connect to the server. All remote access to the devices will be lost. The devices must be connect for this command to work."; } else { x += "This will not remove this device from the server, but the device will not longer be able to connect to the server. All remote access to the device will be lost. The device must be connect for this command to work."; } + if (nodeids.length > 1) { x += "This will not remove the devices from the server, but the devices will not longer be able to connect to the server. All remote access to the devices will be lost. The devices must be connected for this command to work."; } else { x += "This will not remove this device from the server, but the device will not longer be able to connect to the server. All remote access to the device will be lost. The device must be connect for this command to work."; } x += '

'; setDialogMode(2, "Uninstall agent", 3, p10showSendUninstallAgentDialogEx, x, nodeids); p10validateSendUninstallAgentDialog(); diff --git a/webserver.js b/webserver.js index d76bb172..9fc971a7 100644 --- a/webserver.js +++ b/webserver.js @@ -2955,6 +2955,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { localPort: 1234, remoteName: node.name, remoteNodeId: node._id, + remoteTarget: '', remotePort: 3389, username: '', password: '',