Add system proxy exception function for linux

#6214
2dust · Dec 6, 2024 · dbd4f55 · dbd4f55
1 parent 5f5d717
commit dbd4f55
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 10 deletions.
diff --git a/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingLinux.cs b/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingLinux.cs
@@ -2,9 +2,9 @@
 {
     public class ProxySettingLinux
     {
-        public static async Task SetProxy(string host, int port)
+        public static async Task SetProxy(string host, int port, string exceptions)
         {
-            var lstCmd = GetSetCmds(host, port);
+            var lstCmd = GetSetCmds(host, port, exceptions);
 
             await ExecCmd(lstCmd);
         }
@@ -29,7 +29,7 @@ private static async Task ExecCmd(List<CmdItem> lstCmd)
             }
         }
 
-        private static List<CmdItem> GetSetCmds(string host, int port)
+        private static List<CmdItem> GetSetCmds(string host, int port, string exceptions)
         {
             var isKde = IsKde(out var configDir);
             List<string> lstType = ["", "http", "https", "socks", "ftp"];
@@ -41,13 +41,21 @@ private static List<CmdItem> GetSetCmds(string host, int port)
                 {
                     lstCmd.AddRange(GetSetCmd4Kde(type, host, port, configDir));
                 }
+                if (exceptions.IsNotEmpty())
+                {
+                    lstCmd.AddRange(GetSetCmd4Kde("exceptions", exceptions, 0, configDir));
+                }
             }
             else
             {
                 foreach (var type in lstType)
                 {
                     lstCmd.AddRange(GetSetCmd4Gnome(type, host, port));
                 }
+                if (exceptions.IsNotEmpty())
+                {
+                    lstCmd.AddRange(GetSetCmd4Gnome("exceptions", exceptions, 0));
+                }
             }
             return lstCmd;
         }
@@ -89,6 +97,14 @@ private static List<CmdItem> GetSetCmd4Kde(string type, string host, int port, s
                     Arguments = ["--file", $"{configDir}/kioslaverc", "--group", "Proxy Settings", "--key", "ProxyType", "1"]
                 });
             }
+            else if (type == "exceptions")
+            {
+                lstCmd.Add(new()
+                {
+                    Cmd = "kwriteconfig5",
+                    Arguments = ["--file", $"{configDir}/kioslaverc", "--group", "Proxy Settings", "--key", "NoProxyFor", host]
+                });
+            }
             else
             {
                 var type2 = type.Equals("https") ? "http" : type;
@@ -114,6 +130,14 @@ private static List<CmdItem> GetSetCmd4Gnome(string type, string host, int port)
                     Arguments = ["set", "org.gnome.system.proxy", "mode", "manual"]
                 });
             }
