From 6c4f1ec2b550532b4958333f8b914d8e100e52ef Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Tue, 31 Mar 2020 10:37:52 -0700 Subject: [PATCH] Fixed server crash due to assigning a const. --- meshuser.js | 5 ++--- webserver.js | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/meshuser.js b/meshuser.js index 1aa6122f..3c4a4592 100644 --- a/meshuser.js +++ b/meshuser.js @@ -857,13 +857,12 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use info.dbType = ['None', 'NeDB', 'MongoJS', 'MongoDB'][parent.db.databaseType]; if (parent.db.databaseType == 3) { info.dbChangeStream = parent.db.changeStream; } if (parent.parent.pluginHandler != null) { info.plugins = []; for (var i in parent.parent.pluginHandler.plugins) { info.plugins.push(i); } } - try { info.nodeVersion = Number(process.version.match(/^v(\d+\.\d+)/)[1]); } catch (ex) { } - try { info.currentVer = parent.parent.currentVer; } catch (ex) { } + try { info.nodeVersion = process.version; } catch (ex) { } + try { info.meshVersion = parent.parent.currentVer; } catch (ex) { } try { info.platform = process.platform; } catch (ex) { } try { info.arch = process.arch; } catch (ex) { } try { info.pid = process.pid; } catch (ex) { } try { info.uptime = process.uptime(); } catch (ex) { } - 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) { } diff --git a/webserver.js b/webserver.js index ebe72895..3604fafc 100644 --- a/webserver.js +++ b/webserver.js @@ -3238,7 +3238,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { // Handle a request to download a mesh agent obj.handleMeshAgentRequest = function (req, res) { - const domain = getDomain(req, res); + var domain = getDomain(req, res); if (domain == null) { parent.debug('web', 'handleRootRequest: invalid domain.'); try { res.sendStatus(404); } catch (ex) { } return; } // If required, check if this user has rights to do this