diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-alb/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-alb/index.ts index 138268532..c348ed3ca 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-alb/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-alb/index.ts @@ -316,6 +316,8 @@ export class AliyunDeployCertToALB extends AbstractTaskPlugin { certId = certIdRes.certId as any; }else if (casCert.certId){ certId = casCert.certId; + }else{ + throw new Error('证书格式错误'+JSON.stringify(this.cert)); } } diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apig/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apig/index.ts index 5093054fc..14e5ac6a1 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apig/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apig/index.ts @@ -141,11 +141,13 @@ export class DeployCertToAliyunApig extends AbstractTaskPlugin { const casCert = this.cert as CasCertId; if (casCert.certId) { certId = casCert.certId; - } else { + } else if (certInfo.crt) { certId = await sslClient.uploadCert({ name: this.buildCertName(CertReader.getMainDomain(certInfo.crt)), cert: certInfo, }); + }else{ + throw new Error('证书格式错误'+JSON.stringify(this.cert)); } } diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts index 57689e82a..c5ee7df9b 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts @@ -117,13 +117,15 @@ export class DeployCertToAliyunCDN extends AbstractTaskPlugin { const casCert = this.cert as CasCertId; if (casCert.certId) { certId = casCert.certId; - } else { + } else if (certInfo.crt) { certName = this.buildCertName(CertReader.getMainDomain(certInfo.crt)) const certIdRes = await sslClient.uploadCertificate({ name:certName, cert: certInfo, }); certId = certIdRes.certId as any; + }else{ + throw new Error('证书格式错误'+JSON.stringify(this.cert)); } } diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts index 13cda1abd..8bc11d2db 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts @@ -106,6 +106,7 @@ export class DeployCertToAliyunDCDN extends AbstractTaskPlugin { let certId: any = this.cert if (typeof this.cert === 'object') { const certInfo = this.cert as CertInfo; + const casCertId = this.cert as CasCertId; if (certInfo.crt) { this.logger.info('上传证书:', CertName); const cert: any = this.cert; @@ -117,6 +118,10 @@ export class DeployCertToAliyunDCDN extends AbstractTaskPlugin { SSLPub: cert.crt, SSLPri: cert.key, }; + }else if (casCertId.certId){ + certId = casCertId.certId; + }else{ + throw new Error('证书格式错误'+JSON.stringify(this.cert)); } } this.logger.info('使用已上传的证书:', certId); diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-esa/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-esa/index.ts index ad5eac4c9..22c3eb1a9 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-esa/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-esa/index.ts @@ -122,7 +122,7 @@ export class AliyunDeployCertToESA extends AbstractTaskPlugin { if (casCert.certId) { certId = casCert.certId; certName = casCert.certName; - } else { + } else if (certInfo.crt) { certName = this.buildCertName(CertReader.getMainDomain(certInfo.crt)); const certIdRes = await sslClient.uploadCertificate({ @@ -131,6 +131,8 @@ export class AliyunDeployCertToESA extends AbstractTaskPlugin { }); certId = certIdRes.certId as any; this.logger.info("上传证书成功", certId, certName); + }else{ + throw new Error('证书格式错误'+JSON.stringify(this.cert)); } } return { diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-oss/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-oss/index.ts index 7d9a341dd..5a351ccee 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-oss/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-oss/index.ts @@ -175,7 +175,7 @@ export class DeployCertToAliyunOSS extends AbstractTaskPlugin { ${certInfo.key} ${certInfo.crt} ` - }else{ + }else { const casCert = this.cert as CasCertId; certStr = `${casCert.certIdentifier}` } diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-waf/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-waf/index.ts index baa4e14c4..ce9b91322 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-waf/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-waf/index.ts @@ -153,15 +153,17 @@ export class AliyunDeployCertToWaf extends AbstractTaskPlugin { }); const cert = this.cert as CertInfo; + const casCert = this.cert as CasCertInfo; if (cert.crt) { const certIdRes = await sslClient.uploadCertificate({ name: this.buildCertName(CertReader.getMainDomain(cert.crt)), cert: cert, }); certId = certIdRes.certId as any; - }else { - const casCert = this.cert as CasCertInfo; + } else if (casCert.certId) { certId = casCert.certId; + } else { + throw new Error('证书格式错误'+JSON.stringify(this.cert)); } } diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts index 79b655056..98d4017e3 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts @@ -101,7 +101,7 @@ export class UploadCertToAliyun extends AbstractTaskPlugin { let certName = "" if (this.name){ certName = this.appendTimeSuffix(this.name) - }else{ + }else { certName = this.buildCertName(CertReader.getMainDomain(this.cert.crt)) } const certIdRes = await client.uploadCertificate({