mirror of
https://github.com/2dust/v2rayN.git
synced 2026-09-25 15:58:09 +03:00
* fix: sanitize system proxy exceptions to avoid macOS ExceptionsList being dropped
On macOS/Linux the exception list is comma-separated and passed to networksetup. It was only stripped of spaces, so a stray newline or a trailing comma left a malformed/empty entry. macOS configd then silently rejects the whole ExceptionsList (scutil --proxy shows no ExceptionsList), so the bypass never takes effect. Split on ',' with TrimEntries + RemoveEmptyEntries and rejoin; behavior-preserving for well-formed input. Windows path (';') is left unchanged.
Note: not built locally (no .NET SDK on hand); relying on CI.
* Update SysProxyHandler.cs
---------
Co-authored-by: 2dust <31833384+2dust@users.noreply.github.com>
118 lines
4.0 KiB
C#
118 lines
4.0 KiB
C#
namespace ServiceLib.Handler.SysProxy;
|
|
|
|
public static class SysProxyHandler
|
|
{
|
|
private static readonly string _tag = "SysProxyHandler";
|
|
|
|
public static async Task<bool> UpdateSysProxy(Config config, bool forceDisable)
|
|
{
|
|
var type = config.SystemProxyItem.SysProxyType;
|
|
|
|
if (forceDisable && type != ESysProxyType.Unchanged)
|
|
{
|
|
type = ESysProxyType.ForcedClear;
|
|
}
|
|
|
|
try
|
|
{
|
|
var port = AppManager.Instance.GetLocalPort(EInboundProtocol.socks);
|
|
if (port <= 0)
|
|
{
|
|
return false;
|
|
}
|
|
switch (type)
|
|
{
|
|
case ESysProxyType.ForcedChange when Utils.IsWindows():
|
|
var (strProxy, strExceptions) = GetWindowsProxyString(config, port);
|
|
ProxySettingWindows.SetProxy(strProxy, strExceptions, 2);
|
|
break;
|
|
|
|
case ESysProxyType.ForcedChange when Utils.IsLinux():
|
|
var exceptions = SanitizeExceptions(config);
|
|
await ProxySettingLinux.SetProxy(Global.Loopback, port, exceptions);
|
|
break;
|
|
|
|
case ESysProxyType.ForcedChange when Utils.IsMacOS():
|
|
var exceptions2 = SanitizeExceptions(config);
|
|
await ProxySettingOSX.SetProxy(Global.Loopback, port, exceptions2);
|
|
break;
|
|
|
|
case ESysProxyType.ForcedClear when Utils.IsWindows():
|
|
ProxySettingWindows.UnsetProxy();
|
|
break;
|
|
|
|
case ESysProxyType.ForcedClear when Utils.IsLinux():
|
|
await ProxySettingLinux.UnsetProxy();
|
|
break;
|
|
|
|
case ESysProxyType.ForcedClear when Utils.IsMacOS():
|
|
await ProxySettingOSX.UnsetProxy();
|
|
break;
|
|
|
|
case ESysProxyType.Pac when Utils.IsWindows():
|
|
await SetWindowsProxyPac(port);
|
|
break;
|
|
}
|
|
|
|
if (type != ESysProxyType.Pac && Utils.IsWindows())
|
|
{
|
|
PacManager.Instance.Stop();
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Logging.SaveLog(_tag, ex);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
private static string SanitizeExceptions(Config config)
|
|
{
|
|
var exceptions = config.SystemProxyItem.SystemProxyExceptions;
|
|
if (exceptions.IsNullOrEmpty())
|
|
{
|
|
return string.Empty;
|
|
}
|
|
|
|
var items = exceptions
|
|
.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)
|
|
.Select(item => item.Replace(" ", string.Empty))
|
|
.Where(item => item.Length > 0);
|
|
|
|
return string.Join(',', items);
|
|
}
|
|
|
|
private static (string strProxy, string strExceptions) GetWindowsProxyString(Config config, int port)
|
|
{
|
|
var strExceptions = config.SystemProxyItem.SystemProxyExceptions.Replace(" ", "");
|
|
if (config.SystemProxyItem.NotProxyLocalAddress)
|
|
{
|
|
strExceptions = $"<local>;{strExceptions}";
|
|
}
|
|
|
|
var strProxy = string.Empty;
|
|
if (config.SystemProxyItem.SystemProxyAdvancedProtocol.IsNullOrEmpty())
|
|
{
|
|
strProxy = $"{Global.Loopback}:{port}";
|
|
}
|
|
else
|
|
{
|
|
strProxy = config.SystemProxyItem.SystemProxyAdvancedProtocol
|
|
.Replace("{ip}", Global.Loopback)
|
|
.Replace("{http_port}", port.ToString())
|
|
.Replace("{socks_port}", port.ToString());
|
|
}
|
|
|
|
return (strProxy, strExceptions);
|
|
}
|
|
|
|
[SupportedOSPlatform("windows")]
|
|
private static async Task SetWindowsProxyPac(int port)
|
|
{
|
|
var portPac = AppManager.Instance.GetLocalPort(EInboundProtocol.pac);
|
|
await PacManager.Instance.StartAsync(port, portPac);
|
|
var strProxy = $"{Global.HttpProtocol}{Global.Loopback}:{portPac}/pac?t={DateTime.Now.Ticks}";
|
|
ProxySettingWindows.SetProxy(strProxy, "", 4);
|
|
}
|
|
}
|