+            else if (type == "exceptions")
+            {
+                lstCmd.Add(new()
+                {
+                    Cmd = "gsettings",
+                    Arguments = ["set", $"org.gnome.system.proxy", "ignore-hosts", JsonUtils.Serialize(host.Split(','), false)]
+                });
+            }
             else
             {
                 lstCmd.Add(new()

diff --git a/v2rayN/ServiceLib/Handler/SysProxy/SysProxyHandler.cs b/v2rayN/ServiceLib/Handler/SysProxy/SysProxyHandler.cs
@@ -14,6 +14,7 @@ public static async Task<bool> UpdateSysProxy(Config config, bool forceDisable)
             try
             {
                 var port = AppHandler.Instance.GetLocalPort(EInboundProtocol.socks);
+                var exceptions = config.SystemProxyItem.SystemProxyExceptions;
                 if (port <= 0)
                 {
                     return false;
@@ -27,7 +28,7 @@ public static async Task<bool> UpdateSysProxy(Config config, bool forceDisable)
                             break;
                         }
                     case ESysProxyType.ForcedChange when Utils.IsLinux():
-                        await ProxySettingLinux.SetProxy(Global.Loopback, port);
+                        await ProxySettingLinux.SetProxy(Global.Loopback, port, exceptions);
                         break;
 
                     case ESysProxyType.ForcedChange when Utils.IsOSX():

diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@@ -1380,11 +1380,14 @@
   </data>
   <data name="TransportExtraTip" xml:space="preserve">
     <value>جیسون خام XHTTP Extra, فرمت: { XHTTPObject }</value>
-  </data> 
+  </data>
   <data name="TbSettingsHide2TrayWhenClose" xml:space="preserve">
     <value>هنگام بستن پنجره در سینی پنهان شوید</value>
   </data>
   <data name="TbSettingsSpeedTestPageSize" xml:space="preserve">
     <value>تعداد در هر زمان برای دسته خودکار در طول تست سرعت (حداکثر 1000)</value>
   </data>
-</root>
+  <data name="TbSettingsExceptionTip2" xml:space="preserve">
+    <value>Exception. Do not use proxy server for addresses,with a comma (,)</value>
+  </data>
+</root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1387,4 +1387,7 @@
   <data name="TbSettingsSpeedTestPageSize" xml:space="preserve">
     <value>Number per time for auto batch during speedtest(max 1000)</value>
   </data>
+  <data name="TbSettingsExceptionTip2" xml:space="preserve">
+    <value>Exception. Do not use proxy server for addresses,with a comma (,)</value>
+  </data>
 </root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1387,4 +1387,7 @@
   <data name="TbSettingsSpeedTestPageSize" xml:space="preserve">
     <value>Number per time for auto batch during speedtest(max 1000)</value>
   </data>
+  <data name="TbSettingsExceptionTip2" xml:space="preserve">
+    <value>Exception. Do not use proxy server for addresses,with a comma (,)</value>
+  </data>
 </root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1384,4 +1384,7 @@
   <data name="TbSettingsSpeedTestPageSize" xml:space="preserve">
     <value>测速时自动分批的每批数量（最大1000）</value>
   </data>
+  <data name="TbSettingsExceptionTip2" xml:space="preserve">
+    <value>例外. 对于下列地址不使用代理配置文件:使用逗号(,)分隔</value>
+  </data>
 </root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1384,4 +1384,7 @@
   <data name="TbSettingsSpeedTestPageSize" xml:space="preserve">
     <value>測速時自動分批的每批數量（最大1000）</value>
   </data>
+  <data name="TbSettingsExceptionTip2" xml:space="preserve">
+    <value>例外. 對於下列位址不使用代理設定檔:使用逗號(,)分隔</value>
+  </data>
 </root>
diff --git a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
@@ -697,7 +697,10 @@
 
             <TabItem Name="tabSystemproxy" Header="{x:Static resx:ResUI.TbSettingsSystemproxy}">
                 <DockPanel Classes="Margin8">
-                    <StackPanel DockPanel.Dock="Bottom" Orientation="Vertical">
+                    <StackPanel
+                        Name="panSystemProxyAdvanced"
+                        DockPanel.Dock="Bottom"
+                        Orientation="Vertical">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 VerticalAlignment="Center"
@@ -723,11 +726,17 @@
                     </StackPanel>
 
                     <TextBlock
-                        Grid.Row="1"
+                        Name="txbSettingsExceptionTip"
                         VerticalAlignment="Center"
                         Classes="Margin8"
                         DockPanel.Dock="Top"
                         Text="{x:Static resx:ResUI.TbSettingsExceptionTip}" />
+                    <TextBlock
+                        Name="txbSettingsExceptionTip2"
+                        VerticalAlignment="Center"
+                        Classes="Margin8"
+                        DockPanel.Dock="Top"
+                        Text="{x:Static resx:ResUI.TbSettingsExceptionTip2}" />
                     <TextBox
                         x:Name="txtsystemProxyExceptions"
                         VerticalAlignment="Stretch"

diff --git a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
@@ -166,9 +166,14 @@ public OptionSettingWindow()
                 this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
             });
 
-            if (!Utils.IsWindows())
+            if (Utils.IsWindows())
             {
-                tabSystemproxy.IsVisible = false;
+                txbSettingsExceptionTip2.IsVisible = false;
+            }
+            else
+            {
+                txbSettingsExceptionTip.IsVisible = false;
+                panSystemProxyAdvanced.IsVisible = false;
             }
 
             if (Utils.IsOSX())