修复初始化端口持久化和系统服务权限
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

+43 -3
View File
@@ -2,6 +2,8 @@ package config
import (
"fmt"
"os"
"strconv"
"strings"
"sync/atomic"
@@ -55,21 +57,59 @@ func CurrentHTTPConfig() HTTPConfig {
if manager := CurrentManager(); manager != nil {
runtime := manager.Snapshot()
if runtime.Generation != 0 {
return cloneHTTPConfig(runtime.Root.HTTP)
return ResolveHTTPPortDefaults(runtime.Root.HTTP, RuntimeSetupPort())
}
}
cfg := CurrentConfig()
if cfg == nil {
return HTTPConfig{}
return ResolveHTTPPortDefaults(HTTPConfig{}, RuntimeSetupPort())
}
mode := strings.ToLower(strings.TrimSpace(cfg.TLSMode))
return HTTPConfig{
return ResolveHTTPPortDefaults(HTTPConfig{
Port: cfg.HttpPort,
HTTPSPort: cfg.HttpsPort,
HTTPSEnabled: cfg.HttpsEnabled != 2,
TLSMode: mode,
TrustedProxyCIDRs: append([]string(nil), cfg.TrustedProxyCIDRs...),
}, cfg.GetSetupPort())
}
func ResolveHTTPPortDefaults(value HTTPConfig, setupPort int) HTTPConfig {
result := cloneHTTPConfig(value)
result.TLSMode = strings.ToLower(strings.TrimSpace(result.TLSMode))
if result.Port == 0 {
result.Port = environmentPort("SMAIL_HTTP_PORT")
if result.Port == 0 && validServicePort(setupPort) {
result.Port = setupPort
}
if result.Port == 0 {
result.Port = 80
}
}
if result.TLSMode == HTTPSTLSModeProxy {
result.HTTPSPort = 0
result.HTTPSEnabled = false
return result
}
if result.HTTPSPort == 0 {
result.HTTPSPort = environmentPort("SMAIL_HTTPS_PORT")
if result.HTTPSPort == 0 {
result.HTTPSPort = 443
}
}
return result
}
func environmentPort(name string) int {
port, err := strconv.Atoi(strings.TrimSpace(os.Getenv(name)))
if err != nil || !validServicePort(port) {
return 0
}
return port
}
func validServicePort(port int) bool {
return port > 0 && port <= 65535
}
// CurrentWebDomain 返回当前进程实际使用的 Web 域名。
+51
View File
@@ -0,0 +1,51 @@
package config
import "testing"
func TestResolveHTTPPortDefaultsPreservesConfiguredPorts(t *testing.T) {
t.Setenv("SMAIL_HTTP_PORT", "19001")
t.Setenv("SMAIL_HTTPS_PORT", "19002")
got := ResolveHTTPPortDefaults(HTTPConfig{
Port: 9001,
HTTPSPort: 9002,
HTTPSEnabled: true,
}, 18080)
if got.Port != 9001 || got.HTTPSPort != 9002 {
t.Fatalf("HTTP ports = %d/%d, want 9001/9002", got.Port, got.HTTPSPort)
}
}
func TestResolveHTTPPortDefaultsUsesEnvironmentPorts(t *testing.T) {
t.Setenv("SMAIL_HTTP_PORT", "9001")
t.Setenv("SMAIL_HTTPS_PORT", "9002")
got := ResolveHTTPPortDefaults(HTTPConfig{HTTPSEnabled: true}, 18080)
if got.Port != 9001 || got.HTTPSPort != 9002 {
t.Fatalf("HTTP ports = %d/%d, want 9001/9002", got.Port, got.HTTPSPort)
}
}
func TestResolveHTTPPortDefaultsUsesSetupAndDirectDefaults(t *testing.T) {
t.Setenv("SMAIL_HTTP_PORT", "")
t.Setenv("SMAIL_HTTPS_PORT", "")
got := ResolveHTTPPortDefaults(HTTPConfig{HTTPSEnabled: true}, 9001)
if got.Port != 9001 || got.HTTPSPort != 443 {
t.Fatalf("HTTP ports = %d/%d, want 9001/443", got.Port, got.HTTPSPort)
}
}
func TestResolveHTTPPortDefaultsDisablesInternalHTTPSInProxyMode(t *testing.T) {
t.Setenv("SMAIL_HTTP_PORT", "9001")
t.Setenv("SMAIL_HTTPS_PORT", "9002")
got := ResolveHTTPPortDefaults(HTTPConfig{
HTTPSPort: 9443,
HTTPSEnabled: true,
TLSMode: " PROXY ",
}, 18080)
if got.Port != 9001 || got.HTTPSPort != 0 || got.HTTPSEnabled {
t.Fatalf("proxy HTTP config = %+v, want HTTP 9001 with internal HTTPS disabled", got)
}
}