wood/certimate
1
0
Fork 0
mirror of https://github.com/woodchen-ink/certimate.git synced 2025-07-18 17:31:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: clean code

Browse Source
This commit is contained in:
Fu Diwei 2025-01-15 22:45:02 +08:00
parent 974c320925
commit b657405e46
21 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/applicant/acme-user.go
View File

@ -11,7 +11,7 @@ import (
"github.com/go-acme/lego/v4/registration" "github.com/go-acme/lego/v4/registration"
"github.com/usual2970/certimate/internal/domain" "github.com/usual2970/certimate/internal/domain"
"github.com/usual2970/certimate/internal/pkg/utils/x509" "github.com/usual2970/certimate/internal/pkg/utils/certs"
"github.com/usual2970/certimate/internal/repository" "github.com/usual2970/certimate/internal/repository"
) )
@ -38,7 +38,7 @@ func newAcmeUser(ca, email string) (*acmeUser, error) {
return nil, err return nil, err
} }
keyPEM, err := x509.ConvertECPrivateKeyToPEM(key) keyPEM, err := certs.ConvertECPrivateKeyToPEM(key)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -62,7 +62,7 @@ func (u acmeUser) GetRegistration() *registration.Resource {
} }
func (u *acmeUser) GetPrivateKey() crypto.PrivateKey { func (u *acmeUser) GetPrivateKey() crypto.PrivateKey {
rs, _ := x509.ParseECPrivateKeyFromPEM(u.privkey) rs, _ := certs.ParseECPrivateKeyFromPEM(u.privkey)
return rs return rs
} }

24
internal/applicant/applicant.go
View File

@ -20,12 +20,12 @@ import (
) )
type ApplyCertResult struct { type ApplyCertResult struct {
CertificateChain string CertificateFullChain string
IssuerCertificate string IssuerCertificate string
PrivateKey string PrivateKey string
ACMECertUrl string ACMECertUrl string
ACMECertStableUrl string ACMECertStableUrl string
CSR string CSR string
} }
type Applicant interface { type Applicant interface {
@ -150,12 +150,12 @@ func apply(challengeProvider challenge.Provider, options *applicantOptions) (*Ap
} }
return &ApplyCertResult{ return &ApplyCertResult{
CertificateChain: strings.TrimSpace(string(certResource.Certificate)), CertificateFullChain: strings.TrimSpace(string(certResource.Certificate)),
IssuerCertificate: strings.TrimSpace(string(certResource.IssuerCertificate)), IssuerCertificate: strings.TrimSpace(string(certResource.IssuerCertificate)),
PrivateKey: strings.TrimSpace(string(certResource.PrivateKey)), PrivateKey: strings.TrimSpace(string(certResource.PrivateKey)),
ACMECertUrl: certResource.CertURL, ACMECertUrl: certResource.CertURL,
ACMECertStableUrl: certResource.CertStableURL, ACMECertStableUrl: certResource.CertStableURL,
CSR: string(certResource.CSR), CSR: string(certResource.CSR),
}, nil }, nil
} }

4
internal/pkg/core/deployer/providers/k8s-secret/k8s_secret.go
View File

