统一证书热加载策略并记录内置续期验收边界
Security Checks / security (push) Waiting to run

This commit is contained in:
xuans committed 2026-09-18 15:08:37 +08:00
1 parent 5f62762d97
commit e05d1ff571
4 files changed
+64 -2

No files matched your search

+1 -1
View File
@@ -106,7 +106,7 @@ func loadValidatedRuntimeCertificate(cfg *Config) (tls.Certificate, error) {
AdminRecovery: cfg.AdminRecoveryDomain,
}}}
runtime.SSL.TLS = cfg.SSL
if cfg.SSLType == SSLTypeAutoDNS {
if cfg.EffectiveSSLType() == SSLTypeAutoDNS {
runtime.SSL.TLS.Management = SSLManagementProject
runtime.SSL.TLS.Challenge = SSLChallengeDNS
}
+26 -1
View File
@@ -1,6 +1,9 @@
package config
import "testing"
import (
"testing"
"time"
)
func TestSSLPolicyFollowsManagement(t *testing.T) {
for _, test := range []struct {
@@ -34,3 +37,25 @@ func TestSSLPolicyFollowsManagement(t *testing.T) {
})
}
}
func TestExternalCertificateReloadIgnoresLegacyDNSMode(t *testing.T) {
previousRoot := ROOT_PATH
ROOT_PATH = t.TempDir()
t.Cleanup(func() { ROOT_PATH = previousRoot })
key, cert := testManagedCertificate(t, "mail.example.com", time.Now().Add(-time.Hour), time.Now().Add(24*time.Hour), 2048)
reference, err := ImportManagedSSL(ManagedSSLModeUpload, key, cert, nil, []string{"mail.example.com"})
if err != nil {
t.Fatal(err)
}
defer ReleaseStagedSSL(reference)
for _, management := range []string{SSLManagementCustom, SSLManagementWebServer} {
cfg := &Config{
Domain: "mail.example.com", WebDomain: "mail.example.com", SSLType: SSLTypeAutoDNS,
SSL: SSLConfig{Management: management, Mode: reference.Mode,
CertificateRef: reference.CertificateRef, PrivateKeyRef: reference.PrivateKeyRef},
}
if _, err := loadValidatedRuntimeCertificate(cfg); err != nil {
t.Fatalf("外部证书被旧 DNS 类型错误拒绝:management=%s err=%v", management, err)
}
}
}