MyFavMirrors
/
MeshCentral
mirror of https://github.com/Ylianst/MeshCentral.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for invalid amtactivation.log parsing.

This commit is contained in:
Ylian Saint-Hilaire 2021-10-12 22:36:41 -07:00
parent 7e0e790e39
commit 0240d1a651
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
meshcentral.js
View File

@ -2851,16 +2851,19 @@ function CreateMeshCentralServer(config, args) {
obj.fs.readFile(amtlogfilename, 'utf8', function (err, data) {
var amtPasswords = {}; // UUID --> [Passwords]
if ((err == null) && (data != null)) {
const lines = data.split('\r\n');
const lines = data.split('\r\n').join('\n').split('\n');
for (var i in lines) {
var line = lines[i];
if (line.startsWith('{')) {
var j = JSON.parse(line);
if ((typeof j.amtUuid == 'string') && (typeof j.password == 'string')) {
if (amtPasswords[j.amtUuid] == null) {
amtPasswords[j.amtUuid] = [j.password]; // Add password to array
} else {
amtPasswords[j.amtUuid].unshift(j.password); // Add password at the start of the array
var j = null;
try { j = JSON.parse(line); } catch (ex) { }
if ((j != null) && (typeof j == 'object')) {
if ((typeof j.amtUuid == 'string') && (typeof j.password == 'string')) {
if (amtPasswords[j.amtUuid] == null) {
amtPasswords[j.amtUuid] = [j.password]; // Add password to array
} else {
amtPasswords[j.amtUuid].unshift(j.password); // Add password at the start of the array
}
}
}
}