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

Updated agent installer on windows to show firewall enumeration progress, and to utilize the asynchronous api, so the installer doesn't appear non-responsive if it takes a long time. Also added a timeout, so installation will continue if it takes too long

Browse Source
This commit is contained in:
Bryan Roe
2022-04-24 23:22:14 -07:00
parent bae07c6be7
commit a0cd3e3587
3 changed files with 55 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long

22
modules/agent-installer.js
View File

@@ -503,19 +503,21 @@ function serviceExists(loc, params)
process.stdout.write(' [FOUND: ' + loc + ']\n');
if(process.platform == 'win32')
{
process.stdout.write(' -> Checking firewall rules for previous installation...');
if(require('win-firewall').removeFirewallRule({ program: loc }))
process.stdout.write(' -> Checking firewall rules for previous installation... [0%]');
var p = require('win-firewall').getFirewallRulesAsync({ program: loc, noResult: true, minimal: true, timeout: 15000 });
p.on('progress', function (c)
{
// SUCCESS
process.stdout.write(' [DELETED]\n');
uninstallService(params);
}
else
process.stdout.write('\r -> Checking firewall rules for previous installation... [' + c + ']');
});
p.on('rule', function (r)
{
// FAILED
process.stdout.write(' [No Rules Found]\n');
require('win-firewall').removeFirewallRule(r.DisplayName);
});
p.finally(function ()
{
process.stdout.write('\r -> Checking firewall rules for previous installation... [DONE]\n');
uninstallService(params);
}
});
}
else
{

42
modules/win-firewall.js
View File

@@ -378,6 +378,45 @@ function getFirewallRulesAsync2(p)
p.resolve(p.options.noResult === true ? null : p.arr);
}
}
function getRulesCount2(options)
{
if (options == null) { options = {} };
var promise = require('promise');
var unknown = GM.CreatePointer();
var ret = new promise(promise.defaultInit);
ret.NetFwPolicy2 = require('win-com').createInstance(require('win-com').CLSIDFromString(CLSID_NetFwPolicy2), require('win-com').IID_IUnknown);
ret.NetFwPolicy2.funcs = require('win-com').marshalFunctions(ret.NetFwPolicy2, FirewallFunctions);
ret.rules = GM.CreatePointer();
ret.enumerator = GM.CreatePointer();
ret.vvar = GM.CreateVariable(GM.PointerSize == 8 ? 24 : 16);
ret.fetched = GM.CreateVariable(4);
ret.options = options;
ret.val = GM.CreatePointer();
ret.arr = [];
ret.counter = 0;
ret.evented = false;
require('events').EventEmitter.call(ret, true)
.createEvent('progress')
.createEvent('rule');
ret.NetFwPolicy2.funcs.get_Rules(ret.NetFwPolicy2, ret.rules).Val;
ret.rules.funcs = require('win-com').marshalFunctions(ret.rules.Deref(), RulesFunctions);
ret.__count = GM.CreateVariable(4);
ret.rules.funcs.get_Count._spawnThread = true;
ret.__countobj = ret.rules.funcs.get_Count(ret.rules.Deref(), ret.__count);
ret.__countobj.ret = ret;
ret.__countobj.once('done', function (r)
{
var result = this.ret.__count.toBuffer().readUInt32LE()
this.ret.NetFwPolicy2.funcs.Release(this.ret.NetFwPolicy2);
this.ret.resolve(result);
});
ret.timeout = setTimeout(function (r) { r.reject(); }, 5000, ret);
return (ret);
}
function getFirewallRulesAsync(options)
{
if (options == null) { options = {} };
@@ -410,6 +449,7 @@ function getFirewallRulesAsync(options)
var count = GM.CreateVariable(4);
ret.rules.funcs.get_Count(ret.rules.Deref(), count).Val;
ret.count = count.toBuffer().readInt32LE();
ret.startTime = Date.now();
setImmediate(getFirewallRulesAsync2, ret);
@@ -440,7 +480,6 @@ function getFirewallRules(options)
var count = GM.CreateVariable(4);
hr = rules.funcs.get_Count(rules.Deref(), count).Val;
console.info1('Number of Rules: ' + count.toBuffer().readInt32LE());
if (options && options.count === true)
@@ -649,6 +688,7 @@ function addFirewallRule(rule)
module.exports =
{
getRulesCount: getRulesCount,
getRulesCount2: getRulesCount2,
getFirewallRules: getFirewallRules,
getFirewallRulesAsync: getFirewallRulesAsync,
disableFirewallRules: disableFirewallRules,