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;