MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-15 07:43:50 +00:00
Code Issues Releases Wiki Activity

Added support for fetching system proxy settings from gnome

Browse Source
This commit is contained in:
Bryan Roe
2019-08-12 11:27:15 -07:00
parent 7fa076a0cb
commit bc2ef6a3f4
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
meshcore/agentcore.c
View File

@@ -444,6 +444,16 @@ int MeshAgent_GetSystemProxy(MeshAgentHostContainer *agent, char *buffer, size_t
child.ret = child.stdout.str.trim().split('\\n')[0].split('//')[1];\
if(child.ret != '') { return(child.ret); }\
}\
if (require('fs').existsSync('/usr/bin/gsettings'))\
{\
var setting;\
var ids = require('user-sessions').loginUids(); \
for (var i in ids)\
{\
setting = require('linux-gnome-helpers').getProxySettings(ids[i]);\
if (setting.mode == 'manual') { return(setting.host + ':' + setting.port);} \
}\
}\
throw('No Proxy set');\
})();";
#endif

14
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long

10
modules/user-sessions.js
View File

@@ -554,6 +554,16 @@ function UserSessions()
}
return (ret);
}
this.loginUids = function loginUids()
{
var min = this.minUid();
var child = require('child_process').execFile('/bin/sh', ['sh']);
child.stderr.str = ''; child.stderr.on('data', function (chunk) { this.str += chunk.toString(); });
child.stdout.str = ''; child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
child.stdin.write('getent passwd | awk -F: \'{ if($3 >= ' + min + ') { a=split($7,b,"/"); if(b[a]!="nologin") { print $3; } }}\' | tr "\\n" "\\," | awk \'{ printf "[%s]", $0; }\'\nexit\n');
child.waitExit();
return (JSON.parse(child.stdout.str.trim().replace(',]',']')));
}
this.consoleUid = function consoleUid()
{
var child = require('child_process').execFile('/bin/sh', ['sh']);