Skip to content

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

fixed Sonarqube and Github SAST

AnoF-Cyberb0804a6026d4
diff --git a/Windows/gui/ViewModels/MainWindowViewModel.cs b/Windows/gui/ViewModels/MainWindowViewModel.cs
index ebfacdc..5eac8a2 100644
--- a/Windows/gui/ViewModels/MainWindowViewModel.cs
+++ b/Windows/gui/ViewModels/MainWindowViewModel.cs
@@ -161,13 +161,10 @@ public class MainWindowViewModel : ViewModelBase
}
}
- foreach (var rule in ProxyRules)
+ foreach (var rule in ProxyRules.Where(r => r.Action == "PROXY" && r.ProxyConfigId > 0))
{
- if (rule.Action == "PROXY" && rule.ProxyConfigId > 0)
- {
- var pc = ProxyConfigs.FirstOrDefault(p => p.Id == rule.ProxyConfigId);
- rule.ProxyConfigDisplay = pc?.DisplayName ?? "";
- }
+ var pc = ProxyConfigs.FirstOrDefault(p => p.Id == rule.ProxyConfigId);
+ rule.ProxyConfigDisplay = pc?.DisplayName ?? "";
}
}
else
@@ -878,13 +875,10 @@ public class MainWindowViewModel : ViewModelBase
return log;
var sb = new StringBuilder(log.Length);
- foreach (var line in log.Split('\n'))
+ foreach (var line in log.Split('\n').Where(l => !l.Contains(" via Direct", StringComparison.OrdinalIgnoreCase)))
{
- if (!line.Contains(" via Direct", StringComparison.OrdinalIgnoreCase))
- {
- sb.Append(line);
- sb.Append('\n');
- }
+ sb.Append(line);
+ sb.Append('\n');
}
return sb.ToString();
}
@@ -910,10 +904,7 @@ public class MainWindowViewModel : ViewModelBase
private static int CountNewlines(string log)
{
- int count = 0;
- foreach (char c in log)
- if (c == '\n') count++;
- return count;
+ return log.Count(c => c == '\n');
}
private void LoadConfiguration()
@@ -958,9 +949,8 @@ public class MainWindowViewModel : ViewModelBase
if (profile.ProxyConfigs != null)
{
- foreach (var pc in profile.ProxyConfigs)
+ foreach (var pc in profile.ProxyConfigs.Where(pc => !string.IsNullOrWhiteSpace(pc.Host)))
{
- if (string.IsNullOrWhiteSpace(pc.Host)) continue;
ProxyConfigs.Add(new ProxyConfig
{
Id = pc.Id,
@@ -1049,9 +1039,9 @@ public class MainWindowViewModel : ViewModelBase
}
var configIdMap = new Dictionary<uint, uint>();
- foreach (var pc in profile.ProxyConfigs ?? new List<ProxyConfigEntry>())
+ foreach (var pc in (profile.ProxyConfigs ?? Enumerable.Empty<ProxyConfigEntry>()).Where(pc => !string.IsNullOrWhiteSpace(pc.Host) && ushort.TryParse(pc.Port, out _)))
{
- if (string.IsNullOrWhiteSpace(pc.Host) || !ushort.TryParse(pc.Port, out ushort port)) continue;
+ ushort.TryParse(pc.Port, out ushort port);
uint nativeId = _proxyService != null
? _proxyService.AddProxyConfig(pc.Type, pc.Host, port, pc.Username ?? "", pc.Password ?? "")
diff --git a/Windows/gui/ViewModels/ProxySettingsViewModel.cs b/Windows/gui/ViewModels/ProxySettingsViewModel.cs
index bc973e5..3e6bfa3 100644
--- a/Windows/gui/ViewModels/ProxySettingsViewModel.cs
+++ b/Windows/gui/ViewModels/ProxySettingsViewModel.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.ObjectModel;
+using System.Linq;
using System.Net;
using System.Text.RegularExpressions;
using System.Windows.Input;
@@ -295,9 +296,7 @@ public class ProxySettingsViewModel : ViewModelBase
private ProxyConfig? FindConfig(uint configId)
{
- foreach (var c in _proxyConfigs)
- if (c.Id == configId) return c;
- return null;
+ return _proxyConfigs.FirstOrDefault(c => c.Id == configId);
}
private async System.Threading.Tasks.Task DeleteConfigAsync(ProxyConfig config)
diff --git a/Windows/gui/Views/ProxySettingsWindow.axaml.cs b/Windows/gui/Views/ProxySettingsWindow.axaml.cs
index d941e8a..4514012 100644
--- a/Windows/gui/Views/ProxySettingsWindow.axaml.cs
+++ b/Windows/gui/Views/ProxySettingsWindow.axaml.cs
@@ -1,4 +1,5 @@
using System.ComponentModel;
+using System.Linq;
using Avalonia.Controls;
using Avalonia.Interactivity;
using ProxyBridge.GUI.ViewModels;
@@ -62,15 +63,10 @@ public partial class ProxySettingsWindow : Window
if (comboBox == null) return;
_isUpdatingFromViewModel = true;
- foreach (var obj in comboBox.Items)
- {
- if (obj is ComboBoxItem item && item.Tag is string tag &&
- tag.Equals(typeTag, System.StringComparison.OrdinalIgnoreCase))
- {
- comboBox.SelectedItem = item;
- break;
- }
- }
+ comboBox.SelectedItem = comboBox.Items
+ .OfType<ComboBoxItem>()
+ .FirstOrDefault(item => item.Tag is string tag &&
+ tag.Equals(typeTag, System.StringComparison.OrdinalIgnoreCase));
_isUpdatingFromViewModel = false;
}
diff --git a/Windows/src/ProxyBridge.c b/Windows/src/ProxyBridge.c
index 93d6390..4072c10 100644
--- a/Windows/src/ProxyBridge.c
+++ b/Windows/src/ProxyBridge.c
@@ -2135,10 +2135,8 @@ static int http_connect_v6(SOCKET s, const UINT8 dest_ip6[16], UINT16 dest_port,
if (send(s, request, len, 0) != len) return -1;
len = recv(s, response, sizeof(response) - 1, 0);
- if (len <= 0) return -1;
+ if (len <= 0 || len >= (int)sizeof(response)) return -1;
response[len] = '\0';
-
- if (strncmp(response, "HTTP/1.", 7) != 0) return -1;
char *code_start = strchr(response, ' ');
if (!code_start || atoi(code_start + 1) != 200) return -1;
return 0;
@@ -2212,7 +2210,7 @@ static int http_connect(SOCKET s, UINT32 dest_ip, UINT16 dest_port, const PROXY_
}
len = recv(s, response, sizeof(response) - 1, 0);
- if (len <= 0)
+ if (len <= 0 || len >= (int)sizeof(response))
{
log_message("HTTP: Failed to receive response");
return -1;
@@ -2401,10 +2399,10 @@ static BOOL establish_udp_associate_for_config(PROXY_CONFIG *cfg)
static DWORD WINAPI udp_relay_server(LPVOID arg)
{
WSADATA wsa_data;
- struct sockaddr_in local_addr, from_addr;
+ struct sockaddr_in local_addr = {0}, from_addr = {0};
unsigned char recv_buf[MAXBUF];
unsigned char send_buf[MAXBUF];
- int recv_len, from_len;
+ int recv_len, from_len = 0;
if (WSAStartup(MAKEWORD(2, 2), &wsa_data) != 0)
return 1;
@@ -2682,7 +2680,7 @@ static DWORD WINAPI udp_relay_server(LPVOID arg)
// IPv6 UDP packets from application
if (udp_relay_socket6 != INVALID_SOCKET && FD_ISSET(udp_relay_socket6, &read_fds))
{
- struct sockaddr_in6 from_addr6;
+ struct sockaddr_in6 from_addr6 = {0};
int fl = sizeof(from_addr6);
recv_len = recvfrom(udp_relay_socket6, (char*)recv_buf, sizeof(recv_buf), 0,
(struct sockaddr*)&from_addr6, &fl);