From 4be788f880d6bd6de45d5cf984acaaa37ddf4438 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Thu, 13 Nov 2025 20:54:11 +0800 Subject: [PATCH] refactor: clean code --- .../certdeploy/deployers/sp_qiniu_kodo.go | 1 + .../certdeploy/deployers/sp_upyun_file.go | 5 +- .../providers/qiniu-kodo/qiniu_kodo.go | 2 + .../providers/qiniu-kodo/qiniu_kodo_test.go | 5 + .../providers/upyun-file/upyun_file.go | 122 ++++++++++++++++++ .../providers/upyun-file/upyun_file_test.go | 80 ++++++++++++ ...eployNodeConfigFieldsProviderQiniuKodo.tsx | 11 ++ ...eployNodeConfigFieldsProviderUpyunFile.tsx | 11 ++ .../i18n/locales/en/nls.workflow.nodes.json | 4 + .../i18n/locales/zh/nls.workflow.nodes.json | 8 +- 10 files changed, 245 insertions(+), 4 deletions(-) create mode 100644 pkg/core/ssl-deployer/providers/upyun-file/upyun_file.go create mode 100644 pkg/core/ssl-deployer/providers/upyun-file/upyun_file_test.go diff --git a/internal/certdeploy/deployers/sp_qiniu_kodo.go b/internal/certdeploy/deployers/sp_qiniu_kodo.go index 69ba9e26..147e62bc 100644 --- a/internal/certdeploy/deployers/sp_qiniu_kodo.go +++ b/internal/certdeploy/deployers/sp_qiniu_kodo.go @@ -19,6 +19,7 @@ func init() { provider, err := qiniukodo.NewSSLDeployerProvider(&qiniukodo.SSLDeployerProviderConfig{ AccessKey: credentials.AccessKey, SecretKey: credentials.SecretKey, + Bucket: xmaps.GetString(options.ProviderExtendedConfig, "bucket"), Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err diff --git a/internal/certdeploy/deployers/sp_upyun_file.go b/internal/certdeploy/deployers/sp_upyun_file.go index 1b6b8f9c..2a82fb9b 100644 --- a/internal/certdeploy/deployers/sp_upyun_file.go +++ b/internal/certdeploy/deployers/sp_upyun_file.go @@ -5,7 +5,7 @@ import ( "github.com/certimate-go/certimate/internal/domain" "github.com/certimate-go/certimate/pkg/core" - upyuncdn "github.com/certimate-go/certimate/pkg/core/ssl-deployer/providers/upyun-cdn" + upyunfile "github.com/certimate-go/certimate/pkg/core/ssl-deployer/providers/upyun-file" xmaps "github.com/certimate-go/certimate/pkg/utils/maps" ) @@ -16,9 +16,10 @@ func init() { return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - provider, err := upyuncdn.NewSSLDeployerProvider(&upyuncdn.SSLDeployerProviderConfig{ + provider, err := upyunfile.NewSSLDeployerProvider(&upyunfile.SSLDeployerProviderConfig{ Username: credentials.Username, Password: credentials.Password, + Bucket: xmaps.GetString(options.ProviderExtendedConfig, "bucket"), Domain: xmaps.GetString(options.ProviderExtendedConfig, "domain"), }) return provider, err diff --git a/pkg/core/ssl-deployer/providers/qiniu-kodo/qiniu_kodo.go b/pkg/core/ssl-deployer/providers/qiniu-kodo/qiniu_kodo.go index 66dd5601..c9b41d2c 100644 --- a/pkg/core/ssl-deployer/providers/qiniu-kodo/qiniu_kodo.go +++ b/pkg/core/ssl-deployer/providers/qiniu-kodo/qiniu_kodo.go @@ -18,6 +18,8 @@ type SSLDeployerProviderConfig struct { AccessKey string `json:"accessKey"` // 七牛云 SecretKey。 SecretKey string `json:"secretKey"` + // 存储桶名。暂时无用。 + Bucket string `json:"bucket"` // 自定义域名（不支持泛域名）。 Domain string `json:"domain"` } diff --git a/pkg/core/ssl-deployer/providers/qiniu-kodo/qiniu_kodo_test.go b/pkg/core/ssl-deployer/providers/qiniu-kodo/qiniu_kodo_test.go index 3dfcf456..4b8df52a 100644 --- a/pkg/core/ssl-deployer/providers/qiniu-kodo/qiniu_kodo_test.go +++ b/pkg/core/ssl-deployer/providers/qiniu-kodo/qiniu_kodo_test.go @@ -16,6 +16,7 @@ var ( fInputKeyPath string fAccessKey string fSecretKey string + fBucket string fDomain string ) @@ -26,6 +27,7 @@ func init() { flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") flag.StringVar(&fAccessKey, argsPrefix+"ACCESSKEY", "", "") flag.StringVar(&fSecretKey, argsPrefix+"SECRETKEY", "", "") + flag.StringVar(&fBucket, argsPrefix+"BUCKET", "", "") flag.StringVar(&fDomain, argsPrefix+"DOMAIN", "", "") } @@ -37,6 +39,7 @@ Shell command to run this test: --CERTIMATE_SSLDEPLOYER_QINIUKODO_INPUTKEYPATH="/path/to/your-input-key.pem" \ --CERTIMATE_SSLDEPLOYER_QINIUKODO_ACCESSKEY="your-access-key" \ --CERTIMATE_SSLDEPLOYER_QINIUKODO_SECRETKEY="your-secret-key" \ + --CERTIMATE_SSLDEPLOYER_QINIUKODO_BUCKET="your-bucket" \ --CERTIMATE_SSLDEPLOYER_QINIUKODO_DOMAIN="example.com" */ func TestDeploy(t *testing.T) { @@ -49,12 +52,14 @@ func TestDeploy(t *testing.T) { fmt.Sprintf("INPUTKEYPATH: %v", fInputKeyPath), fmt.Sprintf("ACCESSKEY: %v", fAccessKey), fmt.Sprintf("SECRETKEY: %v", fSecretKey), + fmt.Sprintf("BUCKET: %v", fBucket), fmt.Sprintf("DOMAIN: %v", fDomain), }, "\n")) deployer, err := provider.NewSSLDeployerProvider(&provider.SSLDeployerProviderConfig{ AccessKey: fAccessKey, SecretKey: fSecretKey, + Bucket: fBucket, Domain: fDomain, }) if err != nil { diff --git a/pkg/core/ssl-deployer/providers/upyun-file/upyun_file.go b/pkg/core/ssl-deployer/providers/upyun-file/upyun_file.go new file mode 100644 index 00000000..5b2d07cf --- /dev/null +++ b/pkg/core/ssl-deployer/providers/upyun-file/upyun_file.go @@ -0,0 +1,122 @@ +package upyunfile + +import ( + "context" + "errors" + "fmt" + "log/slog" + + "github.com/samber/lo" + + "github.com/certimate-go/certimate/pkg/core" + sslmgrsp "github.com/certimate-go/certimate/pkg/core/ssl-manager/providers/upyun-ssl" + upyunsdk "github.com/certimate-go/certimate/pkg/sdk3rd/upyun/console" +) + +type SSLDeployerProviderConfig struct { + // 又拍云账号用户名。 + Username string `json:"username"` + // 又拍云账号密码。 + Password string `json:"password"` + // 存储桶名。暂时无用。 + Bucket string `json:"bucket"` + // 自定义域名（支持泛域名）。 + Domain string `json:"domain"` +} + +type SSLDeployerProvider struct { + config *SSLDeployerProviderConfig + logger *slog.Logger + sdkClient *upyunsdk.Client + sslManager core.SSLManager +} + +var _ core.SSLDeployer = (*SSLDeployerProvider)(nil) + +func NewSSLDeployerProvider(config *SSLDeployerProviderConfig) (*SSLDeployerProvider, error) { + if config == nil { + return nil, errors.New("the configuration of the ssl deployer provider is nil") + } + + client, err := createSDKClient(config.Username, config.Password) + if err != nil { + return nil, fmt.Errorf("could not create sdk client: %w", err) + } + + sslmgr, err := sslmgrsp.NewSSLManagerProvider(&sslmgrsp.SSLManagerProviderConfig{ + Username: config.Username, + Password: config.Password, + }) + if err != nil { + return nil, fmt.Errorf("could not create ssl manager: %w", err) + } + + return &SSLDeployerProvider{ + config: config, + logger: slog.Default(), + sdkClient: client, + sslManager: sslmgr, + }, nil +} + +func (d *SSLDeployerProvider) SetLogger(logger *slog.Logger) { + if logger == nil { + d.logger = slog.New(slog.DiscardHandler) + } else { + d.logger = logger + } + + d.sslManager.SetLogger(logger) +} + +func (d *SSLDeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPEM string) (*core.SSLDeployResult, error) { + // 上传证书 + upres, err := d.sslManager.Upload(ctx, certPEM, privkeyPEM) + if err != nil { + return nil, fmt.Errorf("failed to upload certificate file: %w", err) + } else { + d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) + } + + // 获取域名证书配置 + getHttpsServiceManagerResp, err := d.sdkClient.GetHttpsServiceManager(d.config.Domain) + d.logger.Debug("sdk request 'console.GetHttpsServiceManager'", slog.String("request.domain", d.config.Domain), slog.Any("response", getHttpsServiceManagerResp)) + if err != nil { + return nil, fmt.Errorf("failed to execute sdk request 'console.GetHttpsServiceManager': %w", err) + } + + // 判断域名是否已启用 HTTPS + // 如果已启用，迁移域名证书；否则，设置新证书 + _, lastCertIndex, _ := lo.FindIndexOf(getHttpsServiceManagerResp.Data.Domains, func(item upyunsdk.HttpsServiceManagerDomain) bool { + return item.Https + }) + if lastCertIndex == -1 { + updateHttpsCertificateManagerReq := &upyunsdk.UpdateHttpsCertificateManagerRequest{ + CertificateId: upres.CertId, + Domain: d.config.Domain, + Https: true, + ForceHttps: true, + } + updateHttpsCertificateManagerResp, err := d.sdkClient.UpdateHttpsCertificateManager(updateHttpsCertificateManagerReq) + d.logger.Debug("sdk request 'console.EnableDomainHttps'", slog.Any("request", updateHttpsCertificateManagerReq), slog.Any("response", updateHttpsCertificateManagerResp)) + if err != nil { + return nil, fmt.Errorf("failed to execute sdk request 'console.UpdateHttpsCertificateManager': %w", err) + } + } else if getHttpsServiceManagerResp.Data.Domains[lastCertIndex].CertificateId != upres.CertId { + migrateHttpsDomainReq := &upyunsdk.MigrateHttpsDomainRequest{ + CertificateId: upres.CertId, + Domain: d.config.Domain, + } + migrateHttpsDomainResp, err := d.sdkClient.MigrateHttpsDomain(migrateHttpsDomainReq) + d.logger.Debug("sdk request 'console.MigrateHttpsDomain'", slog.Any("request", migrateHttpsDomainReq), slog.Any("response", migrateHttpsDomainResp)) + if err != nil { + return nil, fmt.Errorf("failed to execute sdk request 'console.MigrateHttpsDomain': %w", err) + } + } + + return &core.SSLDeployResult{}, nil +} + +func createSDKClient(username, password string) (*upyunsdk.Client, error) { + return upyunsdk.NewClient(username, password) +} diff --git a/pkg/core/ssl-deployer/providers/upyun-file/upyun_file_test.go b/pkg/core/ssl-deployer/providers/upyun-file/upyun_file_test.go new file mode 100644 index 00000000..f10e0919 --- /dev/null +++ b/pkg/core/ssl-deployer/providers/upyun-file/upyun_file_test.go @@ -0,0 +1,80 @@ +package upyunfile_test + +import ( + "context" + "flag" + "fmt" + "os" + "strings" + "testing" + + provider "github.com/certimate-go/certimate/pkg/core/ssl-deployer/providers/upyun-file" +) + +var ( + fInputCertPath string + fInputKeyPath string + fUsername string + fPassword string + fBucket string + fDomain string +) + +func init() { + argsPrefix := "CERTIMATE_SSLDEPLOYER_UPYUNFILE_" + + flag.StringVar(&fInputCertPath, argsPrefix+"INPUTCERTPATH", "", "") + flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "") + flag.StringVar(&fUsername, argsPrefix+"USERNAME", "", "") + flag.StringVar(&fPassword, argsPrefix+"PASSWORD", "", "") + flag.StringVar(&fBucket, argsPrefix+"BUCKET", "", "") + flag.StringVar(&fDomain, argsPrefix+"DOMAIN", "", "") +} + +/* +Shell command to run this test: + + go test -v ./upyun_file_test.go -args \ + --CERTIMATE_SSLDEPLOYER_UPYUNFILE_INPUTCERTPATH="/path/to/your-input-cert.pem" \ + --CERTIMATE_SSLDEPLOYER_UPYUNFILE_INPUTKEYPATH="/path/to/your-input-key.pem" \ + --CERTIMATE_SSLDEPLOYER_UPYUNFILE_USERNAME="your-username" \ + --CERTIMATE_SSLDEPLOYER_UPYUNFILE_PASSWORD="your-password" \ + --CERTIMATE_SSLDEPLOYER_UPYUNFILE_BUCKET="your-bucket" \ + --CERTIMATE_SSLDEPLOYER_UPYUNFILE_DOMAIN="example.com" +*/ +func TestDeploy(t *testing.T) { + flag.Parse() + + t.Run("Deploy", func(t *testing.T) { + t.Log(strings.Join([]string{ + "args:", + fmt.Sprintf("INPUTCERTPATH: %v", fInputCertPath), + fmt.Sprintf("INPUTKEYPATH: %v", fInputKeyPath), + fmt.Sprintf("USERNAME: %v", fUsername), + fmt.Sprintf("PASSWORD: %v", fPassword), + fmt.Sprintf("BUCKET: %v", fBucket), + fmt.Sprintf("DOMAIN: %v", fDomain), + }, "\n")) + + deployer, err := provider.NewSSLDeployerProvider(&provider.SSLDeployerProviderConfig{ + Username: fUsername, + Password: fPassword, + Bucket: fBucket, + Domain: fDomain, + }) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + fInputCertData, _ := os.ReadFile(fInputCertPath) + fInputKeyData, _ := os.ReadFile(fInputKeyPath) + res, err := deployer.Deploy(context.Background(), string(fInputCertData), string(fInputKeyData)) + if err != nil { + t.Errorf("err: %+v", err) + return + } + + t.Logf("ok: %v", res) + }) +} diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderQiniuKodo.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderQiniuKodo.tsx index 65844614..41e4965b 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderQiniuKodo.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderQiniuKodo.tsx @@ -19,6 +19,15 @@ const BizDeployNodeConfigFieldsProviderQiniuKodo = () => { return ( <> + + + + { const getInitialValues = (): Nullish>> => { return { + bucket: "", domain: "", }; }; @@ -41,6 +51,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) const { t } = i18n; return z.object({ + bucket: z.string().nonempty(t("workflow_node.deploy.form.qiniu_kodo_domain.placeholder")), domain: z.string().refine((v) => validDomainName(v), t("common.errmsg.domain_invalid")), }); }; diff --git a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderUpyunFile.tsx b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderUpyunFile.tsx index bbe5a4f0..99b21823 100644 --- a/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderUpyunFile.tsx +++ b/ui/src/components/workflow/designer/forms/BizDeployNodeConfigFieldsProviderUpyunFile.tsx @@ -24,6 +24,15 @@ const BizDeployNodeConfigFieldsProviderUpyunFile = () => { } /> + + + + { const getInitialValues = (): Nullish>> => { return { + bucket: "", domain: "", }; }; @@ -46,6 +56,7 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType }) const { t } = i18n; return z.object({ + bucket: z.string().nonempty(t("workflow_node.deploy.form.upyun_file_bucket.placeholder")), domain: z.string().refine((v) => validDomainName(v), t("common.errmsg.domain_invalid")), }); }; diff --git a/ui/src/i18n/locales/en/nls.workflow.nodes.json b/ui/src/i18n/locales/en/nls.workflow.nodes.json index d99b7da9..38712266 100644 --- a/ui/src/i18n/locales/en/nls.workflow.nodes.json +++ b/ui/src/i18n/locales/en/nls.workflow.nodes.json @@ -693,6 +693,8 @@ "workflow_node.deploy.form.proxmoxve_auto_restart.label": "Auto restart Proxmox VE after deployment", "workflow_node.deploy.form.qiniu_cdn_domain.label": "Qiniu CDN domain", "workflow_node.deploy.form.qiniu_cdn_domain.placeholder": "Please enter Qiniu CDN domain name", + "workflow_node.deploy.form.qiniu_kodo_bucket.label": "Qiniu Kodo bucket", + "workflow_node.deploy.form.qiniu_kodo_bucket.placeholder": "Please enter Qiniu Kodo bucket name", "workflow_node.deploy.form.qiniu_kodo_domain.label": "Qiniu Kodo custom domain", "workflow_node.deploy.form.qiniu_kodo_domain.placeholder": "Please enter Qiniu Kodo bucket custom domain name", "workflow_node.deploy.form.qiniu_pili_hub.label": "Qiniu Pili hub", @@ -920,6 +922,8 @@ "workflow_node.deploy.form.upyun_cdn_domain.label": "UPYUN CDN domain", "workflow_node.deploy.form.upyun_cdn_domain.placeholder": "Please enter UPYUN CDN domain name", "workflow_node.deploy.form.upyun_file.guide": "This uses webpage simulator login and does not guarantee stability. If there are any changes to the UPYUN, please create a GitHub Issue.", + "workflow_node.deploy.form.upyun_file_bucket.label": "UPYUN USS bucket", + "workflow_node.deploy.form.upyun_file_bucket.placeholder": "Please enter UPYUN USS bucket name", "workflow_node.deploy.form.upyun_file_domain.label": "UPYUN USS custom domain", "workflow_node.deploy.form.upyun_file_domain.placeholder": "Please enter UPYUN USS bucket custom domain name", "workflow_node.deploy.form.volcengine_alb_region.label": "VolcEngine ALB region", diff --git a/ui/src/i18n/locales/zh/nls.workflow.nodes.json b/ui/src/i18n/locales/zh/nls.workflow.nodes.json index 24779628..4b68a206 100644 --- a/ui/src/i18n/locales/zh/nls.workflow.nodes.json +++ b/ui/src/i18n/locales/zh/nls.workflow.nodes.json @@ -691,6 +691,8 @@ "workflow_node.deploy.form.proxmoxve_auto_restart.label": "部署后自动重启 Proxmox VE 服务", "workflow_node.deploy.form.qiniu_cdn_domain.label": "七牛云 CDN 加速域名", "workflow_node.deploy.form.qiniu_cdn_domain.placeholder": "请输入七牛云 CDN 加速域名", + "workflow_node.deploy.form.qiniu_kodo_bucket.label": "七牛云对象存储桶名", + "workflow_node.deploy.form.qiniu_kodo_bucket.placeholder": "请输入七牛云对象存储桶名", "workflow_node.deploy.form.qiniu_kodo_domain.label": "七牛云对象存储自定义域名", "workflow_node.deploy.form.qiniu_kodo_domain.placeholder": "请输入七牛云对象存储自定义域名", "workflow_node.deploy.form.qiniu_pili_hub.label": "七牛云视频直播空间名", @@ -918,6 +920,8 @@ "workflow_node.deploy.form.upyun_cdn_domain.label": "又拍云 CDN 加速域名", "workflow_node.deploy.form.upyun_cdn_domain.placeholder": "请输入又拍云 CDN 加速域名", "workflow_node.deploy.form.upyun_file.guide": "由于又拍云未公开相关 API，这里将使用网页模拟登录方式部署，但无法保证稳定性。如遇又拍云接口变更，请到 GitHub 发起 Issue 告知。", + "workflow_node.deploy.form.upyun_file_bucket.label": "又拍云云存储桶名", + "workflow_node.deploy.form.upyun_file_bucket.placeholder": "请输入又拍云云存储桶名", "workflow_node.deploy.form.upyun_file_domain.label": "又拍云云存储自定义域名", "workflow_node.deploy.form.upyun_file_domain.placeholder": "请输入又拍云云存储自定义域名", "workflow_node.deploy.form.volcengine_alb_resource_type.label": "证书部署方式", @@ -958,8 +962,8 @@ "workflow_node.deploy.form.volcengine_imagex_region.label": "火山引擎 ImageX 服务地域", "workflow_node.deploy.form.volcengine_imagex_region.placeholder": "请输入火山引擎 ImageX 服务地域（例如：cn-north-1）", "workflow_node.deploy.form.volcengine_imagex_region.tooltip": "这是什么？请参阅 https://www.volcengine.com/docs/508/23757", - "workflow_node.deploy.form.volcengine_imagex_service_id.label": "火山引擎 TOS 服务 ID", - "workflow_node.deploy.form.volcengine_imagex_service_id.placeholder": "请输入火山引擎 TOS 服务 ID", + "workflow_node.deploy.form.volcengine_imagex_service_id.label": "火山引擎 ImageX 服务 ID", + "workflow_node.deploy.form.volcengine_imagex_service_id.placeholder": "请输入火山引擎 ImageX 服务 ID", "workflow_node.deploy.form.volcengine_imagex_service_id.tooltip": "这是什么？请参阅 https://console.volcengine.com/imagex", "workflow_node.deploy.form.volcengine_imagex_domain.label": "火山引擎 ImageX 绑定域名", "workflow_node.deploy.form.volcengine_imagex_domain.placeholder": "请输入火山引擎 ImageX 绑定域名",