Skip to content

BillionMail gives you open-source MailServer, NewsLetter, Email Marketing — fully self-hosted, dev-friendly, and free from monthly fees. Join the discord: https://discord.gg/asfXzBUhZr

fix(certificate): return certificate info and error on file check failure

lotkdea22f5b9719
diff --git a/core/internal/service/mail_service/certificate.go b/core/internal/service/mail_service/certificate.go
index 0e0a4a85..86b54f66 100644
--- a/core/internal/service/mail_service/certificate.go
+++ b/core/internal/service/mail_service/certificate.go
@@ -531,13 +531,12 @@ func (c *Certificate) getSSLInfoFromFiles(domain string) (certInfo v1.CertInfo,
keyPath := filepath.Join(consts.SSL_PATH, domain, "/privkey.pem")
if !c.checkCertificateFiles(csrPath, keyPath) {
- err = fmt.Errorf("certificate files do not exist")
- return certInfo,err
+ return certInfo, nil
}
crtPem, err := public.ReadFile(csrPath)
if err != nil {
- return certInfo,err
+ return certInfo, err
}
// Get certificate information
@@ -547,7 +546,7 @@ func (c *Certificate) getSSLInfoFromFiles(domain string) (certInfo v1.CertInfo,
certInfo.CertPem = crtPem
certInfo.KeyPem, err = public.ReadFile(keyPath)
if err != nil {
- return certInfo,err
+ return certInfo, err
}
}