支持主域名同时申请多级泛域名

完善多级子域名的泛域名生成、申请类型展示、编辑回显与挑战类型校验,并补充前后端测试。
This commit is contained in:
xuans committed 2026-10-16 02:19:20 +08:00
1 parent d33ee0d944
commit 79c5fe112c
10 files changed
+184 -7

No files matched your search

+10
View File
@@ -59,6 +59,16 @@ func TestNewDomainSANValidation(t *testing.T) {
}
}
func TestNewDomainSANAllowsWildcardIdentifier(t *testing.T) {
result, err := NewDomain("x.x.x.com", CertificateSAN, []string{"*.x.x.x.com"})
if err != nil {
t.Fatalf("多级域名与对应泛域名的 SAN 配置不应失败:%v", err)
}
if len(result.SANs) != 2 || result.SANs[0] != "x.x.x.com" || result.SANs[1] != "*.x.x.x.com" {
t.Fatalf("SAN 域名顺序或内容不正确:%v", result.SANs)
}
}
func TestNewDomainOptionsValidation(t *testing.T) {
item, err := NewDomainWithOptions("example.com", CertificateSingle, nil, false, ACMEEnvironmentProduction, "cloudflare")
if err != nil {
@@ -78,6 +78,38 @@ func TestHTTPDomainCreateAndUpdateBypassDNSOnly(t *testing.T) {
}
}
func TestDomainCreateCanIncludeWildcardForMultiLevelName(t *testing.T) {
item, err := newDomainFromRequest(domainRequest{
Name: "x.x.x.com",
CertificateType: string(domain.CertificateSingle),
IncludeWildcard: true,
ChallengeType: stringPointer(domain.ChallengeDNS01),
})
if err != nil {
t.Fatalf("主域名同时申请泛域名失败:%v", err)
}
if item.CertificateType != domain.CertificateSAN {
t.Fatalf("联合申请应使用 SAN 证书链路:%s", item.CertificateType)
}
if len(item.SANs) != 2 || item.SANs[0] != "x.x.x.com" || item.SANs[1] != "*.x.x.x.com" {
t.Fatalf("联合申请的多级域名标识不正确:%v", item.SANs)
}
_, err = newDomainFromRequest(domainRequest{
Name: "x.x.x.com",
CertificateType: string(domain.CertificateSingle),
IncludeWildcard: true,
ChallengeType: stringPointer(domain.ChallengeHTTP01),
})
if err == nil {
t.Fatal("主域名同时申请泛域名时不应允许 HTTP-01")
}
}
func stringPointer(value string) *string {
return &value
}
func TestHTTPTaskAuthorizationRetainsProjectPermissions(t *testing.T) {
for _, denied := range []domain.ProjectPermission{domain.PermissionDNSCredentialUse, domain.PermissionCertificateManage, domain.PermissionDeploymentExecute} {
t.Run(string(denied), func(t *testing.T) {
+16 -1
View File
@@ -422,6 +422,7 @@ type domainRequest struct {
Name string `json:"name" binding:"required"`
CertificateType string `json:"certificate_type" binding:"required"`
SANs []string `json:"sans"`
IncludeWildcard bool `json:"include_wildcard"`
AutoRenew *bool `json:"auto_renew"`
ACMEEnvironment string `json:"acme_environment"`
DNSProvider string `json:"dns_provider"`
@@ -756,7 +757,21 @@ func newDomainFromRequest(request domainRequest) (domain.Domain, error) {
if acmeEnvironment == "" {
acmeEnvironment = domain.ACMEEnvironmentStaging
}
item, err := domain.NewDomainWithOptions(request.Name, domain.CertificateType(request.CertificateType), request.SANs, autoRenew, acmeEnvironment, request.DNSProvider)
certificateType := domain.CertificateType(request.CertificateType)
sans := append([]string(nil), request.SANs...)
if request.IncludeWildcard {
name := strings.TrimSpace(request.Name)
if strings.HasPrefix(name, "*.") {
return domain.Domain{}, errors.New("同时申请泛域名时,主域名不能以 *. 开头")
}
if certificateType != domain.CertificateSingle {
return domain.Domain{}, errors.New("同时申请泛域名仅适用于单域名证书")
}
wildcardName := "*." + strings.ToLower(name)
sans = append(sans, wildcardName)
certificateType = domain.CertificateSAN
}
item, err := domain.NewDomainWithOptions(request.Name, certificateType, sans, autoRenew, acmeEnvironment, request.DNSProvider)
if err != nil {
return domain.Domain{}, err
}