Add socks 5 env & other settings

Author: intika

README README.mdREADME renamed to README.md

@@ -1,11 +1,11 @@
-ProxyBound v4.7
+ProxyBound v4.9
 ===============
 
   ProxyBound is a UNIX program, that hooks network-related libc functions
   in dynamically linked programs via a preloaded DLL and redirects the
   connections through SOCKS4a/5 or HTTP proxies.
 
-  It's based on proxychains-ng by rofl0r
+  It's based on proxychains-ng by rofl0r & proxychains by haad
 
 How it works:
 =============
@@ -16,6 +16,16 @@ How it works:
   why ? because in order to hook to libc functions like
   connect(), dynamic loader facilities are used, namely
   dl_sym() and LD_PRELOAD.
+  
+Used environment variable:
+==========================
+
+- PROXYBOUND_CONF_FILE:     Path to config file
+- PROXYBOUND_QUIET_MODE:    Quiet mode (1 or 0)
+- PROXYBOUND_SOCKS5_HOST:   Specify unique socks 5 proxy to use 
+- PROXYBOUND_SOCKS5_PORT:   Socks 5 port
+- PROXYBOUND_FORCE_DNS:     Force dns requests through (1 or 0)
+- PROXYBOUND_ALLOW_LEAKS:   Not yet implemented (Allow unproxyfied protocols "UDP/ICMP/RAW")
 
 Install:
 ========
@@ -30,6 +40,12 @@ Install:
 Changelog:
 ==========
 
+  Version 4.9:
+  - Import simple SOCKS5 proxy mode from https://github.com/haad/proxychains
+
+  Version 4.8:
+  - Updates with some features from https://github.com/haad/proxychains
+
   Version 4.7:
   - Fix chrome compatibility
 
@@ -56,18 +72,22 @@ Configuration:
 Usage Example:
 ==============
 
+  $ export PROXYBOUND_QUIET_MODE="1"
+  $ export LD_PRELOAD=/usr/local/lib/libproxybound.so
+  $ export PROXYBOUND_CONF_FILE=/etc/proxybound.conf
+  $ telnet targethost.com
+  
+  In this example it will run telnet through proxy without using proxybound binary
+
   $ proxybound telnet targethost.com
 
-  in this example it will run telnet through proxy(or chained proxies)
-  specified by proxybound.conf
+  In this example it will run telnet through proxy(or chained proxies) specified by proxybound.conf
 
   $ proxybound -f /etc/proxybound-other.conf targethost2.com
 
-  in this example it will use different configuration file then proxybound.conf 
-  to connect to targethost2.com host.
+  In this example it will use different configuration file then proxybound.conf to connect to targethost2.com host.
 
   $ proxyresolv targethost.com
 
-  in this example it will resolve targethost.com through proxy(or chained proxies)
-  specified by proxybound.conf
+  In this example it will resolve targethost.com through proxy(or chained proxies) specified by proxybound.conf
 

src/common.h

@@ -1,5 +1,9 @@
 #define PROXYBOUND_CONF_FILE_ENV_VAR "PROXYBOUND_CONF_FILE"
 #define PROXYBOUND_QUIET_MODE_ENV_VAR "PROXYBOUND_QUIET_MODE"
+#define PROXYBOUND_SOCKS5_HOST_ENV_VAR "PROXYBOUND_SOCKS5_HOST"
+#define PROXYBOUND_SOCKS5_PORT_ENV_VAR "PROXYBOUND_SOCKS5_PORT"
+#define PROXYBOUND_FORCE_DNS_ENV_VAR "PROXYBOUND_FORCE_DNS"
+#define PROXYBOUND_ALLOW_LEAKS_ENV_VAR "PROXYBOUND_ALLOW_LEAKS"
 #define PROXYBOUND_CONF_FILE "proxybound.conf"
 #define LOG_PREFIX "[Proxybound] "
 #ifndef SYSCONFDIR

src/libproxybound.c

