From 89cafa3ba4fb5e19f2ec963397b749dff898f584 Mon Sep 17 00:00:00 2001 From: Bryan Roe Date: Wed, 13 May 2020 15:44:45 -0700 Subject: [PATCH] Updated linux proxy detetion logic --- meshcore/agentcore.c | 36 +---------- microscript/ILibDuktape_Polyfills.c | 2 +- modules/proxy-helper.js | 92 ++++++++++++++++++++++++++++- 3 files changed, 93 insertions(+), 37 deletions(-) diff --git a/meshcore/agentcore.c b/meshcore/agentcore.c index 391cfdf..9a9b5c2 100644 --- a/meshcore/agentcore.c +++ b/meshcore/agentcore.c @@ -432,41 +432,7 @@ int MeshAgent_GetSystemProxy(MeshAgentHostContainer *agent, char *buffer, size_t })();"; #else // Linux Only - char getProxy[] = "(function getProxies(){\ - if(require('fs').existsSync('/etc/environment'))\ - {\ - var e = require('fs').readFileSync('/etc/environment').toString();\ - var tokens = e.split('\\n');\ - for(var line in tokens)\ - {\ - var val = tokens[line].split('=');\ - if(val.length == 2 && (val[0].trim() == 'http_proxy' || val[0].trim() == 'https_proxy'))\ - {\ - return(val[1].split('//')[1]);\ - }\ - }\ - }\ - if(require('fs').existsSync('/etc/profile.d/proxy_setup'))\ - {\ - var child = require('child_process').execFile('/bin/sh', ['sh']);\ - child.stdout.str = ''; child.stdout.on('data', function (c) { this.str += c.toString(); });\ - child.stdin.write('cat /etc/profile.d/proxy_setup | awk \\'{ split($2, tok, \"=\"); if(tok[1]==\"http_proxy\") { print tok[2]; }}\\'\\nexit\\n');\ - child.waitExit();\ - 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');\ - })();"; + char getProxy[] = "require('proxy-helper').getProxy()"; #endif // Linux and FreeBSD if (duk_peval_string(agent->meshCoreCtx, getProxy) == 0) diff --git a/microscript/ILibDuktape_Polyfills.c b/microscript/ILibDuktape_Polyfills.c index dc7e241..7d9e196 100644 --- a/microscript/ILibDuktape_Polyfills.c +++ b/microscript/ILibDuktape_Polyfills.c @@ -2212,7 +2212,7 @@ void ILibDuktape_Polyfills_JS_Init(duk_context *ctx) free(_notifybardesktop); // proxy-helper, refer to modules/proxy-helper.js - duk_peval_string_noresult(ctx, "addModule('proxy-helper', Buffer.from('LyoKQ29weXJpZ2h0IDIwMTkgSW50ZWwgQ29ycG9yYXRpb24KCkxpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwp5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCllvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAoKICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAoKVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQpkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLApXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZApsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKi8NCg0KZnVuY3Rpb24gcG9zaXhfcHJveHlDaGVjayh1aWQsIGNoZWNrQWRkcikNCnsNCiAgICB2YXIgZzsNCiAgICB2YXIgeCA9IHByb2Nlc3MuZW52Wydub19wcm94eSddID8gcHJvY2Vzcy5lbnZbJ25vX3Byb3h5J10uc3BsaXQoJywnKSA6IFtdOw0KICAgIHZhciB0Ow0KDQogICAgaWYgKHJlcXVpcmUoJ2xpbnV4LWdub21lLWhlbHBlcnMnKS5hdmFpbGFibGUgJiYgKGcgPSByZXF1aXJlKCdsaW51eC1nbm9tZS1oZWxwZXJzJykuZ2V0UHJveHlTZXR0aW5ncyh1aWQpKS5tb2RlICE9ICdub25lJykNCiAgICB7DQogICAgICAgIHggPSBnLmV4Y2VwdGlvbnM7DQogICAgfQ0KDQogICAgZm9yKHZhciBpIGluIHgpDQogICAgew0KICAgICAgICBpZiAoeFtpXSA9PSBjaGVja0FkZHIpIHsgcmV0dXJuICh0cnVlKTsgfSAgICAgICAgICAgICAgIC8vIERpcmVjdCBNYXRjaA0KICAgICAgICBpZiAoY2hlY2tBZGRyLmVuZHNXaXRoKCcuJyArIHhbaV0pKSB7IHJldHVybiAodHJ1ZSk7IH0gIC8vIFN1YmRvbWFpbiBNYXRjaA0KICAgICAgICBpZiAoKHYgPSB4W2ldLnNwbGl0KCcvJykpLmxlbmd0aCA9PSAyKQ0KICAgICAgICB7DQogICAgICAgICAgICB0cnkNCiAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICBpZihyZXF1aXJlKCdpcC1hZGRyZXNzJykuQWRkcmVzczQuZnJvbVN0cmluZyh2WzBdKS5tYXNrKHBhcnNlSW50KHZbMV0pKSA9PSByZXF1aXJlKCdpcC1hZGRyZXNzJykuQWRkcmVzczQuZnJvbVN0cmluZyhjaGVja0FkZHIpLm1hc2socGFyc2VJbnQodlsxXSkpKQ0KICAgICAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICAgICAgcmV0dXJuKHRydWUpOw0KICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAgIH0NCiAgICAgICAgICAgIGNhdGNoIChleCkNCiAgICAgICAgICAgIHsNCiAgICAgICAgICAgIH0NCiAgICAgICAgfQ0KICAgIH0NCiAgICByZXR1cm4gKGZhbHNlKTsNCn0NCg0KZnVuY3Rpb24gd2luZG93c19wcm94eUNoZWNrKGtleSwgY2hlY2tBZGRyKQ0Kew0KICAgIGlmKCFrZXkpDQogICAgew0KICAgICAgICB2YXIgaTsNCiAgICAgICAgLy8gS2V5IHdhc24ndCBzcGVjaWZpZWQsIHNvIGxldHMgdHJ5IHRvIGZpZ3VyZSBpdCBvdXQNCiAgICAgICAgaWYoKGk9cmVxdWlyZSgndXNlci1zZXNzaW9ucycpLmdldFByb2Nlc3NPd25lck5hbWUocHJvY2Vzcy5waWQpKS50c2lkID09IDApDQogICAgICAgIHsNCiAgICAgICAgICAgIC8vIFdlIGFyZSBhIHNlcnZpY2UsIHNvIHdlIHNob3VsZCBjaGVjayB0aGUgdXNlciB0aGF0IGluc3RhbGxlZCB0aGUgTWVzaCBBZ2VudA0KICAgICAgICAgICAgdHJ5DQogICAgICAgICAgICB7DQogICAgICAgICAgICAgICAga2V5ID0gcmVxdWlyZSgnd2luLXJlZ2lzdHJ5JykuUXVlcnlLZXkocmVxdWlyZSgnd2luLXJlZ2lzdHJ5JykuSEtFWS5Mb2NhbE1hY2hpbmUsICdTWVNURU1cXEN1cnJlbnRDb250cm9sU2V0XFxTZXJ2aWNlc1xcTWVzaCBBZ2VudCcsICdfSW5zdGFsbGVkQnknKTsNCiAgICAgICAgICAgIH0NCiAgICAgICAgICAgIGNhdGNoKHh4KQ0KICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgIC8vIFRoaXMgaW5mbyBpc24ndCBhdmFpbGFibGUsIHNvIGxldCdzIHRyeSB0byB1c2UgdGhlIGN1cnJlbnRseSBsb2dnZWQgaW4gdXNlcg0KICAgICAgICAgICAgICAgIHRyeQ0KICAgICAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICAgICAga2V5ID0gcmVxdWlyZSgnd2luLXJlZ2lzdHJ5JykudXNlcm5hbWVUb1VzZXJLZXkocmVxdWlyZSgndXNlci1zZXNzaW9ucycpLmdldFVzZXJuYW1lKHJlcXVpcmUoJ3VzZXItc2Vzc2lvbnMnKS5jb25zb2xlVWlkKCkpKTsNCiAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgICAgY2F0Y2goeHh4KQ0KICAgICAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICAgICAgLy8gTm8gdXNlcnMgYXJlIGxvZ2dlZCBpbiwgc28gYXMgYSBsYXN0IHJlc29ydCwgbGV0J3MgdHJ5IHRoZSBsYXN0IGxvZ2dlZCBpbiB1c2VyLg0KICAgICAgICAgICAgICAgICAgICB2YXIgZW50cmllcyA9IHJlcXVpcmUoJ3dpbi1yZWdpc3RyeScpLlF1ZXJ5S2V5KHJlcXVpcmUoJ3dpbi1yZWdpc3RyeScpLkhLRVkuVXNlcnMpOw0KICAgICAgICAgICAgICAgICAgICBmb3IoaSBpbiBlbnRyaWVzLnN1YmtleXMpDQogICAgICAgICAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICAgICAgICAgIGlmKGVudHJpZXMuc3Via2V5c1tpXS5zcGxpdCgnLScpLmxlbmd0aD41ICYmICFlbnRyaWVzLnN1YmtleXNbaV0uZW5kc1dpdGgoJ19DbGFzc2VzJykpDQogICAgICAgICAgICAgICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICAgICAgICAgICAga2V5ID0gZW50cmllcy5zdWJrZXlzW2ldOw0KICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOw0KICAgICAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgfQ0KICAgICAgICB9DQogICAgICAgIGVsc2UNCiAgICAgICAgew0KICAgICAgICAgICAgLy8gV2UgYXJlIGEgbG9nZ2VkIGluIHVzZXINCiAgICAgICAgICAgIGtleSA9IHJlcXVpcmUoJ3dpbi1yZWdpc3RyeScpLnVzZXJuYW1lVG9Vc2VyS2V5KGkubmFtZSk7DQogICAgICAgIH0NCiAgICAgICAgaWYoIWtleSkge3Rocm93KCdDb3VsZCBub3QgZGV0ZXJtaW5lIHdoaWNoIHVzZXIgcHJveHkgc2V0dGluZyB0byBxdWVyeScpO30NCiAgICB9DQogICAgdmFyIHByb3h5T3ZlcnJpZGUgPSByZXF1aXJlKCd3aW4tcmVnaXN0cnknKS5RdWVyeUtleShyZXF1aXJlKCd3aW4tcmVnaXN0cnknKS5IS0VZLlVzZXJzLCBrZXkgKyAnXFxTb2Z0d2FyZVxcTWljcm9zb2Z0XFxXaW5kb3dzXFxDdXJyZW50VmVyc2lvblxcSW50ZXJuZXQgU2V0dGluZ3MnLCAnUHJveHlPdmVycmlkZScpLnNwbGl0KCc7Jyk7DQogICAgZm9yKHZhciBpIGluIHByb3h5T3ZlcnJpZGUpDQogICAgew0KICAgICAgICBwcm94eU92ZXJyaWRlW2ldID0gcHJveHlPdmVycmlkZVtpXS50cmltKCk7DQogICAgICAgIGlmICgoY2hlY2tBZGRyID09ICcxMjcuMC4wLjEnIHx8IGNoZWNrQWRkciA9PSAnOjoxJykgJiYgcHJveHlPdmVycmlkZVtpXSA9PSAnPGxvY2FsPicpIHsgcmV0dXJuICh0cnVlKTsgfQ0KICAgICAgICBpZiAoY2hlY2tBZGRyID09IHByb3h5T3ZlcnJpZGVbaV0pIHsgcmV0dXJuICh0cnVlKTsgfSAvLyBFeGFjdCBNYXRjaA0KICAgICAgICBpZiAocHJveHlPdmVycmlkZVtpXS5zdGFydHNXaXRoKCcqLicpICYmIGNoZWNrQWRkci5lbmRzV2l0aChwcm94eU92ZXJyaWRlW2ldLnN1YnN0cmluZygxKSkpIHsgcmV0dXJuICh0cnVlKTsgfQ0KICAgICAgICBpZiAocHJveHlPdmVycmlkZVtpXS5lbmRzV2l0aCgnLionKSAmJiBjaGVja0FkZHIuc3RhcnRzV2l0aChwcm94eU92ZXJyaWRlW2ldLnN1YnN0cmluZygwLCBwcm94eU92ZXJyaWRlW2ldLmxlbmd0aCAtIDEpKSkgeyByZXR1cm4gKHRydWUpOyB9DQogICAgfQ0KICAgIHJldHVybiAoZmFsc2UpOw0KfQ0KDQpzd2l0Y2ggKHByb2Nlc3MucGxhdGZvcm0pDQp7DQogICAgY2FzZSAnbGludXgnOg0KICAgIGNhc2UgJ2ZyZWVic2QnOg0KICAgICAgICBtb2R1bGUuZXhwb3J0cyA9IHsgaWdub3JlUHJveHk6IHBvc2l4X3Byb3h5Q2hlY2sgfTsNCiAgICAgICAgYnJlYWs7DQogICAgY2FzZSAnd2luMzInOg0KICAgICAgICBtb2R1bGUuZXhwb3J0cyA9IHsgaWdub3JlUHJveHk6IHdpbmRvd3NfcHJveHlDaGVjayB9Ow0KICAgICAgICBicmVhazsNCiAgICBjYXNlICdkYXJ3aW4nOg0KICAgICAgICBicmVhazsNCn0NCv==', 'base64').toString());"); + duk_peval_string_noresult(ctx, "addModule('proxy-helper', Buffer.from('/*
Copyright 2019 Intel Corporation

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/


function linux_getProxy()
{
    // Check Environment Variabels
    if(require('fs').existsSync('/etc/environment'))
    {
	    var e = require('fs').readFileSync('/etc/environment').toString();
	    var tokens = e.split('\\n');
	    for(var line in tokens)
	    {
		    var val = tokens[line].split('=');
		    if(val.length == 2 && (val[0].trim() == 'http_proxy' || val[0].trim() == 'https_proxy'))
		    {
			    return(val[1].split('//')[1]);
		    }
	    }
    }

    // Check profile.d
    if(require('fs').existsSync('/etc/profile.d/proxy_setup'))
    {
	    var child = require('child_process').execFile('/bin/sh', ['sh']);
	    child.stdout.str = ''; child.stdout.on('data', function (c) { this.str += c.toString(); });
	    child.stdin.write("cat /etc/profile.d/proxy_setup | awk '" + '{ split($2, tok, "="); if(tok[1]=="http_proxy") { print tok[2]; }}\'\nexit\n');
	    child.waitExit();
	    child.ret = child.stdout.str.trim().split('\n')[0].split('//')[1];
	    if(child.ret != '') { return(child.ret); }
    }

    // Check gsettings
    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);} 
	    }
    }

    if (require('fs').existsSync('/etc/apt/apt.conf.d/proxy.conf'))
    {
        var child = require('child_process').execFile('/bin/sh', ['sh']);
        child.stdout.str = ''; child.stdout.on('data', function (c) { this.str += c.toString(); });
        child.stderr.on('data', function (c) { console.log(c.toString()); });
        child.stdin.write("cat /etc/apt/apt.conf.d/proxy.conf | tr '\\n' '`' | awk -F'`' '{");
        child.stdin.write('for(n=1;n<NF;++n) { ln=split($n,tok,"::"); split(tok[ln],px,"\\""); split(px[2],x,"://"); if(x[2]!="") { print x[2]; break; } }');
        child.stdin.write("}'\nexit\n");
        child.waitExit();
        if (child.stdout.str.trim() != "") { return (child.stdout.str.trim()); }
    }
    if (require('fs').existsSync('/etc/yum.conf'))
    {
        var child = require('child_process').execFile('/bin/sh', ['sh']);
        child.stdout.str = ''; child.stdout.on('data', function (c) { this.str += c.toString(); });
        child.stderr.on('data', function (c) { console.log(c.toString()); });
        child.stdin.write('cat /etc/yum.conf | grep "proxy=" | ' + "tr '\\n' '`' | awk -F'`' '{");
        child.stdin.write('for(n=1;n<NF;++n) { cl=split($n,c,"#"); split($n,px,"://"); if(px[2]!="" && cl==1) { print px[2]; break; } }');
        child.stdin.write("}'\nexit\n");
        child.waitExit();
        if (child.stdout.str.trim() != "") { return (child.stdout.str.trim()); }
    }
    if (require('fs').existsSync('/etc/sysconfig/proxy'))
    {
        var child = require('child_process').execFile('/bin/sh', ['sh']);
        child.stdout.str = ''; child.stdout.on('data', function (c) { this.str += c.toString(); });
        child.stderr.on('data', function (c) { console.log(c.toString()); });
        child.stdin.write('cat /etc/sysconfig/proxy | grep PROXY_ENABLED= | awk \'{');
        child.stdin.write('split($0,res,"\\""); if(res[2]=="yes") { print res[2]; }')
        child.stdin.write("}'\nexit\n");
        child.waitExit();
        if (child.stdout.str.trim() != "")
        {
            // Enabled
            child = require('child_process').execFile('/bin/sh', ['sh']);
            child.stdout.str = ''; child.stdout.on('data', function (c) { this.str += c.toString(); });
            child.stderr.on('data', function (c) { console.log(c.toString()); });
            child.stdin.write('cat /etc/sysconfig/proxy | grep _PROXY | ' + "tr '\\n' '`' | awk -F'`' '{");
            child.stdin.write('for(i=1;i<NF;++i) { if(split($i,r,"HTTP_PROXY=")>1 || split($i,r,"HTTPS_PROXY=")>1) {');
            child.stdin.write('cl=split($i,c,"#");');
            child.stdin.write('split($i,px,"\\""); split(px[2],pxx,"://"); if(pxx[2]!="" && cl==1) { print pxx[2]; break; }');
            child.stdin.write('} }');
            child.stdin.write("}'\nexit\n");
            child.waitExit();
            if (child.stdout.str.trim() != '') { return (child.stdout.str.trim()); }
        }
    }
    throw ('No proxies');
}
function posix_proxyCheck(uid, checkAddr)
{
    var g;
    var x = process.env['no_proxy'] ? process.env['no_proxy'].split(',') : [];
    var t;

    if (require('linux-gnome-helpers').available && (g = require('linux-gnome-helpers').getProxySettings(uid)).mode != 'none')
    {
        x = g.exceptions;
    }

    for(var i in x)
    {
        if (x[i] == checkAddr) { return (true); }               // Direct Match
        if (checkAddr.endsWith('.' + x[i])) { return (true); }  // Subdomain Match
        if ((v = x[i].split('/')).length == 2)
        {
            try
            {
                if(require('ip-address').Address4.fromString(v[0]).mask(parseInt(v[1])) == require('ip-address').Address4.fromString(checkAddr).mask(parseInt(v[1])))
                {
                    return(true);
                }
            }
            catch (ex)
            {
            }
        }
    }
    return (false);
}

function windows_proxyCheck(key, checkAddr)
{
    if(!key)
    {
        var i;
        // Key wasn't specified, so lets try to figure it out
        if((i=require('user-sessions').getProcessOwnerName(process.pid)).tsid == 0)
        {
            // We are a service, so we should check the user that installed the Mesh Agent
            try
            {
                key = require('win-registry').QueryKey(require('win-registry').HKEY.LocalMachine, 'SYSTEM\\CurrentControlSet\\Services\\Mesh Agent', '_InstalledBy');
            }
            catch(xx)
            {
                // This info isn't available, so let's try to use the currently logged in user
                try
                {
                    key = require('win-registry').usernameToUserKey(require('user-sessions').getUsername(require('user-sessions').consoleUid()));
                }
                catch(xxx)
                {
                    // No users are logged in, so as a last resort, let's try the last logged in user.
                    var entries = require('win-registry').QueryKey(require('win-registry').HKEY.Users);
                    for(i in entries.subkeys)
                    {
                        if(entries.subkeys[i].split('-').length>5 && !entries.subkeys[i].endsWith('_Classes'))
                        {
                            key = entries.subkeys[i];
                            break;
                        }
                    }
                }
            }
        }
        else
        {
            // We are a logged in user
            key = require('win-registry').usernameToUserKey(i.name);
        }
        if(!key) {throw('Could not determine which user proxy setting to query');}
    }
    var proxyOverride = require('win-registry').QueryKey(require('win-registry').HKEY.Users, key + '\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings', 'ProxyOverride').split(';');
    for(var i in proxyOverride)
    {
        proxyOverride[i] = proxyOverride[i].trim();
        if ((checkAddr == '127.0.0.1' || checkAddr == '::1') && proxyOverride[i] == '<local>') { return (true); }
        if (checkAddr == proxyOverride[i]) { return (true); } // Exact Match
        if (proxyOverride[i].startsWith('*.') && checkAddr.endsWith(proxyOverride[i].substring(1))) { return (true); }
        if (proxyOverride[i].endsWith('.*') && checkAddr.startsWith(proxyOverride[i].substring(0, proxyOverride[i].length - 1))) { return (true); }
    }
    return (false);
}

switch (process.platform)
{
    case 'linux':
    case 'freebsd':
        module.exports = { ignoreProxy: posix_proxyCheck, getProxy: linux_getProxy };
        break;
    case 'win32':
        module.exports = { ignoreProxy: windows_proxyCheck };
        break;
    case 'darwin':
        break;
}
', 'base64').toString());"); #ifdef _POSIX duk_peval_string_noresult(ctx, "addModule('linux-pathfix', Buffer.from('LyoKQ29weXJpZ2h0IDIwMTkgSW50ZWwgQ29ycG9yYXRpb24KCkxpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwp5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCllvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAoKICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAoKVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQpkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLApXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZApsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKi8NCg0KZnVuY3Rpb24gY2hlY2tQYXRoKCkNCnsNCiAgICBpZiAocHJvY2Vzcy5wbGF0Zm9ybSA9PSAnbGludXgnKQ0KICAgIHsNCiAgICAgICAgdmFyIGNoaWxkID0gcmVxdWlyZSgnY2hpbGRfcHJvY2VzcycpLmV4ZWNGaWxlKCcvYmluL3NoJywgWydzaCddKTsNCiAgICAgICAgY2hpbGQuc3RkZXJyLnN0ciA9ICcnOyBjaGlsZC5zdGRlcnIub24oJ2RhdGEnLCBmdW5jdGlvbiAoYykgeyB0aGlzLnN0ciArPSBjLnRvU3RyaW5nKCk7IH0pOw0KICAgICAgICBjaGlsZC5zdGRvdXQuc3RyID0gJyc7IGNoaWxkLnN0ZG91dC5vbignZGF0YScsIGZ1bmN0aW9uIChjKSB7IHRoaXMuc3RyICs9IGMudG9TdHJpbmcoKTsgfSk7DQogICAgICAgIGNoaWxkLnN0ZGluLndyaXRlKCdlY2hvICRQQVRIIHwgYXdrIFwneyB5ZXM9MDsgYT1zcGxpdCgkMCwgYiwgIjoiKTsgZm9yKHg9MTt4PD1hOysreCkgeyBpZihiW3hdPT0iL3NiaW4iKSB7IHllcz0xOyB9IH0gcHJpbnQgeWVzOyB9XCdcbmV4aXRcbicpOw0KICAgICAgICBjaGlsZC53YWl0RXhpdCgpOw0KDQogICAgICAgIGlmIChwYXJzZUludChjaGlsZC5zdGRvdXQuc3RyLnRyaW0oKSkgPT0gMCkNCiAgICAgICAgew0KICAgICAgICAgICAgcHJvY2Vzcy5zZXRlbnYoJ1BBVEgnLCBwcm9jZXNzLmVudlsnUEFUSCddICsgJzovc2JpbicpOw0KICAgICAgICB9DQogICAgfQ0KfQ0KDQptb2R1bGUuZXhwb3J0cyA9IGNoZWNrUGF0aDsNCg0KDQo=', 'base64').toString());"); diff --git a/modules/proxy-helper.js b/modules/proxy-helper.js index 1b6b9c5..2eb3dc5 100644 --- a/modules/proxy-helper.js +++ b/modules/proxy-helper.js @@ -14,6 +14,96 @@ See the License for the specific language governing permissions and limitations under the License. */ + +function linux_getProxy() +{ + // Check Environment Variabels + if(require('fs').existsSync('/etc/environment')) + { + var e = require('fs').readFileSync('/etc/environment').toString(); + var tokens = e.split('\\n'); + for(var line in tokens) + { + var val = tokens[line].split('='); + if(val.length == 2 && (val[0].trim() == 'http_proxy' || val[0].trim() == 'https_proxy')) + { + return(val[1].split('//')[1]); + } + } + } + + // Check profile.d + if(require('fs').existsSync('/etc/profile.d/proxy_setup')) + { + var child = require('child_process').execFile('/bin/sh', ['sh']); + child.stdout.str = ''; child.stdout.on('data', function (c) { this.str += c.toString(); }); + child.stdin.write("cat /etc/profile.d/proxy_setup | awk '" + '{ split($2, tok, "="); if(tok[1]=="http_proxy") { print tok[2]; }}\'\nexit\n'); + child.waitExit(); + child.ret = child.stdout.str.trim().split('\n')[0].split('//')[1]; + if(child.ret != '') { return(child.ret); } + } + + // Check gsettings + 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);} + } + } + + if (require('fs').existsSync('/etc/apt/apt.conf.d/proxy.conf')) + { + var child = require('child_process').execFile('/bin/sh', ['sh']); + child.stdout.str = ''; child.stdout.on('data', function (c) { this.str += c.toString(); }); + child.stderr.on('data', function (c) { console.log(c.toString()); }); + child.stdin.write("cat /etc/apt/apt.conf.d/proxy.conf | tr '\\n' '`' | awk -F'`' '{"); + child.stdin.write('for(n=1;n