From f939ce1f452bf7ef206f8f86dcf77d1eb3f49e5c Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Wed, 11 Nov 2020 17:18:00 -0800 Subject: [PATCH] Version 0.6.85 --- meshuser.js | 3 +++ package.json | 2 +- sample-config-advanced.json | 2 +- webserver.js | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/meshuser.js b/meshuser.js index b562f991..4ef1e8f4 100644 --- a/meshuser.js +++ b/meshuser.js @@ -1330,10 +1330,13 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use // Add server TLS cert hash var tlsCertHash = null; + // TODO: Once new mesh agents seem to work, re-enable this. + /* if (parent.parent.args.ignoreagenthashcheck !== true) { tlsCertHash = parent.webCertificateFullHashs[domain.id]; if (tlsCertHash != null) { command.servertlshash = Buffer.from(tlsCertHash, 'binary').toString('hex'); } } + */ // Add user consent messages command.soptions = {}; diff --git a/package.json b/package.json index a488dd44..78f26fb1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.6.84", + "version": "0.6.85", "keywords": [ "Remote Device Management", "Remote Device Monitoring", diff --git a/sample-config-advanced.json b/sample-config-advanced.json index 091b26b8..8cb2beac 100644 --- a/sample-config-advanced.json +++ b/sample-config-advanced.json @@ -182,7 +182,7 @@ "agentCustomization": { "displayName": "Compagny® Product™", "description": "Compagny® Product™ agent for remote monitoring, management and assistance.", - "companyName": "Compagny®", + "companyName": "Compagny", "serviceName": "compagnyagent" }, "_userAllowedIP": "127.0.0.1,192.168.1.0/24", diff --git a/webserver.js b/webserver.js index ffa30b02..b75d2bb1 100644 --- a/webserver.js +++ b/webserver.js @@ -3218,10 +3218,13 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { // Instruct one of more agents to download a URL to a given local drive location. var tlsCertHash = null; + // TODO: Once new mesh agents seem to work, re-enable this. + /* if (parent.args.ignoreagenthashcheck !== true) { tlsCertHash = obj.webCertificateFullHashs[cmd.domain.id]; if (tlsCertHash != null) { tlsCertHash = Buffer.from(tlsCertHash, 'binary').toString('hex'); } } + */ for (var i in cmd.nodeids) { obj.GetNodeWithRights(cmd.domain, cmd.user, cmd.nodeids[i], function (node, rights, visible) { if ((node == null) || ((rights & 8) == 0) || (visible == false)) return; // We don't have remote control rights to this device