Force Proxy to any Windows/MacOS/Linux Application TCP and UDP traffic
C ccybersecurityhttp3httpproxylinuxlinux-proxymacosmacos-appmacos-proxyproxifierproxifier-alternativeproxyclienttcpthick-clientudpwindivertwindows
ADD Pipeline checks and add CI hash for Supply security improve code quality and performance in various services and view models
AnoF-Cyber49bf56bf820c
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.ymlindex 06b9872..5f2dd84 100644--- a/.github/workflows/build-windows.yml+++ b/.github/workflows/build-windows.yml@@ -13,25 +13,15 @@ jobs:steps:- name: Checkout code- uses: actions/checkout@v4+ uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4- name: Setup .NET- uses: actions/setup-dotnet@v4+ uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4with:dotnet-version: '10.0.x'- - name: Setup MSYS2 (for GCC)- uses: msys2/setup-msys2@v2- with:- msystem: MINGW64- update: true- install: >-- mingw-w64-x86_64-gcc- mingw-w64-x86_64-toolchain-- - name: Add MSYS2 to PATH- run: echo "C:\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append- shell: pwsh+ # No MSVC setup action needed β compile.ps1 auto-detects cl.exe via vswhere.exe,+ # which is pre-installed on every windows-latest runner.- name: Install NSISrun: |@@ -42,7 +32,13 @@ jobs:run: |$nsisPluginDir = "C:\Program Files (x86)\NSIS\Plugins\x86-unicode"$url = "https://nsis.sourceforge.io/mediawiki/images/7/7f/EnVar_plugin.zip"- Invoke-WebRequest -Uri $url -OutFile "EnVar.zip"+ $expectedHash = "E9AA92DE351345ED82795251D838F1AE9041BA35AF9D381A5780C7843B01F56A"+ Invoke-WebRequest -Uri $url -OutFile "EnVar.zip" -UseBasicParsing+ $actualHash = (Get-FileHash "EnVar.zip" -Algorithm SHA256).Hash+ if ($actualHash -ne $expectedHash) {+ Write-Error "EnVar.zip SHA256 mismatch! Expected: $expectedHash Got: $actualHash"+ exit 1+ }Expand-Archive -Path "EnVar.zip" -DestinationPath "EnVar"Copy-Item "EnVar\Plugins\x86-unicode\EnVar.dll" -Destination $nsisPluginDir -ForceWrite-Host "EnVar plugin installed successfully"@@ -50,8 +46,14 @@ jobs:- name: Download WinDivertrun: |- $url = "https://github.com/basil00/Divert/releases/download/v2.2.2/WinDivert-2.2.2-A.zip"- Invoke-WebRequest -Uri $url -OutFile "WinDivert.zip"+ $url = "https://github.com/basil00/WinDivert/releases/download/v2.2.2/WinDivert-2.2.2-A.zip"+ $expectedHash = "63CB41763BB4B20F600B6DE04E991A9C2BE73279E317D4D82F237B150C5F3F15"+ Invoke-WebRequest -Uri $url -OutFile "WinDivert.zip" -UseBasicParsing+ $actualHash = (Get-FileHash "WinDivert.zip" -Algorithm SHA256).Hash+ if ($actualHash -ne $expectedHash) {+ Write-Error "WinDivert.zip SHA256 mismatch! Expected: $expectedHash Got: $actualHash"+ exit 1+ }Expand-Archive -Path "WinDivert.zip" -DestinationPath "C:\"shell: pwsh@@ -69,11 +71,11 @@ jobs:- name: Build projectrun: |cd Windows- .\compile.ps1 -NoSign -Compiler gcc+ .\compile.ps1 -NoSignshell: pwsh- name: Upload artifacts- uses: actions/upload-artifact@v4+ uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4with:name: ProxyBridge-Build-${{ github.sha }}path: Windows/output/diff --git a/Windows/gui/Services/ProfileManager.cs b/Windows/gui/Services/ProfileManager.csindex 6868d49..12855e8 100644--- a/Windows/gui/Services/ProfileManager.cs+++ b/Windows/gui/Services/ProfileManager.cs@@ -90,6 +90,9 @@ public static class ProfileManagerpublic const string ProfileExtension = ".pbprofile";public const string DefaultProfileName = "Default";+ private static readonly HashSet<char> _invalidFileNameChars =+ new(Path.GetInvalidFileNameChars());+private static readonly string ProfilesDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),"ProxyBridge",@@ -201,8 +204,7 @@ public static class ProfileManagerpublic static bool IsValidProfileName(string name){if (string.IsNullOrWhiteSpace(name) || name.Length > 64) return false;- var invalid = Path.GetInvalidFileNameChars();- return !name.Any(c => invalid.Contains(c));+ return !name.Any(c => _invalidFileNameChars.Contains(c));}private static string GetProfilePath(string name)@@ -218,8 +220,7 @@ public static class ProfileManagerprivate static string SanitizeProfileName(string name){- var invalid = Path.GetInvalidFileNameChars();- var sanitized = new string(name.Select(c => invalid.Contains(c) ? '_' : c).ToArray()).Trim();+ var sanitized = new string(name.Select(c => _invalidFileNameChars.Contains(c) ? '_' : c).ToArray()).Trim();if (string.IsNullOrWhiteSpace(sanitized)) return "Imported";return sanitized.Length <= 64 ? sanitized : sanitized[..64];}diff --git a/Windows/gui/Services/ProxyBridgeService.cs b/Windows/gui/Services/ProxyBridgeService.csindex 2ef99a9..b973bc1 100644--- a/Windows/gui/Services/ProxyBridgeService.cs+++ b/Windows/gui/Services/ProxyBridgeService.cs@@ -51,7 +51,7 @@ public class ProxyBridgeService : IDisposablepublic uint AddProxyConfig(string type, string ip, ushort port, string username, string password){- var proxyType = type.ToUpper() == "HTTP"+ var proxyType = string.Equals(type, "HTTP", StringComparison.OrdinalIgnoreCase)? ProxyBridgeNative.ProxyType.HTTP: ProxyBridgeNative.ProxyType.SOCKS5;@@ -60,7 +60,7 @@ public class ProxyBridgeService : IDisposablepublic bool EditProxyConfig(uint configId, string type, string ip, ushort port, string username, string password){- var proxyType = type.ToUpper() == "HTTP"+ var proxyType = string.Equals(type, "HTTP", StringComparison.OrdinalIgnoreCase)? ProxyBridgeNative.ProxyType.HTTP: ProxyBridgeNative.ProxyType.SOCKS5;@@ -81,20 +81,22 @@ public class ProxyBridgeService : IDisposablepublic uint AddRule(string processName, string targetHosts, string targetPorts, string protocol, string action, uint proxyConfigId = 0){- var ruleAction = action.ToUpper() switch- {- "DIRECT" => ProxyBridgeNative.RuleAction.DIRECT,- "BLOCK" => ProxyBridgeNative.RuleAction.BLOCK,- _ => ProxyBridgeNative.RuleAction.PROXY- };-- var ruleProtocol = protocol.ToUpper() switch- {- "UDP" => ProxyBridgeNative.RuleProtocol.UDP,- "BOTH" => ProxyBridgeNative.RuleProtocol.BOTH,- "TCP+UDP" => ProxyBridgeNative.RuleProtocol.BOTH,- _ => ProxyBridgeNative.RuleProtocol.TCP- };+ ProxyBridgeNative.RuleAction ruleAction;+ if (string.Equals(action, "DIRECT", StringComparison.OrdinalIgnoreCase))+ ruleAction = ProxyBridgeNative.RuleAction.DIRECT;+ else if (string.Equals(action, "BLOCK", StringComparison.OrdinalIgnoreCase))+ ruleAction = ProxyBridgeNative.RuleAction.BLOCK;+ else+ ruleAction = ProxyBridgeNative.RuleAction.PROXY;++ ProxyBridgeNative.RuleProtocol ruleProtocol;+ if (string.Equals(protocol, "UDP", StringComparison.OrdinalIgnoreCase))+ ruleProtocol = ProxyBridgeNative.RuleProtocol.UDP;+ else if (string.Equals(protocol, "BOTH", StringComparison.OrdinalIgnoreCase) ||+ string.Equals(protocol, "TCP+UDP", StringComparison.OrdinalIgnoreCase))+ ruleProtocol = ProxyBridgeNative.RuleProtocol.BOTH;+ else+ ruleProtocol = ProxyBridgeNative.RuleProtocol.TCP;return ProxyBridgeNative.ProxyBridge_AddRule(processName, targetHosts, targetPorts, ruleProtocol, ruleAction, proxyConfigId);}@@ -116,20 +118,22 @@ public class ProxyBridgeService : IDisposablepublic bool EditRule(uint ruleId, string processName, string targetHosts, string targetPorts, string protocol, string action, uint proxyConfigId = 0){- var ruleAction = action.ToUpper() switch- {- "DIRECT" => ProxyBridgeNative.RuleAction.DIRECT,- "BLOCK" => ProxyBridgeNative.RuleAction.BLOCK,- _ => ProxyBridgeNative.RuleAction.PROXY- };-- var ruleProtocol = protocol.ToUpper() switch- {- "UDP" => ProxyBridgeNative.RuleProtocol.UDP,- "BOTH" => ProxyBridgeNative.RuleProtocol.BOTH,- "TCP+UDP" => ProxyBridgeNative.RuleProtocol.BOTH,- _ => ProxyBridgeNative.RuleProtocol.TCP- };+ ProxyBridgeNative.RuleAction ruleAction;+ if (string.Equals(action, "DIRECT", StringComparison.OrdinalIgnoreCase))+ ruleAction = ProxyBridgeNative.RuleAction.DIRECT;+ else if (string.Equals(action, "BLOCK", StringComparison.OrdinalIgnoreCase))+ ruleAction = ProxyBridgeNative.RuleAction.BLOCK;+ else+ ruleAction = ProxyBridgeNative.RuleAction.PROXY;++ ProxyBridgeNative.RuleProtocol ruleProtocol;+ if (string.Equals(protocol, "UDP", StringComparison.OrdinalIgnoreCase))+ ruleProtocol = ProxyBridgeNative.RuleProtocol.UDP;+ else if (string.Equals(protocol, "BOTH", StringComparison.OrdinalIgnoreCase) ||+ string.Equals(protocol, "TCP+UDP", StringComparison.OrdinalIgnoreCase))+ ruleProtocol = ProxyBridgeNative.RuleProtocol.BOTH;+ else+ ruleProtocol = ProxyBridgeNative.RuleProtocol.TCP;return ProxyBridgeNative.ProxyBridge_EditRule(ruleId, processName, targetHosts, targetPorts, ruleProtocol, ruleAction, proxyConfigId);}diff --git a/Windows/gui/Services/UpdateService.cs b/Windows/gui/Services/UpdateService.csindex 3699ae3..2edebba 100644--- a/Windows/gui/Services/UpdateService.cs+++ b/Windows/gui/Services/UpdateService.cs@@ -19,13 +19,15 @@ internal partial class SourceGenerationContext : JsonSerializerContextpublic class UpdateService{- private readonly HttpClient _httpClient;+ private static readonly HttpClient _httpClient;+ private static readonly Version _currentVersion;private const string GitHubApiUrl = "https://api.github.com/repos/InterceptSuite/ProxyBridge/releases/latest";- public UpdateService()+ static UpdateService(){_httpClient = new HttpClient();_httpClient.DefaultRequestHeaders.Add("User-Agent", "ProxyBridge-UpdateChecker");+ _currentVersion = Assembly.GetExecutingAssembly().GetName().Version ?? new Version(1, 0, 0);}public async Task<VersionInfo> CheckForUpdatesAsync()@@ -76,11 +78,7 @@ public class UpdateService}}- private Version GetCurrentVersion()- {- var version = Assembly.GetExecutingAssembly().GetName().Version;- return version ?? new Version(1, 0, 0);- }+ private Version GetCurrentVersion() => _currentVersion;private Version ParseVersion(string? tagName){@@ -167,10 +165,7 @@ public class UpdateService}}- public void Dispose()- {- _httpClient?.Dispose();- }+ public void Dispose() { }}public class VersionInfodiff --git a/Windows/gui/ViewModels/MainWindowViewModel.cs b/Windows/gui/ViewModels/MainWindowViewModel.csindex e3f0315..192109e 100644--- a/Windows/gui/ViewModels/MainWindowViewModel.cs+++ b/Windows/gui/ViewModels/MainWindowViewModel.cs@@ -4,6 +4,7 @@ using System.Collections.ObjectModel;using System.Windows.Input;using System.Linq;using System.Text;+using System.Threading;using System.Threading.Tasks;using Avalonia.Threading;using Avalonia.Controls;@@ -51,6 +52,7 @@ public class MainWindowViewModel : ViewModelBaseprivate DispatcherTimer? _activityLogTimer;private int _connectionLogLineCount = 0;private int _activityLogLineCount = 0;+ private CancellationTokenSource? _saveCts;public void SetMainWindow(Window window){@@ -842,6 +844,7 @@ public class MainWindowViewModel : ViewModelBasepublic void Cleanup(){+ try { _saveCts?.Cancel(); _saveCts?.Dispose(); _saveCts = null; } catch { }try { SaveCurrentProfile(); } catch { }try { _proxyService?.Dispose(); _proxyService = null; } catch { }}@@ -1112,9 +1115,22 @@ public class MainWindowViewModel : ViewModelBaseprivate void SaveCurrentProfileAsync(){+ var oldCts = _saveCts;+ _saveCts = new CancellationTokenSource();+ oldCts?.Cancel();+ oldCts?.Dispose();+ var token = _saveCts.Token;var name = _activeProfileName;var profile = BuildCurrentProfile();- Task.Run(() => ProfileManager.SaveProfile(name, profile));+ _ = Task.Run(async () =>+ {+ try+ {+ await Task.Delay(150, token);+ ProfileManager.SaveProfile(name, profile);+ }+ catch (OperationCanceledException) { }+ });}private ProxyProfile BuildCurrentProfile()@@ -1239,7 +1255,11 @@ public class ProxyRule : ViewModelBasepublic string ProxyConfigDisplay{get => _proxyConfigDisplay;- set => SetProperty(ref _proxyConfigDisplay, value);+ set+ {+ if (SetProperty(ref _proxyConfigDisplay, value))+ OnPropertyChanged(nameof(ActionDisplay));+ }}public string ActionDisplay => Action == "PROXY"diff --git a/Windows/gui/ViewModels/ProxyRulesViewModel.cs b/Windows/gui/ViewModels/ProxyRulesViewModel.csindex 8f017f0..4292725 100644--- a/Windows/gui/ViewModels/ProxyRulesViewModel.cs+++ b/Windows/gui/ViewModels/ProxyRulesViewModel.cs@@ -10,6 +10,10 @@ namespace ProxyBridge.GUI.ViewModels;public class ProxyRulesViewModel : ViewModelBase{+ private static readonly System.Text.RegularExpressions.Regex _processNameRegex =+ new(@"^[\w\s._\-*;""\\:()\u4E00-\u9FFF\u3400-\u4DBF\uF900-\uFAFF]+$",+ System.Text.RegularExpressions.RegexOptions.Compiled);+private readonly Loc _loc = Loc.Instance;public Loc Loc => _loc;@@ -145,7 +149,7 @@ public class ProxyRulesViewModel : ViewModelBaseNewTargetHosts = ValidationHelper.DefaultIfEmpty(NewTargetHosts);NewTargetPorts = ValidationHelper.DefaultIfEmpty(NewTargetPorts);- if (!System.Text.RegularExpressions.Regex.IsMatch(NewProcessName, @"^[\w\s._\-*;""\\:()\u4E00-\u9FFF\u3400-\u4DBF\uF900-\uFAFF]+$"))+ if (!_processNameRegex.IsMatch(NewProcessName)){ProcessNameError = "Invalid characters in process name. Only letters, numbers, spaces, dots, dashes, underscores, semicolons, quotes, parentheses, and * are allowed";return;diff --git a/Windows/gui/ViewModels/ProxySettingsViewModel.cs b/Windows/gui/ViewModels/ProxySettingsViewModel.csindex d315f89..845a93e 100644--- a/Windows/gui/ViewModels/ProxySettingsViewModel.cs+++ b/Windows/gui/ViewModels/ProxySettingsViewModel.cs@@ -11,6 +11,10 @@ namespace ProxyBridge.GUI.ViewModels;public class ProxySettingsViewModel : ViewModelBase{+ private static readonly Regex _domainRegex =+ new(@"^(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)*[a-zA-Z0-9](?:[a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?$",+ RegexOptions.Compiled);+private readonly Loc _loc = Loc.Instance;public Loc Loc => _loc;@@ -382,7 +386,6 @@ public class ProxySettingsViewModel : ViewModelBaseprivate static bool IsValidIpOrDomain(string input){if (IPAddress.TryParse(input, out _)) return true;- var domainRegex = new Regex(@"^(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)*[a-zA-Z0-9](?:[a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?$");- return domainRegex.IsMatch(input);+ return _domainRegex.IsMatch(input);}}diff --git a/Windows/gui/Views/ProxyRulesWindow.axaml b/Windows/gui/Views/ProxyRulesWindow.axamlindex d0156f5..7b70a0d 100644--- a/Windows/gui/Views/ProxyRulesWindow.axaml+++ b/Windows/gui/Views/ProxyRulesWindow.axaml@@ -4,14 +4,14 @@xmlns:views="using:ProxyBridge.GUI.Views"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- mc:Ignorable="d" d:DesignWidth="700" d:DesignHeight="550"+ mc:Ignorable="d" d:DesignWidth="1100" d:DesignHeight="550"x:Class="ProxyBridge.GUI.Views.ProxyRulesWindow"x:DataType="vm:ProxyRulesViewModel"x:CompileBindings="True"Title="{Binding Loc.ProxyRulesTitle}"Icon="/Assets/logo.ico"- Width="1000" Height="550"- MinWidth="900" MinHeight="400"+ Width="1100" Height="550"+ MinWidth="980" MinHeight="400"Background="#FF2D2D30"WindowStartupLocation="CenterOwner">diff --git a/Windows/gui/Views/ProxySettingsWindow.axaml b/Windows/gui/Views/ProxySettingsWindow.axamlindex f749ca2..6e03f26 100644--- a/Windows/gui/Views/ProxySettingsWindow.axaml+++ b/Windows/gui/Views/ProxySettingsWindow.axaml@@ -3,14 +3,16 @@xmlns:vm="using:ProxyBridge.GUI.ViewModels"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- mc:Ignorable="d" d:DesignWidth="700" d:DesignHeight="550"+ mc:Ignorable="d" d:DesignWidth="560" d:DesignHeight="600"x:Class="ProxyBridge.GUI.Views.ProxySettingsWindow"x:DataType="vm:ProxySettingsViewModel"x:CompileBindings="True"Title="{Binding Loc.ProxySettingsTitle}"Icon="/Assets/logo.ico"- Width="680" Height="420"- MinWidth="520" MinHeight="300"+ Width="560" Height="520"+ MinWidth="440" MinHeight="300"+ MaxHeight="700"+ SizeToContent="Height"CanResize="True"Background="#FF2D2D30"WindowStartupLocation="CenterOwner">@@ -117,45 +119,67 @@<!-- Test Panel at bottom (shared) --><Border Grid.Row="2"- Background="#FF252526"- BorderBrush="#FF3F3F46"- BorderThickness="0,1,0,0"- Padding="20,16"+ Background="#FF1E1E1E"+ BorderBrush="#FF007ACC"+ BorderThickness="0,2,0,0"IsVisible="{Binding IsTestViewOpen}">- <StackPanel Spacing="10">- <Grid ColumnDefinitions="*,Auto">- <TextBlock Text="{Binding Loc.TestConnectionTitle}"+ <!-- Header bar -->+ <StackPanel>+ <Grid ColumnDefinitions="Auto,*,Auto"+ Background="#FF252526"+ Margin="0">+ <TextBlock Grid.Column="0"+ Text="π"FontSize="14"+ VerticalAlignment="Center"+ Margin="16,10,8,10"/>+ <TextBlock Grid.Column="1"+ Text="{Binding Loc.TestConnectionTitle}"+ FontSize="13"FontWeight="SemiBold"Foreground="#FFE0E0E0"VerticalAlignment="Center"/>- <Button Grid.Column="1"- Content="β"+ <Button Grid.Column="2"+ Content="β Close"Classes="secondary"Command="{Binding CloseTestPanelCommand}"- Width="32" Height="32" Padding="0"/>- </Grid>- <Grid ColumnDefinitions="3*,2*,Auto">- <TextBox Grid.Column="0" Text="{Binding TestTargetHost}" Watermark="Target host" Margin="0,0,8,0"/>- <TextBox Grid.Column="1" Text="{Binding TestTargetPort}" Watermark="Port" Margin="0,0,8,0"/>- <Button Grid.Column="2" Content="{Binding Loc.StartTestButton}"- Command="{Binding StartTestCommand}"- IsEnabled="{Binding !IsTesting}"/>+ FontSize="12"+ Padding="10,6"+ Margin="8,6"/></Grid>- <Border Background="#FF1E1E1E"- BorderBrush="#FF3F3F46"- BorderThickness="1"- Padding="10"- MinHeight="80"- MaxHeight="150">- <ScrollViewer VerticalScrollBarVisibility="Auto">- <TextBlock Text="{Binding TestOutput}"- FontFamily="Consolas,monospace"- FontSize="12"- Foreground="#FFE0E0E0"- TextWrapping="Wrap"/>- </ScrollViewer>- </Border>+ <StackPanel Spacing="8" Margin="16,10,16,14">+ <Grid ColumnDefinitions="3*,120,Auto">+ <TextBox Grid.Column="0"+ Text="{Binding TestTargetHost}"+ Watermark="Target host (e.g. google.com)"+ Margin="0,0,8,0"/>+ <TextBox Grid.Column="1"+ Text="{Binding TestTargetPort}"+ Watermark="Port"+ Margin="0,0,8,0"/>+ <Button Grid.Column="2"+ Content="{Binding Loc.StartTestButton}"+ Command="{Binding StartTestCommand}"+ IsEnabled="{Binding !IsTesting}"+ MinWidth="100"/>+ </Grid>+ <Border Background="#FF2D2D30"+ BorderBrush="#FF3F3F46"+ BorderThickness="1"+ CornerRadius="3"+ Padding="10,8"+ MinHeight="60"+ MaxHeight="130"+ IsVisible="{Binding TestOutput, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">+ <ScrollViewer VerticalScrollBarVisibility="Auto">+ <TextBlock Text="{Binding TestOutput}"+ FontFamily="Consolas,monospace"+ FontSize="12"+ Foreground="#FFD4D4D4"+ TextWrapping="Wrap"/>+ </ScrollViewer>+ </Border>+ </StackPanel></StackPanel></Border></Grid>