修复初始化端口持久化和系统服务权限
Security Checks / security (push) Waiting to run

This commit is contained in:
xuans committed 2026-08-31 21:00:38 +08:00
1 parent 76635274fa
commit 18896997df
6 files changed
+263 -4

No files matched your search

+26
View File
@@ -17,7 +17,13 @@ func Finish() error {
if err != nil {
return errors.Wrap(err)
}
portsChanged := applyServicePorts(cfg)
if cfg.IsSetupReady() {
if portsChanged {
if err = config.WriteConfig(cfg); err != nil {
return errors.Wrap(err)
}
}
config.SetInitState(true)
return nil
}
@@ -37,3 +43,23 @@ func Finish() error {
}
return nil
}
func applyServicePorts(cfg *config.Config) bool {
if cfg == nil {
return false
}
resolved := config.ResolveHTTPPortDefaults(config.HTTPConfig{
Port: cfg.HttpPort,
HTTPSPort: cfg.HttpsPort,
HTTPSEnabled: cfg.HttpsEnabled != 2,
TLSMode: cfg.TLSMode,
}, cfg.GetSetupPort())
changed := cfg.HttpPort != resolved.Port || cfg.HttpsPort != resolved.HTTPSPort
cfg.HttpPort = resolved.Port
cfg.HttpsPort = resolved.HTTPSPort
if resolved.TLSMode == config.HTTPSTLSModeProxy && cfg.HttpsEnabled != 2 {
cfg.HttpsEnabled = 2
changed = true
}
return changed
}
+112
View File
@@ -0,0 +1,112 @@
package setup
import (
"os"
"testing"
"git.pcux.cn/xuans/Smail/config"
)
func TestFinishPersistsServicePorts(t *testing.T) {
prepareFinishConfigTest(t)
t.Setenv("SMAIL_HTTP_PORT", "9001")
t.Setenv("SMAIL_HTTPS_PORT", "9002")
config.SetRuntimeSetupPort(18080)
if err := config.WriteConfig(&config.Config{
SetupState: config.SetupStateBootstrap,
HttpsEnabled: 1,
}); 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.HttpPort != 9001 || loaded.HttpsPort != 9002 {
t.Fatalf("persisted HTTP ports = %d/%d, want 9001/9002", loaded.HttpPort, loaded.HttpsPort)
}
if loaded.SetupState != config.SetupStateReady || !loaded.IsInit {
t.Fatalf("setup state = %q, isInit = %t", loaded.SetupState, loaded.IsInit)
}
}
func TestFinishRepairsReadyConfigWithMissingPorts(t *testing.T) {
prepareFinishConfigTest(t)
t.Setenv("SMAIL_HTTP_PORT", "9001")
t.Setenv("SMAIL_HTTPS_PORT", "9002")
if err := config.WriteConfig(&config.Config{
SetupState: config.SetupStateReady,
IsInit: true,
HttpsEnabled: 1,
}); 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.HttpPort != 9001 || loaded.HttpsPort != 9002 {
t.Fatalf("repaired HTTP ports = %d/%d, want 9001/9002", loaded.HttpPort, loaded.HttpsPort)
}
}
func TestFinishKeepsInternalHTTPSDisabledInProxyMode(t *testing.T) {
prepareFinishConfigTest(t)
t.Setenv("SMAIL_HTTP_PORT", "9001")
t.Setenv("SMAIL_HTTPS_PORT", "9002")
if err := config.WriteConfig(&config.Config{
SetupState: config.SetupStateBootstrap,
TLSMode: config.HTTPSTLSModeProxy,
HttpsPort: 9443,
HttpsEnabled: 1,
}); 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.HttpPort != 9001 || loaded.HttpsPort != 0 || loaded.HttpsEnabled != 2 {
t.Fatalf("proxy config = HTTP %d, HTTPS %d, enabled %d", loaded.HttpPort, loaded.HttpsPort, loaded.HttpsEnabled)
}
}
func prepareFinishConfigTest(t *testing.T) {
t.Helper()
previousRoot := config.ROOT_PATH
previousInstance := config.Instance
previousManager := config.CurrentManager()
previousSetupPort := config.RuntimeSetupPort()
previousInitState := config.IsInit
config.ROOT_PATH = t.TempDir() + string(os.PathSeparator)
config.Instance = nil
config.PublishConfigSnapshot(nil)
config.SetRuntimeManager(nil)
config.SetRuntimeSetupPort(0)
config.SetInitState(false)
t.Cleanup(func() {
config.ROOT_PATH = previousRoot
config.Instance = previousInstance
config.PublishConfigSnapshot(previousInstance)
config.SetRuntimeManager(previousManager)
config.SetRuntimeSetupPort(previousSetupPort)
config.SetInitState(previousInitState)
})
}