@@ -1,11 +1,14 @@
 /***************************************************************************
                            libproxybound.c
                            ---------------
-    begin                : Tue May 14 2002
-    copyright            : netcreature (C) 2002
-    email                : netcreature@users.sourceforge.net
+
+     copyright: intika      (C) 2019 intika@librefox.org
+     copyright: rofl0r      (C) 2012 https://github.com/rofl0r
+     copyright: haad        (C) 2012 https://github.com/haad
+     copyright: netcreature (C) 2002 netcreature@users.sourceforge.net
+    
  ***************************************************************************
- *     GPL *
+ *   GPL                                                                   *
  ***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -32,7 +35,6 @@
 #include <fcntl.h>
 #include <dlfcn.h>
 
-
 #include "core.h"
 #include "common.h"
 
@@ -62,14 +64,18 @@ int proxybound_resolver = 0;
 localaddr_arg localnet_addr[MAX_LOCALNET];
 size_t num_localnet_addr = 0;
 unsigned int remote_dns_subnet = 224;
-
 #ifdef THREAD_SAFE
 pthread_once_t init_once = PTHREAD_ONCE_INIT;
 #endif
+
 static int init_l = 0;
 
+static void init_additional_settings(chain_type *ct);
+
 static inline void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_type * ct);
 
+static void manual_socks5_env(proxy_data * pd, unsigned int *proxy_count, chain_type * ct);
+
 static void* load_sym(char* symname, void* proxyfunc) {
 
 	void *funcptr = dlsym(RTLD_NEXT, symname);
@@ -94,6 +100,10 @@ static void* load_sym(char* symname, void* proxyfunc) {
 static void do_init(void) {
 	MUTEX_INIT(&internal_ips_lock, NULL);
 	MUTEX_INIT(&hostdb_lock, NULL);
+    
+    /* check for simple SOCKS5 proxy setup */
+	manual_socks5_env(proxybound_pd, &proxybound_proxy_count, &proxybound_ct);
+    
 	/* read the config file */
 	get_chain_data(proxybound_pd, &proxybound_proxy_count, &proxybound_ct);
 
@@ -135,6 +145,18 @@ static void gcc_init(void) {
 }
 #endif
 
+static void init_additional_settings(chain_type *ct) {
+	char *env;
+
+	tcp_read_time_out = 4 * 1000;
+	tcp_connect_time_out = 10 * 1000;
+	*ct = DYNAMIC_TYPE;
+
+	env = getenv(PROXYBOUND_QUIET_MODE_ENV_VAR);
+	if(env && *env == '1')
+		proxybound_quiet_mode = 1;
+}
+
 /* get configuration from config file */
 static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_type * ct) {
 	int count = 0, port_n = 0, list = 0;
@@ -148,17 +170,11 @@ static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_typ
 		return;
 
 	//Some defaults
-	tcp_read_time_out = 4 * 1000;
-	tcp_connect_time_out = 10 * 1000;
-	*ct = DYNAMIC_TYPE;
+    init_additional_settings(ct);
 
 	env = get_config_path(getenv(PROXYBOUND_CONF_FILE_ENV_VAR), buff, sizeof(buff));
 	file = fopen(env, "r");
 
-	env = getenv(PROXYBOUND_QUIET_MODE_ENV_VAR);
-	if(env && *env == '1')
-		proxybound_quiet_mode = 1;
-
 	while(fgets(buff, sizeof(buff), file)) {
 		if(buff[0] != '\n' && buff[strspn(buff, " ")] != '#') {
 			/* proxylist has to come last */
@@ -267,6 +283,38 @@ static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_typ
 	proxybound_got_chain_data = 1;
 }
 
+static void manual_socks5_env(proxy_data *pd, unsigned int *proxy_count, chain_type *ct) {
+	char *port_string;
+    char *host_string;
+
+	if(proxybound_got_chain_data)
+		return;
+
+	init_additional_settings(ct);
+
+    port_string = getenv(PROXYBOUND_SOCKS5_PORT_ENV_VAR);
+	if(!port_string)
+		return;
+    
+    host_string = getenv(PROXYBOUND_SOCKS5_HOST_ENV_VAR);
+    if(!host_string)
+        host_string = "127.0.0.1";
+
+	memset(pd, 0, sizeof(proxy_data));
+
+	pd[0].ps = PLAY_STATE;
+	pd[0].ip.as_int = (uint32_t) inet_addr(host_string);
+	pd[0].port = htons((unsigned short) strtol(port_string, NULL, 0));
+	pd[0].pt = SOCKS5_TYPE;
+	proxybound_max_chain = 1;
+
+	if(getenv(PROXYBOUND_FORCE_DNS_ENV_VAR) && (*getenv(PROXYBOUND_FORCE_DNS_ENV_VAR) == '1'))
+		proxybound_resolver = 1;
+
+	*proxy_count = 1;
+	proxybound_got_chain_data = 1;
+}
+
 /*******  HOOK FUNCTIONS  *******/
 
 int connect(int sock, const struct sockaddr *addr, socklen_t len) {