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

Synced with Agent Repo

Browse Source 
1. Capped smbios to 64k
2. Removed commented out code from win-console.js
3. Updated win-terminal to check for null before pushing
This commit is contained in:
Bryan Roe 2020-04-06 17:21:19 -07:00
parent b6f9a422d7
commit b93ba8ccdd
3 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agents/modules_meshcore/smbios.js
View File

@ -191,6 +191,12 @@ function SMBiosTables()
catch(e) catch(e)
{ {
} }
try
{
if (JSON.stringify(r).length > 65535) { r = {}; }
}
catch(ee)
{}
return r; return r;
} }
this.processorInfo = function processorInfo(data) { this.processorInfo = function processorInfo(data) {

1
agents/modules_meshcore/win-console.js
View File

@ -145,7 +145,6 @@ function WindowsConsole()
this.TrayIcon.remove(); this.TrayIcon.remove();
handled = true; handled = true;
} }
//if (!handled) { console.log(msg); }
} }
}); });
retVal.remove = function remove() retVal.remove = function remove()

38
agents/modules_meshcore/win-terminal.js
View File

@ -401,7 +401,8 @@ function windows_terminal() {
} }
} }
} }
this._WriteCharacter = function (key, bControlKey) { this._WriteCharacter = function (key, bControlKey)
{
var rec = GM.CreateVariable(20); var rec = GM.CreateVariable(20);
rec.Deref(0, 2).toBuffer().writeUInt16LE(KEY_EVENT); // rec.EventType rec.Deref(0, 2).toBuffer().writeUInt16LE(KEY_EVENT); // rec.EventType
rec.Deref(4, 4).toBuffer().writeUInt16LE(1); // rec.Event.KeyEvent.bKeyDown rec.Deref(4, 4).toBuffer().writeUInt16LE(1); // rec.Event.KeyEvent.bKeyDown
@ -410,10 +411,10 @@ function windows_terminal() {
rec.Deref(8, 2).toBuffer().writeUInt16LE(1); // rec.Event.KeyEvent.wRepeatCount rec.Deref(8, 2).toBuffer().writeUInt16LE(1); // rec.Event.KeyEvent.wRepeatCount
rec.Deref(10, 2).toBuffer().writeUInt16LE(this._user32.VkKeyScanA(key).Val); // rec.Event.KeyEvent.wVirtualKeyCode rec.Deref(10, 2).toBuffer().writeUInt16LE(this._user32.VkKeyScanA(key).Val); // rec.Event.KeyEvent.wVirtualKeyCode
rec.Deref(12, 2).toBuffer().writeUInt16LE(this._user32.MapVirtualKeyA(this._user32.VkKeyScanA(key).Val, MAPVK_VK_TO_VSC).Val); rec.Deref(12, 2).toBuffer().writeUInt16LE(this._user32.MapVirtualKeyA(this._user32.VkKeyScanA(key).Val, MAPVK_VK_TO_VSC).Val);
var dwWritten = GM.CreateVariable(4); var dwWritten = GM.CreateVariable(4);
if (this._kernel32.WriteConsoleInputA(this._stdinput, rec, 1, dwWritten).Val == 0) { return (false); } if (this._kernel32.WriteConsoleInputA(this._stdinput, rec, 1, dwWritten).Val == 0) { return (false); }
rec.Deref(4, 4).toBuffer().writeUInt16LE(0); // rec.Event.KeyEvent.bKeyDown rec.Deref(4, 4).toBuffer().writeUInt16LE(0); // rec.Event.KeyEvent.bKeyDown
return (this._kernel32.WriteConsoleInputA(this._stdinput, rec, 1, dwWritten).Val != 0); return (this._kernel32.WriteConsoleInputA(this._stdinput, rec, 1, dwWritten).Val != 0);
} }
@ -478,23 +479,28 @@ function windows_terminal() {
return (retVal); return (retVal);
} }
this._SendDataBuffer = function (data) { this._SendDataBuffer = function (data)
{
// { data, attributes, width, height, x, y } // { data, attributes, width, height, x, y }
if (this._stream != null)
var dy, line, attr; {
for (dy = 0; dy < data.height; ++dy) { var dy, line, attr;
line = data.data[dy]; for (dy = 0; dy < data.height; ++dy)
attr = data.attributes[dy]; {
line.s = line.toString(); line = data.data[dy];
attr = data.attributes[dy];
//line = data.data.slice(data.width * dy, (data.width * dy) + data.width); line.s = line.toString();
//attr = data.attributes.slice(data.width * dy, (data.width * dy) + data.width);
this._stream.push(TranslateLine(data.x + 1, data.y + dy + 1, line, attr)); //line = data.data.slice(data.width * dy, (data.width * dy) + data.width);
//attr = data.attributes.slice(data.width * dy, (data.width * dy) + data.width);
this._stream.push(TranslateLine(data.x + 1, data.y + dy + 1, line, attr));
}
} }
} }
this._SendScroll = function _SendScroll(dx, dy) { this._SendScroll = function _SendScroll(dx, dy)
if (this._scrollTimer) { return; } {
if (this._scrollTimer || this._stream == null) { return; }
var info = GM.CreateVariable(22); var info = GM.CreateVariable(22);
if (this._kernel32.GetConsoleScreenBufferInfo(this._stdoutput, info).Val == 0) { throw ('Error getting screen buffer info'); } if (this._kernel32.GetConsoleScreenBufferInfo(this._stdoutput, info).Val == 0) { throw ('Error getting screen buffer info'); }