diff --git a/package.json b/package.json index 137ec043..392c9f9e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.3.2-d", + "version": "0.3.2-f", "keywords": [ "Remote Management", "Intel AMT", diff --git a/webserver.js b/webserver.js index 8468c61b..81d7aee5 100644 --- a/webserver.js +++ b/webserver.js @@ -2185,6 +2185,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { obj.db.Get(req.query.nodeid, function (err, nodes) { if (nodes.length != 1) { res.sendStatus(401); return; } var node = nodes[0]; + // Create the meshaction.txt file for meshcmd.exe var meshaction = { action: req.query.meshaction, @@ -2195,7 +2196,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { username: '', password: '', serverId: obj.agentCertificateHashHex.toUpperCase(), // SHA384 of server HTTPS public key - serverHttpsHash: Buffer.from(obj.webCertificateHash, 'binary').toString('hex').toUpperCase(), // SHA384 of server HTTPS certificate + serverHttpsHash: Buffer.from(obj.webCertificateHashs[domain.id], 'binary').toString('hex').toUpperCase(), // SHA384 of server HTTPS certificate debugLevel: 0 }; if (user != null) { meshaction.username = user.name; } @@ -2210,7 +2211,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { username: '', password: '', serverId: obj.agentCertificateHashHex.toUpperCase(), // SHA384 of server HTTPS public key - serverHttpsHash: Buffer.from(obj.webCertificateHash, 'binary').toString('hex').toUpperCase(), // SHA384 of server HTTPS certificate + serverHttpsHash: Buffer.from(obj.webCertificateHashs[domain.id], 'binary').toString('hex').toUpperCase(), // SHA384 of server HTTPS certificate debugLevel: 0 }; if (user != null) { meshaction.username = user.name; }