统一多级域名泛域名生成与预览

集中处理泛域名识别、生成、编辑回显和多级子域名预览,补充前后端测试覆盖。
This commit is contained in:
xuans committed 2026-10-16 02:41:16 +08:00
1 parent 79c5fe112c
commit 73511d6fcb
7 files changed
+98 -18

No files matched your search

+15 -3
View File
@@ -75,10 +75,10 @@ func NewDomainWithOptions(name string, certificateType CertificateType, sans []s
if certificateType != CertificateSAN {
cleanSANs = []string{name}
}
if certificateType == CertificateWildcard && !strings.HasPrefix(name, "*.") {
if certificateType == CertificateWildcard && !IsWildcardName(name) {
return Domain{}, fmt.Errorf("泛域名必须以 *. 开头")
}
if certificateType != CertificateWildcard && strings.HasPrefix(name, "*.") {
if certificateType != CertificateWildcard && IsWildcardName(name) {
return Domain{}, fmt.Errorf("只有泛域名证书类型允许使用 *. 域名")
}
now := time.Now().UTC()
@@ -104,12 +104,24 @@ func IsValidACMEEnvironment(value string) bool {
func IsValidName(name string) bool {
name = strings.TrimSpace(strings.ToLower(name))
if strings.HasPrefix(name, "*.") {
if IsWildcardName(name) {
name = strings.TrimPrefix(name, "*.")
}
return domainPattern.MatchString(name)
}
func IsWildcardName(name string) bool {
return strings.HasPrefix(strings.TrimSpace(strings.ToLower(name)), "*.")
}
func WildcardName(name string) (string, error) {
name = strings.TrimSpace(strings.ToLower(name))
if IsWildcardName(name) || !IsValidName(name) {
return "", fmt.Errorf("主域名格式无效,无法生成泛域名:%s", name)
}
return "*." + name, nil
}
func normalizeSANs(sans []string) []string {
seen := make(map[string]struct{}, len(sans))
result := make([]string, 0, len(sans))
+23
View File
@@ -81,3 +81,26 @@ func TestNewDomainOptionsValidation(t *testing.T) {
t.Fatal("非法 ACME 环境未被拒绝")
}
}
func TestWildcardNamePreservesMultiLevelDomain(t *testing.T) {
for _, item := range []struct {
input string
want string
}{
{input: "x.x.com", want: "*.x.x.com"},
{input: " X.X.X.COM ", want: "*.x.x.x.com"},
} {
got, err := WildcardName(item.input)
if err != nil {
t.Fatalf("WildcardName(%q) failed: %v", item.input, err)
}
if got != item.want {
t.Fatalf("WildcardName(%q) = %q, want %q", item.input, got, item.want)
}
}
for _, input := range []string{"*.x.x.com", "bad_domain"} {
if _, err := WildcardName(input); err == nil {
t.Fatalf("WildcardName(%q) should reject invalid base domain", input)
}
}
}
+5 -2
View File
@@ -761,13 +761,16 @@ func newDomainFromRequest(request domainRequest) (domain.Domain, error) {
sans := append([]string(nil), request.SANs...)
if request.IncludeWildcard {
name := strings.TrimSpace(request.Name)
if strings.HasPrefix(name, "*.") {
if domain.IsWildcardName(name) {
return domain.Domain{}, errors.New("同时申请泛域名时,主域名不能以 *. 开头")
}
if certificateType != domain.CertificateSingle {
return domain.Domain{}, errors.New("同时申请泛域名仅适用于单域名证书")
}
wildcardName := "*." + strings.ToLower(name)
wildcardName, err := domain.WildcardName(name)
if err != nil {
return domain.Domain{}, err
}
sans = append(sans, wildcardName)
certificateType = domain.CertificateSAN
}