Skip to content

Force Proxy to any Windows/MacOS/Linux Application TCP and UDP traffic

#155 - Fixed Relay server IP issue

AnoF-Cyber2fdf440dd054
diff --git a/Windows/gui/Interop/ProxyBridgeNative.cs b/Windows/gui/Interop/ProxyBridgeNative.cs
index df7c4b5..a25b34b 100644
--- a/Windows/gui/Interop/ProxyBridgeNative.cs
+++ b/Windows/gui/Interop/ProxyBridgeNative.cs
@@ -171,9 +171,6 @@ public static class ProxyBridgeNative
[DllImport(DllName, CallingConvention = CallingConvention.Cdecl)]
public static extern void ProxyBridge_SetTrafficLoggingEnabled([MarshalAs(UnmanagedType.Bool)] bool enable);
- [DllImport(DllName, CallingConvention = CallingConvention.Cdecl)]
- public static extern void ProxyBridge_SetDnsViaProxy([MarshalAs(UnmanagedType.Bool)] bool enable);
-
[DllImport(DllName, CallingConvention = CallingConvention.Cdecl)]
public static extern void ProxyBridge_SetLocalhostViaProxy([MarshalAs(UnmanagedType.Bool)] bool enable);
diff --git a/Windows/gui/Resources/Resources.Designer.cs b/Windows/gui/Resources/Resources.Designer.cs
index 388e10f..75cdab5 100644
--- a/Windows/gui/Resources/Resources.Designer.cs
+++ b/Windows/gui/Resources/Resources.Designer.cs
@@ -83,15 +83,6 @@ namespace ProxyBridge.GUI.Resources {
}
}
- /// <summary>
- /// Looks up a localized string similar to DNS via Proxy.
- /// </summary>
- internal static string MenuDnsViaProxy {
- get {
- return ResourceManager.GetString("MenuDnsViaProxy", resourceCulture);
- }
- }
-
internal static string MenuLocalhostViaProxy {
get {
return ResourceManager.GetString("MenuLocalhostViaProxy", resourceCulture);
@@ -400,24 +391,6 @@ namespace ProxyBridge.GUI.Resources {
}
}
- /// <summary>
- /// Looks up a localized string similar to DNS via Proxy: Enabled.
- /// </summary>
- internal static string LogDnsViaProxyEnabled {
- get {
- return ResourceManager.GetString("LogDnsViaProxyEnabled", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to DNS via Proxy: Disabled.
- /// </summary>
- internal static string LogDnsViaProxyDisabled {
- get {
- return ResourceManager.GetString("LogDnsViaProxyDisabled", resourceCulture);
- }
- }
-
/// <summary>
/// Looks up a localized string similar to Language changed to.
/// </summary>
diff --git a/Windows/gui/Resources/Resources.resx b/Windows/gui/Resources/Resources.resx
index a1f3362..5f0db8b 100644
--- a/Windows/gui/Resources/Resources.resx
+++ b/Windows/gui/Resources/Resources.resx
@@ -23,9 +23,6 @@
<data name="MenuProxyRules" xml:space="preserve">
<value>Proxy Rules</value>
</data>
- <data name="MenuDnsViaProxy" xml:space="preserve">
- <value>DNS via Proxy</value>
- </data>
<data name="MenuLocalhostViaProxy" xml:space="preserve">
<value>Localhost via Proxy</value>
</data>
@@ -164,12 +161,6 @@
<data name="LogRuleAddFailed" xml:space="preserve">
<value>ERROR: Failed to add rule</value>
</data>
- <data name="LogDnsViaProxyEnabled" xml:space="preserve">
- <value>DNS via Proxy: Enabled</value>
- </data>
- <data name="LogDnsViaProxyDisabled" xml:space="preserve">
- <value>DNS via Proxy: Disabled</value>
- </data>
<data name="LogLanguageChanged" xml:space="preserve">
<value>Language changed to</value>
</data>
diff --git a/Windows/gui/Resources/Resources.zh.resx b/Windows/gui/Resources/Resources.zh.resx
index 7912514..7414cf2 100644
--- a/Windows/gui/Resources/Resources.zh.resx
+++ b/Windows/gui/Resources/Resources.zh.resx
@@ -23,9 +23,6 @@
<data name="MenuProxyRules" xml:space="preserve">
<value>代理规则</value>
</data>
- <data name="MenuDnsViaProxy" xml:space="preserve">
- <value>DNS通过代理</value>
- </data>
<data name="MenuLocalhostViaProxy" xml:space="preserve">
<value>本地主机通过代理</value>
</data>
@@ -165,12 +162,6 @@
<data name="LogRuleAddFailed" xml:space="preserve">
<value>错误: 添加规则失败</value>
</data>
- <data name="LogDnsViaProxyEnabled" xml:space="preserve">
- <value>DNS通过代理: 已启用</value>
- </data>
- <data name="LogDnsViaProxyDisabled" xml:space="preserve">
- <value>DNS通过代理: 已禁用</value>
- </data>
<data name="LogLanguageChanged" xml:space="preserve">
<value>语言已更改为</value>
</data>
diff --git a/Windows/gui/Services/Loc.cs b/Windows/gui/Services/Loc.cs
index 994010d..f3ab9c3 100644
--- a/Windows/gui/Services/Loc.cs
+++ b/Windows/gui/Services/Loc.cs
@@ -40,7 +40,6 @@ public class Loc : INotifyPropertyChanged
public string MenuProxy => Resources.Resources.MenuProxy;
public string MenuProxySettings => Resources.Resources.MenuProxySettings;
public string MenuProxyRules => Resources.Resources.MenuProxyRules;
- public string MenuDnsViaProxy => Resources.Resources.MenuDnsViaProxy;
public string MenuLocalhostViaProxy => Resources.Resources.MenuLocalhostViaProxy;
public string MenuEnableTrafficLogging => Resources.Resources.MenuEnableTrafficLogging;
public string MenuLogFilters => Resources.Resources.MenuLogFilters;
@@ -93,8 +92,6 @@ public class Loc : INotifyPropertyChanged
public string LogProxySettingsFailed => Resources.Resources.LogProxySettingsFailed;
public string LogRuleAdded => Resources.Resources.LogRuleAdded;
public string LogRuleAddFailed => Resources.Resources.LogRuleAddFailed;
- public string LogDnsViaProxyEnabled => Resources.Resources.LogDnsViaProxyEnabled;
- public string LogDnsViaProxyDisabled => Resources.Resources.LogDnsViaProxyDisabled;
public string LogLanguageChanged => Resources.Resources.LogLanguageChanged;
public string LogWithAuth => Resources.Resources.LogWithAuth;
diff --git a/Windows/gui/Services/ProfileManager.cs b/Windows/gui/Services/ProfileManager.cs
index 97ccdf7..60bb565 100644
--- a/Windows/gui/Services/ProfileManager.cs
+++ b/Windows/gui/Services/ProfileManager.cs
@@ -39,7 +39,6 @@ public class ProxyProfile
{
public string Version { get; set; } = "1.0";
public string Name { get; set; } = "Default";
- public bool DnsViaProxy { get; set; } = true;
public bool LocalhostViaProxy { get; set; } = false;
public bool IsTrafficLoggingEnabled { get; set; } = true;
public bool AutoClearConnectionLogs { get; set; } = true;
diff --git a/Windows/gui/Services/ProxyBridgeService.cs b/Windows/gui/Services/ProxyBridgeService.cs
index 4157a8e..3662721 100644
--- a/Windows/gui/Services/ProxyBridgeService.cs
+++ b/Windows/gui/Services/ProxyBridgeService.cs
@@ -153,11 +153,6 @@ public class ProxyBridgeService : IDisposable
return ProxyBridgeNative.ProxyBridge_MoveRuleToPosition(ruleId, newPosition);
}
- public void SetDnsViaProxy(bool enable)
- {
- ProxyBridgeNative.ProxyBridge_SetDnsViaProxy(enable);
- }
-
public void SetLocalhostViaProxy(bool enable)
{
ProxyBridgeNative.ProxyBridge_SetLocalhostViaProxy(enable);
diff --git a/Windows/gui/ViewModels/MainWindowViewModel.cs b/Windows/gui/ViewModels/MainWindowViewModel.cs
index 2cb2873..82e86d7 100644
--- a/Windows/gui/ViewModels/MainWindowViewModel.cs
+++ b/Windows/gui/ViewModels/MainWindowViewModel.cs
@@ -127,7 +127,6 @@ public class MainWindowViewModel : ViewModelBase
};
_activityLogTimer.Start();
- _proxyService.SetDnsViaProxy(_dnsViaProxy);
_proxyService.SetLocalhostViaProxy(_localhostViaProxy);
// Build stored-ID to native-ID map while registering proxy configs
@@ -280,20 +279,6 @@ public class MainWindowViewModel : ViewModelBase
set => SetProperty(ref _newProxyAction, value);
}
- private bool _dnsViaProxy = true;
- public bool DnsViaProxy
- {
- get => _dnsViaProxy;
- set
- {
- if (SetProperty(ref _dnsViaProxy, value))
- {
- _proxyService?.SetDnsViaProxy(value);
- SaveCurrentProfileAsync();
- }
- }
- }
-
private bool _localhostViaProxy = false;
public bool LocalhostViaProxy
{
@@ -388,7 +373,6 @@ public class MainWindowViewModel : ViewModelBase
public ICommand ShowLogFiltersCommand { get; }
public ICommand ShowAboutCommand { get; }
public ICommand CheckForUpdatesCommand { get; }
- public ICommand ToggleDnsViaProxyCommand { get; }
public ICommand ToggleLocalhostViaProxyCommand { get; }
public ICommand ToggleTrafficLoggingCommand { get; }
public ICommand ToggleAutoClearConnectionLogsCommand { get; }
@@ -505,7 +489,6 @@ public class MainWindowViewModel : ViewModelBase
await updateWindow.ShowDialog(_mainWindow);
});
- ToggleDnsViaProxyCommand = new RelayCommand(() => { DnsViaProxy = !DnsViaProxy; });
ToggleLocalhostViaProxyCommand = new RelayCommand(() => { LocalhostViaProxy = !LocalhostViaProxy; });
ToggleTrafficLoggingCommand = new RelayCommand(() => { IsTrafficLoggingEnabled = !IsTrafficLoggingEnabled; });
ToggleAutoClearConnectionLogsCommand = new RelayCommand(() => { AutoClearConnectionLogs = !AutoClearConnectionLogs; });
@@ -1004,9 +987,6 @@ public class MainWindowViewModel : ViewModelBase
var profile = ProfileManager.LoadProfile(profileName);
- _dnsViaProxy = profile.DnsViaProxy;
- OnPropertyChanged(nameof(DnsViaProxy));
-
_localhostViaProxy = profile.LocalhostViaProxy;
OnPropertyChanged(nameof(LocalhostViaProxy));
@@ -1092,10 +1072,6 @@ public class MainWindowViewModel : ViewModelBase
ActiveProfileName = name;
Title = $"ProxyBridge - {name}";
- _dnsViaProxy = profile.DnsViaProxy;
- OnPropertyChanged(nameof(DnsViaProxy));
- _proxyService?.SetDnsViaProxy(profile.DnsViaProxy);
-
_localhostViaProxy = profile.LocalhostViaProxy;
OnPropertyChanged(nameof(LocalhostViaProxy));
_proxyService?.SetLocalhostViaProxy(profile.LocalhostViaProxy);
@@ -1216,7 +1192,6 @@ public class MainWindowViewModel : ViewModelBase
{
return new ProxyProfile
{
- DnsViaProxy = _dnsViaProxy,
LocalhostViaProxy = _localhostViaProxy,
IsTrafficLoggingEnabled = _isTrafficLoggingEnabled,
AutoClearConnectionLogs = _autoClearConnectionLogs,
diff --git a/Windows/gui/Views/MainWindow.axaml b/Windows/gui/Views/MainWindow.axaml
index 274fe86..e722661 100644
--- a/Windows/gui/Views/MainWindow.axaml
+++ b/Windows/gui/Views/MainWindow.axaml
@@ -219,14 +219,6 @@
Margin="0"/>
</MenuItem.Icon>
</MenuItem>
- <MenuItem Header="{Binding Loc.MenuDnsViaProxy}"
- Command="{Binding ToggleDnsViaProxyCommand}">
- <MenuItem.Icon>
- <CheckBox IsChecked="{Binding DnsViaProxy}"
- IsHitTestVisible="False"
- Margin="0"/>
- </MenuItem.Icon>
- </MenuItem>
<MenuItem Header="{Binding Loc.MenuLocalhostViaProxy}"
Command="{Binding ToggleLocalhostViaProxyCommand}">
<MenuItem.Icon>
diff --git a/Windows/src/ProxyBridge.c b/Windows/src/ProxyBridge.c
index 700467f..bcb774f 100644
--- a/Windows/src/ProxyBridge.c
+++ b/Windows/src/ProxyBridge.c
@@ -230,7 +230,6 @@ static __forceinline void port_clear(UINT16 p)
}
static UINT16 g_local_relay_port = LOCAL_PROXY_PORT;
-static BOOL g_dns_via_proxy = TRUE;
static BOOL g_localhost_via_proxy = FALSE; // default disabled for security - most proxy server block localhost for ssrf and also many app might not work if localhost trafic goes to remote server if proxy server is on diffrent machine
static LogCallback g_log_callback = NULL;
static ConnectionCallback g_connection_callback = NULL;
@@ -776,10 +775,7 @@ static DWORD WINAPI packet_processor(LPVOID arg)
DWORD pid = 0;
UINT32 proxy_config_id = 0;
- if (dest_port == 53 && !g_dns_via_proxy)
- action = RULE_ACTION_DIRECT;
- else
- action = check_process_rule(src_ip, src_port, dest_ip, dest_port, TRUE, &pid, &proxy_config_id);
+ action = check_process_rule(src_ip, src_port, dest_ip, dest_port, TRUE, &pid, &proxy_config_id);
// override PROXY to DIRECT if localhost proxy is disabled and destination is localhost
BYTE dest_first_octet = (dest_ip >> 0) & 0xFF;
@@ -988,10 +984,7 @@ static DWORD WINAPI packet_processor(LPVOID arg)
DWORD pid = 0;
UINT32 proxy_config_id = 0;
- if (orig_dest_port == 53 && !g_dns_via_proxy)
- action = RULE_ACTION_DIRECT;
- else
- action = check_process_rule(src_ip, src_port, orig_dest_ip, orig_dest_port, FALSE, &pid, &proxy_config_id);
+ action = check_process_rule(src_ip, src_port, orig_dest_ip, orig_dest_port, FALSE, &pid, &proxy_config_id);
BYTE orig_dest_first_octet = (orig_dest_ip >> 0) & 0xFF;
if (action == RULE_ACTION_PROXY && !g_localhost_via_proxy && orig_dest_first_octet == 127)
@@ -2757,6 +2750,13 @@ static BOOL establish_udp_associate_for_config(PROXY_CONFIG *cfg)
return FALSE;
}
+ // Many SOCKS5 servers return 0.0.0.0 as BND.ADDR in
+ // the UDP ASSOCIATE reply as per RFC 1928 says "use the same address
+ // as the TCP control connection". sendto(0.0.0.0:PORT) fails with
+ // WSAEADDRNOTAVAIL (10049), so replace it with the proxy's resolved IP.
+ if (cfg->udp_relay_addr.sin_addr.s_addr == INADDR_ANY)
+ cfg->udp_relay_addr.sin_addr.s_addr = socks5_ip;
+
cfg->udp_tcp_ctrl = tcp_sock;
// create UDP socket for sending to SOCKS5 proxy
@@ -2772,7 +2772,9 @@ static BOOL establish_udp_associate_for_config(PROXY_CONFIG *cfg)
configure_udp_socket(cfg->udp_send_sock, 262144, 30000);
cfg->udp_connected = TRUE;
- log_message("UDP ASSOCIATE established with SOCKS5 proxy %s:%d", cfg->host, cfg->port);
+ log_message("UDP ASSOCIATE established with SOCKS5 proxy %s:%d (UDP relay at %s:%d)",
+ cfg->host, cfg->port,
+ inet_ntoa(cfg->udp_relay_addr.sin_addr), ntohs(cfg->udp_relay_addr.sin_port));
return TRUE;
}
@@ -2800,8 +2802,9 @@ static DWORD WINAPI udp_relay_server(LPVOID arg)
memset(&local_addr, 0, sizeof(local_addr));
local_addr.sin_family = AF_INET;
- local_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
- local_addr.sin_port = htons(LOCAL_UDP_RELAY_PORT);
+ local_addr.sin_addr.s_addr = htonl(INADDR_ANY); // must be any WinDivert swaps src/dst IPs for
+ local_addr.sin_port = htons(LOCAL_UDP_RELAY_PORT);// tracked connections so packets arrive at the
+ // machines real ip and not 127.0.0.1
if (bind(udp_relay_socket, (struct sockaddr *)&local_addr, sizeof(local_addr)) == SOCKET_ERROR)
{
@@ -2822,7 +2825,7 @@ static DWORD WINAPI udp_relay_server(LPVOID arg)
struct sockaddr_in6 a6;
memset(&a6, 0, sizeof(a6));
a6.sin6_family = AF_INET6;
- a6.sin6_addr = in6addr_loopback;
+ a6.sin6_addr = in6addr_any; // same tracked packets arrive at machines real IPv6
a6.sin6_port = htons(LOCAL_UDP_RELAY_PORT);
if (bind(udp_relay_socket6, (struct sockaddr*)&a6, sizeof(a6)) == SOCKET_ERROR)
{
@@ -2958,10 +2961,6 @@ static DWORD WINAPI udp_relay_server(LPVOID arg)
cfg->udp_connected = FALSE;
}
}
- else
- {
- log_message("[UDP RELAY] No connection found for port %d", from_port);
- }
}
}
@@ -3000,11 +2999,11 @@ static DWORD WINAPI udp_relay_server(LPVOID arg)
UINT32 src_ip = (recv_buf[4]<<0)|(recv_buf[5]<<8)|(recv_buf[6]<<16)|(recv_buf[7]<<24);
UINT16 src_port = (recv_buf[8]<<8)|recv_buf[9];
- AcquireSRWLockShared(&lock);
- struct sockaddr_in target_addr;
BOOL found = FALSE;
UINT32 target_ip = 0;
UINT16 target_port = 0;
+
+ AcquireSRWLockShared(&lock);
ULONGLONG best_activity = 0;
for (int b = 0; b < CONNECTION_HASH_SIZE; b++)
{
@@ -3015,7 +3014,7 @@ static DWORD WINAPI udp_relay_server(LPVOID arg)
{
if (!found || conn->last_activity > best_activity)
{
- target_ip = conn->src_ip;
+ target_ip = conn->src_ip;
target_port = conn->src_port;
best_activity = conn->last_activity;
found = TRUE;
@@ -3025,8 +3024,10 @@ static DWORD WINAPI udp_relay_server(LPVOID arg)
}
}
ReleaseSRWLockShared(&lock);
+
if (found)
{
+ struct sockaddr_in target_addr;
memset(&target_addr, 0, sizeof(target_addr));
target_addr.sin_family = AF_INET;
target_addr.sin_addr.s_addr = target_ip;
@@ -4279,12 +4280,6 @@ PROXYBRIDGE_API int ProxyBridge_TestProxyConfig(UINT32 config_id, const char* ta
}
}
-PROXYBRIDGE_API void ProxyBridge_SetDnsViaProxy(BOOL enable)
-{
- g_dns_via_proxy = enable;
- log_message("DNS routing: %s", enable ? "via proxy" : "direct");
-}
-
PROXYBRIDGE_API void ProxyBridge_SetLocalhostViaProxy(BOOL enable)
{
g_localhost_via_proxy = enable;
diff --git a/Windows/src/ProxyBridge.h b/Windows/src/ProxyBridge.h
index ff91792..467e48e 100644
--- a/Windows/src/ProxyBridge.h
+++ b/Windows/src/ProxyBridge.h
@@ -50,7 +50,6 @@ 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, UINT32 proxy_config_id);
PROXYBRIDGE_API BOOL ProxyBridge_MoveRuleToPosition(UINT32 rule_id, UINT32 new_position); // Move rule to specific position (1=first, 2=second, etc)
PROXYBRIDGE_API UINT32 ProxyBridge_GetRulePosition(UINT32 rule_id); // Get current position of rule in list (1-based)
-PROXYBRIDGE_API void ProxyBridge_SetDnsViaProxy(BOOL enable);
PROXYBRIDGE_API void ProxyBridge_SetLocalhostViaProxy(BOOL enable);
PROXYBRIDGE_API void ProxyBridge_SetLogCallback(LogCallback callback);
PROXYBRIDGE_API void ProxyBridge_SetConnectionCallback(ConnectionCallback callback);