修复全新部署反代模式证书初始化失败
This commit is contained in:
parent
034059b034
commit
29dbe325be
@ -1,10 +1,11 @@
|
|||||||
package config
|
package config
|
||||||
|
|
||||||
import "strings"
|
|
||||||
|
|
||||||
// UsesProxyHTTPS 表示网页 HTTPS 由反向代理终止,不代表邮件协议可以关闭 TLS。
|
// UsesProxyHTTPS 表示网页 HTTPS 由反向代理终止,不代表邮件协议可以关闭 TLS。
|
||||||
func (c *Config) UsesProxyHTTPS() bool {
|
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 以证书管理责任为准,仅在旧配置未记录管理方式时兼容旧类型。
|
// EffectiveSSLType 以证书管理责任为准,仅在旧配置未记录管理方式时兼容旧类型。
|
||||||
|
|||||||
@ -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) {
|
func TestExternalCertificateReloadIgnoresLegacyDNSMode(t *testing.T) {
|
||||||
previousRoot := ROOT_PATH
|
previousRoot := ROOT_PATH
|
||||||
ROOT_PATH = t.TempDir()
|
ROOT_PATH = t.TempDir()
|
||||||
|
|||||||
@ -64,9 +64,10 @@ func applyServicePorts(cfg *config.Config) bool {
|
|||||||
HTTPSEnabled: cfg.HttpsEnabled != 2,
|
HTTPSEnabled: cfg.HttpsEnabled != 2,
|
||||||
TLSMode: cfg.TLSMode,
|
TLSMode: cfg.TLSMode,
|
||||||
}, cfg.GetSetupPort())
|
}, cfg.GetSetupPort())
|
||||||
changed := cfg.HttpPort != resolved.Port || cfg.HttpsPort != resolved.HTTPSPort
|
changed := cfg.HttpPort != resolved.Port || cfg.HttpsPort != resolved.HTTPSPort || cfg.TLSMode != resolved.TLSMode
|
||||||
cfg.HttpPort = resolved.Port
|
cfg.HttpPort = resolved.Port
|
||||||
cfg.HttpsPort = resolved.HTTPSPort
|
cfg.HttpsPort = resolved.HTTPSPort
|
||||||
|
cfg.TLSMode = resolved.TLSMode
|
||||||
if resolved.TLSMode == config.HTTPSTLSModeProxy && cfg.HttpsEnabled != 2 {
|
if resolved.TLSMode == config.HTTPSTLSModeProxy && cfg.HttpsEnabled != 2 {
|
||||||
cfg.HttpsEnabled = 2
|
cfg.HttpsEnabled = 2
|
||||||
changed = true
|
changed = true
|
||||||
|
|||||||
@ -166,6 +166,32 @@ func TestFinishRejectsInvalidConfigBeforeReady(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestFinishPersistsRuntimeProxyMode(t *testing.T) {
|
||||||
|
prepareFinishConfigTest(t)
|
||||||
|
t.Setenv("SMAIL_HTTP_TLS_MODE_OVERRIDE", config.HTTPSTLSModeProxy)
|
||||||
|
t.Setenv("SMAIL_HTTP_PORT_OVERRIDE", "8001")
|
||||||
|
if err := config.WriteConfig(&config.Config{
|
||||||
|
SetupState: config.SetupStateBootstrap,
|
||||||
|
HttpsEnabled: 2,
|
||||||
|
Domain: "example.com",
|
||||||
|
WebDomain: "mail.example.com",
|
||||||
|
DbType: config.DBTypeSQLite,
|
||||||
|
DbDSN: filepath.Join(config.ROOT_PATH, "data", "smail.db"),
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := Finish(); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
loaded, err := config.ReadConfig()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if loaded.TLSMode != config.HTTPSTLSModeProxy || loaded.HttpsPort != 0 || loaded.HttpsEnabled != 2 || loaded.HttpPort != 8001 {
|
||||||
|
t.Fatalf("unexpected HTTP settings: mode=%q port=%d httpsPort=%d enabled=%d", loaded.TLSMode, loaded.HttpPort, loaded.HttpsPort, loaded.HttpsEnabled)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func prepareFinishConfigTest(t *testing.T) {
|
func prepareFinishConfigTest(t *testing.T) {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
previousRoot := config.ROOT_PATH
|
previousRoot := config.ROOT_PATH
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user