调整系统管理入口并实现用户分组与角色可见范围

This commit is contained in:
xuans committed 2026-09-25 22:15:52 +08:00
1 parent c91aab659b
commit 5bcada2ac8
28 files changed
+915 -72

No files matched your search

+4 -4
View File
@@ -177,12 +177,12 @@ func (s *Server) registerRoutes() {
s.router.POST("/api/v1/auth/password", s.requireAuthenticated, s.changePassword)
s.router.POST("/api/v1/password-reset/resolve", s.resolvePasswordResetAccount)
adminAPI := s.router.Group("/api/v1", s.requireAdmin)
userAPI := s.router.Group("/api/v1/users", s.requireSuperAdmin)
userAPI := s.router.Group("/api/v1/users", s.requireAuthenticated)
userAPI.GET("", s.listUsers)
userAPI.POST("", s.createUser)
userAPI.POST("", s.requireSuperAdmin, s.createUser)
userAPI.GET("/:id", s.getUser)
userAPI.PUT("/:id", s.updateUser)
userAPI.DELETE("/:id", s.deleteUser)
userAPI.PUT("/:id", s.requireSuperAdmin, s.updateUser)
userAPI.DELETE("/:id", s.requireSuperAdmin, s.deleteUser)
adminAPI.GET("/domains", s.listDomains)
adminAPI.POST("/domains", s.dnsOperation, s.createDomain)
adminAPI.PUT("/domains/:id", s.dnsOperation, s.updateDomain)
+80
View File
@@ -0,0 +1,80 @@
package httpapi
import (
"net/http"
"git.pcux.cn/xuans/Scert/backend/internal/repository"
"github.com/gin-gonic/gin"
)
// userListViewer 每次从仓储读取当前分组,避免调组后沿用会话中的旧权限。
func (s *Server) userListViewer(c *gin.Context) (repository.User, bool) {
session, ok := s.currentAuthSession(c)
if !ok {
s.writeError(c, http.StatusUnauthorized, "请先登录管理后台", nil)
return repository.User{}, false
}
if session.Role == repository.UserRoleSuperAdmin {
return repository.User{ID: session.UserID, Role: session.Role}, true
}
viewer, err := s.users.GetUserByID(c.Request.Context(), session.UserID)
if err != nil || viewer.Status != repository.UserStatusActive || viewer.Role != session.Role {
s.writeError(c, http.StatusForbidden, "当前账号无法读取用户列表", nil)
return repository.User{}, false
}
return viewer, true
}
func userVisibleTo(viewer, item repository.User) bool {
if viewer.Role == repository.UserRoleSuperAdmin || viewer.ID == item.ID {
return true
}
if viewer.Role != repository.UserRoleAdmin || item.Role == repository.UserRoleSuperAdmin {
return false
}
if len(viewer.Groups) == 0 && len(item.Groups) == 0 {
return true
}
for _, group := range viewer.Groups {
for _, memberGroup := range item.Groups {
if group == memberGroup {
return true
}
}
}
return false
}
// scopedUserGroups 不向普通用户输出分组,也不向管理员泄露其他分组名称。
func scopedUserGroups(viewer, item repository.User) repository.User {
if viewer.Role == repository.UserRoleSuperAdmin {
return item
}
groups := make([]string, 0)
if viewer.Role == repository.UserRoleAdmin {
for _, group := range item.Groups {
for _, allowed := range viewer.Groups {
if group == allowed {
groups = append(groups, group)
break
}
}
}
}
item.Groups = groups
return item
}
func (s *Server) applyRequestedUserGroups(c *gin.Context, item *repository.User, requested *[]string) bool {
groups := item.Groups
if requested != nil {
groups = *requested
}
var err error
item.Groups, err = repository.NormalizeUserGroups(item.Role, groups)
if err != nil {
s.writeError(c, http.StatusBadRequest, err.Error(), nil)
return false
}
return true
}
@@ -0,0 +1,139 @@
package httpapi
import (
"encoding/json"
"net/http"
"reflect"
"sort"
"strings"
"testing"
"git.pcux.cn/xuans/Scert/backend/internal/repository"
)
func TestUserGroupVisibilityAndWriteProtection(t *testing.T) {
server, users, _ := protectedUserServer(t)
password := "Member123a"
hash := httpUserPasswordHash(t, password)
for _, item := range []repository.User{
{ID: "leader", Username: "leader", Role: "admin", Groups: []string{"甲组", "乙组"}},
{ID: "peer", Username: "peer", Role: "admin", Groups: []string{"乙组", "隐藏组"}},
{ID: "first", Username: "first", Role: "user", Groups: []string{"甲组"}},
{ID: "second", Username: "second", Role: "user", Groups: []string{"乙组"}},
{ID: "other", Username: "other", Role: "user", Groups: []string{"隐藏组"}},
{ID: "default-user", Username: "default-user", Role: "user"},
{ID: "default-admin", Username: "default-admin", Role: "admin"},
} {
item.PasswordHash, item.Status = hash, "active"
if err := users.CreateUser(t.Context(), item); err != nil {
t.Fatal(err)
}
}
for _, tc := range []struct {
name string
want []string
}{
{"leader", []string{"first", "leader", "peer", "second"}},
{"first", []string{"first"}},
{"default-admin", []string{"default-admin", "default-user"}},
} {
t.Run(tc.name, func(t *testing.T) {
cookie := loginAuthTest(t, server, tc.name, password, false).Result().Cookies()[0]
response := serveUserRequest(server, cookie, http.MethodGet, "/api/v1/users", "")
if response.Code != http.StatusOK {
t.Fatalf("读取分组失败:%d %s", response.Code, response.Body.String())
}
var body struct {
Items []repository.User `json:"items"`
}
if err := json.Unmarshal(response.Body.Bytes(), &body); err != nil {
t.Fatal(err)
}
ids := make([]string, 0, len(body.Items))
for _, item := range body.Items {
ids = append(ids, item.ID)
}
sort.Strings(ids)
if !reflect.DeepEqual(ids, tc.want) {
t.Fatalf("用户范围错误:%v", ids)
}
if strings.Contains(response.Body.String(), "隐藏组") {
t.Fatal("泄露组外分组名称")
}
if tc.name == "first" && strings.Contains(response.Body.String(), `"groups"`) {
t.Fatal("普通用户不应收到分组信息")
}
outside := serveUserRequest(server, cookie, http.MethodGet, "/api/v1/users/other", "")
if outside.Code != http.StatusNotFound {
t.Fatalf("组外读取应返回 404:%d", outside.Code)
}
for _, method := range []string{http.MethodPost, http.MethodPut, http.MethodDelete} {
path := "/api/v1/users/first"
if method == http.MethodPost {
path = "/api/v1/users"
}
result := serveUserRequest(server, cookie, method, path, `{"username":"first","role":"admin","groups":["隐藏组"]}`)
if result.Code != http.StatusForbidden {
t.Fatalf("越权写入应返回 403:%s %d", method, result.Code)
}
}
})
}
superCookie := loginAuthTest(t, server, "admin", "AdminPass123", false).Result().Cookies()[0]
all := serveUserRequest(server, superCookie, http.MethodGet, "/api/v1/users", "")
if all.Code != http.StatusOK || !strings.Contains(all.Body.String(), "隐藏组") || !strings.Contains(all.Body.String(), "default-user") {
t.Fatal("超级管理员应读取所有分组")
}
for _, payload := range []string{
`{"username":"new-user","password":"Member123a","role":"user","groups":["甲组","乙组"]}`,
`{"username":"new-user","password":"Member123a","role":"user","groups":["默认分组"]}`,
`{"username":"new-user","password":"Member123a","role":"user","groups":[""]}`,
} {
response := serveUserRequest(server, superCookie, http.MethodPost, "/api/v1/users", payload)
if response.Code != http.StatusBadRequest {
t.Fatalf("非法分组未拒绝:%d", response.Code)
}
}
// 降级时不得静默丢弃管理员的多组成员关系。
badRole := serveUserRequest(server, superCookie, http.MethodPut, "/api/v1/users/leader", `{"username":"leader","role":"user"}`)
if badRole.Code != http.StatusBadRequest {
t.Fatal("多组管理员降级应要求明确选择单组")
}
updated := serveUserRequest(server, superCookie, http.MethodPut, "/api/v1/users/leader", `{"username":"leader","role":"user","groups":["乙组"]}`)
if updated.Code != http.StatusOK {
t.Fatalf("单组降级失败:%s", updated.Body.String())
}
cleared := serveUserRequest(server, superCookie, http.MethodPut, "/api/v1/users/leader", `{"username":"leader","groups":[]}`)
if cleared.Code != http.StatusOK {
t.Fatalf("回到默认分组失败:%s", cleared.Body.String())
}
item, err := users.GetUserByID(t.Context(), "leader")
if err != nil || len(item.Groups) != 0 {
t.Fatalf("分组清空未保存:%v", err)
}
}
func TestUserGroupsAreReadFromCurrentRepository(t *testing.T) {
server, users, _ := protectedUserServer(t)
hash := httpUserPasswordHash(t, "Member123a")
for _, item := range []repository.User{
{ID: "leader", Username: "leader", Role: "admin", Groups: []string{"甲组"}},
{ID: "first", Username: "first", Role: "user", Groups: []string{"甲组"}},
{ID: "second", Username: "second", Role: "user", Groups: []string{"乙组"}},
} {
item.PasswordHash, item.Status = hash, "active"
if err := users.CreateUser(t.Context(), item); err != nil {
t.Fatal(err)
}
}
cookie := loginAuthTest(t, server, "leader", "Member123a", false).Result().Cookies()[0]
item, _ := users.GetUserByID(t.Context(), "leader")
item.Groups = []string{"乙组"}
if err := users.UpdateUser(t.Context(), item); err != nil {
t.Fatal(err)
}
response := serveUserRequest(server, cookie, http.MethodGet, "/api/v1/users", "")
if response.Code != http.StatusOK || strings.Contains(response.Body.String(), `"id":"first"`) || !strings.Contains(response.Body.String(), `"id":"second"`) {
t.Fatalf("旧会话未应用新分组范围:%s", response.Body.String())
}
}
+33 -7
View File
@@ -14,11 +14,12 @@ import (
)
type userRequest struct {
Username string `json:"username"`
Email string `json:"email"`
Password string `json:"password"`
Role string `json:"role"`
Status string `json:"status"`
Username string `json:"username"`
Email string `json:"email"`
Password string `json:"password"`
Role string `json:"role"`
Status string `json:"status"`
Groups *[]string `json:"groups"`
}
func (s *Server) requireSuperAdmin(c *gin.Context) {
@@ -53,12 +54,22 @@ func (s *Server) listUsers(c *gin.Context) {
s.writeError(c, http.StatusNotImplemented, "用户管理接口尚未配置", errors.New("用户仓储未配置"))
return
}
viewer, ok := s.userListViewer(c)
if !ok {
return
}
items, err := s.users.ListUsers(c.Request.Context())
if err != nil {
s.writeError(c, http.StatusInternalServerError, "查询用户失败", err)
return
}
c.JSON(http.StatusOK, gin.H{"items": items})
visible := make([]repository.User, 0, len(items))
for _, item := range items {
if userVisibleTo(viewer, item) {
visible = append(visible, scopedUserGroups(viewer, item))
}
}
c.JSON(http.StatusOK, gin.H{"items": visible, "current_user_id": viewer.ID, "current_role": viewer.Role})
}
func (s *Server) getUser(c *gin.Context) {
@@ -66,6 +77,10 @@ func (s *Server) getUser(c *gin.Context) {
s.writeError(c, http.StatusNotImplemented, "用户管理接口尚未配置", errors.New("用户仓储未配置"))
return
}
viewer, ok := s.userListViewer(c)
if !ok {
return
}
item, err := s.users.GetUserByID(c.Request.Context(), c.Param("id"))
if err != nil {
if repository.IsNotFound(err) {
@@ -75,7 +90,11 @@ func (s *Server) getUser(c *gin.Context) {
s.writeError(c, http.StatusInternalServerError, "读取用户失败", err)
return
}
c.JSON(http.StatusOK, item)
if !userVisibleTo(viewer, item) {
s.writeError(c, http.StatusNotFound, "用户不存在", nil)
return
}
c.JSON(http.StatusOK, scopedUserGroups(viewer, item))
}
func (s *Server) createUser(c *gin.Context) {
@@ -97,6 +116,9 @@ func (s *Server) createUser(c *gin.Context) {
s.writeError(c, http.StatusBadRequest, "系统只允许初始化时创建一个超级管理员", nil)
return
}
if !s.applyRequestedUserGroups(c, &item, request.Groups) {
return
}
if err := s.users.CreateUser(c.Request.Context(), item); err != nil {
s.writeError(c, userErrorStatus(err), "创建用户失败", err)
return
@@ -143,6 +165,10 @@ func (s *Server) updateUser(c *gin.Context) {
if request.Status == "" {
item.Status = existing.Status
}
item.Groups = existing.Groups
if !s.applyRequestedUserGroups(c, &item, request.Groups) {
return
}
if existing.Role != repository.UserRoleSuperAdmin && item.Role == repository.UserRoleSuperAdmin {
s.writeError(c, http.StatusBadRequest, "不能将用户提升为超级管理员", nil)
return
+2 -2
View File
@@ -54,8 +54,8 @@ func TestUserManagementAuthorizationAndCRUD(t *testing.T) {
}
regularCookie := httpUserSessionCookie(server, "user-1", repository.UserRoleUser)
forbidden := serveUserRequest(server, regularCookie, http.MethodGet, "/api/v1/users", "")
if forbidden.Code != http.StatusForbidden {
t.Fatalf("普通用户请求应返回 403:%d %s", forbidden.Code, forbidden.Body.String())
if forbidden.Code != http.StatusOK || strings.Contains(forbidden.Body.String(), "primary-super-admin") || strings.Contains(forbidden.Body.String(), `"groups"`) {
t.Fatalf("普通用户只能读取自己且不显示分组:%d %s", forbidden.Code, forbidden.Body.String())
}
adminCookie := httpUserSessionCookie(server, "primary-super-admin", repository.UserRoleSuperAdmin)