收紧全局设置与DNS权限并更新进度清单
限制系统设置修改、DNS在线测试和续期操作的角色权限,补充前后端回归测试与开发进度记录。
This commit is contained in:
1 parent
f254dd9248
commit
ba6bd80382
12 files changed
+160
-10
No files matched your search
@@ -42,6 +42,47 @@ func TestAdminDNSProvidersReturnsCatalog(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestAdminDNSMutationRequiresSuperAdmin(t *testing.T) {
|
||||
cfg := config.Default(t.TempDir())
|
||||
cfg.SetupReady = true
|
||||
server := New(Dependencies{Config: cfg, SetupDNS: &fakeSetupDNSVerifier{}})
|
||||
cookie := httpUserSessionCookie(server, "dns-admin", repository.UserRoleAdmin)
|
||||
cases := []struct {
|
||||
name string
|
||||
method string
|
||||
path string
|
||||
body string
|
||||
}{
|
||||
{
|
||||
name: "在线测试",
|
||||
method: http.MethodPost,
|
||||
path: "/api/v1/dns/test",
|
||||
body: `{"provider":"cloudflare","test_domain":"example.com","credentials":{"api_token":"test-token"}}`,
|
||||
},
|
||||
{
|
||||
name: "阿里云权限检查",
|
||||
method: http.MethodPost,
|
||||
path: "/api/v1/dns/aliyun/check",
|
||||
body: `{"domain":"example.com"}`,
|
||||
},
|
||||
}
|
||||
for _, item := range cases {
|
||||
t.Run(item.name, func(t *testing.T) {
|
||||
request := httptest.NewRequest(item.method, item.path, strings.NewReader(item.body))
|
||||
request.Header.Set("Content-Type", "application/json")
|
||||
request.AddCookie(cookie)
|
||||
response := httptest.NewRecorder()
|
||||
server.Handler().ServeHTTP(response, request)
|
||||
if response.Code != http.StatusForbidden {
|
||||
t.Fatalf("普通管理员执行 DNS 变更操作应返回 403,实际为 %d:%s", response.Code, response.Body.String())
|
||||
}
|
||||
if !strings.Contains(response.Body.String(), "只有超级管理员可以管理系统设置") {
|
||||
t.Fatalf("DNS 权限错误提示不明确:%s", response.Body.String())
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestAdminDNSAccountsExposeProjectScope(t *testing.T) {
|
||||
cfg := config.Default(t.TempDir())
|
||||
cfg.SetupReady = true
|
||||
@@ -122,7 +163,7 @@ func TestAdminDNSTestReturnsVerificationResult(t *testing.T) {
|
||||
"credentials":{"api_token":"test-token"}
|
||||
}`))
|
||||
request.Header.Set("Content-Type", "application/json")
|
||||
serveAdminHTTP(server, response, request)
|
||||
serveSuperAdminHTTP(server, response, request)
|
||||
if response.Code != http.StatusOK {
|
||||
t.Fatalf("DNS 在线测试失败:%d %s", response.Code, response.Body.String())
|
||||
}
|
||||
@@ -152,7 +193,7 @@ func TestAdminAliyunDNSTestReportsFastVerificationTimeout(t *testing.T) {
|
||||
"credentials":{"access_key_id":"test-id","access_key_secret":"test-secret","managed_zones":"example.com","allowed_domains":"example.com"}
|
||||
}`))
|
||||
request.Header.Set("Content-Type", "application/json")
|
||||
serveAdminHTTP(server, response, request)
|
||||
serveSuperAdminHTTP(server, response, request)
|
||||
if response.Code != http.StatusOK || !strings.Contains(response.Body.String(), `"verification_timeout_secs":6`) {
|
||||
t.Fatalf("管理端阿里云 DNS 在线测试未返回 6 秒等待上限:%d %s", response.Code, response.Body.String())
|
||||
}
|
||||
@@ -165,7 +206,7 @@ func TestAdminDNSTestRejectsUnavailableService(t *testing.T) {
|
||||
response := httptest.NewRecorder()
|
||||
request := httptest.NewRequest(http.MethodPost, "/api/v1/dns/test", strings.NewReader(`{"provider":"cloudflare","test_domain":"example.com","credentials":{"api_token":"test-token"}}`))
|
||||
request.Header.Set("Content-Type", "application/json")
|
||||
serveAdminHTTP(server, response, request)
|
||||
serveSuperAdminHTTP(server, response, request)
|
||||
if response.Code != http.StatusServiceUnavailable {
|
||||
t.Fatalf("DNS 服务未初始化时应返回 503,实际为 %d:%s", response.Code, response.Body.String())
|
||||
}
|
||||
|
||||
@@ -221,11 +221,11 @@ func (s *Server) registerRoutes() {
|
||||
api.GET("/tasks/:id/attempts", s.listTaskAttempts)
|
||||
|
||||
adminAPI.GET("/settings", s.getSettings)
|
||||
adminAPI.PUT("/settings", s.updateSettings)
|
||||
adminAPI.PUT("/settings", s.requireSuperAdminSystemConfig, s.updateSettings)
|
||||
adminAPI.GET("/dns/providers", s.listAdminDNSProviders)
|
||||
adminAPI.GET("/dns/accounts", s.listDNSAccounts)
|
||||
adminAPI.POST("/dns/test", s.dnsOperation, s.testAdminDNS)
|
||||
adminAPI.POST("/dns/aliyun/check", s.dnsOperation, s.checkAliyunDNSDomain)
|
||||
adminAPI.POST("/dns/test", s.requireSuperAdminSystemConfig, s.dnsOperation, s.testAdminDNS)
|
||||
adminAPI.POST("/dns/aliyun/check", s.requireSuperAdminSystemConfig, s.dnsOperation, s.checkAliyunDNSDomain)
|
||||
adminAPI.POST("/renewal/run", s.requireSuperAdmin, s.longOperation(certificateTaskTimeout), s.runRenewalNow)
|
||||
domainAPI.POST("/domains/:id/certificate/import", s.longOperation(certificateTaskTimeout), s.importCertificateFiles)
|
||||
domainAPI.POST("/domains/:id/certificate/validate", s.longOperation(certificateTaskTimeout), s.validateCertificate)
|
||||
|
||||
@@ -31,6 +31,23 @@ func TestSettingsAPIRequiresAuthentication(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestSettingsAPIUpdateRequiresSuperAdmin(t *testing.T) {
|
||||
cfg := config.Default(t.TempDir())
|
||||
cfg.SetupReady = true
|
||||
server := New(Dependencies{Config: cfg})
|
||||
request := httptest.NewRequest(http.MethodPut, "/api/v1/settings", strings.NewReader(`{"server":{"port":5443}}`))
|
||||
request.Header.Set("Content-Type", "application/json")
|
||||
request.AddCookie(httpUserSessionCookie(server, "settings-admin", repository.UserRoleAdmin))
|
||||
response := httptest.NewRecorder()
|
||||
server.Handler().ServeHTTP(response, request)
|
||||
if response.Code != http.StatusForbidden {
|
||||
t.Fatalf("普通管理员修改系统设置应返回 403,实际为 %d:%s", response.Code, response.Body.String())
|
||||
}
|
||||
if !strings.Contains(response.Body.String(), "只有超级管理员可以管理系统设置") {
|
||||
t.Fatalf("系统设置权限错误提示不明确:%s", response.Body.String())
|
||||
}
|
||||
}
|
||||
|
||||
func TestSettingsAPIUpdatesSafeFieldsWithoutReturningSecrets(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
cfg := config.Default(dir)
|
||||
|
||||
@@ -104,3 +104,8 @@ func serveAdminHTTP(server *Server, recorder *httptest.ResponseRecorder, request
|
||||
request.AddCookie(httpUserSessionCookie(server, "test-admin", repository.UserRoleAdmin))
|
||||
server.Handler().ServeHTTP(recorder, request)
|
||||
}
|
||||
|
||||
func serveSuperAdminHTTP(server *Server, recorder *httptest.ResponseRecorder, request *http.Request) {
|
||||
request.AddCookie(httpUserSessionCookie(server, "test-super-admin", repository.UserRoleSuperAdmin))
|
||||
server.Handler().ServeHTTP(recorder, request)
|
||||
}
|
||||
@@ -23,6 +23,14 @@ type userRequest struct {
|
||||
}
|
||||
|
||||
func (s *Server) requireSuperAdmin(c *gin.Context) {
|
||||
s.requireSuperAdminAction(c, "管理用户")
|
||||
}
|
||||
|
||||
func (s *Server) requireSuperAdminSystemConfig(c *gin.Context) {
|
||||
s.requireSuperAdminAction(c, "管理系统设置")
|
||||
}
|
||||
|
||||
func (s *Server) requireSuperAdminAction(c *gin.Context, action string) {
|
||||
s.configMu.RLock()
|
||||
setupReady := s.config.SetupReady
|
||||
s.configMu.RUnlock()
|
||||
@@ -39,7 +47,7 @@ func (s *Server) requireSuperAdmin(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
if session.Role != repository.UserRoleSuperAdmin {
|
||||
c.AbortWithStatusJSON(http.StatusForbidden, gin.H{"error": "只有超级管理员可以管理用户", "request_id": requestIDFromContext(c)})
|
||||
c.AbortWithStatusJSON(http.StatusForbidden, gin.H{"error": "只有超级管理员可以" + action, "request_id": requestIDFromContext(c)})
|
||||
return
|
||||
}
|
||||
if !s.sameOriginForAPI(c.Request) {
|
||||
|
||||
Reference in new issue
Block a user