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

Updated toaster on windows to support multiple TSIDs

Browse Source
This commit is contained in:
Bryan Roe
2019-12-09 12:47:51 -08:00
parent 09666e0bc8
commit 0e3280a5da
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long

28
modules/toaster.js
View File

@@ -41,7 +41,7 @@ if (process.platform == 'linux' || process.platform == 'darwin' || process.platf
function Toaster() function Toaster()
{ {
this._ObjectID = 'toaster'; this._ObjectID = 'toaster';
this.Toast = function Toast(title, caption) this.Toast = function Toast(title, caption, tsid)
{ {
var retVal = new promise(function (res, rej) { this._res = res; this._rej = rej; }); var retVal = new promise(function (res, rej) { this._res = res; this._rej = rej; });
retVal.title = title; retVal.title = title;
@@ -51,10 +51,7 @@ function Toaster()
{ {
case 'win32': case 'win32':
{ {
var GM = require('_GenericMarshal'); var id = require('user-sessions').getProcessOwnerName(process.pid).tsid;
var kernel32 = GM.CreateNativeProxy('kernel32.dll');
kernel32.CreateMethod('ProcessIdToSessionId');
var psid = GM.CreateVariable(4);
var consoleUid = 0; var consoleUid = 0;
try try
{ {
@@ -65,21 +62,26 @@ function Toaster()
retVal._rej('Cannot display user notification when a user is not logged in'); retVal._rej('Cannot display user notification when a user is not logged in');
return (retVal); return (retVal);
} }
if (kernel32.ProcessIdToSessionId(process.pid, psid).Val == 0)
{
retVal._rej('internal error'); return (retVal);
}
if (consoleUid == psid.toBuffer().readUInt32LE())
if (id != 0)
{ {
// We are running on the physical console // We are running as user
if(tsid != null && tsid != id)
{
// If we aren't LocalSystem, we cannot spawn as a different user
retVal._rej('Cannot display user notification to TSID: ' + tsid + ' from TSID: ' + id);
return (retVal);
}
retVal._child = require('ScriptContainer').Create({ processIsolation: true }); retVal._child = require('ScriptContainer').Create({ processIsolation: true });
} }
else else
{ {
// We need so spawn the ScriptContainer into the correct session // We are running as LocalSystem
retVal._child = require('ScriptContainer').Create({ processIsolation: true, sessionId: consoleUid }); if (tsid == null) { tsid = consoleUid; }
retVal._child = require('ScriptContainer').Create({ processIsolation: true, sessionId: tsid });
} }
retVal._child.parent = retVal; retVal._child.parent = retVal;
retVal._child.on('exit', function (code) { this.parent._res('DISMISSED'); }); retVal._child.on('exit', function (code) { this.parent._res('DISMISSED'); });
retVal._child.addModule('win-console', getJSModule('win-console')); retVal._child.addModule('win-console', getJSModule('win-console'));