修复全新部署反代模式证书初始化失败
Security Checks / security (push) Waiting to run

This commit is contained in:
xuans committed 2026-10-01 20:59:47 +08:00
1 parent 4f5c725013
commit 336aa9b2ce
4 files changed
+57 -4

No files matched your search

+4 -3
View File
@@ -1,10 +1,11 @@
package config
import "strings"
// UsesProxyHTTPS 表示网页 HTTPS 由反向代理终止,不代表邮件协议可以关闭 TLS。
func (c *Config) UsesProxyHTTPS() bool {
return c != nil && strings.EqualFold(strings.TrimSpace(c.TLSMode), HTTPSTLSModeProxy)
if c == nil {
return false
}
return ResolveHTTPPortDefaults(HTTPConfig{TLSMode: c.TLSMode}, 0).TLSMode == HTTPSTLSModeProxy
}
// EffectiveSSLType 以证书管理责任为准,仅在旧配置未记录管理方式时兼容旧类型。
+25
View File
@@ -38,6 +38,31 @@ func TestSSLPolicyFollowsManagement(t *testing.T) {
}
}
func TestSSLPolicyFollowsRuntimeTLSOverride(t *testing.T) {
for _, test := range []struct {
name string
stored string
override string
wantProxy bool
}{
{name: "bootstrap_proxy", override: HTTPSTLSModeProxy, wantProxy: true},
{name: "direct_to_proxy", stored: HTTPSTLSModeDirect, override: " PROXY ", wantProxy: true},
{name: "proxy_to_direct", stored: HTTPSTLSModeProxy, override: HTTPSTLSModeDirect},
{name: "invalid_override", stored: HTTPSTLSModeProxy, override: "invalid", wantProxy: true},
} {
t.Run(test.name, func(t *testing.T) {
t.Setenv("SMAIL_HTTP_TLS_MODE_OVERRIDE", test.override)
cfg := &Config{TLSMode: test.stored, SSLType: SSLTypeAutoHTTP}
if got := cfg.UsesProxyHTTPS(); got != test.wantProxy {
t.Fatalf("proxy policy = %t, want %t", got, test.wantProxy)
}
if cfg.AutomaticSSLEnabled() == test.wantProxy {
t.Fatal("certificate policy disagrees with effective TLS mode")
}
})
}
}
func TestExternalCertificateReloadIgnoresLegacyDNSMode(t *testing.T) {
previousRoot := ROOT_PATH
ROOT_PATH = t.TempDir()