Ylianst/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-11-23 22:57:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Ylianst/MeshCentral

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2020-01-22 11:34:26 -08:00
commit 74505e6001
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
agents/meshcore.js
View File

@ -39,11 +39,17 @@ var MESHRIGHT_LIMITEDINPUT = 4096;
function createMeshCore(agent) {
var obj = {};
if (process.platform == 'win32' && require('user-sessions').isRoot()) {
if (process.platform == 'win32' && require('user-sessions').isRoot())
{
// Check the Agent Uninstall MetaData for correctness, as the installer may have written an incorrect value
var writtenSize = 0, actualSize = Math.floor(require('fs').statSync(process.execPath).size / 1024);
try { writtenSize = require('win-registry').QueryKey(require('win-registry').HKEY.LocalMachine, 'Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MeshCentralAgent', 'EstimatedSize'); } catch (x) { }
if (writtenSize != actualSize) { try { require('win-registry').WriteKey(require('win-registry').HKEY.LocalMachine, 'Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MeshCentralAgent', 'EstimatedSize', actualSize); } catch (x2) { } }
// Check to see if we are the Installed Mesh Agent Service, if we are, make sure we can run in Safe Mode
var meshCheck = false;
try { meshCheck = require('service-manager').manager.getService('Mesh Agent').isMe(); } catch (mce) { }
if (meshCheck && require('win-bcd').isSafeModeService && !require('win-bcd').isSafeModeService('Mesh Agent')) { require('win-bcd').enableSafeModeService('Mesh Agent'); }
}
if (process.platform == 'darwin' && !process.versions) {

11
translate/translate.json
View File

@ -5629,6 +5629,7 @@
},
{
"en": "Download \\\"meshcmd\\\" with an action file to route traffic thru this server to this device. Make sure to edit meshaction.txt and add your account password or make any changes needed.",
"nl": "Download \\\"meshcmd\\\" met het actiebestand om verkeer via deze server naar dit apparaat te leiden. Zorg ervoor dat u meshaction.txt bewerkt en uw accountwachtwoord toevoegt of breng de nodige wijzigingen aan.",
"xloc": [
"default.handlebars->23->572"
]
@ -10305,6 +10306,7 @@
},
{
"en": "MeshAction (.txt)",
"nl": "MeshAction (.txt)",
"xloc": [
"default.handlebars->23->576",
"default.handlebars->23->578"
@ -10446,42 +10448,49 @@
},
{
"en": "MeshCmd (Linux ARM, 32bit)",
"nl": "MeshCmd (Linux ARM, 32bit)",
"xloc": [
"default.handlebars->23->586"
]
},
{
"en": "MeshCmd (Linux x86, 32bit)",
"nl": "MeshCmd (Linux x86, 32bit)",
"xloc": [
"default.handlebars->23->583"
]
},
{
"en": "MeshCmd (Linux x86, 64bit)",
"nl": "MeshCmd (Linux x86, 64bit)",
"xloc": [
"default.handlebars->23->584"
]
},
{
"en": "MeshCmd (MacOS, 64bit)",
"nl": "MeshCmd (MacOS, 64bit)",
"xloc": [
"default.handlebars->23->585"
]
},
{
"en": "MeshCmd (Win32 executable)",
"nl": "MeshCmd (Win32 executable)",
"xloc": [
"default.handlebars->23->581"
]
},
{
"en": "MeshCmd (Win64 executable)",
"nl": "MeshCmd (Win64 executable)",
"xloc": [
"default.handlebars->23->582"
]
},
{
"en": "MeshCmd is a command line tool that performs lots of different operations. The action file can optionally be downloaded and edited to provide server information and credentials.",
"nl": "MeshCmd is een opdrachtregelprogramma dat veel verschillende bewerkingen uitvoert. Het actiebestand is optioneel, en kan worden gedownload en bewerkt om serverinformatie en referenties te verstrekken.",
"xloc": [
"default.handlebars->23->571"
]
@ -19255,4 +19264,4 @@
]
}
]
}
}