保存统一Web域名恢复入口接手基线
Security Checks / security (push) Waiting to run

This commit is contained in:
xuans committed 2026-09-16 19:17:55 +08:00
1 parent 74493f0d5b
commit 606861822b
18 files changed
+129 -90

No files matched your search

+1 -4
View File
@@ -306,7 +306,7 @@ func sslDomains(cfg *config.Config) []string {
if cfg == nil {
return nil
}
return config.SSLCertificateDomains(cfg.Domain, cfg.WebDomain, cfg.Domains, cfg.AdminRecoveryDomain)
return config.SSLCertificateDomains(cfg.Domain, cfg.WebDomain, cfg.Domains)
}
func certificateMatchesConfiguredDomains(cert *x509.Certificate, cfg *config.Config) bool {
@@ -343,9 +343,6 @@ func validateWildcardConfiguration(cfg *config.Config) error {
if cfg.WebDomain != "" && !covered(cfg.WebDomain) {
return newUserCertificateError("Web 域名必须是主域名的一级子域名,泛域名证书不覆盖根域名或多级子域名")
}
if cfg.AdminRecoveryDomain != "" && !covered(cfg.AdminRecoveryDomain) {
return newUserCertificateError("超级管理员恢复域名必须是主邮件域名的一级子域名,才能由 DNS 泛域名证书覆盖")
}
for _, domain := range cfg.Domains {
if !covered("smtp."+domain) || !covered("imap."+domain) || !covered("pop."+domain) {
return newUserCertificateError("附加邮箱域名的服务地址不在主域泛域名证书覆盖范围内")
+10 -11
View File
@@ -52,18 +52,17 @@ func TestWildcardCertificateDomains(t *testing.T) {
func TestCertificateDomainsFollowChallengeMode(t *testing.T) {
cfg := &config.Config{
Domain: "xuans.com",
WebDomain: "web.xuans.com",
AdminRecoveryDomain: "recovery.xuans.com",
Domains: []string{"xuans.com"},
Domain: "xuans.com",
WebDomain: "web.xuans.com",
Domains: []string{"xuans.com"},
}
cfg.SSLType = config.SSLTypeAutoHTTP
httpDomains := certificateDomains(cfg)
if len(httpDomains) != 6 {
t.Fatalf("got %d HTTP domains, want 6: %v", len(httpDomains), httpDomains)
if len(httpDomains) != 5 {
t.Fatalf("got %d HTTP domains, want 5: %v", len(httpDomains), httpDomains)
}
if httpDomains[0] != "web.xuans.com" || httpDomains[1] != "xuans.com" || httpDomains[2] != "recovery.xuans.com" {
if httpDomains[0] != "web.xuans.com" || httpDomains[1] != "xuans.com" || httpDomains[2] != "smtp.xuans.com" {
t.Fatalf("unexpected HTTP domains: %v", httpDomains)
}
@@ -74,7 +73,7 @@ func TestCertificateDomainsFollowChallengeMode(t *testing.T) {
}
}
func TestDNSWildcardRejectsUncoveredAdminRecoveryDomain(t *testing.T) {
func TestDNSWildcardIgnoresLegacyAdminRecoveryDomain(t *testing.T) {
base := &config.Config{
Domain: "example.com",
WebDomain: "mail.example.com",
@@ -83,13 +82,13 @@ func TestDNSWildcardRejectsUncoveredAdminRecoveryDomain(t *testing.T) {
AdminRecoveryDomain: "recovery.example.com",
}
if err := validateWildcardConfiguration(base); err != nil {
t.Fatalf("covered recovery domain was rejected: %v", err)
t.Fatalf("legacy recovery domain changed wildcard validation: %v", err)
}
for _, value := range []string{"example.com", "a.recovery.example.com", "recovery.other.example"} {
candidate := *base
candidate.AdminRecoveryDomain = value
if err := validateWildcardConfiguration(&candidate); err == nil {
t.Fatalf("uncovered recovery domain %q was accepted", value)
if err := validateWildcardConfiguration(&candidate); err != nil {
t.Fatalf("legacy recovery domain %q changed wildcard validation: %v", value, err)
}
}
}