MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2026-01-07 11:03:55 +00:00
Code Issues Releases Wiki Activity

1. Updated win-dispatcher to support dispatching to current user

Browse Source 
2. Updated win-virtual-terminal.js to correctly use ClosePseudoConsole()
This commit is contained in:
Bryan Roe
2020-01-07 14:49:33 -08:00
parent 65f3fd5910
commit 36d1362deb
3 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/win-dispatcher.js
View File

@@ -17,7 +17,7 @@ limitations under the License.
function dispatch(options)
{
if (!options || !options.user || !options.modules || !options.launch || !options.launch.module || !options.launch.method || !options.launch.args) { throw ('Invalid Parameters'); }
if (!options || !options.modules || !options.launch || !options.launch.module || !options.launch.method || !options.launch.args) { throw ('Invalid Parameters'); }
var ipcInteger
var ret = { options: options };
@@ -63,14 +63,24 @@ function dispatch(options)
this.parent.emit('connection', s);
});
var child = require('child_process').execFile(process.env['windir'] + '\\system32\\cmd.exe', ['cmd']);
child.stderr.on('data', function (c) { });
child.stdout.on('data', function (c) { });
child.stdin.write('SCHTASKS /CREATE /F /TN MeshUserTask /SC ONCE /ST 00:00 /RU ' + options.user + ' /TR "' + process.execPath + ' -b64exec ' + str + '"\r\n');
if (options.user)
{
child.stdin.write('SCHTASKS /CREATE /F /TN MeshUserTask /SC ONCE /ST 00:00 /RU ' + options.user + ' /TR "' + process.execPath + ' -b64exec ' + str + '"\r\n');
}
else
{
child.stdin.write('SCHTASKS /CREATE /F /TN MeshUserTask /SC ONCE /ST 00:00 /TR "' + process.execPath + ' -b64exec ' + str + '"\r\n');
}
child.stdin.write('SCHTASKS /RUN /TN MeshUserTask\r\n');
child.stdin.write('SCHTASKS /DELETE /F /TN MeshUserTask\r\n');
child.stdin.write('exit\r\n');
child.waitExit();
return (ret);
}

30
modules/win-virtual-terminal.js
View File

@@ -47,9 +47,12 @@ function vt()
var GM = require('_GenericMarshal');
var k32 = GM.CreateNativeProxy('kernel32.dll');
k32.CreateMethod('CancelIoEx');
k32.CreateMethod('CreatePipe');
k32.CreateMethod('CreateProcessW');
k32.CreateMethod('CreatePseudoConsole');
k32.CreateMethod('CloseHandle');
k32.CreateMethod('ClosePseudoConsole');
k32.CreateMethod('GetProcessHeap');
k32.CreateMethod('HeapAlloc');
k32.CreateMethod('InitializeProcThreadAttributeList');
@@ -101,16 +104,34 @@ function vt()
{
if (this.terminal._process)
{
this.terminal.k32.TerminateProcess(this.terminal._process, 0);
this.terminal._process = null;
this.terminal.k32.ReadFile.async.abort();
k32.ClosePseudoConsole(this._obj._h.Deref());
}
flush();
}
});
ds._obj = ret;
ret._waiter = require('DescriptorEvents').addDescriptor(pi.Deref(0));
ret._waiter.ds = ds;
ret._waiter.on('signaled', function () { this.ds.push(null); });
ret._waiter._obj = ret;
ret._waiter.on('signaled', function ()
{
k32.CancelIoEx(this._obj._output.Deref(), 0);
// Child process has exited
this.ds.push(null);
if (this._obj._process)
{
this._obj._process = null;
k32.ClosePseudoConsole(this._obj._h.Deref());
}
k32.CloseHandle(this._obj._input.Deref());
k32.CloseHandle(this._obj._output.Deref());
k32.CloseHandle(this._obj._consoleInput.Deref());
k32.CloseHandle(this._obj._consoleOutput.Deref());
});
ds.terminal = ret;
ds._rpbuf = GM.CreateVariable(4096);
@@ -121,6 +142,8 @@ function vt()
this._rp.then(function ()
{
var len = this.parent._rpbufRead.toBuffer().readUInt32LE();
if (len <= 0) { return; }
this.parent.push(this.parent._rpbuf.toBuffer().slice(0, len));
this.parent.__read();
});
@@ -131,7 +154,6 @@ function vt()
}
else
{
console.log('FAILED!');
}
}