@ -14,7 +14,7 @@ import (
"github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/deployer"
"github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/logger"
"github.com/usual2970/certimate/internal/pkg/utils/x509" "github.com/usual2970/certimate/internal/pkg/utils/certs"
) )
type K8sSecretDeployerConfig struct { type K8sSecretDeployerConfig struct {
@ -75,7 +75,7 @@ func (d *K8sSecretDeployer) Deploy(ctx context.Context, certPem string, privkeyP
return nil, errors.New("config `secretDataKeyForKey` is required") return nil, errors.New("config `secretDataKeyForKey` is required")
} }
certX509, err := x509.ParseCertificateFromPEM(certPem) certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil { if err != nil {
return nil, err return nil, err
} }

16
internal/pkg/core/deployer/providers/local/local.go
View File

@ -12,8 +12,8 @@ import (
"github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/deployer"
"github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/logger"
"github.com/usual2970/certimate/internal/pkg/utils/fs" "github.com/usual2970/certimate/internal/pkg/utils/certs"
"github.com/usual2970/certimate/internal/pkg/utils/x509" "github.com/usual2970/certimate/internal/pkg/utils/files"
) )
type LocalDeployerConfig struct { type LocalDeployerConfig struct {
@ -84,41 +84,41 @@ func (d *LocalDeployer) Deploy(ctx context.Context, certPem string, privkeyPem s
// 写入证书和私钥文件 // 写入证书和私钥文件
switch d.config.OutputFormat { switch d.config.OutputFormat {
case OUTPUT_FORMAT_PEM: case OUTPUT_FORMAT_PEM:
if err := fs.WriteFileString(d.config.OutputCertPath, certPem); err != nil { if err := files.WriteString(d.config.OutputCertPath, certPem); err != nil {
return nil, xerrors.Wrap(err, "failed to save certificate file") return nil, xerrors.Wrap(err, "failed to save certificate file")
} }
d.logger.Logt("certificate file saved") d.logger.Logt("certificate file saved")
if err := fs.WriteFileString(d.config.OutputKeyPath, privkeyPem); err != nil { if err := files.WriteString(d.config.OutputKeyPath, privkeyPem); err != nil {
return nil, xerrors.Wrap(err, "failed to save private key file") return nil, xerrors.Wrap(err, "failed to save private key file")
} }
d.logger.Logt("private key file saved") d.logger.Logt("private key file saved")
case OUTPUT_FORMAT_PFX: case OUTPUT_FORMAT_PFX:
pfxData, err := x509.TransformCertificateFromPEMToPFX(certPem, privkeyPem, d.config.PfxPassword) pfxData, err := certs.TransformCertificateFromPEMToPFX(certPem, privkeyPem, d.config.PfxPassword)
if err != nil { if err != nil {
return nil, xerrors.Wrap(err, "failed to transform certificate to PFX") return nil, xerrors.Wrap(err, "failed to transform certificate to PFX")
} }
d.logger.Logt("certificate transformed to PFX") d.logger.Logt("certificate transformed to PFX")
if err := fs.WriteFile(d.config.OutputCertPath, pfxData); err != nil { if err := files.Write(d.config.OutputCertPath, pfxData); err != nil {
return nil, xerrors.Wrap(err, "failed to save certificate file") return nil, xerrors.Wrap(err, "failed to save certificate file")
} }
d.logger.Logt("certificate file saved") d.logger.Logt("certificate file saved")
case OUTPUT_FORMAT_JKS: case OUTPUT_FORMAT_JKS:
jksData, err := x509.TransformCertificateFromPEMToJKS(certPem, privkeyPem, d.config.JksAlias, d.config.JksKeypass, d.config.JksStorepass) jksData, err := certs.TransformCertificateFromPEMToJKS(certPem, privkeyPem, d.config.JksAlias, d.config.JksKeypass, d.config.JksStorepass)
if err != nil { if err != nil {
return nil, xerrors.Wrap(err, "failed to transform certificate to JKS") return nil, xerrors.Wrap(err, "failed to transform certificate to JKS")
} }
d.logger.Logt("certificate transformed to JKS") d.logger.Logt("certificate transformed to JKS")
if err := fs.WriteFile(d.config.OutputCertPath, jksData); err != nil { if err := files.Write(d.config.OutputCertPath, jksData); err != nil {
return nil, xerrors.Wrap(err, "failed to save certificate file") return nil, xerrors.Wrap(err, "failed to save certificate file")
} }

6
internal/pkg/core/deployer/providers/ssh/ssh.go
View File

@ -14,7 +14,7 @@ import (
"github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/deployer"
"github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/logger"
"github.com/usual2970/certimate/internal/pkg/utils/x509" "github.com/usual2970/certimate/internal/pkg/utils/certs"
) )
type SshDeployerConfig struct { type SshDeployerConfig struct {
@ -125,7 +125,7 @@ func (d *SshDeployer) Deploy(ctx context.Context, certPem string, privkeyPem str
d.logger.Logt("private key file uploaded") d.logger.Logt("private key file uploaded")
case OUTPUT_FORMAT_PFX: case OUTPUT_FORMAT_PFX:
pfxData, err := x509.TransformCertificateFromPEMToPFX(certPem, privkeyPem, d.config.PfxPassword) pfxData, err := certs.TransformCertificateFromPEMToPFX(certPem, privkeyPem, d.config.PfxPassword)
if err != nil { if err != nil {
return nil, xerrors.Wrap(err, "failed to transform certificate to PFX") return nil, xerrors.Wrap(err, "failed to transform certificate to PFX")
} }
@ -139,7 +139,7 @@ func (d *SshDeployer) Deploy(ctx context.Context, certPem string, privkeyPem str
d.logger.Logt("certificate file uploaded") d.logger.Logt("certificate file uploaded")
case OUTPUT_FORMAT_JKS: case OUTPUT_FORMAT_JKS:
jksData, err := x509.TransformCertificateFromPEMToJKS(certPem, privkeyPem, d.config.JksAlias, d.config.JksKeypass, d.config.JksStorepass) jksData, err := certs.TransformCertificateFromPEMToJKS(certPem, privkeyPem, d.config.JksAlias, d.config.JksKeypass, d.config.JksStorepass)
if err != nil { if err != nil {
return nil, xerrors.Wrap(err, "failed to transform certificate to JKS") return nil, xerrors.Wrap(err, "failed to transform certificate to JKS")
} }

4
internal/pkg/core/deployer/providers/webhook/webhook.go
View File

@ -14,7 +14,7 @@ import (
"github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/deployer"
"github.com/usual2970/certimate/internal/pkg/core/logger" "github.com/usual2970/certimate/internal/pkg/core/logger"
"github.com/usual2970/certimate/internal/pkg/utils/x509" "github.com/usual2970/certimate/internal/pkg/utils/certs"
) )
type WebhookDeployerConfig struct { type WebhookDeployerConfig struct {
@ -55,7 +55,7 @@ func NewWithLogger(config *WebhookDeployerConfig, logger logger.Logger) (*Webhoo
} }
func (d *WebhookDeployer) Deploy(ctx context.Context, certPem string, privkeyPem string) (*deployer.DeployResult, error) { func (d *WebhookDeployer) Deploy(ctx context.Context, certPem string, privkeyPem string) (*deployer.DeployResult, error) {
certX509, err := x509.ParseCertificateFromPEM(certPem) certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil { if err != nil {
return nil, xerrors.Wrap(err, "failed to parse x509") return nil, xerrors.Wrap(err, "failed to parse x509")
} }

8
internal/pkg/core/uploader/providers/aliyun-cas/aliyun_cas.go
View File

@ -13,7 +13,7 @@ import (
xerrors "github.com/pkg/errors" xerrors "github.com/pkg/errors"
"github.com/usual2970/certimate/internal/pkg/core/uploader" "github.com/usual2970/certimate/internal/pkg/core/uploader"
"github.com/usual2970/certimate/internal/pkg/utils/x509" "github.com/usual2970/certimate/internal/pkg/utils/certs"
) )
type AliyunCASUploaderConfig struct { type AliyunCASUploaderConfig struct {
@ -54,7 +54,7 @@ func New(config *AliyunCASUploaderConfig) (*AliyunCASUploader, error) {
func (u *AliyunCASUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { func (u *AliyunCASUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 解析证书内容 // 解析证书内容
certX509, err := x509.ParseCertificateFromPEM(certPem) certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -90,12 +90,12 @@ func (u *AliyunCASUploader) Upload(ctx context.Context, certPem string, privkeyP
if *getUserCertificateDetailResp.Body.Cert == certPem { if *getUserCertificateDetailResp.Body.Cert == certPem {
isSameCert = true isSameCert = true
} else { } else {
oldCertX509, err := x509.ParseCertificateFromPEM(*getUserCertificateDetailResp.Body.Cert) oldCertX509, err := certs.ParseCertificateFromPEM(*getUserCertificateDetailResp.Body.Cert)
if err != nil { if err != nil {
continue continue
} }
isSameCert = x509.EqualCertificate(certX509, oldCertX509) isSameCert = certs.EqualCertificate(certX509, oldCertX509)
} }
// 如果已存在相同证书，直接返回已有的证书信息 // 如果已存在相同证书，直接返回已有的证书信息

4
internal/pkg/core/uploader/providers/aliyun-slb/aliyun_slb.go
View File

@ -16,7 +16,7 @@ import (
xerrors "github.com/pkg/errors" xerrors "github.com/pkg/errors"
"github.com/usual2970/certimate/internal/pkg/core/uploader" "github.com/usual2970/certimate/internal/pkg/core/uploader"
"github.com/usual2970/certimate/internal/pkg/utils/x509" "github.com/usual2970/certimate/internal/pkg/utils/certs"
) )
type AliyunSLBUploaderConfig struct { type AliyunSLBUploaderConfig struct {
@ -57,7 +57,7 @@ func New(config *AliyunSLBUploaderConfig) (*AliyunSLBUploader, error) {
func (u *AliyunSLBUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { func (u *AliyunSLBUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 解析证书内容 // 解析证书内容
certX509, err := x509.ParseCertificateFromPEM(certPem) certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
internal/pkg/core/uploader/providers/byteplus-cdn/byteplus_cdn.go
View File

@ -14,7 +14,7 @@ import (
xerrors "github.com/pkg/errors" xerrors "github.com/pkg/errors"
"github.com/usual2970/certimate/internal/pkg/core/uploader" "github.com/usual2970/certimate/internal/pkg/core/uploader"
"github.com/usual2970/certimate/internal/pkg/utils/x509" "github.com/usual2970/certimate/internal/pkg/utils/certs"
) )
type ByteplusCDNUploaderConfig struct { type ByteplusCDNUploaderConfig struct {
@ -48,7 +48,7 @@ func New(config *ByteplusCDNUploaderConfig) (*ByteplusCDNUploader, error) {
func (u *ByteplusCDNUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { func (u *ByteplusCDNUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 解析证书内容 // 解析证书内容
certX509, err := x509.ParseCertificateFromPEM(certPem) certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil { if err != nil {
return nil, err return nil, err
} }

8
internal/pkg/core/uploader/providers/huaweicloud-elb/huaweicloud_elb.go
View File

@ -17,7 +17,7 @@ import (
xerrors "github.com/pkg/errors" xerrors "github.com/pkg/errors"
"github.com/usual2970/certimate/internal/pkg/core/uploader" "github.com/usual2970/certimate/internal/pkg/core/uploader"
"github.com/usual2970/certimate/internal/pkg/utils/x509" "github.com/usual2970/certimate/internal/pkg/utils/certs"
hwsdk "github.com/usual2970/certimate/internal/pkg/vendors/huaweicloud-sdk" hwsdk "github.com/usual2970/certimate/internal/pkg/vendors/huaweicloud-sdk"
) )
@ -59,7 +59,7 @@ func New(config *HuaweiCloudELBUploaderConfig) (*HuaweiCloudELBUploader, error)
func (u *HuaweiCloudELBUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { func (u *HuaweiCloudELBUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 解析证书内容 // 解析证书内容
certX509, err := x509.ParseCertificateFromPEM(certPem) certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -85,12 +85,12 @@ func (u *HuaweiCloudELBUploader) Upload(ctx context.Context, certPem string, pri
if certDetail.Certificate == certPem { if certDetail.Certificate == certPem {
isSameCert = true isSameCert = true
} else { } else {
oldCertX509, err := x509.ParseCertificateFromPEM(certDetail.Certificate) oldCertX509, err := certs.ParseCertificateFromPEM(certDetail.Certificate)
if err != nil { if err != nil {
continue continue
} }
isSameCert = x509.EqualCertificate(certX509, oldCertX509) isSameCert = certs.EqualCertificate(certX509, oldCertX509)
} }
// 如果已存在相同证书，直接返回已有的证书信息 // 如果已存在相同证书，直接返回已有的证书信息

8
internal/pkg/core/uploader/providers/huaweicloud-scm/huaweicloud_scm.go
View File

@ -13,7 +13,7 @@ import (
xerrors "github.com/pkg/errors" xerrors "github.com/pkg/errors"
"github.com/usual2970/certimate/internal/pkg/core/uploader" "github.com/usual2970/certimate/internal/pkg/core/uploader"
"github.com/usual2970/certimate/internal/pkg/utils/x509" "github.com/usual2970/certimate/internal/pkg/utils/certs"
hwsdk "github.com/usual2970/certimate/internal/pkg/vendors/huaweicloud-sdk" hwsdk "github.com/usual2970/certimate/internal/pkg/vendors/huaweicloud-sdk"
) )
@ -55,7 +55,7 @@ func New(config *HuaweiCloudSCMUploaderConfig) (*HuaweiCloudSCMUploader, error)
func (u *HuaweiCloudSCMUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { func (u *HuaweiCloudSCMUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 解析证书内容 // 解析证书内容
certX509, err := x509.ParseCertificateFromPEM(certPem) certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -94,12 +94,12 @@ func (u *HuaweiCloudSCMUploader) Upload(ctx context.Context, certPem string, pri
if *exportCertificateResp.Certificate == certPem { if *exportCertificateResp.Certificate == certPem {
isSameCert = true isSameCert = true
} else { } else {
oldCertX509, err := x509.ParseCertificateFromPEM(*exportCertificateResp.Certificate) oldCertX509, err := certs.ParseCertificateFromPEM(*exportCertificateResp.Certificate)
if err != nil { if err != nil {
continue continue
} }
isSameCert = x509.EqualCertificate(certX509, oldCertX509) isSameCert = certs.EqualCertificate(certX509, oldCertX509)
} }
// 如果已存在相同证书，直接返回已有的证书信息 // 如果已存在相同证书，直接返回已有的证书信息

4
internal/pkg/core/uploader/providers/qiniu-sslcert/qiniu_sslcert.go
View File

@ -10,7 +10,7 @@ import (
"github.com/qiniu/go-sdk/v7/auth" "github.com/qiniu/go-sdk/v7/auth"
"github.com/usual2970/certimate/internal/pkg/core/uploader" "github.com/usual2970/certimate/internal/pkg/core/uploader"
"github.com/usual2970/certimate/internal/pkg/utils/x509" "github.com/usual2970/certimate/internal/pkg/utils/certs"
qiniuEx "github.com/usual2970/certimate/internal/pkg/vendors/qiniu-sdk" qiniuEx "github.com/usual2970/certimate/internal/pkg/vendors/qiniu-sdk"
) )
@ -49,7 +49,7 @@ func New(config *QiniuSSLCertUploaderConfig) (*QiniuSSLCertUploader, error) {
func (u *QiniuSSLCertUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { func (u *QiniuSSLCertUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 解析证书内容 // 解析证书内容
certX509, err := x509.ParseCertificateFromPEM(certPem) certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
internal/pkg/core/uploader/providers/ucloud-ussl/ucloud_ussl.go
View File

@ -16,7 +16,7 @@ import (
uAuth "github.com/ucloud/ucloud-sdk-go/ucloud/auth" uAuth "github.com/ucloud/ucloud-sdk-go/ucloud/auth"
"github.com/usual2970/certimate/internal/pkg/core/uploader" "github.com/usual2970/certimate/internal/pkg/core/uploader"
x509util "github.com/usual2970/certimate/internal/pkg/utils/x509" "github.com/usual2970/certimate/internal/pkg/utils/certs"
usdkSsl "github.com/usual2970/certimate/internal/pkg/vendors/ucloud-sdk/ussl" usdkSsl "github.com/usual2970/certimate/internal/pkg/vendors/ucloud-sdk/ussl"
) )
@ -94,7 +94,7 @@ func (u *UCloudUSSLUploader) Upload(ctx context.Context, certPem string, privkey
func (u *UCloudUSSLUploader) getExistCert(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { func (u *UCloudUSSLUploader) getExistCert(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 解析证书内容 // 解析证书内容
certX509, err := x509util.ParseCertificateFromPEM(certPem) certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
internal/pkg/core/uploader/providers/volcengine-cdn/volcengine_cdn.go
View File

@ -15,7 +15,7 @@ import (
ve "github.com/volcengine/volcengine-go-sdk/volcengine" ve "github.com/volcengine/volcengine-go-sdk/volcengine"
"github.com/usual2970/certimate/internal/pkg/core/uploader" "github.com/usual2970/certimate/internal/pkg/core/uploader"
"github.com/usual2970/certimate/internal/pkg/utils/x509" "github.com/usual2970/certimate/internal/pkg/utils/certs"
) )
type VolcEngineCDNUploaderConfig struct { type VolcEngineCDNUploaderConfig struct {
@ -49,7 +49,7 @@ func New(config *VolcEngineCDNUploaderConfig) (*VolcEngineCDNUploader, error) {
func (u *VolcEngineCDNUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { func (u *VolcEngineCDNUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 解析证书内容 // 解析证书内容
certX509, err := x509.ParseCertificateFromPEM(certPem) certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil { if err != nil {
return nil, err return nil, err
} }

8
internal/pkg/core/uploader/providers/volcengine-live/volcengine_live.go
View File

@ -12,7 +12,7 @@ import (
ve "github.com/volcengine/volcengine-go-sdk/volcengine" ve "github.com/volcengine/volcengine-go-sdk/volcengine"
"github.com/usual2970/certimate/internal/pkg/core/uploader" "github.com/usual2970/certimate/internal/pkg/core/uploader"
"github.com/usual2970/certimate/internal/pkg/utils/x509" "github.com/usual2970/certimate/internal/pkg/utils/certs"
) )
type VolcEngineLiveUploaderConfig struct { type VolcEngineLiveUploaderConfig struct {
@ -46,7 +46,7 @@ func New(config *VolcEngineLiveUploaderConfig) (*VolcEngineLiveUploader, error)
func (u *VolcEngineLiveUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) { func (u *VolcEngineLiveUploader) Upload(ctx context.Context, certPem string, privkeyPem string) (res *uploader.UploadResult, err error) {
// 解析证书内容 // 解析证书内容
certX509, err := x509.ParseCertificateFromPEM(certPem) certX509, err := certs.ParseCertificateFromPEM(certPem)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -75,12 +75,12 @@ func (u *VolcEngineLiveUploader) Upload(ctx context.Context, certPem string, pri
if certificate == certPem { if certificate == certPem {
isSameCert = true isSameCert = true
} else { } else {
oldCertX509, err := x509.ParseCertificateFromPEM(certificate) oldCertX509, err := certs.ParseCertificateFromPEM(certificate)
if err != nil { if err != nil {
continue continue
} }
isSameCert = x509.EqualCertificate(certX509, oldCertX509) isSameCert = certs.EqualCertificate(certX509, oldCertX509)
} }
// 如果已存在相同证书，直接返回已有的证书信息 // 如果已存在相同证书，直接返回已有的证书信息

2
internal/pkg/utils/x509/common.go → internal/pkg/utils/certs/common.go
View File

@ -1,4 +1,4 @@
package x509 package certs
import ( import (
"crypto/x509" "crypto/x509"

2
internal/pkg/utils/x509/converter.go → internal/pkg/utils/certs/converter.go
View File

@ -1,4 +1,4 @@
package x509 package certs
import ( import (
"crypto/ecdsa" "crypto/ecdsa"

2
internal/pkg/utils/x509/parser.go → internal/pkg/utils/certs/parser.go
View File

@ -1,4 +1,4 @@
package x509 package certs
import ( import (
"crypto/ecdsa" "crypto/ecdsa"

2
internal/pkg/utils/x509/transformer.go → internal/pkg/utils/certs/transformer.go
View File

@ -1,4 +1,4 @@
package x509 package certs
import ( import (
"bytes" "bytes"

10
internal/pkg/utils/fs/fs.go → internal/pkg/utils/files/files.go
View File

@ -1,4 +1,4 @@
package fs package files
import ( import (
"os" "os"
@ -7,7 +7,7 @@ import (
xerrors "github.com/pkg/errors" xerrors "github.com/pkg/errors"
) )
// 与 [WriteFile] 类似，但写入的是字符串内容。 // 与 [Write] 类似，但写入的是字符串内容。
// //
// 入参: // 入参:
// - path: 文件路径。 // - path: 文件路径。
@ -15,8 +15,8 @@ import (
// //
// 出参: // 出参:
// - 错误。 // - 错误。
func WriteFileString(path string, content string) error { func WriteString(path string, content string) error {
return WriteFile(path, []byte(content)) return Write(path, []byte(content))
} }
// 将数据写入指定路径的文件。 // 将数据写入指定路径的文件。
@ -29,7 +29,7 @@ func WriteFileString(path string, content string) error {
// //
// 出参: // 出参:
// - 错误。 // - 错误。
func WriteFile(path string, data []byte) error { func Write(path string, data []byte) error {
dir := filepath.Dir(path) dir := filepath.Dir(path)
err := os.MkdirAll(dir, os.ModePerm) err := os.MkdirAll(dir, os.ModePerm)

6
internal/workflow/node-processor/apply_node.go
View File

@ -7,7 +7,7 @@ import (
"github.com/usual2970/certimate/internal/applicant" "github.com/usual2970/certimate/internal/applicant"
"github.com/usual2970/certimate/internal/domain" "github.com/usual2970/certimate/internal/domain"
"github.com/usual2970/certimate/internal/pkg/utils/x509" "github.com/usual2970/certimate/internal/pkg/utils/certs"
"github.com/usual2970/certimate/internal/repository" "github.com/usual2970/certimate/internal/repository"
) )
@ -89,7 +89,7 @@ func (a *applyNode) Run(ctx context.Context) error {
Outputs: a.node.Outputs, Outputs: a.node.Outputs,
} }
certX509, err := x509.ParseCertificateFromPEM(applyResult.CertificateChain) certX509, err := certs.ParseCertificateFromPEM(applyResult.CertificateFullChain)
if err != nil { if err != nil {
a.AddOutput(ctx, a.node.Name, "解析证书失败", err.Error()) a.AddOutput(ctx, a.node.Name, "解析证书失败", err.Error())
return err return err
@ -98,7 +98,7 @@ func (a *applyNode) Run(ctx context.Context) error {
certificate := &domain.Certificate{ certificate := &domain.Certificate{
Source: domain.CertificateSourceTypeWorkflow, Source: domain.CertificateSourceTypeWorkflow,
SubjectAltNames: strings.Join(certX509.DNSNames, ";"), SubjectAltNames: strings.Join(certX509.DNSNames, ";"),
Certificate: applyResult.CertificateChain, Certificate: applyResult.CertificateFullChain,
PrivateKey: applyResult.PrivateKey, PrivateKey: applyResult.PrivateKey,
IssuerCertificate: applyResult.IssuerCertificate, IssuerCertificate: applyResult.IssuerCertificate,
ACMECertUrl: applyResult.ACMECertUrl, ACMECertUrl: applyResult.ACMECertUrl,