完善Web管理页面开关

This commit is contained in:
xuans committed 2026-08-31 00:52:40 +08:00
1 parent d3eb7b542f
commit c9bbb25154
4 files changed
+89 -6

No files matched your search

+2 -1
View File
@@ -218,6 +218,7 @@ func (s *Server) updateSettings(c *gin.Context) {
previous.Server.Port != updated.Server.Port ||
previous.Server.HTTPSMode != updated.Server.HTTPSMode
configRestartRequired := listenerRestartRequired ||
previous.Web.Enabled != updated.Web.Enabled ||
previous.Paths.Certificate != updated.Paths.Certificate ||
!reflect.DeepEqual(nonRenewalACMEConfig(previous.ACME), nonRenewalACMEConfig(updated.ACME)) ||
!reflect.DeepEqual(previous.DNS, updated.DNS) ||
@@ -229,7 +230,7 @@ func (s *Server) updateSettings(c *gin.Context) {
if listenerRestartRequired {
message = "设置已保存;服务监听地址、端口或 HTTPS 模式已变更,请重启 Scert 服务"
} else if configRestartRequired {
message = "设置已保存;部分证书、DNS 或通知运行配置已变更,请重启 Scert 服务"
message = "设置已保存;Web 页面、证书、DNS 或通知运行配置已变更,请重启 Scert 服务"
}
s.config = updated
s.configMu.Unlock()
@@ -128,6 +128,57 @@ func TestSettingsAPIWebAddressChangeDoesNotRequireRestart(t *testing.T) {
}
}
func TestSettingsAPIWebEnabledChangeRequiresRestart(t *testing.T) {
dir := t.TempDir()
cfg := config.Default(dir)
cfg.SetupReady = true
cfg.Web.Enabled = true
cfg.Web.Hostname = "scert.example.test"
cfg.DNS.VerificationState = "verified"
cfg.Admin.Username = "admin"
cfg.Admin.Email = "admin@example.test"
cfg.Admin.PasswordHash = mustTestPasswordHash(t, "Password123")
configPath := dir + "\\config\\scert.json"
if err := cfg.Save(configPath); err != nil {
t.Fatalf("保存测试配置失败:%v", err)
}
server := New(Dependencies{Config: cfg, ConfigPath: configPath})
cookie := loginForSettingsTest(t, server)
request := httptest.NewRequest(http.MethodPut, "/api/v1/settings", strings.NewReader(`{
"web": {"enabled": false}
}`))
request.Header.Set("Content-Type", "application/json")
request.AddCookie(cookie)
response := httptest.NewRecorder()
server.Handler().ServeHTTP(response, request)
if response.Code != http.StatusOK {
t.Fatalf("更新 Web 页面开关应成功,实际为 %d:%s", response.Code, response.Body.String())
}
var payload struct {
Settings settingsView `json:"settings"`
RestartRequired bool `json:"restart_required"`
Message string `json:"message"`
}
if err := json.Unmarshal(response.Body.Bytes(), &payload); err != nil {
t.Fatalf("解析 Web 页面开关响应失败:%v", err)
}
if !payload.RestartRequired || payload.Settings.Web.Enabled {
t.Fatalf("关闭 Web 页面应要求重启并返回关闭状态:%+v", payload)
}
if !strings.Contains(payload.Message, "Web 页面") || !strings.Contains(payload.Message, "请重启 Scert 服务") {
t.Fatalf("Web 页面开关变更应明确提示重启服务:%s", payload.Message)
}
saved, err := config.Load(configPath)
if err != nil {
t.Fatalf("读取 Web 页面开关配置失败:%v", err)
}
if saved.Web.Enabled {
t.Fatal("关闭 Web 页面后配置文件仍为开启状态")
}
}
func TestSettingsAPIReturnsAndUpdatesRenewalPolicy(t *testing.T) {
dir := t.TempDir()
cfg := config.Default(dir)