diff --git a/agents/MeshCmd-signed.exe b/agents/MeshCmd-signed.exe index 03e99ec0..214198dc 100644 Binary files a/agents/MeshCmd-signed.exe and b/agents/MeshCmd-signed.exe differ diff --git a/agents/MeshCmd64-signed.exe b/agents/MeshCmd64-signed.exe index fbb7f383..271cfb36 100644 Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ diff --git a/agents/MeshService-signed.exe b/agents/MeshService-signed.exe index 0152ca63..dfc99e17 100644 Binary files a/agents/MeshService-signed.exe and b/agents/MeshService-signed.exe differ diff --git a/agents/MeshService.exe b/agents/MeshService.exe index e1a64b9a..a464b8c7 100644 Binary files a/agents/MeshService.exe and b/agents/MeshService.exe differ diff --git a/agents/MeshService64-signed.exe b/agents/MeshService64-signed.exe index da76b2ab..1885b246 100644 Binary files a/agents/MeshService64-signed.exe and b/agents/MeshService64-signed.exe differ diff --git a/agents/MeshService64.exe b/agents/MeshService64.exe index af98ae6d..4171b57b 100644 Binary files a/agents/MeshService64.exe and b/agents/MeshService64.exe differ diff --git a/meshuser.js b/meshuser.js index f39d211c..8c1e93b7 100644 --- a/meshuser.js +++ b/meshuser.js @@ -775,7 +775,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,le,lecheck,leevents,dbstats,sms,amtacm'; + 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,le,lecheck,leevents,dbstats,sms,amtacm,certhashes'; if (parent.parent.config.settings.heapdump === true) { availcommands += ',heapdump'; } availcommands = availcommands.split(',').sort(); while (availcommands.length > 0) { if (f.length > 80) { fin += (f + ',\r\n'); f = ''; } f += (((f != '') ? ', ' : ' ') + availcommands.shift()); } @@ -783,6 +783,12 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use r = 'Available commands: \r\n' + fin + '.'; break; } + case 'certhashes': { + r += 'AgentCertHash: ' + parent.agentCertificateHashHex; + for (var i in parent.webCertificateHashs) { r += '\r\nwebCertificateHash (' + i + '): ' + common.rstr2hex(parent.webCertificateHashs[i]); } + for (var i in parent.webCertificateFullHashs) { r += '\r\nwebCertificateFullHash (' + i + '): ' + common.rstr2hex(parent.webCertificateFullHashs[i]); } + break; + } case 'amtacm': { if ((domain.amtacmactivation == null) || (domain.amtacmactivation.acmmatch == null) || (domain.amtacmactivation.acmmatch.length == 0)) { r = 'No Intel AMT activation certificates.'; diff --git a/package.json b/package.json index 5bc2e22d..afbd5107 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,6 @@ "sample-config-advanced.json" ], "dependencies": { - "archiver": "^3.0.0", "body-parser": "^1.19.0", "cbor": "^4.1.5", "compression": "^1.7.4", diff --git a/views/default.handlebars b/views/default.handlebars index def47de0..3a3df502 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -5633,6 +5633,10 @@ for (var i in urlargs) { urlviewmode += ('&' + i + '=' + urlargs[i]); } try { window.history.replaceState({}, document.title, window.location.pathname + urlviewmode); } catch (ex) { } } + + // Clear the desktop session selector + QV('p11DeskSessionSelector', false); + QH('p11DeskSessionSelector', ''); } setupDesktop(); // Always refresh the desktop, even if we are on the same device, we need to do some canvas switching. if (!panel) panel = 10;