Skip to content

feat: add -x flag to specify proxy URL on command line #618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Cherrling wants to merge 1 commit into
base: master
Choose a base branch
from
+56 −4
Open

feat: add -x flag to specify proxy URL on command line #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions src/libproxychains.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,11 @@ static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_typ
tcp_connect_time_out = 10 * 1000;
*ct = DYNAMIC_TYPE;

if(getenv("PROXYCHAINS_PROXY")) {
proxychains_write_log(LOG_PREFIX "using -x proxy, no config file\n");
goto use_proxy_env;
}

env = get_config_path(getenv(PROXYCHAINS_CONF_FILE_ENV_VAR), buf, sizeof(buf));
if( ( file = fopen(env, "r") ) == NULL )
{
Expand Down Expand Up @@ -564,9 +569,41 @@ static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_typ
fclose(file);
#endif
if(!count) {
if(getenv("PROXYCHAINS_PROXY"))
goto use_proxy_env;
fprintf(stderr, "error: no valid proxy found in config\n");
exit(1);
}
goto done;

use_proxy_env:
{
int port_n = 0;
char *proxy_env = getenv("PROXYCHAINS_PROXY");

if(!proxy_from_string(proxy_env, type, host, &port_n, pd[0].user, pd[0].pass)) {
fprintf(stderr, "error: invalid proxy specified in -x: %s\n", proxy_env);
exit(1);
}

pd[0].ip.is_v6 = !!strchr(host, ':');
pd[0].port = htons((unsigned short) port_n);
if(1 != inet_pton(pd[0].ip.is_v6 ? AF_INET6 : AF_INET, host, pd[0].ip.addr.v6)) {
fprintf(stderr, "error: proxy host must be a numeric ip: %s\n", host);
exit(1);
}

if(!strcmp(type, "http"))
pd[0].pt = HTTP_TYPE;
else if(!strcmp(type, "socks4"))
pd[0].pt = SOCKS4_TYPE;
else
pd[0].pt = SOCKS5_TYPE;

count = 1;
}

done:
*proxy_count = count;
proxychains_got_chain_data = 1;
PDEBUG("proxy_dns: %s\n", rdns_resolver_string(proxychains_resolver));
Expand Down
23 changes: 19 additions & 4 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,12 @@
#include "common.h"

static int usage(char **argv) {
printf("\nUsage:\t%s -q -f config_file program_name [arguments]\n"
printf("\nUsage:\t%s -q -f config_file -x proxy_url program_name [arguments]\n"
"\t-q makes proxychains quiet - this overrides the config setting\n"
"\t-f allows one to manually specify a configfile to use\n"
"\t-x allows one to manually specify a proxy (e.g. socks5://127.0.0.1:1080)\n"
"\t proxy types: http, socks4, socks5, raw\n"
"\t syntax: type://[user:pass@]host:port\n"
"\tfor example : proxychains telnet somehost.com\n" "More help in README file\n\n", argv[0]);
return EXIT_FAILURE;
}
Expand Down Expand Up @@ -63,7 +66,7 @@ static void set_own_dir(const char *argv0) {
}
}

#define MAX_COMMANDLINE_FLAGS 2
#define MAX_COMMANDLINE_FLAGS 3

int main(int argc, char *argv[]) {
char *path = NULL;
Expand All @@ -90,7 +93,16 @@ int main(int argc, char *argv[]) {
return usage(argv);

start_argv += 2;
}
} else if(argv[start_argv][1] == 'x') {

if(start_argv + 1 < argc)
setenv("PROXYCHAINS_PROXY", argv[start_argv + 1], 1);
else
return usage(argv);

start_argv += 2;
} else
break;
} else
break;
}
Expand All @@ -99,7 +111,10 @@ int main(int argc, char *argv[]) {
return usage(argv);

/* check if path of config file has not been passed via command line */
path = get_config_path(path, pbuf, sizeof(pbuf));
if(getenv("PROXYCHAINS_PROXY"))
path = "./proxychains.conf";
else
path = get_config_path(path, pbuf, sizeof(pbuf));

if(!quiet)
fprintf(stderr, LOG_PREFIX "config file found: %s\n", path);
Expand Down