MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-06 00:13:33 +00:00
Code Issues Releases Wiki Activity

Fixed bug when user specified with quotes, causing failover from win-task to SCHTASKS. Also fixed referencing issue that caused delayed GC when using SCHTASKS

Browse Source
This commit is contained in:
Bryan Roe
2022-08-21 10:54:41 -07:00
parent 8b49af30be
commit 7905caa745
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long

13
modules/win-dispatcher.js
View File

@@ -129,12 +129,16 @@ function dispatch(options)
} }
else else
{ {
var tokens = options.user.split('\\'); var u = options.user;
if (u[0] == '"') { u = u.substring(1, u.length - 1); }
var tokens = u.split('\\');
if(tokens.length!=2) { throw('invalid user format');} if(tokens.length!=2) { throw('invalid user format');}
user = tokens[1]; user = tokens[1];
domain = tokens[0]; domain = tokens[0];
} }
console.info1('user- ' + user, 'domain- ' + domain);
var task = { name: 'MeshUserTask', user: user, domain: domain, execPath: process.execPath, arguments: ['-b64exec ' + str] }; var task = { name: 'MeshUserTask', user: user, domain: domain, execPath: process.execPath, arguments: ['-b64exec ' + str] };
require('win-tasks').addTask(task); require('win-tasks').addTask(task);
require('win-tasks').getTask({ name: 'MeshUserTask' }).run(); require('win-tasks').getTask({ name: 'MeshUserTask' }).run();
@@ -146,6 +150,8 @@ function dispatch(options)
console.info1(xx); console.info1(xx);
} }
console.info1('Using SCHTASKS...');
var taskoptions = { env: { _target: process.execPath, _args: '-b64exec ' + str, _user: '"' + options.user + '"' } }; var taskoptions = { env: { _target: process.execPath, _args: '-b64exec ' + str, _user: '"' + options.user + '"' } };
for (var c1e in process.env) for (var c1e in process.env)
{ {
@@ -153,8 +159,8 @@ function dispatch(options)
} }
var child = require('child_process').execFile(process.env['windir'] + '\\System32\\WindowsPowerShell\\v1.0\\powershell.exe', ['powershell', '-noprofile', '-nologo', '-command', '-'], taskoptions); var child = require('child_process').execFile(process.env['windir'] + '\\System32\\WindowsPowerShell\\v1.0\\powershell.exe', ['powershell', '-noprofile', '-nologo', '-command', '-'], taskoptions);
child.stderr.on('data', function (c) { }); child.stderr.on('data', empty_func2);
child.stdout.on('data', function (c) { }); child.stdout.on('data', empty_func2);
child.stdin.write('SCHTASKS /CREATE /F /TN MeshUserTask /SC ONCE /ST 00:00 '); child.stdin.write('SCHTASKS /CREATE /F /TN MeshUserTask /SC ONCE /ST 00:00 ');
if (options.user) if (options.user)
{ {
@@ -184,7 +190,6 @@ function dispatch(options)
child.stdin.write('SCHTASKS /DELETE /F /TN MeshUserTask\r\nexit\r\n'); child.stdin.write('SCHTASKS /DELETE /F /TN MeshUserTask\r\nexit\r\n');
child.waitExit(); child.waitExit();
return (ret); return (ret);
} }