mirror of
https://github.com/Ylianst/MeshCentral.git
synced 2024-11-30 03:16:12 +03:00
Merge branch 'master' of https://github.com/Ylianst/MeshCentral
This commit is contained in:
Ylian Saint-Hilaire
commit
da33f1dfb1
@ -2736,7 +2736,7 @@ function processConsoleCommand(cmd, args, rights, sessionid) {
|
||||
var response = null;
|
||||
switch (cmd) {
|
||||
case 'help': { // Displays available commands
|
||||
var fin = '', f = '', availcommands = 'agentupdate,msh,timerinfo,coreinfo,coredump,service,fdsnapshot,fdcount,startupoptions,alert,agentsize,versions,help,info,osinfo,args,print,type,dbkeys,dbget,dbset,dbcompact,eval,parseuri,httpget,wslist,plugin,wsconnect,wssend,wsclose,notify,ls,ps,kill,netinfo,location,power,wakeonlan,setdebug,smbios,rawsmbios,toast,lock,users,openurl,getscript,getclip,setclip,log,av,cpuinfo,sysinfo,apf,scanwifi,wallpaper,agentmsg';
|
||||
var fin = '', f = '', availcommands = 'agentupdate,errorlog,msh,timerinfo,coreinfo,coredump,service,fdsnapshot,fdcount,startupoptions,alert,agentsize,versions,help,info,osinfo,args,print,type,dbkeys,dbget,dbset,dbcompact,eval,parseuri,httpget,wslist,plugin,wsconnect,wssend,wsclose,notify,ls,ps,kill,netinfo,location,power,wakeonlan,setdebug,smbios,rawsmbios,toast,lock,users,openurl,getscript,getclip,setclip,log,av,cpuinfo,sysinfo,apf,scanwifi,wallpaper,agentmsg';
|
||||
if (require('os').dns != null) { availcommands += ',dnsinfo'; }
|
||||
if (process.platform == 'win32') { availcommands += ',safemode,wpfhwacceleration,uac'; }
|
||||
if (amt != null) { availcommands += ',amt,amtconfig,amtevents'; }
|
||||
@ -2764,6 +2764,22 @@ function processConsoleCommand(cmd, args, rights, sessionid) {
|
||||
agentUpdate_Start(null, { sessionid: sessionid });
|
||||
}
|
||||
break;
|
||||
case 'errorlog':
|
||||
switch(args['_'].length)
|
||||
{
|
||||
case 0:
|
||||
// All Error Logs
|
||||
response = JSON.stringify(require('util-agentlog').read(), null, 1);
|
||||
break;
|
||||
case 1:
|
||||
// Error Logs, by either count or timestamp
|
||||
response = JSON.stringify(require('util-agentlog').read(parseInt(args['_'][0])), null, 1);
|
||||
break;
|
||||
default:
|
||||
response = "Proper usage:\r\n errorlog [lastCount|linuxEpoch]";
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case 'msh':
|
||||
response = JSON.stringify(_MSH(), null, 2);
|
||||
break;
|
||||
|
||||
179
agents/modules_meshcore/util-agentlog.js
Normal file
179
agents/modules_meshcore/util-agentlog.js
Normal file
@ -0,0 +1,179 @@
|
||||
/*
|
||||
Copyright 2021 Intel Corporation
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
|
||||
function parseLine(entry)
|
||||
{
|
||||
var test = entry.match(/^\[.*M\]/);
|
||||
if (test == null)
|
||||
{
|
||||
test = entry.match(/\[.+ => .+:[0-9]+\]/);
|
||||
if (test != null)
|
||||
{
|
||||
// Windows Crash Entry
|
||||
var file = test[0].substring(1).match(/(?!.+ ).+(?=:)/);
|
||||
var line = test[0].match(/(?!:)[0-9]+(?=\]$)/);
|
||||
var fn = test[0].match(/(?!\[).+(?= =>)/);
|
||||
|
||||
if (file != null) { this.results.peek().f = file[0].trim(); }
|
||||
if (line != null) { this.results.peek().l = line[0]; }
|
||||
if (fn != null) { this.results.peek().fn = fn[0]; }
|
||||
}
|
||||
else
|
||||
{
|
||||
test = entry.match(/^[\.\/].+\(\) \[0x[0-9a-fA-F]+\]$/);
|
||||
if (test != null)
|
||||
{
|
||||
// Linux Crash Stack with no symbols
|
||||
test = test[0].match(/(?!\[)0x[0-9a-fA-F]+(?=\]$)/);
|
||||
if (test != null)
|
||||
{
|
||||
if (this.results.peek().sx == null) { this.results.peek().sx = []; }
|
||||
this.results.peek().sx.unshift(test[0]);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
test = entry.match(/^\[.+_[0-9a-fA-F]{16}\]$/);
|
||||
if(test!=null)
|
||||
{
|
||||
// Linux Crash ID
|
||||
test = test[0].match(/(?!_)[0-9a-fA-F]{16}(?=\]$)/);
|
||||
this.results.peek().h = test[0];
|
||||
}
|
||||
}
|
||||
|
||||
test = entry.match(/(?!^=>)\/+.+:[0-9]+$/);
|
||||
if(test!=null)
|
||||
{
|
||||
// Linux Crash Entry
|
||||
if (this.results.peek().s == null) { this.results.peek().s = []; }
|
||||
this.results.peek().s.unshift(test[0]);
|
||||
}
|
||||
|
||||
}
|
||||
return;
|
||||
}
|
||||
test = test[0];
|
||||
|
||||
var dd = test.substring(1, test.length -1);
|
||||
var c = dd.split(' ');
|
||||
var t = c[1].split(':');
|
||||
if (c[2] == 'PM') { t[0] = parseInt(t[0]) + 12; if (t[0] == 24) { t[0] = 0; } }
|
||||
|
||||
var d = Date.parse(c[0] + 'T' + t.join(':'));
|
||||
var msg = entry.substring(test.length).trim();
|
||||
var hash = msg.match(/^\[[0-9a-fA-F]{16}\]/);
|
||||
if (hash != null)
|
||||
{
|
||||
hash = hash[0].substring(1, hash[0].length - 1);
|
||||
msg = msg.substring(hash.length + 2).trim();
|
||||
}
|
||||
else
|
||||
{
|
||||
hash = msg.match(/^\[\]/);
|
||||
if(hash!=null)
|
||||
{
|
||||
msg = msg.substring(2).trim();
|
||||
hash = null;
|
||||
}
|
||||
}
|
||||
|
||||
var log = { t: Math.floor(d / 1000), m: msg };
|
||||
if (hash != null) { log.h = hash; }
|
||||
|
||||
// Check for File/Line in generic log entry
|
||||
test = msg.match(/^.+:[0-9]+ \([0-9]+,[0-9]+\)/);
|
||||
if (test != null)
|
||||
{
|
||||
log.m = log.m.substring(test[0].length).trim();
|
||||
log.f = test[0].match(/^.+(?=:[0-9]+)/)[0];
|
||||
log.l = test[0].match(/(?!:)[0-9]+(?= \([0-9]+,[0-9]+\)$)/)[0];
|
||||
}
|
||||
|
||||
this.results.push(log);
|
||||
}
|
||||
|
||||
function readLog_data(buffer)
|
||||
{
|
||||
var lines = buffer.toString().split('\n');
|
||||
while(lines.length > 0)
|
||||
{
|
||||
parseLine.call(this, lines.shift());
|
||||
}
|
||||
}
|
||||
|
||||
function readLogEx(path)
|
||||
{
|
||||
var ret = [];
|
||||
try
|
||||
{
|
||||
var s = require('fs').createReadStream(path);
|
||||
s.results = ret;
|
||||
s.on('data', readLog_data);
|
||||
s.resume();
|
||||
s.removeAllListeners('data');
|
||||
s = null;
|
||||
}
|
||||
catch(z)
|
||||
{
|
||||
}
|
||||
|
||||
return (ret);
|
||||
}
|
||||
|
||||
function readLog(criteria, path)
|
||||
{
|
||||
var objects = readLogEx(path == null ? (process.execPath.split('.exe').join('') + '.log') : path);
|
||||
var ret = [];
|
||||
|
||||
if (typeof (criteria) == 'string')
|
||||
{
|
||||
try
|
||||
{
|
||||
var dstring = Date.parse(criteria);
|
||||
criteria = Math.floor(dstring / 1000);
|
||||
}
|
||||
catch(z)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
if (typeof (criteria) == 'number')
|
||||
{
|
||||
if(criteria < 1000)
|
||||
{
|
||||
// Return the last xxx entries
|
||||
ret = objects.slice(objects.length - ((criteria > objects.length) ? objects.length : criteria));
|
||||
}
|
||||
else
|
||||
{
|
||||
// Return entries that are newer than xxx
|
||||
var i;
|
||||
for (i = 0; i < objects.length && objects[i].t <= criteria; ++i) { }
|
||||
ret = objects.slice(i);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
ret = objects;
|
||||
}
|
||||
|
||||
return (ret);
|
||||
}
|
||||
|
||||
module.exports = { read: readLog, readEx: readLogEx }
|
||||
|
||||
Loading…
Reference in New Issue
Block a user