From cec8358922bfb0142009e91178d921d24b8513e5 Mon Sep 17 00:00:00 2001 From: AmazingDM Date: Fri, 25 Dec 2020 11:28:38 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8PAC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Netch/Controllers/HTTPController.cs | 21 +- Netch/Controllers/PrivoxyController.cs | 4 - Netch/Forms/MainForm.Designer.cs | 10 + Netch/Forms/MainForm.MenuStrip.cs | 37 +++ Netch/Models/Setting.cs | 5 + Netch/Properties/Resources.Designer.cs | 10 + Netch/Properties/Resources.resx | 307 ++++++++++-------- Netch/Resources/abp.js.gz | Bin 0 -> 4467 bytes Netch/Resources/zh-CN | 6 + Netch/Utils/HttpProxyHandler/HttpWebServer.cs | 10 +- Netch/Utils/HttpProxyHandler/PACListHandle.cs | 75 ----- Netch/Utils/HttpProxyHandler/PACUtil.cs | 56 ++++ Netch/Utils/StringEx.cs | 46 +++ 13 files changed, 362 insertions(+), 225 deletions(-) create mode 100644 Netch/Resources/abp.js.gz delete mode 100644 Netch/Utils/HttpProxyHandler/PACListHandle.cs create mode 100644 Netch/Utils/HttpProxyHandler/PACUtil.cs create mode 100644 Netch/Utils/StringEx.cs diff --git a/Netch/Controllers/HTTPController.cs b/Netch/Controllers/HTTPController.cs index a4c774fc..bce820ae 100644 --- a/Netch/Controllers/HTTPController.cs +++ b/Netch/Controllers/HTTPController.cs @@ -6,6 +6,7 @@ using Microsoft.Win32; using Netch.Models; using Netch.Utils; using WindowsProxy; +using Netch.Utils.HttpProxyHandler; namespace Netch.Controllers { @@ -36,7 +37,23 @@ namespace Netch.Controllers Global.Job.AddProcess(pPrivoxyController.Instance); } - //if (mode.Type == 3) NativeMethods.SetGlobal($"127.0.0.1:{Global.Settings.HTTPLocalPort}", IEProxyExceptions); + if (mode.Type == 3) + { + if (mode.BypassChina) + { + //启动PAC服务器 + PACServerHandle.InitPACServer("127.0.0.1"); + } + else + { + using var service = new ProxyService + { + Server = $"127.0.0.1:{Global.Settings.HTTPLocalPort}", + Bypass = IEProxyExceptions + }; + service.Global(); + } + } } catch (Exception e) { @@ -88,6 +105,7 @@ namespace Netch.Controllers Task.Factory.StartNew(pPrivoxyController.Stop), Task.Factory.StartNew(() => { + PACServerHandle.Stop(); if (prevEnabled) { if (prevHTTP != "") @@ -97,6 +115,7 @@ namespace Netch.Controllers Server = prevHTTP, Bypass = prevBypass }; + service.Global(); } if (prevPAC != "") { diff --git a/Netch/Controllers/PrivoxyController.cs b/Netch/Controllers/PrivoxyController.cs index 8b2de3b4..d43c053b 100644 --- a/Netch/Controllers/PrivoxyController.cs +++ b/Netch/Controllers/PrivoxyController.cs @@ -35,15 +35,11 @@ namespace Netch.Controllers File.WriteAllText("data\\privoxy.conf", text.ToString()); - //启动PAC服务器 - PACServerHandle.InitPACServer("127.0.0.1"); - return StartInstanceAuto("..\\data\\privoxy.conf"); } public override void Stop() { - PACServerHandle.Stop(); StopInstance(); } } diff --git a/Netch/Forms/MainForm.Designer.cs b/Netch/Forms/MainForm.Designer.cs index 7decdcb6..888ef85d 100644 --- a/Netch/Forms/MainForm.Designer.cs +++ b/Netch/Forms/MainForm.Designer.cs @@ -87,6 +87,7 @@ this.ProfileTable = new System.Windows.Forms.TableLayoutPanel(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.ButtomControlContainerControl = new System.Windows.Forms.ContainerControl(); + this.updatePACToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.MenuStrip.SuspendLayout(); this.ConfigurationGroupBox.SuspendLayout(); this.configLayoutPanel.SuspendLayout(); @@ -196,6 +197,7 @@ this.CleanDNSCacheToolStripMenuItem, this.UpdateACLToolStripMenuItem, this.updateACLWithProxyToolStripMenuItem, + this.updatePACToolStripMenuItem, this.UninstallServiceToolStripMenuItem, this.UninstallTapDriverToolStripMenuItem}); this.OptionsToolStripMenuItem.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1); @@ -697,6 +699,13 @@ this.ButtomControlContainerControl.TabStop = false; this.ButtomControlContainerControl.Text = "groupBox1"; // + // updatePACToolStripMenuItem + // + this.updatePACToolStripMenuItem.Name = "updatePACToolStripMenuItem"; + this.updatePACToolStripMenuItem.Size = new System.Drawing.Size(220, 22); + this.updatePACToolStripMenuItem.Text = "Update PAC"; + this.updatePACToolStripMenuItem.Click += new System.EventHandler(this.updatePACToolStripMenuItem_Click); + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -803,5 +812,6 @@ private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; private System.Windows.Forms.ContainerControl ButtomControlContainerControl; + private System.Windows.Forms.ToolStripMenuItem updatePACToolStripMenuItem; } } \ No newline at end of file diff --git a/Netch/Forms/MainForm.MenuStrip.cs b/Netch/Forms/MainForm.MenuStrip.cs index 9cb1660e..bb5a4ef5 100644 --- a/Netch/Forms/MainForm.MenuStrip.cs +++ b/Netch/Forms/MainForm.MenuStrip.cs @@ -3,12 +3,16 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Net; +using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using Netch.Controllers; using Netch.Forms.Mode; using Netch.Models; +using Netch.Properties; using Netch.Utils; +using Netch.Utils.HttpProxyHandler; +using Newtonsoft.Json; namespace Netch.Forms { @@ -274,6 +278,39 @@ namespace Netch.Forms } } + private async void updatePACToolStripMenuItem_Click(object sender, EventArgs eventArgs) + { + Enabled = false; + + NotifyTip(i18N.Translate("Updating in the background")); + try + { + var req = WebUtil.CreateRequest(Global.Settings.GFWLIST); + + string gfwlist = Path.Combine(Global.NetchDir, $"bin\\gfwlist"); + string pac = Path.Combine(Global.NetchDir, $"bin\\pac.txt"); + + await WebUtil.DownloadFileAsync(req, gfwlist); + + var gfwContent = File.ReadAllText(gfwlist); + List lines = PACUtil.ParseResult(gfwContent); + string abpContent = PACUtil.UnGzip(Resources.abp_js); + abpContent = abpContent.Replace("__RULES__", JsonConvert.SerializeObject(lines, Formatting.Indented)); + File.WriteAllText(pac, abpContent, Encoding.UTF8); + + NotifyTip(i18N.Translate("PAC updated successfully")); + } + catch (Exception e) + { + NotifyTip(i18N.Translate("PAC update failed") + "\n" + e.Message, info: false); + Logging.Error("更新 PAC 失败！" + e); + } + finally + { + Enabled = true; + } + } + private async void UninstallServiceToolStripMenuItem_Click(object sender, EventArgs e) { Enabled = false; diff --git a/Netch/Models/Setting.cs b/Netch/Models/Setting.cs index 0ba2c1a2..ad08da51 100644 --- a/Netch/Models/Setting.cs +++ b/Netch/Models/Setting.cs @@ -250,6 +250,11 @@ namespace Netch.Models /// public string ACL = "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/banAD.acl"; + /// + /// GFWList + /// + public string GFWLIST = "https://raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt"; + /// /// 是否使用DLL启动Shadowsocks /// diff --git a/Netch/Properties/Resources.Designer.cs b/Netch/Properties/Resources.Designer.cs index 4917d0c3..432c445e 100644 --- a/Netch/Properties/Resources.Designer.cs +++ b/Netch/Properties/Resources.Designer.cs @@ -60,6 +60,16 @@ namespace Netch.Properties { } } + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] abp_js { + get { + object obj = ResourceManager.GetObject("abp_js", resourceCulture); + return ((byte[])(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/Netch/Properties/Resources.resx b/Netch/Properties/Resources.resx index 79ba3a16..ed8ebd4e 100644 --- a/Netch/Properties/Resources.resx +++ b/Netch/Properties/Resources.resx @@ -1,145 +1,172 @@  - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + + + + + ..\Resources\defaultTUNTAP;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + - - [base64 mime encoded string representing a byte array form of the .NET Framework object] - This is a comment + + ..\Resources\zh-CN;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + + + + ..\Resources\speed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a + + + + ..\Resources\delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a + + + + ..\Resources\edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a + + + + ..\Resources\Netch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a + + + + ..\Resources\Sponsor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a + + + + ..\Resources\CopyLink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a + + + + ..\Resources\abp.js.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a + - - There are any number of "resheader" rows that contain simple - name/value pairs. - - Each data row contains a name, and value. The row also contains a - type or mimetype. Type corresponds to a .NET class that support - text/value conversion through the TypeConverter architecture. - Classes that don't support this are serialized and stored with the - mimetype set. - - The mimetype is used for serialized objects, and tells the - ResXResourceReader how to depersist the object. This is currently not - extensible. For a given mimetype the value must be set accordingly: - - Note - application/x-microsoft.net.object.binary.base64 is the format - that the ResXResourceWriter will generate, however the reader can - read any of the formats listed below. - - mimetype: application/x-microsoft.net.object.binary.base64 - value : The object must be serialized with - : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter - : and then encoded with base64 encoding. - - mimetype: application/x-microsoft.net.object.soap.base64 - value : The object must be serialized with - : System.Runtime.Serialization.Formatters.Soap.SoapFormatter - : and then encoded with base64 encoding. - - mimetype: application/x-microsoft.net.object.bytearray.base64 - value : The object must be serialized into a byte array - : using a System.ComponentModel.TypeConverter - : and then encoded with base64 encoding. - --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - ..\Resources\defaultTUNTAP;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\zh-CN;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\speed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Netch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Sponsor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\CopyLink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - \ No newline at end of file diff --git a/Netch/Resources/abp.js.gz b/Netch/Resources/abp.js.gz new file mode 100644 index 0000000000000000000000000000000000000000..0577c7f5c14d22f0a4f0c744f3284da191c04cf1 GIT binary patch literal 4467 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 F007W`%bNfI literal 0 HcmV?d00001 diff --git a/Netch/Resources/zh-CN b/Netch/Resources/zh-CN index b4d9f263..93a3af2a 100644 --- a/Netch/Resources/zh-CN +++ b/Netch/Resources/zh-CN @@ -81,10 +81,16 @@ "Modes have been reload": "模式已重载", "Clean DNS Cache": "清理 DNS 缓存", "DNS cache cleanup succeeded": "DNS 缓存清理成功", + + "Update PAC": "更新 PAC", + "PAC updated successfully": "PAC 更新成功", + "PAC update failed": "PAC 更新失败", + "Update ACL": "更新 ACL 规则", "Update ACL with proxy": "使用代理更新 ACL 规则", "ACL updated successfully": "ACL 更新成功", "ACL update failed": "ACL 更新失败", + "Open Directory": "打开目录", "About": "关于", diff --git a/Netch/Utils/HttpProxyHandler/HttpWebServer.cs b/Netch/Utils/HttpProxyHandler/HttpWebServer.cs index 5605faa7..23749580 100644 --- a/Netch/Utils/HttpProxyHandler/HttpWebServer.cs +++ b/Netch/Utils/HttpProxyHandler/HttpWebServer.cs @@ -34,7 +34,6 @@ namespace Netch.Utils.HttpProxyHandler _responderMethod = method; _listener.Start(); - } catch (Exception ex) { @@ -43,7 +42,9 @@ namespace Netch.Utils.HttpProxyHandler } public HttpWebServer(Func method, params string[] prefixes) - : this(prefixes, method) { } + : this(prefixes, method) + { + } public void Run() { @@ -68,7 +69,7 @@ namespace Netch.Utils.HttpProxyHandler } catch { - } // suppress any exceptions + } // suppress any exceptions finally { // always close the stream @@ -94,6 +95,5 @@ namespace Netch.Utils.HttpProxyHandler _listener = null; } } - } -} +} \ No newline at end of file diff --git a/Netch/Utils/HttpProxyHandler/PACListHandle.cs b/Netch/Utils/HttpProxyHandler/PACListHandle.cs deleted file mode 100644 index f8842e29..00000000 --- a/Netch/Utils/HttpProxyHandler/PACListHandle.cs +++ /dev/null @@ -1,75 +0,0 @@ -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.IO; -using System.Net; -using System.Text; - -namespace Netch.Utils.HttpProxyHandler -{ - /// - /// 提供PAC功能支持 - /// - class PACListHandle - { - public event EventHandler UpdateCompleted; - - public class ResultEventArgs : EventArgs - { - public bool Success; - - public ResultEventArgs(bool success) - { - Success = success; - } - } - - private const string GFWLIST_URL = "https://raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt"; - - private static readonly IEnumerable IgnoredLineBegins = new[] { '!', '[' }; - - /// - /// 更新PAC文件（GFWList） - /// - //public void UpdatePACFromGFWList() - //{ - // WebClient http = new WebClient(); - // http.DownloadStringCompleted += http_DownloadStringCompleted; - // http.DownloadStringAsync(new Uri(GFWLIST_URL)); - //} - - //private void http_DownloadStringCompleted(object sender, DownloadStringCompletedEventArgs e) - //{ - // try - // { - // File.WriteAllText(NUtils.GetTempPath("gfwlist.txt"), e.Result, Encoding.UTF8); - // List lines = ParseResult(e.Result); - // string abpContent = NUtils.UnGzip(Resources.abp_js); - // abpContent = abpContent.Replace("__RULES__", JsonConvert.SerializeObject(lines, Formatting.Indented)); - // File.WriteAllText(NUtils.GetPath("pac.txt"), abpContent, Encoding.UTF8); - // if (UpdateCompleted != null) UpdateCompleted(this, new ResultEventArgs(true)); - // } - // catch (Exception ex) - // { - // Logging.Error("http_DownloadStringCompleted():" + ex.Message); - // } - //} - - //public static List ParseResult(string response) - //{ - // byte[] bytes = Convert.FromBase64String(response); - // string content = Encoding.ASCII.GetString(bytes); - // List valid_lines = new List(); - // using (var sr = new StringReader(content)) - // { - // foreach (var line in sr.NonWhiteSpaceLines()) - // { - // if (line.BeginWithAny(IgnoredLineBegins)) - // continue; - // valid_lines.Add(line); - // } - // } - // return valid_lines; - //} - } -} diff --git a/Netch/Utils/HttpProxyHandler/PACUtil.cs b/Netch/Utils/HttpProxyHandler/PACUtil.cs new file mode 100644 index 00000000..791dd601 --- /dev/null +++ b/Netch/Utils/HttpProxyHandler/PACUtil.cs @@ -0,0 +1,56 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.IO; +using System.IO.Compression; +using System.Net; +using System.Text; +using Netch.Forms; +using Netch.Properties; + +namespace Netch.Utils.HttpProxyHandler +{ + /// + /// 提供PAC功能支持 + /// + class PACUtil + { + private static readonly IEnumerable IgnoredLineBegins = new[] {'!', '['}; + + public static List ParseResult(string response) + { + byte[] bytes = Convert.FromBase64String(response); + string content = Encoding.ASCII.GetString(bytes); + List valid_lines = new List(); + using (var sr = new StringReader(content)) + { + foreach (var line in sr.NonWhiteSpaceLines()) + { + if (line.BeginWithAny(IgnoredLineBegins)) + continue; + valid_lines.Add(line); + } + } + return valid_lines; + } + + public static string UnGzip(byte[] buf) + { + byte[] buffer = new byte[1024]; + int n; + using (MemoryStream sb = new MemoryStream()) + { + using (GZipStream input = new GZipStream(new MemoryStream(buf), + CompressionMode.Decompress, + false)) + { + while ((n = input.Read(buffer, 0, buffer.Length)) > 0) + { + sb.Write(buffer, 0, n); + } + } + return System.Text.Encoding.UTF8.GetString(sb.ToArray()); + } + } + } +} \ No newline at end of file diff --git a/Netch/Utils/StringEx.cs b/Netch/Utils/StringEx.cs new file mode 100644 index 00000000..c655c9c0 --- /dev/null +++ b/Netch/Utils/StringEx.cs @@ -0,0 +1,46 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; + +namespace Netch.Utils +{ + static class StringEx + { + public static bool IsNullOrEmpty(this string value) + { + return string.IsNullOrEmpty(value); + } + + public static bool IsNullOrWhiteSpace(this string value) + { + return string.IsNullOrWhiteSpace(value); + } + + public static bool BeginWithAny(this string s, IEnumerable chars) + { + if (s.IsNullOrEmpty()) return false; + return chars.Contains(s[0]); + } + + public static bool IsWhiteSpace(this string value) + { + foreach (var c in value) + { + if (char.IsWhiteSpace(c)) continue; + + return false; + } + return true; + } + + public static IEnumerable NonWhiteSpaceLines(this TextReader reader) + { + string line; + while ((line = reader.ReadLine()) != null) + { + if (line.IsWhiteSpace()) continue; + yield return line; + } + } + } +}