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

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 -1
View File
@@ -10,6 +10,7 @@ import (
)
//go:embed migrations/sqlite/0001_initial.sql migrations/sqlite/0002_domain_options.sql migrations/sqlite/0003_deployment.sql migrations/sqlite/0004_task_attempts.sql migrations/sqlite/0005_users.sql migrations/sqlite/0006_server_validation.sql migrations/sqlite/0007_server_password_auth.sql migrations/mysql/0001_initial.sql migrations/mysql/0002_domain_options.sql migrations/mysql/0003_deployment.sql migrations/mysql/0004_task_attempts.sql migrations/mysql/0005_users.sql migrations/mysql/0006_server_validation.sql migrations/mysql/0007_server_password_auth.sql migrations/postgres/0001_initial.sql migrations/postgres/0002_domain_options.sql migrations/postgres/0003_deployment.sql migrations/postgres/0004_task_attempts.sql migrations/postgres/0005_users.sql migrations/postgres/0006_server_validation.sql migrations/postgres/0007_server_password_auth.sql
//go:embed migrations/sqlite/0008_user_groups.sql migrations/mysql/0008_user_groups.sql migrations/postgres/0008_user_groups.sql
var migrationFiles embed.FS
func Migrate(ctx context.Context, db *sql.DB, driver string) error {
@@ -38,7 +39,7 @@ func Migrate(ctx context.Context, db *sql.DB, driver string) error {
return nil
}
const latestMigrationVersion = 7
const latestMigrationVersion = 8
func applyMigration(ctx context.Context, db *sql.DB, driver string, version int) error {
path := fmt.Sprintf("migrations/%s/%04d_%s.sql", driver, version, migrationName(version))
@@ -133,6 +134,8 @@ func migrationName(version int) string {
return "server_validation"
case 7:
return "server_password_auth"
case 8:
return "user_groups"
default:
return "unknown"
}
@@ -0,0 +1 @@
ALTER TABLE users ADD COLUMN groups_json TEXT;
@@ -0,0 +1 @@
ALTER TABLE users ADD COLUMN groups_json TEXT;
@@ -0,0 +1 @@
ALTER TABLE users ADD COLUMN groups_json TEXT;
@@ -0,0 +1,56 @@
package database
import (
"database/sql"
"path/filepath"
"testing"
"git.pcux.cn/xuans/Scert/backend/internal/config"
)
func TestSQLiteUpgradePreservesUngroupedUsers(t *testing.T) {
cfg := config.Default(t.TempDir()).Database
cfg.DSN = filepath.Join(t.TempDir(), "upgrade.db")
db, err := Open(t.Context(), cfg)
if err != nil {
t.Fatal(err)
}
defer db.Close()
if _, err := db.DB.ExecContext(t.Context(), migrationTableSQL("sqlite")); err != nil {
t.Fatal(err)
}
for version := 1; version <= 7; version++ {
if err := applyMigration(t.Context(), db.DB, "sqlite", version); err != nil {
t.Fatal(err)
}
}
if _, err := db.DB.ExecContext(t.Context(), `INSERT INTO users
(id, username, email, password_hash, role, status)
VALUES ('legacy', 'legacy', '', 'existing-hash', 'admin', 'active')`); err != nil {
t.Fatal(err)
}
for attempt := 0; attempt < 2; attempt++ {
if err := Migrate(t.Context(), db.DB, "sqlite"); err != nil {
t.Fatal(err)
}
}
var username, passwordHash, role, status string
var groups sql.NullString
if err := db.DB.QueryRowContext(t.Context(), `SELECT username, password_hash, role, status, groups_json
FROM users WHERE id = 'legacy'`).Scan(&username, &passwordHash, &role, &status, &groups); err != nil {
t.Fatal(err)
}
if username != "legacy" || passwordHash != "existing-hash" || role != "admin" || status != "active" {
t.Fatalf("unexpected legacy user: %q %q %q", username, role, status)
}
if groups.Valid && groups.String != "[]" {
t.Fatalf("unexpected legacy groups: %v", groups)
}
var version int
if err := db.DB.QueryRowContext(t.Context(), "SELECT MAX(version) FROM schema_migrations").Scan(&version); err != nil {
t.Fatal(err)
}
if version != latestMigrationVersion {
t.Fatalf("unexpected version: %d", version)
}
}
+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)
@@ -0,0 +1,47 @@
package repository
import (
"encoding/json"
"errors"
"sort"
"strings"
"unicode"
)
// NormalizeUserGroups 将未分类表示为空列表,并统一校验分组数量及名称。
func NormalizeUserGroups(role string, groups []string) ([]string, error) {
if len(groups) > 32 {
return nil, errors.New("分组数量不能超过 32 个")
}
result := make([]string, 0, len(groups))
seen := make(map[string]bool)
for _, name := range groups {
name = strings.TrimSpace(name)
if name == "" || name == "默认分组" || len([]rune(name)) > 32 {
return nil, errors.New("分组名称无效:请输入 1 到 32 个字符,默认分组请保持未分组")
}
for _, char := range name {
if unicode.IsControl(char) {
return nil, errors.New("分组名称不能包含控制字符")
}
}
if !seen[name] {
result = append(result, name)
seen[name] = true
}
}
if strings.EqualFold(strings.TrimSpace(role), UserRoleUser) && len(result) > 1 {
return nil, errors.New("普通用户只能属于一个分组")
}
sort.Strings(result)
return result, nil
}
func encodeUserGroups(item User) (string, error) {
groups, err := NormalizeUserGroups(item.Role, item.Groups)
if err != nil {
return "", err
}
data, err := json.Marshal(groups)
return string(data), err
}
@@ -0,0 +1,41 @@
package repository
import (
"reflect"
"strings"
"testing"
)
func TestUserGroupsValidationAndPersistence(t *testing.T) {
db := openUserTestDatabase(t)
defer db.Close()
repo := NewSQLUserRepository(db.DB)
item := User{ID: "group-admin", Username: "group-admin", Role: UserRoleAdmin, Status: UserStatusActive, PasswordHash: userTestPasswordHash(t, "Member123a"), Groups: []string{" beta ", "alpha", "alpha"}}
if err := repo.CreateUser(t.Context(), item); err != nil {
t.Fatal(err)
}
got, err := repo.GetUserByID(t.Context(), item.ID)
if err != nil || !reflect.DeepEqual(got.Groups, []string{"alpha", "beta"}) {
t.Fatalf("分组未规范化保存:%+v %v", got.Groups, err)
}
got.Role = UserRoleUser
if err := repo.UpdateUser(t.Context(), got); err == nil {
t.Fatal("仓储层应拒绝普通用户多组")
}
got.Groups = []string{"alpha"}
if err := repo.UpdateUser(t.Context(), got); err != nil {
t.Fatal(err)
}
if _, err := db.DB.Exec("UPDATE users SET groups_json = NULL WHERE id = ?", item.ID); err != nil {
t.Fatal(err)
}
legacy, err := repo.GetUserByID(t.Context(), item.ID)
if err != nil || len(legacy.Groups) != 0 {
t.Fatal("旧用户应归入默认分组")
}
for _, groups := range [][]string{{""}, {"默认分组"}, {"bad\nname"}, {strings.Repeat("组", 33)}, make([]string, 33)} {
if _, err := NormalizeUserGroups(UserRoleAdmin, groups); err == nil {
t.Fatalf("非法分组未拒绝:%v", groups)
}
}
}
+29 -9
View File
@@ -3,6 +3,7 @@ package repository
import (
"context"
"database/sql"
"encoding/json"
"errors"
"fmt"
"strings"
@@ -30,6 +31,7 @@ type User struct {
Email string `json:"email"`
PasswordHash string `json:"-"`
Role string `json:"role"`
Groups []string `json:"groups,omitempty"`
Status string `json:"status"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
@@ -131,16 +133,20 @@ func (r *SQLUserRepository) CreateUser(ctx context.Context, item User) error {
if err := validateUser(item, false); err != nil {
return err
}
groups, err := encodeUserGroups(item)
if err != nil {
return err
}
if item.CreatedAt.IsZero() {
item.CreatedAt = time.Now().UTC()
}
if item.UpdatedAt.IsZero() {
item.UpdatedAt = item.CreatedAt
}
_, err := r.db.ExecContext(ctx, r.query(`INSERT INTO users
(id, username, email, password_hash, role, status, created_at, updated_at)
VALUES (?, ?, ?, ?, ?, ?, ?, ?)`), item.ID, item.Username, r.emailValue(item.Email), item.PasswordHash,
item.Role, item.Status, item.CreatedAt, item.UpdatedAt)
_, err = r.db.ExecContext(ctx, r.query(`INSERT INTO users
(id, username, email, password_hash, role, status, created_at, updated_at, groups_json)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`), item.ID, item.Username, r.emailValue(item.Email), item.PasswordHash,
item.Role, item.Status, item.CreatedAt, item.UpdatedAt, groups)
if err != nil {
return fmt.Errorf("保存用户失败:%w", err)
}
@@ -155,8 +161,12 @@ func (r *SQLUserRepository) UpdateUser(ctx context.Context, item User) error {
if err := validateUser(item, false); err != nil {
return err
}
result, err := r.db.ExecContext(ctx, r.query(`UPDATE users SET username = ?, email = ?, password_hash = ?, role = ?, status = ?, updated_at = ? WHERE id = ?`),
item.Username, r.emailValue(item.Email), item.PasswordHash, item.Role, item.Status, time.Now().UTC(), item.ID)
groups, err := encodeUserGroups(item)
if err != nil {
return err
}
result, err := r.db.ExecContext(ctx, r.query(`UPDATE users SET username = ?, email = ?, password_hash = ?, role = ?, status = ?, updated_at = ?, groups_json = ? WHERE id = ?`),
item.Username, r.emailValue(item.Email), item.PasswordHash, item.Role, item.Status, time.Now().UTC(), groups, item.ID)
if err != nil {
return fmt.Errorf("更新用户失败:%w", err)
}
@@ -283,15 +293,17 @@ func validateUser(item User, allowEmptyID bool) error {
if item.Status != UserStatusActive && item.Status != UserStatusDisabled {
return fmt.Errorf("用户状态无效:%s", item.Status)
}
return nil
_, err := NormalizeUserGroups(item.Role, item.Groups)
return err
}
const userSelect = `SELECT id, username, email, password_hash, role, status, created_at, updated_at FROM users`
const userSelect = `SELECT id, username, email, password_hash, role, status, created_at, updated_at, COALESCE(groups_json, '[]') FROM users`
func scanUser(row interface{ Scan(...any) error }) (User, error) {
var item User
var email sql.NullString
if err := row.Scan(&item.ID, &item.Username, &email, &item.PasswordHash, &item.Role, &item.Status, &item.CreatedAt, &item.UpdatedAt); err != nil {
var groups string
if err := row.Scan(&item.ID, &item.Username, &email, &item.PasswordHash, &item.Role, &item.Status, &item.CreatedAt, &item.UpdatedAt, &groups); err != nil {
if errors.Is(err, sql.ErrNoRows) {
return User{}, sql.ErrNoRows
}
@@ -300,5 +312,13 @@ func scanUser(row interface{ Scan(...any) error }) (User, error) {
if email.Valid {
item.Email = email.String
}
if err := json.Unmarshal([]byte(groups), &item.Groups); err != nil {
return User{}, fmt.Errorf("读取用户分组失败:%w", err)
}
var err error
item.Groups, err = NormalizeUserGroups(item.Role, item.Groups)
if err != nil {
return User{}, err
}
return normalizeUser(item), nil
}