From f57116d2bebf33e47ad93e0b39c4efe8e4aea25c Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Tue, 7 Jan 2025 23:13:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E5=88=B0=E6=9C=AC=E6=9C=BA=E6=8F=92=E4=BB=B6=EF=BC=8Cpfx?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=A4=8D=E5=88=B6=E6=97=B6=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/plugin-cert/src/plugin/cert-plugin/cert-reader.ts  | 3 +++
 .../src/plugins/plugin-host/plugin/copy-to-local/index.ts      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/cert-reader.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/cert-reader.ts
index d82a6dc6..55d3f3a6 100644
--- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/cert-reader.ts
+++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/cert-reader.ts
@@ -69,6 +69,9 @@ export class CertReader {
       return "";
     }
     const ic = this.crt.substring(start);
+    if (ic == null) {
+      return "";
+    }
     return ic.trim();
   }
 
diff --git a/packages/ui/certd-server/src/plugins/plugin-host/plugin/copy-to-local/index.ts b/packages/ui/certd-server/src/plugins/plugin-host/plugin/copy-to-local/index.ts
index 65b562e3..9804fffc 100644
--- a/packages/ui/certd-server/src/plugins/plugin-host/plugin/copy-to-local/index.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-host/plugin/copy-to-local/index.ts
@@ -226,7 +226,7 @@ export class CopyCertToLocalPlugin extends AbstractTaskPlugin {
         this.hostIcPath = icPath;
       }
       if (pfxPath) {
-        pfxPath = icPath.trim();
+        pfxPath = pfxPath.trim();
         pfxPath = pfxPath.startsWith('/') ? pfxPath : path.join(Constants.dataDir, pfxPath);
         this.copyFile(tmpPfxPath, pfxPath);
         this.hostPfxPath = pfxPath;