1 parent
c82be24178
commit
b062ca645e
6 files changed
+114
-14
No files matched your search
@@ -329,16 +329,16 @@ func certificateMatchesConfiguredDomains(cert *x509.Certificate, cfg *config.Con
|
||||
return true
|
||||
}
|
||||
|
||||
// 自动 DNS 只申请主域泛域名;不覆盖的服务地址是配置错误,不能靠重复续期修复。
|
||||
// 自动 DNS 同时申请主域名和泛域名;不覆盖的服务地址不能靠重复续期修复。
|
||||
func validateWildcardConfiguration(cfg *config.Config) error {
|
||||
if cfg == nil || cfg.EffectiveSSLType() != config.SSLTypeAutoDNS {
|
||||
return nil
|
||||
}
|
||||
domains := wildcardCertificateDomains(cfg)
|
||||
if len(domains) != 1 {
|
||||
if len(domains) != 2 {
|
||||
return newUserCertificateError("自动 DNS 证书需要有效的主域名")
|
||||
}
|
||||
base := strings.TrimPrefix(domains[0], "*.")
|
||||
base := domains[0]
|
||||
covered := func(host string) bool {
|
||||
host = strings.ToLower(strings.TrimSuffix(strings.TrimSpace(host), "."))
|
||||
suffix := "." + strings.ToLower(base)
|
||||
@@ -346,7 +346,10 @@ func validateWildcardConfiguration(cfg *config.Config) error {
|
||||
return strings.HasSuffix(host, suffix) && label != "" && !strings.Contains(label, ".")
|
||||
}
|
||||
if cfg.WebDomain != "" && !covered(cfg.WebDomain) {
|
||||
return newUserCertificateError("Web 域名必须是主域名的一级子域名,泛域名证书不覆盖根域名或多级子域名")
|
||||
webDomain := strings.ToLower(strings.TrimSuffix(strings.TrimSpace(cfg.WebDomain), "."))
|
||||
if webDomain != base {
|
||||
return newUserCertificateError("Web 域名必须是主域名或其一级子域名,泛域名证书不覆盖多级子域名")
|
||||
}
|
||||
}
|
||||
for _, domain := range cfg.Domains {
|
||||
if !covered("smtp."+domain) || !covered("imap."+domain) || !covered("pop."+domain) {
|
||||
@@ -360,14 +363,14 @@ func wildcardCertificateDomains(cfg *config.Config) []string {
|
||||
return nil
|
||||
}
|
||||
|
||||
domain := strings.TrimSpace(cfg.Domain)
|
||||
domain := strings.ToLower(strings.TrimSpace(cfg.Domain))
|
||||
domain = strings.TrimSuffix(domain, ".")
|
||||
domain = strings.TrimPrefix(domain, "*.")
|
||||
if domain == "" {
|
||||
return nil
|
||||
}
|
||||
|
||||
return []string{"*." + domain}
|
||||
return []string{domain, "*." + domain}
|
||||
}
|
||||
|
||||
func certificateDomains(cfg *config.Config) []string {
|
||||
|
||||
@@ -68,3 +68,29 @@ func createCertificateForDomains(t *testing.T, domains []string) []byte {
|
||||
}
|
||||
return der
|
||||
}
|
||||
|
||||
func TestDNSCertificateRequiresRootAndWildcardCoverage(t *testing.T) {
|
||||
for _, test := range []struct {
|
||||
name string
|
||||
domains []string
|
||||
valid bool
|
||||
}{
|
||||
{name: "root and wildcard", domains: []string{"example.com", "*.example.com"}, valid: true},
|
||||
{name: "legacy wildcard only", domains: []string{"*.example.com"}},
|
||||
{name: "root only", domains: []string{"example.com"}},
|
||||
} {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
der := createCertificateForDomains(t, test.domains)
|
||||
cert, err := x509.ParseCertificate(der)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, webDomain := range []string{"example.com", "web.example.com"} {
|
||||
cfg := &config.Config{Domain: "example.com", WebDomain: webDomain, SSLType: config.SSLTypeAutoDNS}
|
||||
if matched := certificateMatchesConfiguredDomains(cert, cfg); matched != test.valid {
|
||||
t.Fatalf("证书覆盖校验结果不符:web=%s matched=%t", webDomain, matched)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -16,12 +16,17 @@ func TestWildcardCertificateDomains(t *testing.T) {
|
||||
{
|
||||
name: "configured domain",
|
||||
config: &config.Config{Domain: "xuans.com", WebDomain: "web.xuans.com", Domains: []string{"xuans.com", "other.example"}},
|
||||
want: []string{"*.xuans.com"},
|
||||
want: []string{"xuans.com", "*.xuans.com"},
|
||||
},
|
||||
{
|
||||
name: "trimmed wildcard domain",
|
||||
config: &config.Config{Domain: " *.xuans.com. "},
|
||||
want: []string{"*.xuans.com"},
|
||||
want: []string{"xuans.com", "*.xuans.com"},
|
||||
},
|
||||
{
|
||||
name: "case normalized domain",
|
||||
config: &config.Config{Domain: "Example.COM"},
|
||||
want: []string{"example.com", "*.example.com"},
|
||||
},
|
||||
{
|
||||
name: "empty domain",
|
||||
@@ -68,11 +73,56 @@ func TestCertificateDomainsFollowChallengeMode(t *testing.T) {
|
||||
|
||||
cfg.SSLType = config.SSLTypeAutoDNS
|
||||
dnsDomains := certificateDomains(cfg)
|
||||
if len(dnsDomains) != 1 || dnsDomains[0] != "*.xuans.com" {
|
||||
if len(dnsDomains) != 2 || dnsDomains[0] != "xuans.com" || dnsDomains[1] != "*.xuans.com" {
|
||||
t.Fatalf("unexpected DNS domains: %v", dnsDomains)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDNSWildcardConfigurationCoverage(t *testing.T) {
|
||||
for _, test := range []struct {
|
||||
name string
|
||||
webDomain string
|
||||
domains []string
|
||||
valid bool
|
||||
}{
|
||||
{name: "root", webDomain: "example.com", valid: true},
|
||||
{name: "normalized root", webDomain: "Example.COM.", valid: true},
|
||||
{name: "subdomain", webDomain: "web.example.com", domains: []string{"example.com"}, valid: true},
|
||||
{name: "nested web", webDomain: "a.web.example.com"},
|
||||
{name: "foreign web", webDomain: "other.example"},
|
||||
{name: "nested mail services", webDomain: "web.example.com", domains: []string{"mail.example.com"}},
|
||||
} {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
cfg := &config.Config{Domain: "example.com", WebDomain: test.webDomain, Domains: test.domains, SSLType: config.SSLTypeAutoDNS}
|
||||
if err := validateWildcardConfiguration(cfg); (err == nil) != test.valid {
|
||||
t.Fatalf("证书域名覆盖校验结果不符:%v", err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestDNSChallengeRootAndWildcardKeepBothRecords(t *testing.T) {
|
||||
challenge := &DNSChallenge{authInfo: map[string]*authInfo{}}
|
||||
for _, item := range []struct{ domain, token, key string }{
|
||||
{"example.com", "root-token", "root-key"},
|
||||
{"*.example.com", "wildcard-token", "wildcard-key"},
|
||||
} {
|
||||
if err := challenge.Present(item.domain, item.token, item.key); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
records := challenge.GetDNSSettings(nil)
|
||||
if len(records) != 2 || records[0].Host != records[1].Host || records[0].Value == records[1].Value {
|
||||
t.Fatalf("根域名和泛域名必须保留同一主机名的两条独立 TXT 记录:%v", records)
|
||||
}
|
||||
if err := challenge.CleanUp("example.com", "root-token", "root-key"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if records = challenge.GetDNSSettings(nil); len(records) != 1 {
|
||||
t.Fatal("清理根域名验证不能删除泛域名验证记录")
|
||||
}
|
||||
}
|
||||
|
||||
func TestDNSWildcardIgnoresLegacyAdminRecoveryDomain(t *testing.T) {
|
||||
base := &config.Config{
|
||||
Domain: "example.com",
|
||||
|
||||
Reference in new issue
Block a user