🐛 Fix macOS 加速错误等待输入密码过长导致 IPC 异常闪退

BeyondDimension · Sep 23, 2023 · 2467ce9 · 2467ce9
1 parent f968f3f
commit 2467ce9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/...ns.Accelerator.ReverseProxy/Services.Implementation/Certificate/CertificateManagerImpl.cs b/...ns.Accelerator.ReverseProxy/Services.Implementation/Certificate/CertificateManagerImpl.cs
@@ -23,9 +23,18 @@ public CertificateManagerImpl(IPCSubProcessService ipc)
 
     public X509CertificatePackable RootCertificatePackable { get; set; }
 
+    readonly object lock_RootCertificatePackable = new();
+
     byte[]? ICertificateManager.RootCertificatePackable
     {
-        get => RootCertificate == default ? default : Serializable.SMP2(RootCertificatePackable);
+        get
+        {
+            lock (lock_RootCertificatePackable)
+            {
+                RootCertificate ??= LoadRootCertificate();
+            }
+            return RootCertificate == default ? default : Serializable.SMP2(RootCertificatePackable);
+        }
     }
 
     /// <inheritdoc cref="ICertificateManager.PfxPassword"/>
@@ -189,6 +198,10 @@ void SharedRemoveTrustedRootCertificate()
                 if (!GenerateCertificateUnlock(filePath))
                     return null;
             }
+            else if (RootCertificate == null)
+            {
+                RootCertificate = LoadRootCertificate();
+            }
             return filePath;
         }
     }

diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/Services/Mvvm/ProxyService.Operate.cs b/src/BD.WTTS.Client.Plugins.Accelerator/Services/Mvvm/ProxyService.Operate.cs
@@ -173,9 +173,13 @@ await EnableProxyScripts.ContinueWith(e =>
 
         if (!OperatingSystem.IsWindows())
         {
-            ICertificateManager.Constants.CheckRootCertificate(
-                platformService,
-                ICertificateManager.Constants.Instance);
+            var checkRootCertificateCode = ICertificateManager.Constants.CheckRootCertificate(
+                  platformService,
+                  ICertificateManager.Constants.Instance);
+            if (checkRootCertificateCode != StartProxyResultCode.Ok)
+            {
+                return $"CheckRootCertificate, ErrCode: {checkRootCertificateCode}";
+            }
         }
 
         ReverseProxySettings reverseProxySettings = new(proxyDomains, scripts,