接通 DNS 账户管理页面并补项目权限与敏感输入回归
This commit is contained in:
1 parent
7f7b0849d5
commit
0adb190a80
21 files changed
+866
-31
No files matched your search
@@ -57,7 +57,7 @@ func TestAuthSessionsSupportOptionalEmail(t *testing.T) {
|
||||
if !payload.Authenticated || payload.Email != "" || payload.Role != role || payload.IsAdmin != (role == repository.UserRoleAdmin) {
|
||||
t.Fatalf("unexpected session identity: %+v", payload)
|
||||
}
|
||||
// 普通管理员可读服务商目录,但不能读取超级管理员专属系统设置。
|
||||
// 服务商目录仅含公共字段定义,已登录用户可读;系统设置仍仅超级管理员可读。
|
||||
settings := serveUserRequest(server, cookies[0], http.MethodGet, "/api/v1/settings", "")
|
||||
if settings.Code != http.StatusForbidden {
|
||||
t.Fatalf("非超级管理员读取系统设置应返回 403,实际为 %d", settings.Code)
|
||||
@@ -66,10 +66,7 @@ func TestAuthSessionsSupportOptionalEmail(t *testing.T) {
|
||||
request.AddCookie(cookies[0])
|
||||
access := httptest.NewRecorder()
|
||||
server.Handler().ServeHTTP(access, request)
|
||||
expectedStatus := http.StatusForbidden
|
||||
if role == repository.UserRoleAdmin {
|
||||
expectedStatus = http.StatusOK
|
||||
}
|
||||
expectedStatus := http.StatusOK
|
||||
if access.Code != expectedStatus {
|
||||
t.Fatalf("role boundary: status=%d want=%d", access.Code, expectedStatus)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
package httpapi
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/domain"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/repository"
|
||||
)
|
||||
|
||||
func TestManagedDNSAccountCatalogForProjectUser(t *testing.T) {
|
||||
f := newProjectMemberAPIFixture(t)
|
||||
for _, actor := range []string{"", "manager", "viewer", "global-admin"} {
|
||||
req := httptest.NewRequest(http.MethodGet, "/api/v1/dns/providers", nil)
|
||||
if actor != "" {
|
||||
req.AddCookie(f.cookies[actor])
|
||||
}
|
||||
response := httptest.NewRecorder()
|
||||
f.server.Handler().ServeHTTP(response, req)
|
||||
status := http.StatusOK
|
||||
if actor == "" {
|
||||
status = http.StatusUnauthorized
|
||||
}
|
||||
if response.Code != status || response.Header().Get("Cache-Control") != "private, no-store" {
|
||||
t.Fatalf("服务商目录认证或缓存隔离错误:%s %d", actor, response.Code)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestManagedDNSAccountProjectCapability(t *testing.T) {
|
||||
f := newProjectMemberAPIFixture(t)
|
||||
if err := f.members.GrantProjectRole(t.Context(), "primary-super-admin", "project-a", "target", domain.ProjectRoleDNSAdmin); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, actor := range []string{"primary-super-admin", "manager", "viewer", "target", "global-admin"} {
|
||||
page, err := f.members.ListVisibleProjects(t.Context(), actor, "", 30)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, item := range page.Items {
|
||||
expected := actor == "primary-super-admin" || actor == "manager" || actor == "target"
|
||||
if item.CanManageDNS != expected {
|
||||
t.Fatalf("DNS 管理提示与项目角色不符:%s %+v", actor, item)
|
||||
}
|
||||
}
|
||||
}
|
||||
if _, err := f.db.ExecContext(t.Context(), "DELETE FROM project_members WHERE user_id = 'target'"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
response := serveUserRequest(f.server, f.cookies["target"], http.MethodGet, "/api/v1/projects", "")
|
||||
var page repository.VisibleProjectPage
|
||||
if err := json.Unmarshal(response.Body.Bytes(), &page); err != nil || response.Code != 200 || len(page.Items) != 0 {
|
||||
t.Fatal("撤权后的旧会话仍有项目管理提示", err)
|
||||
}
|
||||
}
|
||||
@@ -108,7 +108,8 @@ func TestAdminAPIRejectsAuthenticatedRegularUser(t *testing.T) {
|
||||
cfg.Admin.PasswordHash = string(hash)
|
||||
server := New(Dependencies{Config: cfg, Repository: &stubDomainRepository{}})
|
||||
cookie := httpUserSessionCookie(server, "user-1", repository.UserRoleUser)
|
||||
response := serveUserRequest(server, cookie, http.MethodGet, "/api/v1/dns/providers", "")
|
||||
// 目录已允许项目用户读取;实际系统 DNS 在线操作仍必须经过全局管理权限。
|
||||
response := serveUserRequest(server, cookie, http.MethodPost, "/api/v1/dns/test", `{}`)
|
||||
if response.Code != http.StatusForbidden {
|
||||
t.Fatalf("普通用户访问管理接口应返回 403,实际为 %d:%s", response.Code, response.Body.String())
|
||||
}
|
||||
|
||||
@@ -16,6 +16,8 @@ func (s *Server) registerProjectResourceRoutes() {
|
||||
api.GET("/domains/:id/dns-account", s.getDomainDNSAccount)
|
||||
api.PUT("/domains/:id/dns-account", s.requireSameOrigin, s.setDomainDNSAccount)
|
||||
api.GET("/dns/accounts", s.listDNSAccounts)
|
||||
// 服务商目录不包含账户数据;项目 DNS 管理员不必拥有全局管理员身份。
|
||||
api.GET("/dns/providers", s.listAdminDNSProviders)
|
||||
api.GET("/dns/accounts/:id", s.getManagedDNSAccount)
|
||||
api.POST("/dns/accounts", s.requireSameOrigin, s.createManagedDNSAccount)
|
||||
api.PUT("/dns/accounts/:id", s.requireSameOrigin, s.renameManagedDNSAccount)
|
||||
|
||||
@@ -252,7 +252,6 @@ func (s *Server) registerRoutes() {
|
||||
|
||||
s.router.GET("/api/v1/settings", privateProjectResponse, s.requireSuperAdminSystemConfig, s.getSettings)
|
||||
s.router.PUT("/api/v1/settings", privateProjectResponse, s.requireSuperAdminSystemConfig, s.updateSettings)
|
||||
adminAPI.GET("/dns/providers", s.listAdminDNSProviders)
|
||||
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.runRenewalNow)
|
||||
|
||||
@@ -19,6 +19,7 @@ type VisibleProject struct {
|
||||
CanManageMembers bool `json:"can_manage_members"`
|
||||
CanManageProject bool `json:"can_manage_project"`
|
||||
CanDeleteProject bool `json:"can_delete_project"`
|
||||
CanManageDNS bool `json:"can_manage_dns"`
|
||||
}
|
||||
|
||||
type VisibleProjectPage struct {
|
||||
@@ -45,6 +46,10 @@ func (r *SQLProjectMemberRepository) ListVisibleProjects(ctx context.Context, ac
|
||||
CASE WHEN a.role = 'super_admin' OR EXISTS (
|
||||
SELECT 1 FROM project_members manager WHERE manager.project_id = p.id
|
||||
AND manager.user_id = a.id AND manager.role = 'project_admin'
|
||||
) THEN 1 ELSE 0 END,
|
||||
CASE WHEN a.role = 'super_admin' OR EXISTS (
|
||||
SELECT 1 FROM project_members dns_manager WHERE dns_manager.project_id = p.id
|
||||
AND dns_manager.user_id = a.id AND dns_manager.role IN ('project_admin', 'dns_admin')
|
||||
) THEN 1 ELSE 0 END
|
||||
FROM users a LEFT JOIN projects p ON p.id > ? AND (
|
||||
a.role = 'super_admin' OR EXISTS (
|
||||
@@ -62,8 +67,8 @@ func (r *SQLProjectMemberRepository) ListVisibleProjects(ctx context.Context, ac
|
||||
for rows.Next() {
|
||||
var actor, globalRole string
|
||||
var id, name, description sql.NullString
|
||||
var manager int
|
||||
if err := rows.Scan(&actor, &globalRole, &id, &name, &description, &manager); err != nil {
|
||||
var manager, dnsManager int
|
||||
if err := rows.Scan(&actor, &globalRole, &id, &name, &description, &manager, &dnsManager); err != nil {
|
||||
return page, fmt.Errorf("读取可见项目失败:%w", err)
|
||||
}
|
||||
allowed = true
|
||||
@@ -72,6 +77,7 @@ func (r *SQLProjectMemberRepository) ListVisibleProjects(ctx context.Context, ac
|
||||
page.Items = append(page.Items, VisibleProject{
|
||||
ID: id.String, Name: name.String, Description: description.String, CanManageMembers: manager == 1,
|
||||
CanManageProject: manager == 1, CanDeleteProject: manager == 1 && id.String != "default",
|
||||
CanManageDNS: dnsManager == 1,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user