完善续期调度生命周期和Web开关配置

This commit is contained in:
xuans committed 2026-08-31 01:09:04 +08:00
1 parent 1f987eb8be
commit f6ce85b174
7 files changed
+129 -5

No files matched your search

+28
View File
@@ -263,6 +263,23 @@ func (c *Config) ApplyEnvironment() error {
*override.target = strings.TrimSpace(value)
}
}
boolOverrides := []struct {
name string
target *bool
}{
{"SCERT_WEB_ENABLED", &c.Web.Enabled},
}
for _, override := range boolOverrides {
value, ok := os.LookupEnv(override.name)
if !ok {
continue
}
parsed, err := parseEnvironmentBool(override.name, value)
if err != nil {
return err
}
*override.target = parsed
}
intOverrides := []struct {
name string
target *int
@@ -291,6 +308,17 @@ func (c *Config) ApplyEnvironment() error {
return nil
}
func parseEnvironmentBool(name, value string) (bool, error) {
switch strings.ToLower(strings.TrimSpace(value)) {
case "true":
return true, nil
case "false":
return false, nil
default:
return false, fmt.Errorf("环境变量 %s 必须是 true 或 false", name)
}
}
func (c *Config) Normalize() {
if c == nil {
return
+15 -1
View File
@@ -265,6 +265,7 @@ func TestLoadWithEnvOverridesRuntimeSettings(t *testing.T) {
t.Setenv("SCERT_SERVER_HOST", "127.0.0.1")
t.Setenv("SCERT_SERVER_PORT", "9004")
t.Setenv("SCERT_SERVER_HTTPS_MODE", "proxy")
t.Setenv("SCERT_WEB_ENABLED", "false")
t.Setenv("SCERT_WEB_PUBLIC_IP", "192.168.2.3")
t.Setenv("SCERT_ACME_PROPAGATION_TIMEOUT_SECS", "1200")
loaded, err := LoadWithEnv(path)
@@ -274,7 +275,7 @@ func TestLoadWithEnvOverridesRuntimeSettings(t *testing.T) {
if loaded.Server.Host != "127.0.0.1" || loaded.Server.Port != 9004 || loaded.Server.HTTPSMode != "proxy" {
t.Fatalf("服务运行配置覆盖不正确:%+v", loaded.Server)
}
if loaded.Web.PublicIP != "192.168.2.3" || loaded.ACME.PropagationTimeoutSecs != 1200 {
if loaded.Web.Enabled || loaded.Web.PublicIP != "192.168.2.3" || loaded.ACME.PropagationTimeoutSecs != 1200 {
t.Fatalf("运行时辅助配置覆盖不正确:web=%+v acme=%+v", loaded.Web, loaded.ACME)
}
fileConfig, err := Load(path)
@@ -286,6 +287,19 @@ func TestLoadWithEnvOverridesRuntimeSettings(t *testing.T) {
}
}
func TestLoadWithEnvRejectsInvalidBoolean(t *testing.T) {
dir := t.TempDir()
cfg := Default(dir)
path := filepath.Join(dir, "config", "scert.json")
if err := cfg.Save(path); err != nil {
t.Fatalf("保存配置失败:%v", err)
}
t.Setenv("SCERT_WEB_ENABLED", "是")
if _, err := LoadWithEnv(path); err == nil {
t.Fatal("无效 Web 开关环境变量未被拒绝")
}
}
func TestLoadWithEnvRejectsInvalidInteger(t *testing.T) {
dir := t.TempDir()
cfg := Default(dir)