MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-01-12 23:43:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
silversword411 2022-09-22 16:27:12 -04:00
commit dd938c8a96
5 changed files with 177 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agents/meshinstall-linux.js
View File

@ -156,7 +156,7 @@ if (process.argv.includes('-translations'))
console.log(JSON.stringify(translation));
process.exit();
}
if (process.argv.includes('-help') || (process.platform == 'linux' && process.env['XAUTHORITY']==null && process.env['DISPLAY'] == null))
if (process.argv.includes('-help') || (process.platform == 'linux' && process.env['XAUTHORITY'] == null && process.env['DISPLAY'] == null && process.argv.length == 1))
{
console.log("\n" + translation[lang].commands + ": ");
if ((msh.InstallFlags & 1) == 1)

4
apprelays.js
View File

@ -282,7 +282,7 @@ module.exports.CreateWebRelay = function (parent, db, args, domain) {
// Construct the HTTP request
var request = req.method + ' ' + req.url + ' HTTP/' + req.httpVersion + '\r\n';
const blockedHeaders = ['origin', 'cookie', 'upgrade-insecure-requests', 'sec-ch-ua', 'sec-ch-ua-mobile', 'dnt', 'sec-fetch-user', 'sec-ch-ua-platform', 'sec-fetch-site', 'sec-fetch-mode', 'sec-fetch-dest']; // These are headers we do not forward
const blockedHeaders = ['cookie', 'upgrade-insecure-requests', 'sec-ch-ua', 'sec-ch-ua-mobile', 'dnt', 'sec-fetch-user', 'sec-ch-ua-platform', 'sec-fetch-site', 'sec-fetch-mode', 'sec-fetch-dest']; // These are headers we do not forward
for (var i in req.headers) { if (blockedHeaders.indexOf(i) == -1) { request += i + ': ' + req.headers[i] + '\r\n'; } }
var cookieStr = '';
for (var i in parent.webCookies) { if (cookieStr != '') { cookieStr += '; ' } cookieStr += (i + '=' + parent.webCookies[i].value); }
@ -331,7 +331,7 @@ module.exports.CreateWebRelay = function (parent, db, args, domain) {
// Construct the HTTP request
var request = req.method + ' ' + req.url + ' HTTP/' + req.httpVersion + '\r\n';
const blockedHeaders = ['origin', 'cookie', 'sec-websocket-extensions']; // These are headers we do not forward
const blockedHeaders = ['cookie', 'sec-websocket-extensions']; // These are headers we do not forward
for (var i in req.headers) { if (blockedHeaders.indexOf(i) == -1) { request += i + ': ' + req.headers[i] + '\r\n'; } }
var cookieStr = '';
for (var i in parent.webCookies) { if (cookieStr != '') { cookieStr += '; ' } cookieStr += (i + '=' + parent.webCookies[i].value); }

2
docs/docs/meshcentral/SSLnletsencrypt.md
View File

@ -24,7 +24,7 @@ Make sure you match and/or adjust all the following settings appropriately in yo
}
```
If you need further clarification to know what each of these settings are
If you need further clarification to know what each of these settings are, check out [the config schema](https://github.com/Ylianst/MeshCentral/blob/master/meshcentral-config-schema.json).
Then restart meshcentral and it will get a cert for you, the process will need to restart to apply the cert.

2
meshctrl.js
View File

@ -579,6 +579,7 @@ if (args['_'].length == 0) {
console.log("\r\nOptional arguments:\r\n");
console.log(" --desc [description] - New group description.");
console.log(" --amtonly - New group is agent-less, Intel AMT only.");
console.log(" --agentless - New group is agent-less only.");
console.log(" --features [number] - Set device group features, sum of numbers below.");
console.log(" 1 = Auto-Remove 2 = Hostname Sync");
console.log(" 4 = Record Sessions");
@ -1356,6 +1357,7 @@ function serverConnect() {
var op = { action: 'createmesh', meshname: args.name, meshtype: 2, responseid: 'meshctrl' };
if (args.desc) { op.desc = args.desc; }
if (args.amtonly) { op.meshtype = 1; }
if (args.agentless) { op.meshtype = 3; }
if (args.features) { op.flags = parseInt(args.features); }
if (args.consent) { op.consent = parseInt(args.consent); }
ws.send(JSON.stringify(op));

172
translate/translate.json
View File

@ -475,6 +475,8 @@
},
{
"en": "\" requested help.",
"nl": "\" vraagt om hulp.",
"pl": "\" prosi o pomoc.",
"xloc": [
"device-help.html->2->3"
]
@ -5719,6 +5721,7 @@
{
"en": "Account login token records",
"nl": "Token vermeldingen voor accountaanmelding",
"pl": "Zapisy logowania tokenami użytkownika",
"xloc": [
"default.handlebars->47->2918"
]
@ -9277,6 +9280,7 @@
{
"en": "An unknown error occured.",
"nl": "Er is een onbekende fout opgetreden.",
"pl": "Wystąpił nieznany błąd.",
"xloc": [
"default.handlebars->47->2798"
]
@ -15168,6 +15172,7 @@
{
"en": "Commands from file",
"nl": "Opdrachten uit bestand",
"pl": "Komendy z pliku",
"xloc": [
"default.handlebars->47->730"
]
@ -15175,6 +15180,7 @@
{
"en": "Commands from file on server",
"nl": "Opdrachten uit een bestand op de server",
"pl": "Komendy z pliku na serwerze",
"xloc": [
"default.handlebars->47->731"
]
@ -15182,6 +15188,7 @@
{
"en": "Commands from text box",
"nl": "Opdrachten uit tekstvak",
"pl": "Komendy z okienka tekstowego",
"xloc": [
"default.handlebars->47->729"
]
@ -15337,6 +15344,7 @@
{
"en": "Configuration file records",
"nl": "Configuratiebestand vermeldingen",
"pl": "Zapisy pliku konfiguracyjnego",
"xloc": [
"default.handlebars->47->2911"
]
@ -18785,6 +18793,7 @@
{
"en": "Database Records",
"nl": "Database vermeldingen",
"pl": "Zapisy Bazy Danych",
"xloc": [
"default.handlebars->47->2837"
]
@ -19631,6 +19640,8 @@
},
{
"en": "Denied user login from {0}, {1}, {2}",
"nl": "Geweigerde gebruikerslogin van {0}, {1}, {2}",
"pl": "Odmówiono zalogowania użytkownika z {0}, {1}, {2}",
"xloc": [
"default.handlebars->47->2406"
]
@ -20410,12 +20421,16 @@
},
{
"en": "Device \"",
"nl": "Apparaat \"",
"pl": "Urządzenie \"",
"xloc": [
"device-help.html->2->3"
]
},
{
"en": "Device \"[[[DEVICENAME]]]\" requested assistance.",
"nl": "Apparaat \"[[[DEVICENAME]]]\" heeft assistentie gevraagd",
"pl": "Urządzenie \"[[[DEVICENAME]]]\" prosiło o pomoc.",
"xloc": [
"device-help.txt"
]
@ -20826,6 +20841,7 @@
{
"en": "Device Push Notification Record",
"nl": "Apparaat Push Notificatie vermelding",
"pl": "Zapis Powiadomień Push Urządzenia",
"xloc": [
"default.handlebars->47->2920"
]
@ -20833,6 +20849,7 @@
{
"en": "Device SMBIOS record",
"nl": "Apparaat SMBIOS vermelding",
"pl": "Zapis SMBIOS urządzenia",
"xloc": [
"default.handlebars->47->2919"
]
@ -21196,6 +21213,7 @@
{
"en": "Device group record",
"nl": "Apparaatgroep vermelding",
"pl": "Zapis grupy urządzeń",
"xloc": [
"default.handlebars->47->2905"
]
@ -21278,6 +21296,7 @@
{
"en": "Device information records",
"nl": "Apparaatinformatie vermeldingen",
"pl": "Zapisy informacji urządzenia",
"xloc": [
"default.handlebars->47->2907"
]
@ -21799,6 +21818,7 @@
{
"en": "Device power transition records",
"nl": "Apparaat aan/uit vermeldingen",
"pl": "Zapisy zmiany stanu zasilania",
"xloc": [
"default.handlebars->47->2913"
]
@ -21806,6 +21826,7 @@
{
"en": "Device record",
"nl": "Apparaat vermelding",
"pl": "Zapis urządzenia",
"xloc": [
"default.handlebars->47->2904"
]
@ -21863,6 +21884,7 @@
{
"en": "Device sharing records",
"nl": "Apparaten delings vermeldingen",
"pl": "Zapisy udostępniania urządzenia",
"xloc": [
"default.handlebars->47->2917"
]
@ -21870,6 +21892,7 @@
{
"en": "Device, users, groups and other records",
"nl": "Apparaat, gebruikers, groepen en andere vermeldingen",
"pl": "Zapisy urządzenia, użytkowników, grup i inne",
"xloc": [
"default.handlebars->47->2921"
]
@ -24995,6 +25018,8 @@
},
{
"en": "Email Help Request",
"nl": "E-mail hulpverzoek",
"pl": "Prośba Pomocy Email",
"xloc": [
"default.handlebars->47->1939",
"default.handlebars->47->889"
@ -26971,6 +26996,7 @@
{
"en": "Event records",
"nl": "Gebeurtenis vermeldingen",
"pl": "Zapisy zdarzeń",
"xloc": [
"default.handlebars->47->2914"
]
@ -29975,12 +30001,16 @@
},
{
"en": "Go to first page",
"nl": "Ga naar de eerste pagina",
"pl": "Idź do pierwszej strony",
"xloc": [
"default.handlebars->container->column_l->p1->p1title->devListToolbarViewIcons"
]
},
{
"en": "Go to last page",
"nl": "Ga naar de laatste pagina ",
"pl": "Idź do ostatniej strony",
"xloc": [
"default.handlebars->container->column_l->p1->p1title->devListToolbarViewIcons"
]
@ -30039,12 +30069,16 @@
},
{
"en": "Go to next page",
"nl": "Ga naar de volgende pagina",
"pl": "Idź do następnej strony",
"xloc": [
"default.handlebars->container->column_l->p1->p1title->devListToolbarViewIcons"
]
},
{
"en": "Go to previous page",
"nl": "Ga naar de vorige pagina",
"pl": "Idź do poprzedniej strony",
"xloc": [
"default.handlebars->container->column_l->p1->p1title->devListToolbarViewIcons"
]
@ -30417,6 +30451,8 @@
},
{
"en": "Group Type",
"nl": "Groepstype",
"pl": "Typ Grupy",
"xloc": [
"default.handlebars->47->2576"
]
@ -30803,6 +30839,23 @@
},
{
"en": "HTTP/",
"nl": "HTTP/",
"cs": "HTTP/",
"es": "HTTP/",
"de": "HTTP/",
"da": "HTTP/",
"fi": "HTTP/",
"fr": "HTTP/",
"hi": "HTTP/",
"it": "HTTP/",
"ja": "HTTP/",
"ko": "HTTP/",
"pt": "HTTP/",
"pt-br": "HTTP/",
"pl": "HTTP/",
"sv": "HTTP/",
"ru": "HTTP/",
"tr": "HTTP/",
"xloc": [
"default.handlebars->47->1004",
"default.handlebars->47->1981"
@ -30810,6 +30863,8 @@
},
{
"en": "HTTP/{0} link",
"nl": "HTTP/{0} link",
"pl": "HTTP/{0} link",
"xloc": [
"default.handlebars->47->298"
]
@ -30892,6 +30947,23 @@
},
{
"en": "HTTPS/",
"nl": "HTTPS/",
"cs": "HTTPS/",
"es": "HTTPS/",
"de": "HTTPS/",
"da": "HTTPS/",
"fi": "HTTPS/",
"fr": "HTTPS/",
"hi": "HTTPS/",
"it": "HTTPS/",
"ja": "HTTPS/",
"ko": "HTTPS/",
"pt": "HTTPS/",
"pt-br": "HTTPS/",
"sv": "HTTPS/",
"ru": "HTTPS/",
"tr": "HTTPS/",
"pl": "HTTPS/",
"xloc": [
"default.handlebars->47->1005",
"default.handlebars->47->1982"
@ -30899,6 +30971,23 @@
},
{
"en": "HTTPS/{0}",
"nl": "HTTPS/{0}",
"pl": "HTTPS/{0}",
"cs": "HTTPS/{0}",
"es": "HTTPS/{0}",
"de": "HTTPS/{0}",
"da": "HTTPS/{0}",
"fi": "HTTPS/{0}",
"fr": "HTTPS/{0}",
"hi": "HTTPS/{0}",
"it": "HTTPS/{0}",
"ja": "HTTPS/{0}",
"ko": "HTTPS/{0}",
"pt": "HTTPS/{0}",
"pt-br": "HTTPS/{0}",
"sv": "HTTPS/{0}",
"ru": "HTTPS/{0}",
"tr": "HTTPS/{0}",
"xloc": [
"default.handlebars->47->299"
]
@ -31283,6 +31372,8 @@
},
{
"en": "Help requests",
"nl": "Hulpverzoeken",
"pl": "Prośby pomocy",
"xloc": [
"default.handlebars->47->1027",
"default.handlebars->47->2179"
@ -31862,6 +31953,7 @@
{
"en": "IP location information records",
"nl": "IP locatiegegevens vermeldingen",
"pl": "Zapisy o informacji lokalizacji IP",
"xloc": [
"default.handlebars->47->2908"
]
@ -33897,6 +33989,8 @@
},
{
"en": "Intel® AMT Power on to BIOS",
"nl": "Intel® AMT opstarten naar de BIOS",
"pl": "Intel® AMT Uruchom do BIOS",
"xloc": [
"default.handlebars->47->1145"
]
@ -33956,6 +34050,8 @@
},
{
"en": "Intel® AMT Reset to BIOS",
"nl": "Intel® AMT reset naar de BIOS",
"pl": "Intel® AMT Resetuj do BIOS",
"xloc": [
"default.handlebars->47->1144"
]
@ -37353,6 +37449,7 @@
{
"en": "Last connection time records",
"nl": "Laatste verbindingstijd vermeldingen",
"pl": "Zapisy czasu ostatnich połączeń",
"xloc": [
"default.handlebars->47->2912"
]
@ -44056,6 +44153,7 @@
{
"en": "Network interface information records",
"nl": "Netwerkinterface informatie vermeldingen",
"pl": "Zapisy informacji o interfejsach sieciowych",
"xloc": [
"default.handlebars->47->2910"
]
@ -49467,6 +49565,8 @@
},
{
"en": "Perform Intel® AMT power on to BIOS?",
"nl": "Perform Intel® AMT opstarten naar de BIOS?",
"pl": "Czy wykonać Intel® AMT uruchomienie do BIOS?",
"xloc": [
"default.handlebars->47->1168"
]
@ -49499,6 +49599,8 @@
},
{
"en": "Perform Intel® AMT reset to BIOS?",
"nl": "Perform Intel® AMT resetten naar de BIOS?",
"pl": "Czy wykonać Intel® AMT resetowanie do BIOS?",
"xloc": [
"default.handlebars->47->1170"
]
@ -50327,6 +50429,8 @@
},
{
"en": "Port",
"nl": "Poort",
"pl": "Port",
"xloc": [
"default.handlebars->47->1126",
"default.handlebars->47->1127"
@ -55531,12 +55635,16 @@
},
{
"en": "Request:",
"nl": "Verzoek:",
"pl": "Prośba:",
"xloc": [
"device-help.html->2->5"
]
},
{
"en": "Request: \"[[[HELPREQUEST]]]\"",
"nl": "Verzoek: \"[[[HELPREQUEST]]]\"",
"pl": "Prośba: \"[[[HELPREQUEST]]]\"",
"xloc": [
"device-help.txt"
]
@ -56412,6 +56520,7 @@
{
"en": "Run",
"nL": "Uitvoeren",
"pl": "Wykonaj",
"xloc": [
"default.handlebars->47->924"
]
@ -56471,6 +56580,7 @@
{
"en": "Run a script on this computer",
"nl": "Voer een script uit op deze computer",
"pl": "Wykonaj skrypt na tym komputerze",
"xloc": [
"default.handlebars->container->column_l->p11->deskarea0->deskarea4->1"
]
@ -60000,6 +60110,7 @@
{
"en": "Server is unable to get recordings from the database.",
"nl": "Server kan geen opnamen uit de database halen.",
"pl": "Serwer nie może pobrać zapisów z bazy danych.",
"xloc": [
"default.handlebars->47->2797"
]
@ -60007,6 +60118,7 @@
{
"en": "Server is unable to read from the recordings folder.",
"nl": "Server kan niet lezen uit de opnamemap.",
"pl": "Serwer nie może odczytać zapisów z folderu.",
"xloc": [
"default.handlebars->47->2796"
]
@ -60014,6 +60126,7 @@
{
"en": "Server statistics records",
"nl": "Server statistieken vermeldingen",
"pl": "Zapisy statystyk serwera",
"xloc": [
"default.handlebars->47->2915"
]
@ -65584,6 +65697,7 @@
{
"en": "Text notes records",
"nl": "Tekst notities vermeldingen",
"pl": "Zapisy notatek tekstowych",
"xloc": [
"default.handlebars->47->2909"
]
@ -65962,6 +66076,8 @@
},
{
"en": "This NodeJS version does not support OpenID.",
"nl": "Deze NodeJS-versie ondersteunt OpenID niet.",
"pl": "Obecna wersja NodeJS nie wspiera OpenID.",
"xloc": [
"default.handlebars->47->107"
]
@ -68753,6 +68869,7 @@
{
"en": "Unable to load agent icon file: {0}.",
"nl": "Kan agent pictogram bestand niet laden: {0}.",
"pl": "Nie moge załadować pliku ikony agenta: {0}.",
"xloc": [
"default.handlebars->47->105"
]
@ -68760,6 +68877,7 @@
{
"en": "Unable to load agent logo file: {0}.",
"nl": "Kan agent logo bestand niet laden: {0}.",
"pl": "Nie moge załadować pliku logo agenta: {0}.",
"xloc": [
"default.handlebars->47->106"
]
@ -70417,6 +70535,8 @@
},
{
"en": "User Authentication Log",
"nl": "Gebruikersauthenticatielogboek",
"pl": "Dziennik Autentykacji Użytkownika",
"xloc": [
"default.handlebars->47->3053"
]
@ -71117,6 +71237,7 @@
{
"en": "User group records",
"nl": "Gebruikersgroep vermeldingen",
"pl": "Zapisy grupy użytkownika",
"xloc": [
"default.handlebars->47->2916"
]
@ -71229,6 +71350,7 @@
{
"en": "User records",
"nl": "Gebruikers vermeldingen",
"pl": "Zapisy użytkownika",
"xloc": [
"default.handlebars->47->2906"
]
@ -71261,12 +71383,16 @@
},
{
"en": "User:",
"nl": "Gebruiker:",
"pl": "Użytkownik:",
"xloc": [
"device-help.html->2->5"
]
},
{
"en": "User: \"[[[HELPUSERNAME]]]\"",
"nl": "Gebruiker: \"[[[HELPUSERNAME]]]\"",
"pl": "Użytkownik: \"[[[HELPUSERNAME]]]\"",
"xloc": [
"device-help.txt"
]
@ -74984,6 +75110,8 @@
},
{
"en": "[[[DEVICENAME]]]",
"nl": "[[[DEVICENAME]]]",
"pl": "[[[DEVICENAME]]]",
"xloc": [
"device-help.html->2->3->1"
]
@ -75015,12 +75143,44 @@
},
{
"en": "[[[HELPREQUEST]]]",
"nl": "[[[HELPREQUEST]]]",
"pl": "[[[HELPREQUEST]]]",
"cs": "[[[HELPREQUEST]]]",
"de": "[[[HELPREQUEST]]]",
"es": "[[[HELPREQUEST]]]",
"fi": "[[[HELPREQUEST]]]",
"it": "[[[HELPREQUEST]]]",
"hi": "[[[HELPREQUEST]]]",
"fr": "[[[HELPREQUEST]]]",
"ja": "[[[HELPREQUEST]]]",
"ko": "[[[HELPREQUEST]]]",
"pt": "[[[HELPREQUEST]]]",
"pt-br": "[[[HELPREQUEST]]]",
"ru": "[[[HELPREQUEST]]]",
"sv": "[[[HELPREQUEST]]]",
"tr": "[[[HELPREQUEST]]]",
"xloc": [
"device-help.html->2->5->4"
]
},
{
"en": "[[[HELPUSERNAME]]]",
"nl": "[[[HELPUSERNAME]]]",
"pl": "[[[HELPUSERNAME]]]",
"cs": "[[[HELPUSERNAME]]]",
"de": "[[[HELPUSERNAME]]]",
"es": "[[[HELPUSERNAME]]]",
"fi": "[[[HELPUSERNAME]]]",
"it": "[[[HELPUSERNAME]]]",
"hi": "[[[HELPUSERNAME]]]",
"fr": "[[[HELPUSERNAME]]]",
"ja": "[[[HELPUSERNAME]]]",
"ko": "[[[HELPUSERNAME]]]",
"pt": "[[[HELPUSERNAME]]]",
"pt-br": "[[[HELPUSERNAME]]]",
"ru": "[[[HELPUSERNAME]]]",
"sv": "[[[HELPUSERNAME]]]",
"tr": "[[[HELPUSERNAME]]]",
"xloc": [
"device-help.html->2->5->1"
]
@ -75054,6 +75214,8 @@
},
{
"en": "[[[SERVERNAME]]] - \"[[[DEVICENAME]]]\" Help Request",
"nl": "[[[SERVERNAME]]] - \"[[[DEVICENAME]]]\" Verzoek om hulp",
"pl": "[[[SERVERNAME]]] - \"[[[DEVICENAME]]]\" Prośba Pomocy",
"xloc": [
"device-help.html->0"
]
@ -75165,6 +75327,8 @@
},
{
"en": "[[[SERVERNAME]]] - Device Help Request",
"nl": "[[[SERVERNAME]]] - Een verzoek om het apparaat te helpen",
"pl": "[[[SERVERNAME]]] - Prośba Pomocy Urządzenia",
"xloc": [
"device-help.txt"
]
@ -75224,6 +75388,8 @@
},
{
"en": "[[[SERVERNAME]]] - Help Request",
"nl": "[[[SERVERNAME]]] - Verzoek om hulp",
"pl": "[[[SERVERNAME]]] - Prośba Pomocy",
"xloc": [
"device-help.html->2->1->1->0->1->1"
]
@ -75282,6 +75448,8 @@
},
{
"en": "[[[SERVERURL]]]?viewmode=10&gotonode=[[[NODEID]]]",
"nl": "[[[SERVERURL]]]?viewmode=10&gotonode=[[[NODEID]]]",
"pl": "[[[SERVERURL]]]?viewmode=10&gotonode=[[[NODEID]]]",
"xloc": [
"device-help.txt"
]
@ -77501,6 +77669,8 @@
},
{
"en": "to navigate to this device.",
"nl": "naar dit apparaat navigeren.",
"pl": "by nawigować do tego urządzenia.",
"xloc": [
"device-help.html->2->7"
]
@ -79698,4 +79868,4 @@
]
}
]
}
}