Force Proxy to any Windows/MacOS/Linux Application TCP and UDP traffic
C ccybersecurityhttp3httpproxylinuxlinux-proxymacosmacos-appmacos-proxyproxifierproxifier-alternativeproxyclienttcpthick-clientudpwindivertwindows
added domain name for proxy host #18
Sourav Kalal55e4878483ff
diff --git a/Windows/cli/Program.cs b/Windows/cli/Program.csindex dfaddae..13a97e5 100644--- a/Windows/cli/Program.cs+++ b/Windows/cli/Program.cs@@ -109,7 +109,7 @@ class ProgramProxyBridgeNative.ProxyBridge_SetLogCallback(_logCallback);ProxyBridgeNative.ProxyBridge_SetConnectionCallback(_connectionCallback);- Console.WriteLine($"Proxy: {proxyInfo.Type}://{proxyInfo.Ip}:{proxyInfo.Port}");+ Console.WriteLine($"Proxy: {proxyInfo.Type}://{proxyInfo.Host}:{proxyInfo.Port}");if (!string.IsNullOrEmpty(proxyInfo.Username)){Console.WriteLine($"Proxy Auth: {proxyInfo.Username}:***");@@ -118,7 +118,7 @@ class Programif (!ProxyBridgeNative.ProxyBridge_SetProxyConfig(proxyInfo.Type,- proxyInfo.Ip,+ proxyInfo.Host,proxyInfo.Port,proxyInfo.Username ?? "",proxyInfo.Password ?? ""))@@ -205,7 +205,7 @@ class Program}}- private static (ProxyBridgeNative.ProxyType Type, string Ip, ushort Port, string? Username, string? Password) ParseProxyConfig(string proxyUrl)+ private static (ProxyBridgeNative.ProxyType Type, string Host, ushort Port, string? Username, string? Password) ParseProxyConfig(string proxyUrl){string? username = null;string? password = null;@@ -237,7 +237,7 @@ class Program}}- throw new ArgumentException($"Invalid proxy format: {proxyUrl}\nUse type://ip:port or type://ip:port:username:password");+ throw new ArgumentException($"Invalid proxy format: {proxyUrl}\nUse type://host:port or type://host:port:username:password");}private static List<(string ProcessName, string TargetHosts, string TargetPorts, ProxyBridgeNative.RuleProtocol Protocol, ProxyBridgeNative.RuleAction Action)> ParseRules(string[] rules)diff --git a/Windows/gui/ViewModels/ProxySettingsViewModel.cs b/Windows/gui/ViewModels/ProxySettingsViewModel.csindex 5197dd5..3dcdff8 100644--- a/Windows/gui/ViewModels/ProxySettingsViewModel.cs+++ b/Windows/gui/ViewModels/ProxySettingsViewModel.cs@@ -11,7 +11,7 @@ public class ProxySettingsViewModel : ViewModelBaseprivate readonly Loc _loc = Loc.Instance;public Loc Loc => _loc;- private string _proxyIp = "";+ private string _proxyIp = ""; // Can be IP address or hostnameprivate string _proxyPort = "";private string _proxyType = "SOCKS5";private string _proxyUsername = "";@@ -142,12 +142,12 @@ public class ProxySettingsViewModel : ViewModelBaseif (string.IsNullOrWhiteSpace(ProxyIp)){- IpError = "IP address or domain is required";+ IpError = "IP address or hostname is required";isValid = false;}else if (!IsValidIpOrDomain(ProxyIp)){- IpError = "Invalid IP address or domain name";+ IpError = "Invalid IP address or hostname";isValid = false;}@@ -191,7 +191,7 @@ public class ProxySettingsViewModel : ViewModelBase// Validate inputs firstif (string.IsNullOrWhiteSpace(ProxyIp)){- TestOutput = "ERROR: Please configure proxy IP address first";+ TestOutput = "ERROR: Please configure proxy IP address or hostname first";return;}diff --git a/Windows/src/ProxyBridge.c b/Windows/src/ProxyBridge.cindex 9f227c5..599ee77 100644--- a/Windows/src/ProxyBridge.c+++ b/Windows/src/ProxyBridge.c@@ -82,7 +82,7 @@ static DWORD last_udp_connect_attempt = 0;static BOOL running = FALSE;static DWORD g_current_process_id = 0;-static char g_proxy_ip[64] = "";+static char g_proxy_host[256] = ""; // Can be IP address or hostnamestatic UINT16 g_proxy_port = 0;static UINT16 g_local_relay_port = LOCAL_PROXY_PORT;static ProxyType g_proxy_type = PROXY_TYPE_SOCKS5;@@ -115,6 +115,7 @@ static const char* extract_filename(const char* path)}static UINT32 parse_ipv4(const char *ip);+static UINT32 resolve_hostname(const char *hostname);static int socks5_connect(SOCKET s, UINT32 dest_ip, UINT16 dest_port);static int socks5_udp_associate(SOCKET s, struct sockaddr_in *relay_addr);static DWORD WINAPI udp_relay_server(LPVOID arg);@@ -236,7 +237,7 @@ static DWORD WINAPI packet_processor(LPVOID arg)if (action == RULE_ACTION_PROXY){snprintf(proxy_info, sizeof(proxy_info), "Proxy SOCKS5://%s:%d (UDP)",- g_proxy_ip, g_proxy_port);+ g_proxy_host, g_proxy_port);}else if (action == RULE_ACTION_DIRECT){@@ -360,7 +361,7 @@ static DWORD WINAPI packet_processor(LPVOID arg){snprintf(proxy_info, sizeof(proxy_info), "Proxy %s://%s:%d",g_proxy_type == PROXY_TYPE_HTTP ? "HTTP" : "SOCKS5",- g_proxy_ip, g_proxy_port);+ g_proxy_host, g_proxy_port);}else if (action == RULE_ACTION_DIRECT){@@ -430,6 +431,48 @@ static UINT32 parse_ipv4(const char *ip)return (a << 0) | (b << 8) | (c << 16) | (d << 24);}+// Resolve hostname to IPv4 address (supports both IP addresses and domain names)+static UINT32 resolve_hostname(const char *hostname)+{+ if (hostname == NULL || hostname[0] == '\0')+ return 0;++ // First try to parse as IP address+ UINT32 ip = parse_ipv4(hostname);+ if (ip != 0)+ return ip;++ // Not an IP address, try DNS resolution+ struct addrinfo hints, *result = NULL;+ memset(&hints, 0, sizeof(hints));+ hints.ai_family = AF_INET; // IPv4 only+ hints.ai_socktype = SOCK_STREAM;++ if (getaddrinfo(hostname, NULL, &hints, &result) != 0)+ {+ log_message("Failed to resolve hostname: %s", hostname);+ return 0;+ }++ if (result == NULL || result->ai_family != AF_INET)+ {+ if (result != NULL)+ freeaddrinfo(result);+ log_message("No IPv4 address found for hostname: %s", hostname);+ return 0;+ }++ struct sockaddr_in *addr = (struct sockaddr_in *)result->ai_addr;+ UINT32 resolved_ip = addr->sin_addr.s_addr;+ freeaddrinfo(result);++ log_message("Resolved %s to %d.%d.%d.%d", hostname,+ (resolved_ip >> 0) & 0xFF, (resolved_ip >> 8) & 0xFF,+ (resolved_ip >> 16) & 0xFF, (resolved_ip >> 24) & 0xFF);++ return resolved_ip;+}+static DWORD get_process_id_from_connection(UINT32 src_ip, UINT16 src_port){MIB_TCPTABLE_OWNER_PID *tcp_table = NULL;@@ -964,7 +1007,7 @@ static RuleAction check_process_rule(UINT32 src_ip, UINT16 src_port, UINT32 dest{return RULE_ACTION_DIRECT; // HTTP proxy doesn't support UDP}- if (action == RULE_ACTION_PROXY && (g_proxy_ip[0] == '\0' || g_proxy_port == 0))+ if (action == RULE_ACTION_PROXY && (g_proxy_host[0] == '\0' || g_proxy_port == 0)){return RULE_ACTION_DIRECT; // No proxy configured}@@ -1294,7 +1337,13 @@ static BOOL establish_udp_associate(void)setsockopt(tcp_sock, SOL_SOCKET, SO_RCVTIMEO, (char*)&timeout, sizeof(timeout));setsockopt(tcp_sock, SOL_SOCKET, SO_SNDTIMEO, (char*)&timeout, sizeof(timeout));- UINT32 socks5_ip = parse_ipv4(g_proxy_ip);+ UINT32 socks5_ip = resolve_hostname(g_proxy_host);+ if (socks5_ip == 0)+ {+ closesocket(tcp_sock);+ return FALSE;+ }+struct sockaddr_in socks_addr;memset(&socks_addr, 0, sizeof(socks_addr));socks_addr.sin_family = AF_INET;@@ -1690,7 +1739,13 @@ static DWORD WINAPI connection_handler(LPVOID arg)free(config);// Connect to SOCKS5 proxy- socks5_ip = parse_ipv4(g_proxy_ip);+ socks5_ip = resolve_hostname(g_proxy_host);+ if (socks5_ip == 0)+ {+ closesocket(client_sock);+ return 1;+ }+socks_sock = socket(AF_INET, SOCK_STREAM, 0);if (socks_sock == INVALID_SOCKET){@@ -2074,11 +2129,12 @@ PROXYBRIDGE_API BOOL ProxyBridge_SetProxyConfig(ProxyType type, const char* proxif (proxy_ip == NULL || proxy_ip[0] == '\0' || proxy_port == 0)return FALSE;- if (parse_ipv4(proxy_ip) == 0)+ // Validate that the hostname/IP can be resolved+ if (resolve_hostname(proxy_ip) == 0)return FALSE;- strncpy(g_proxy_ip, proxy_ip, sizeof(g_proxy_ip) - 1);- g_proxy_ip[sizeof(g_proxy_ip) - 1] = '\0';+ strncpy(g_proxy_host, proxy_ip, sizeof(g_proxy_host) - 1);+ g_proxy_host[sizeof(g_proxy_host) - 1] = '\0';g_proxy_port = proxy_port;g_proxy_type = (type == PROXY_TYPE_HTTP) ? PROXY_TYPE_HTTP : PROXY_TYPE_SOCKS5;@@ -2249,7 +2305,7 @@ PROXYBRIDGE_API BOOL ProxyBridge_Start(void)log_message("ProxyBridge started");log_message("Local relay: localhost:%d", g_local_relay_port);- log_message("%s proxy: %s:%d", g_proxy_type == PROXY_TYPE_HTTP ? "HTTP" : "SOCKS5", g_proxy_ip, g_proxy_port);+ log_message("%s proxy: %s:%d", g_proxy_type == PROXY_TYPE_HTTP ? "HTTP" : "SOCKS5", g_proxy_host, g_proxy_port);int rule_count = 0;PROCESS_RULE *rule = rules_list;@@ -2329,7 +2385,7 @@ PROXYBRIDGE_API int ProxyBridge_TestConnection(const char* target_host, UINT16 tint ret = -1;char temp_buffer[512];- if (g_proxy_ip[0] == '\0' || g_proxy_port == 0)+ if (g_proxy_host[0] == '\0' || g_proxy_port == 0){snprintf(result_buffer, buffer_size, "ERROR: No proxy configured");return -1;@@ -2351,7 +2407,7 @@ PROXYBRIDGE_API int ProxyBridge_TestConnection(const char* target_host, UINT16 tsnprintf(temp_buffer, sizeof(temp_buffer), "Testing connection to %s:%d via %s proxy %s:%d...\n",target_host, target_port,g_proxy_type == PROXY_TYPE_HTTP ? "HTTP" : "SOCKS5",- g_proxy_ip, g_proxy_port);+ g_proxy_host, g_proxy_port);strncpy(result_buffer, temp_buffer, buffer_size - 1);@@ -2387,10 +2443,10 @@ PROXYBRIDGE_API int ProxyBridge_TestConnection(const char* target_host, UINT16 tmemset(&proxy_addr, 0, sizeof(proxy_addr));proxy_addr.sin_family = AF_INET;- proxy_addr.sin_addr.s_addr = parse_ipv4(g_proxy_ip);+ proxy_addr.sin_addr.s_addr = resolve_hostname(g_proxy_host);proxy_addr.sin_port = htons(g_proxy_port);- snprintf(temp_buffer, sizeof(temp_buffer), "Connecting to proxy %s:%d...\n", g_proxy_ip, g_proxy_port);+ snprintf(temp_buffer, sizeof(temp_buffer), "Connecting to proxy %s:%d...\n", g_proxy_host, g_proxy_port);strncat(result_buffer, temp_buffer, buffer_size - strlen(result_buffer) - 1);if (connect(test_sock, (struct sockaddr*)&proxy_addr, sizeof(proxy_addr)) == SOCKET_ERROR)diff --git a/Windows/src/ProxyBridge.h b/Windows/src/ProxyBridge.hindex 70f5b09..91d1178 100644--- a/Windows/src/ProxyBridge.h+++ b/Windows/src/ProxyBridge.h@@ -38,7 +38,7 @@ PROXYBRIDGE_API BOOL ProxyBridge_EnableRule(UINT32 rule_id);PROXYBRIDGE_API BOOL ProxyBridge_DisableRule(UINT32 rule_id);PROXYBRIDGE_API BOOL ProxyBridge_DeleteRule(UINT32 rule_id);PROXYBRIDGE_API BOOL ProxyBridge_EditRule(UINT32 rule_id, const char* process_name, const char* target_hosts, const char* target_ports, RuleProtocol protocol, RuleAction action);-PROXYBRIDGE_API BOOL ProxyBridge_SetProxyConfig(ProxyType type, const char* proxy_ip, UINT16 proxy_port, const char* username, const char* password);+PROXYBRIDGE_API BOOL ProxyBridge_SetProxyConfig(ProxyType type, const char* proxy_ip, UINT16 proxy_port, const char* username, const char* password); // proxy_ip can be IP address or hostnamePROXYBRIDGE_API void ProxyBridge_SetDnsViaProxy(BOOL enable);PROXYBRIDGE_API void ProxyBridge_SetLogCallback(LogCallback callback);PROXYBRIDGE_API void ProxyBridge_SetConnectionCallback(ConnectionCallback callback);