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

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

@@ -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
}