external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-03-09 15:40:18 +00:00
Code Issues Releases Wiki Activity

Improved database error handling, new Let's Encrypt server console commands.

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2020-03-04 14:57:03 -08:00
parent 2741344268
commit 672517f27d
7 changed files with 137 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

36
meshuser.js
View file

@ -689,7 +689,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
switch (cmd) {
case 'help': {
var fin = '', f = '', availcommands = 'help,info,versions,args,resetserver,showconfig,usersessions,closeusersessions,tasklimiter,setmaxtasks,cores,migrationagents,agentstats,webstats,mpsstats,swarmstats,acceleratorsstats,updatecheck,serverupdate,nodeconfig,heapdump,relays,autobackup,backupconfig,dupagents,dispatchtable,badlogins,showpaths';
var fin = '', f = '', availcommands = 'help,info,versions,args,resetserver,showconfig,usersessions,closeusersessions,tasklimiter,setmaxtasks,cores,migrationagents,agentstats,webstats,mpsstats,swarmstats,acceleratorsstats,updatecheck,serverupdate,nodeconfig,heapdump,relays,autobackup,backupconfig,dupagents,dispatchtable,badlogins,showpaths,letsencrypt';
availcommands = availcommands.split(',').sort();
while (availcommands.length > 0) {
if (f.length > 80) { fin += (f + ',\r\n'); f = ''; }
@ -699,6 +699,37 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
r = 'Available commands: \r\n' + fin + '.';
break;
}
case 'le':
case 'letsencrypt': {
if (parent.parent.letsencrypt == null) {
r = "Let's Encrypt not in use.";
} else {
var leinfo = {};
var greenLockVersion = null;
try { greenLockVersion = require('greenlock/package.json').version; } catch (ex) { }
if (greenLockVersion) { leinfo.greenLockVer = greenLockVersion; }
leinfo.redirWebServerHooked = parent.parent.letsencrypt.redirWebServerHooked;
leinfo.leDomains = parent.parent.letsencrypt.leDomains;
leinfo.leResults = parent.parent.letsencrypt.leResults;
leinfo.leResultsStaging = parent.parent.letsencrypt.leResultsStaging;
leinfo.performRestart = parent.parent.letsencrypt.performRestart;
leinfo.performMoveToProduction = parent.parent.letsencrypt.performMoveToProduction;
leinfo.runAsProduction = parent.parent.letsencrypt.runAsProduction;
leinfo.leDefaults = parent.parent.letsencrypt.leDefaults;
leinfo.leDefaultsStaging = parent.parent.letsencrypt.leDefaultsStaging;
r = JSON.stringify(leinfo, null, 4);
}
break;
}
case 'lecheck': {
if (parent.parent.letsencrypt == null) {
r = "Let's Encrypt not in use.";
} else {
var err = parent.parent.letsencrypt.checkRenewCertificate();
if (err == null) { r = "Called Let's Encrypt certificate check."; } else { r = err; }
}
break;
}
case 'badlogins': {
if (parent.parent.config.settings.maxinvalidlogin == false) {
r = 'Bad login filter is disabled.';
@ -784,7 +815,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
if (error != null) { r2 += 'Exception: ' + error + '\r\n'; }
try { ws.send(JSON.stringify({ action: 'serverconsole', value: r2, tag: command.tag })); } catch (ex) { }
});
r = 'Checking server update...';
r = "Checking server update...";
break;
}
case 'info': {
@ -800,6 +831,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
try { info.version = process.version; } catch (ex) { }
try { info.cpuUsage = process.cpuUsage(); } catch (ex) { }
try { info.warnings = parent.parent.getServerWarnings(); } catch (ex) { }
try { info.database = ["Unknown", "NeDB", "MongoJS", "MongoDB", "MariaDB", "MySQL"][parent.parent.db.databaseType]; } catch (ex) { }
r = JSON.stringify(info, null, 4);
break;
}