Merge branch 'certimate-go:main' into main

This commit is contained in:
RHQYZ 2025-10-15 16:03:19 +08:00 committed by GitHub
commit b374e7299e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 121 additions and 7 deletions

View File

@ -20,11 +20,12 @@ func init() {
}
provider, err := tencentcloudeo.NewSSLDeployerProvider(&tencentcloudeo.SSLDeployerProviderConfig{
SecretId: credentials.SecretId,
SecretKey: credentials.SecretKey,
Endpoint: xmaps.GetString(options.ProviderExtendedConfig, "endpoint"),
ZoneId: xmaps.GetString(options.ProviderExtendedConfig, "zoneId"),
Domains: lo.Filter(strings.Split(xmaps.GetString(options.ProviderExtendedConfig, "domains"), ";"), func(s string, _ int) bool { return s != "" }),
SecretId: credentials.SecretId,
SecretKey: credentials.SecretKey,
Endpoint: xmaps.GetString(options.ProviderExtendedConfig, "endpoint"),
ZoneId: xmaps.GetString(options.ProviderExtendedConfig, "zoneId"),
MatchPattern: xmaps.GetString(options.ProviderExtendedConfig, "matchPattern"),
Domains: lo.Filter(strings.Split(xmaps.GetString(options.ProviderExtendedConfig, "domains"), ";"), func(s string, _ int) bool { return s != "" }),
})
return provider, err
}); err != nil {

View File

@ -0,0 +1,8 @@
package tencentcloudeo
const (
// 匹配模式:精确匹配。
MatchPatternExact = "exact"
// 匹配模式:通配符匹配。
MatchPatternWildcard = "wildcard"
)

View File

@ -14,6 +14,7 @@ import (
"github.com/certimate-go/certimate/pkg/core"
sslmgrsp "github.com/certimate-go/certimate/pkg/core/ssl-manager/providers/tencentcloud-ssl"
xcert "github.com/certimate-go/certimate/pkg/utils/cert"
)
type SSLDeployerProviderConfig struct {
@ -25,6 +26,9 @@ type SSLDeployerProviderConfig struct {
Endpoint string `json:"endpoint,omitempty"`
// 站点 ID。
ZoneId string `json:"zoneId"`
// 域名匹配模式。
// 零值时默认值 [MatchPatternExact]。
MatchPattern string `json:"matchPattern,omitempty"`
// 加速域名列表(支持泛域名)。
Domains []string `json:"domains"`
}
@ -93,12 +97,52 @@ func (d *SSLDeployerProvider) Deploy(ctx context.Context, certPEM string, privke
d.logger.Info("ssl certificate uploaded", slog.Any("result", upres))
}
var domains []string
switch d.config.MatchPattern {
case "", MatchPatternExact:
{
if len(d.config.Domains) == 0 {
return nil, errors.New("config `domains` is required")
}
domains = d.config.Domains
}
case MatchPatternWildcard:
{
if len(d.config.Domains) == 0 {
return nil, errors.New("config `domains` is required")
}
domainsInZone, err := d.getDomainsInZone(ctx, d.config.ZoneId)
if err != nil {
return nil, err
}
domains = lo.Filter(domainsInZone, func(domain string, _ int) bool {
for _, configDomain := range d.config.Domains {
if xcert.MatchHostname(configDomain, domain) {
return true
}
}
return false
})
if len(domains) == 0 {
return nil, errors.New("no domains matched in wildcard mode")
}
}
default:
return nil, fmt.Errorf("unsupported match pattern: '%s'", d.config.MatchPattern)
}
// 配置域名证书
// REF: https://cloud.tencent.com/document/api/1552/80764
modifyHostsCertificateReq := tcteo.NewModifyHostsCertificateRequest()
modifyHostsCertificateReq.ZoneId = common.StringPtr(d.config.ZoneId)
modifyHostsCertificateReq.Mode = common.StringPtr("sslcert")
modifyHostsCertificateReq.Hosts = common.StringPtrs(d.config.Domains)
modifyHostsCertificateReq.Hosts = common.StringPtrs(domains)
modifyHostsCertificateReq.ServerCertInfo = []*tcteo.ServerCertInfo{{CertId: common.StringPtr(upres.CertId)}}
modifyHostsCertificateResp, err := d.sdkClient.ModifyHostsCertificate(modifyHostsCertificateReq)
d.logger.Debug("sdk request 'teo.ModifyHostsCertificate'", slog.Any("request", modifyHostsCertificateReq), slog.Any("response", modifyHostsCertificateResp))
@ -109,6 +153,44 @@ func (d *SSLDeployerProvider) Deploy(ctx context.Context, certPEM string, privke
return &core.SSLDeployResult{}, nil
}
func (d *SSLDeployerProvider) getDomainsInZone(ctx context.Context, zoneId string) ([]string, error) {
var domainsInZone []string
const pageSize = 200
for offset := 0; ; offset += pageSize {
select {
case <-ctx.Done():
return nil, ctx.Err()
default:
}
// 查询加速域名列表
// REF: https://cloud.tencent.com/document/api/1552/86336
describeAccelerationDomainsReq := tcteo.NewDescribeAccelerationDomainsRequest()
describeAccelerationDomainsReq.Limit = common.Int64Ptr(pageSize)
describeAccelerationDomainsReq.Offset = common.Int64Ptr(int64(offset))
describeAccelerationDomainsReq.ZoneId = common.StringPtr(zoneId)
describeAccelerationDomainsResp, err := d.sdkClient.DescribeAccelerationDomains(describeAccelerationDomainsReq)
d.logger.Debug("sdk request 'teo.DescribeAccelerationDomains'", slog.Any("request", describeAccelerationDomainsReq), slog.Any("response", describeAccelerationDomainsResp))
if err != nil {
return nil, fmt.Errorf("failed to execute sdk request 'teo.DescribeAccelerationDomains': %w", err)
}
for _, accelerationDomain := range describeAccelerationDomainsResp.Response.AccelerationDomains {
if accelerationDomain == nil || accelerationDomain.DomainName == nil {
continue
}
domainsInZone = append(domainsInZone, *accelerationDomain.DomainName)
}
if len(describeAccelerationDomainsResp.Response.AccelerationDomains) < pageSize {
break
}
}
return domainsInZone, nil
}
func createSDKClient(secretId, secretKey, endpoint string) (*tcteo.Client, error) {
credential := common.NewCredential(secretId, secretKey)

View File

@ -1,5 +1,5 @@
import { getI18n, useTranslation } from "react-i18next";
import { Form, Input } from "antd";
import { Form, Input, Radio } from "antd";
import { createSchemaFieldRule } from "antd-zod";
import { z } from "zod";
@ -9,6 +9,8 @@ import { validDomainName } from "@/utils/validators";
import { useFormNestedFieldsContext } from "./_context";
const MULTIPLE_INPUT_SEPARATOR = ";";
const MATCH_PATTERN_EXACT = "exact" as const;
const MATCH_PATTERN_WILDCARD = "wildcard" as const;
const BizDeployNodeConfigFieldsProviderTencentCloudEO = () => {
const { i18n, t } = useTranslation();
@ -42,6 +44,22 @@ const BizDeployNodeConfigFieldsProviderTencentCloudEO = () => {
<Input placeholder={t("workflow_node.deploy.form.tencentcloud_eo_zone_id.placeholder")} />
</Form.Item>
<Form.Item
name={[parentNamePath, "matchPattern"]}
initialValue={initialValues.matchPattern}
label={t("workflow_node.deploy.form.shared_domain_match_pattern.label")}
extra={<span dangerouslySetInnerHTML={{ __html: t("workflow_node.deploy.form.shared_domain_match_pattern.help_wildcard") }}></span>}
rules={[formRule]}
>
<Radio.Group
options={[MATCH_PATTERN_EXACT, MATCH_PATTERN_WILDCARD].map((s) => ({
key: s,
label: t(`workflow_node.deploy.form.shared_domain_match_pattern.option.${s}.label`),
value: s,
}))}
/>
</Form.Item>
<Form.Item
name={[parentNamePath, "domains"]}
initialValue={initialValues.domains}
@ -63,6 +81,7 @@ const BizDeployNodeConfigFieldsProviderTencentCloudEO = () => {
const getInitialValues = (): Nullish<z.infer<ReturnType<typeof getSchema>>> => {
return {
matchPattern: MATCH_PATTERN_EXACT,
zoneId: "",
domains: "",
};
@ -74,6 +93,10 @@ const getSchema = ({ i18n = getI18n() }: { i18n?: ReturnType<typeof getI18n> })
return z.object({
endpoint: z.string().nullish(),
zoneId: z.string().nonempty(t("workflow_node.deploy.form.tencentcloud_eo_zone_id.placeholder")),
matchPattern: z.enum(
[MATCH_PATTERN_EXACT, MATCH_PATTERN_WILDCARD],
t("workflow_node.deploy.form.shared_domain_match_pattern.placeholder")
),
domains: z.string().refine((v) => {
if (!v) return false;
return String(v)