fix BeyondDimension#1186

rmbadmin · rmbadmin · commit cfb5796cb65d · 2022-03-31T16:59:29.000+08:00
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/CommunityProxyPage/ProxySettingsWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/CommunityProxyPage/ProxySettingsWindow.axaml
@@ -60,7 +60,13 @@
                 <ToggleSwitch
                             IsChecked="{ReflectionBinding Source={x:Static ms:ProxySettings.OnlyEnableProxyScript},Path=Value, Mode=TwoWay}"/>
               </DockPanel>
-
+              
+              <DockPanel>
+                <TextBlock Text="{ReflectionBinding Path=Res.CommunityFix_EnableHttpProxyToHttps,Mode=OneWay,Source={x:Static resx:R.Current}}" ></TextBlock>
+                <ToggleSwitch
+                            IsChecked="{ReflectionBinding Source={x:Static ms:ProxySettings.EnableHttpProxyToHttps},Path=Value, Mode=TwoWay}"/>
+              </DockPanel>
+              
               <!--<DockPanel>
                 <Label Content="自定义根证书密码"></Label>
                 <TextBox></TextBox>
diff --git a/src/ST.Client/Services/IHttpProxyService.cs b/src/ST.Client/Services/IHttpProxyService.cs
@@ -59,6 +59,8 @@ public interface IHttpProxyService : IDisposable
 
         bool Socks5ProxyEnable { get; set; }
 
+        bool EnableHttpProxyToHttps { get; set; }
+
         int Socks5ProxyPortId { get; set; }
 
         bool TwoLevelAgentEnable { get; set; }
diff --git a/src/ST.Client/Services/Implementation/HttpProxyServiceImpl.cs b/src/ST.Client/Services/Implementation/HttpProxyServiceImpl.cs
@@ -57,6 +57,8 @@ sealed class HttpProxyServiceImpl : IHttpProxyService
 
         public bool Socks5ProxyEnable { get; set; }
 
+        public bool EnableHttpProxyToHttps { get; set; }
+
         public int Socks5ProxyPortId { get; set; }
 
         public bool TwoLevelAgentEnable { get; set; }
@@ -499,10 +501,10 @@ public void DeleteCer()
             using (var store = new X509Store(StoreName.My, StoreLocation.CurrentUser))
             {
                 store.Open(OpenFlags.ReadOnly);
-                X509Certificate2Collection collection = store.Certificates.Find(X509FindType.FindByIssuerName, RootCertificateName, false); 
+                X509Certificate2Collection collection = store.Certificates.Find(X509FindType.FindByIssuerName, RootCertificateName, false);
                 foreach (var item in collection)
                 {
-                    if (item != null) 
+                    if (item != null)
                         IPlatformService.Instance.RunShell($"security delete-certificate -Z {item.GetCertHashString()}", true);
                 }
             }
@@ -609,7 +611,7 @@ public async Task<bool> StartProxy()
 
                     try
                     {
-                        if (PortInUse(80) == false)
+                        if (EnableHttpProxyToHttps && PortInUse(80) == false)
                             proxyServer.AddEndPoint(new TransparentProxyEndPoint(ProxyIp, 80, false));
                     }
                     catch { }
diff --git a/src/ST.Client/Services/Mvvm/ProxyService.cs b/src/ST.Client/Services/Mvvm/ProxyService.cs
@@ -100,6 +100,7 @@ await EnableProxyScripts.ContinueWith(e =>
                         httpProxyService.TwoLevelAgentPassword = ProxySettings.TwoLevelAgentPassword.Value;
 
                         httpProxyService.ProxyDNS = IPAddress2.TryParse(ProxySettings.ProxyMasterDns.Value, out var dns) ? dns : null;
+                        httpProxyService.EnableHttpProxyToHttps = ProxySettings.EnableHttpProxyToHttps.Value;
 
                         this.RaisePropertyChanged(nameof(EnableProxyDomains));
                         this.RaisePropertyChanged(nameof(EnableProxyScripts));
diff --git a/src/ST.Client/Settings/ProxySettings.cs b/src/ST.Client/Settings/ProxySettings.cs
@@ -65,6 +65,12 @@ public sealed partial class ProxySettings : SettingsHost2<ProxySettings>
         /// </summary>
         public static SerializableProperty<string?> ProxyMasterDns { get; }
             = GetProperty<string?>(defaultValue: "223.5.5.5", autoSave: false);
+
+        /// <summary>
+        /// 启用Http链接转发到Https
+        /// </summary>
+        public static SerializableProperty<bool> EnableHttpProxyToHttps { get; }
+            = GetProperty(defaultValue: true, autoSave: true);
         #endregion
 
         #region 本地代理设置
diff --git a/src/ST.Client/UI/Resx/AppResources.Designer.cs b/src/ST.Client/UI/Resx/AppResources.Designer.cs
diff --git a/src/ST.Client/UI/Resx/AppResources.resx b/src/ST.Client/UI/Resx/AppResources.resx
@@ -1804,6 +1804,9 @@ AAAAA-BBBBB-CCCC3</value>
   <data name="CommunityFix_ProxyOnlyOnScript" xml:space="preserve">
     <value>代理仅启用脚本功能</value>
   </data>
+  <data name="CommunityFix_EnableHttpProxyToHttps" xml:space="preserve">
+    <value>启用Http协议转发到Https(需监听80端口)</value>
+  </data>
   <data name="About_AppReview" xml:space="preserve">
     <value>打分&amp;评价</value>
   </data>

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,8 @@ sealed class HttpProxyServiceImpl : IHttpProxyService`
`57`	`57`
`58`	`58`	`public bool Socks5ProxyEnable { get; set; }`
`59`	`59`
	`60`	`+ public bool EnableHttpProxyToHttps { get; set; }`
	`61`	`+`
`60`	`62`	`public int Socks5ProxyPortId { get; set; }`
`61`	`63`
`62`	`64`	`public bool TwoLevelAgentEnable { get; set; }`
`@@ -499,10 +501,10 @@ public void DeleteCer()`
`499`	`501`	`using (var store = new X509Store(StoreName.My, StoreLocation.CurrentUser))`
`500`	`502`	`{`
`501`	`503`	`store.Open(OpenFlags.ReadOnly);`
`502`		`- X509Certificate2Collection collection = store.Certificates.Find(X509FindType.FindByIssuerName, RootCertificateName, false);`
	`504`	`+ X509Certificate2Collection collection = store.Certificates.Find(X509FindType.FindByIssuerName, RootCertificateName, false);`
`503`	`505`	`foreach (var item in collection)`
`504`	`506`	`{`
`505`		`- if (item != null)`
	`507`	`+ if (item != null)`
`506`	`508`	`IPlatformService.Instance.RunShell($"security delete-certificate -Z {item.GetCertHashString()}", true);`
`507`	`509`	`}`
`508`	`510`	`}`
`@@ -609,7 +611,7 @@ public async Task<bool> StartProxy()`
`609`	`611`
`610`	`612`	`try`
`611`	`613`	`{`
`612`		`- if (PortInUse(80) == false)`
	`614`	`+ if (EnableHttpProxyToHttps && PortInUse(80) == false)`
`613`	`615`	`proxyServer.AddEndPoint(new TransparentProxyEndPoint(ProxyIp, 80, false));`
`614`	`616`	`}`
`615`	`617`	`catch { }`