v2rayN/Directory.Packages.props

@@ -14,7 +14,7 @@
     <PackageVersion Include="Downloader" Version="4.0.3" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.2" />
     <PackageVersion Include="MaterialDesignThemes" Version="5.3.0" />
-    <PackageVersion Include="MessageBox.Avalonia" Version="3.3.0" />
+    <PackageVersion Include="MessageBox.Avalonia" Version="3.2.0" />
     <PackageVersion Include="QRCoder" Version="1.7.0" />
     <PackageVersion Include="ReactiveUI" Version="22.2.1" />
     <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />

v2rayN/ServiceLib/Manager/CertPemManager.cs

@@ -202,17 +202,14 @@ public class CertPemManager
     /// <summary>
     /// Get certificate in PEM format from a server with CA pinning validation
     /// </summary>
-    public async Task<(string?, string?)> GetCertPemAsync(string target, string serverName, int timeout = 10)
+    public async Task<string?> GetCertPemAsync(string target, string serverName)
     {
         try
         {
             var (domain, _, port, _) = Utils.ParseUrl(target);
 
-            using var cts = new CancellationTokenSource();
-            cts.CancelAfter(TimeSpan.FromSeconds(timeout));
-
             using var client = new TcpClient();
-            await client.ConnectAsync(domain, port > 0 ? port : 443, cts.Token);
+            await client.ConnectAsync(domain, port > 0 ? port : 443);
 
             using var ssl = new SslStream(client.GetStream(), false, ValidateServerCertificate);
 
@@ -221,39 +218,31 @@ public class CertPemManager
             var remote = ssl.RemoteCertificate;
             if (remote == null)
             {
-                return (null, null);
+                return null;
             }
 
             var leaf = new X509Certificate2(remote);
-            return (ExportCertToPem(leaf), null);
-        }
-        catch (OperationCanceledException)
-        {
-            Logging.SaveLog(_tag, new TimeoutException($"Connection timeout after {timeout} seconds"));
-            return (null, $"Connection timeout after {timeout} seconds");
+            return ExportCertToPem(leaf);
         }
         catch (Exception ex)
         {
             Logging.SaveLog(_tag, ex);
-            return (null, ex.Message);
+            return null;
         }
     }
 
     /// <summary>
     /// Get certificate chain in PEM format from a server with CA pinning validation
     /// </summary>
-    public async Task<(List<string>, string?)> GetCertChainPemAsync(string target, string serverName, int timeout = 10)
+    public async Task<List<string>> GetCertChainPemAsync(string target, string serverName)
     {
-        var pemList = new List<string>();
         try
         {
+            var pemList = new List<string>();
             var (domain, _, port, _) = Utils.ParseUrl(target);
 
-            using var cts = new CancellationTokenSource();
-            cts.CancelAfter(TimeSpan.FromSeconds(timeout));
-
             using var client = new TcpClient();
-            await client.ConnectAsync(domain, port > 0 ? port : 443, cts.Token);
+            await client.ConnectAsync(domain, port > 0 ? port : 443);
 
             using var ssl = new SslStream(client.GetStream(), false, ValidateServerCertificate);
 
@@ -261,7 +250,7 @@ public class CertPemManager
 
             if (ssl.RemoteCertificate is not X509Certificate2 certChain)
             {
-                return (pemList, null);
+                return pemList;
             }
 
             var chain = new X509Chain();
@@ -273,17 +262,12 @@ public class CertPemManager
                 pemList.Add(pem);
             }
 
-            return (pemList, null);
-        }
-        catch (OperationCanceledException)
-        {
-            Logging.SaveLog(_tag, new TimeoutException($"Connection timeout after {timeout} seconds"));
-            return (pemList, $"Connection timeout after {timeout} seconds");
+            return pemList;
         }
         catch (Exception ex)
         {
             Logging.SaveLog(_tag, ex);
-            return (pemList, ex.Message);
+            return new List<string>();
         }
     }
 

v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs

@@ -146,8 +146,7 @@ public class AddServerViewModel : MyReactiveObject
         {
             domain += $":{SelectedSource.Port}";
         }
-        (Cert, _certError) = await CertPemManager.Instance.GetCertPemAsync(domain, serverName);
-        UpdateCertTip();
+        Cert = await CertPemManager.Instance.GetCertPemAsync(domain, serverName);
     }
 
     private async Task FetchCertChain()
@@ -177,8 +176,7 @@ public class AddServerViewModel : MyReactiveObject
         {
             domain += $":{SelectedSource.Port}";
         }
-        (var certs, _certError) = await CertPemManager.Instance.GetCertChainPemAsync(domain, serverName);
-        UpdateCertTip();
+        var certs = await CertPemManager.Instance.GetCertChainPemAsync(domain, serverName);
         Cert = string.Join("\n", certs);
     }
 }