From 65d20c3c7887d245b4f7b9ba9e430f5077ff41a9 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Tue, 26 Nov 2019 14:11:09 -0800 Subject: [PATCH] Added server warnings in MyServer tab. --- meshcentral.js | 22 +++++++++++++------- meshuser.js | 6 +++++- package.json | 2 +- public/styles/style.css | 2 +- views/default-min.handlebars | 11 +++++++++- views/default.handlebars | 17 +++++++++++++-- views/translations/default-min_fr.handlebars | 11 +++++++++- views/translations/default_fr.handlebars | 17 +++++++++++++-- 8 files changed, 71 insertions(+), 17 deletions(-) diff --git a/meshcentral.js b/meshcentral.js index 2e8ba814..67d76122 100644 --- a/meshcentral.js +++ b/meshcentral.js @@ -68,6 +68,7 @@ function CreateMeshCentralServer(config, args) { obj.serverStatsCounter = Math.floor(Math.random() * 1000); obj.taskLimiter = obj.common.createTaskLimiterQueue(50, 20, 60); // (maxTasks, maxTaskTime, cleaningInterval) This is a task limiter queue to smooth out server work. obj.agentUpdateBlockSize = 65531; // MeshAgent update block size + obj.serverWarnings = []; // List of warnings that should be shown to administrators try { obj.currentVer = JSON.parse(obj.fs.readFileSync(obj.path.join(__dirname, 'package.json'), 'utf8')).version; } catch (e) { } // Fetch server version // Setup the default configuration and files paths @@ -391,7 +392,7 @@ function CreateMeshCentralServer(config, args) { //wincmd.list(function (svc) { console.log(svc); }, true); // Check top level configuration for any unreconized values - if (config) { for (var i in config) { if ((typeof i == 'string') && (i.length > 0) && (i[0] != '_') && (['settings', 'domains', 'configfiles', 'smtp', 'letsencrypt', 'peers'].indexOf(i) == -1)) { console.log('WARNING: unrecognized configuration option \"' + i + '\".'); } } } + if (config) { for (var i in config) { if ((typeof i == 'string') && (i.length > 0) && (i[0] != '_') && (['settings', 'domains', 'configfiles', 'smtp', 'letsencrypt', 'peers'].indexOf(i) == -1)) { addServerWarning('WARNING: unrecognized configuration option \"' + i + '\".'); } } } if (typeof obj.args.userallowedip == 'string') { if (obj.args.userallowedip == '') { obj.args.userallowedip = null; } else { obj.args.userallowedip = obj.args.userallowedip.split(','); } } if (typeof obj.args.userblockedip == 'string') { if (obj.args.userblockedip == '') { obj.args.userblockedip = null; } else { obj.args.userblockedip = obj.args.userblockedip.split(','); } } @@ -759,9 +760,9 @@ function CreateMeshCentralServer(config, args) { // Look at passed in arguments if ((obj.args.user != null) && (typeof obj.args.user != 'string')) { delete obj.args.user; } - if ((obj.args.ciralocalfqdn != null) && ((obj.args.lanonly == true) || (obj.args.wanonly == true))) { console.log("WARNING: CIRA local FQDN's ignored when server in LAN-only or WAN-only mode."); } - if ((obj.args.ciralocalfqdn != null) && (obj.args.ciralocalfqdn.split(',').length > 4)) { console.log("WARNING: Can't have more than 4 CIRA local FQDN's. Ignoring value."); obj.args.ciralocalfqdn = null; } - if (obj.args.ignoreagenthashcheck === true) { console.log("WARNING: Agent hash checking is being skipped, this is unsafe."); } + if ((obj.args.ciralocalfqdn != null) && ((obj.args.lanonly == true) || (obj.args.wanonly == true))) { addServerWarning("CIRA local FQDN's ignored when server in LAN-only or WAN-only mode."); } + if ((obj.args.ciralocalfqdn != null) && (obj.args.ciralocalfqdn.split(',').length > 4)) { addServerWarning("Can't have more than 4 CIRA local FQDN's. Ignoring value."); obj.args.ciralocalfqdn = null; } + if (obj.args.ignoreagenthashcheck === true) { addServerWarning("Agent hash checking is being skipped, this is unsafe."); } if (obj.args.port == null || typeof obj.args.port != 'number') { if (obj.args.notls == null) { obj.args.port = 443; } else { obj.args.port = 80; } } if (obj.args.aliasport != null && (typeof obj.args.aliasport != 'number')) obj.args.aliasport = null; if (obj.args.mpsport == null || typeof obj.args.mpsport != 'number') obj.args.mpsport = 4433; @@ -843,7 +844,7 @@ function CreateMeshCentralServer(config, args) { if ((obj.config) && (obj.config.settings) && (obj.config.settings.plugins != null)) { const nodeVersion = Number(process.version.match(/^v(\d+\.\d+)/)[1]); if (nodeVersion < 7) { - console.log("WARNING: Plugin support requires Node 7 or higher."); + addServerWarning("Plugin support requires Node v7.0 or higher."); delete obj.config.settings.plugins; } else { obj.pluginHandler = require('./pluginHandler.js').pluginHandler(obj); @@ -981,7 +982,7 @@ function CreateMeshCentralServer(config, args) { if ((obj.config.smtp != null) && (obj.config.smtp.host != null) && (obj.config.smtp.from != null)) { obj.mailserver = require('./meshmail.js').CreateMeshMail(obj); obj.mailserver.verify(); - if (obj.args.lanonly == true) { console.log("WARNING: SMTP server has limited use in LAN mode."); } + if (obj.args.lanonly == true) { addServerWarning("SMTP server has limited use in LAN mode."); } } // Start periodic maintenance @@ -1931,6 +1932,7 @@ function CreateMeshCentralServer(config, args) { function logInfoEvent(msg) { if (obj.servicelog != null) { obj.servicelog.info(msg); } console.log(msg); } function logWarnEvent(msg) { if (obj.servicelog != null) { obj.servicelog.warn(msg); } console.log(msg); } function logErrorEvent(msg) { if (obj.servicelog != null) { obj.servicelog.error(msg); } console.error(msg); } + obj.getServerWarnings = function() { return serverWarnings; } // Return the path of a file into the meshcentral-data path obj.getConfigFilePath = function (filename) { @@ -2036,10 +2038,14 @@ function InstallModule(modulename, func, tag1, tag2) { // Detect CTRL-C on Linux and stop nicely process.on('SIGINT', function () { if (meshserver != null) { meshserver.Stop(); meshserver = null; } console.log('Server Ctrl-C exit...'); process.exit(); }); +// Add a server warning, warnings will be shown to the administrator on the web application +var serverWarnings = []; +function addServerWarning(msg, print) { serverWarnings.push(msg); if (print !== false) { console.log("WARNING: " + msg); } } + // Load the really basic modules var meshserver = null; var childProcess = null; -var previouslyInstalledModules = { }; +var previouslyInstalledModules = {}; function mainStart() { // Check the NodeJS is version 6 or better. if (Number(process.version.match(/^v(\d+\.\d+)/)[1]) < 6) { console.log("MeshCentral requires Node v6.x or above, current version is " + process.version + "."); return; } @@ -2076,7 +2082,7 @@ function mainStart() { var modules = ['ws', 'cbor', 'nedb', 'https', 'yauzl', 'xmldom', 'ipcheck', 'express', 'archiver', 'multiparty', 'node-forge', 'express-ws', 'compression', 'body-parser', 'connect-redis', 'cookie-session', 'express-handlebars']; if (require('os').platform() == 'win32') { modules.push('node-windows'); if (sspi == true) { modules.push('node-sspi'); } } // Add Windows modules if (ldap == true) { modules.push('ldapauth-fork'); } - if (config.letsencrypt != null) { if ((nodeVersion < 10) || (require('crypto').generateKeyPair == null)) { if (!args.launch) { console.log("WARNING: Let's Encrypt support requires Node v10.12.0 or higher."); } } else { modules.push('greenlock'); } } // Add Greenlock Module + if (config.letsencrypt != null) { if ((nodeVersion < 10) || (require('crypto').generateKeyPair == null)) { addServerWarning("Let's Encrypt support requires Node v10.12 or higher.", !args.launch); } else { modules.push('greenlock'); } } // Add Greenlock Module if (config.settings.mqtt != null) { modules.push('aedes'); } // Add MQTT Modules if (config.settings.mongodb != null) { modules.push('mongodb'); } // Add MongoDB, official driver. if (config.settings.vault != null) { modules.push('node-vault'); } // Add official HashiCorp's Vault module. diff --git a/meshuser.js b/meshuser.js index 952f8862..297ec00a 100644 --- a/meshuser.js +++ b/meshuser.js @@ -355,9 +355,13 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use // Send user information to web socket, this is the first thing we send try { ws.send(JSON.stringify({ action: 'userinfo', userinfo: parent.CloneSafeUser(parent.users[user._id]) })); } catch (ex) { } - // Send server tracing information if (user.siteadmin == 0xFFFFFFFF) { + // Send server tracing information try { ws.send(JSON.stringify({ action: 'traceinfo', traceSources: parent.parent.debugRemoteSources })); } catch (ex) { } + + // Send any server warnings if any + var serverWarnings = parent.parent.getServerWarnings(); + if (serverWarnings.length > 0) { try { ws.send(JSON.stringify({ action: 'serverwarnings', warnings: serverWarnings })); } catch (ex) { } } } // See how many times bad login attempts where made since the last login diff --git a/package.json b/package.json index 83574516..59ce1036 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.4.4-y", + "version": "0.4.5-a", "keywords": [ "Remote Management", "Intel AMT", diff --git a/public/styles/style.css b/public/styles/style.css index d7b44da6..b80683bc 100644 --- a/public/styles/style.css +++ b/public/styles/style.css @@ -810,7 +810,7 @@ NoMeshesPanel img { padding-left: 15px; } -#p2noMeshFound, #serverStats { +#p2noMeshFound, #serverStats, #serverWarnings { margin-left: 40px; } diff --git a/views/default-min.handlebars b/views/default-min.handlebars index fbebf8e7..16766df4 100644 --- a/views/default-min.handlebars +++ b/views/default-min.handlebars @@ -1,4 +1,4 @@ -{{{title}}}
{{{title}}}
{{{title2}}}

{{{logoutControl}}}

♦
 

{{{title}}}
{{{title}}}
{{{title2}}}

{{{logoutControl}}}

♦
 

{{{title}}}
{{{title}}}
{{{title2}}}

{{{logoutControl}}}

♦
 

{{{title}}}
{{{title}}}
{{{title2}}}

{{{logoutControl}}}

♦