修复管理员分组版本校验和受限保存
修复管理员用户列表成员版本缺失导致的多分组保存失败,并保留管理员不可管理分组的成员关系,补充回归测试。
This commit is contained in:
1 parent
87b834e9b2
commit
0f083ccf61
4 files changed
+103
-9
No files matched your search
@@ -296,6 +296,15 @@ func Guard(actorID int, role access.Role, sessionVersion, securityVersion int, t
|
||||
}
|
||||
|
||||
func SetMembership(engine *xorm.Engine, user models.User, input []int, guards ...WriteGuard) error {
|
||||
return setMembership(engine, user, input, nil, guards...)
|
||||
}
|
||||
|
||||
// SetScopedMembership 只替换可管理分组,保留目标账号在其他分组中的成员关系。
|
||||
func SetScopedMembership(engine *xorm.Engine, user models.User, input []int, editableGroupIDs []int, guards ...WriteGuard) error {
|
||||
return setMembership(engine, user, input, editableGroupIDs, guards...)
|
||||
}
|
||||
|
||||
func setMembership(engine *xorm.Engine, user models.User, input []int, editableGroupIDs []int, guards ...WriteGuard) error {
|
||||
if engine == nil || user.ID <= 0 {
|
||||
return ErrDenied
|
||||
}
|
||||
@@ -323,6 +332,24 @@ func SetMembership(engine *xorm.Engine, user models.User, input []int, guards ..
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if editableGroupIDs != nil {
|
||||
editable := make(map[int]struct{}, len(editableGroupIDs))
|
||||
for _, groupID := range editableGroupIDs {
|
||||
editable[groupID] = struct{}{}
|
||||
}
|
||||
existing := make([]models.AccountGroupMember, 0)
|
||||
if err := tx.Where(`user_id = ?`, user.ID).Find(&existing); err != nil {
|
||||
return err
|
||||
}
|
||||
preserved := make([]int, 0, len(existing)+len(ids))
|
||||
for _, row := range existing {
|
||||
if _, ok := editable[row.GroupID]; !ok {
|
||||
preserved = append(preserved, row.GroupID)
|
||||
}
|
||||
}
|
||||
ids = append(preserved, ids...)
|
||||
sort.Ints(ids)
|
||||
}
|
||||
if err := ReplaceMembership(tx, user.ID, ids); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -135,3 +135,35 @@ func TestValidateMembershipKeepsAdminMultiGroupAndUserSingleGroupRules(t *testin
|
||||
t.Fatalf("普通用户不应允许多个分组,得到:%v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSetScopedMembershipPreservesGroupsOutsideAdminScope(t *testing.T) {
|
||||
engine, err := xorm.NewEngine(`sqlite`, `:memory:`)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer engine.Close()
|
||||
if err := engine.Sync2(new(models.User), new(models.AccountGroup), new(models.AccountGroupMember)); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
target := models.User{Account: `target`, Name: `Target`, Role: string(access.RoleUser), SessionVersion: 1, SecurityVersion: 1}
|
||||
if _, err := engine.Insert(&target); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := engine.Insert(&models.AccountGroup{ID: 1, Name: `visible`}, &models.AccountGroup{ID: 2, Name: `hidden`}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := engine.Insert(&models.AccountGroupMember{UserID: target.ID, GroupID: 1}, &models.AccountGroupMember{UserID: target.ID, GroupID: 2}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
allow := func(*xorm.Session) error { return nil }
|
||||
if err := SetScopedMembership(engine, target, []int{0}, []int{0, 1}, allow); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
rows := make([]models.AccountGroupMember, 0)
|
||||
if err := engine.Where(`user_id = ?`, target.ID).Asc(`group_id`).Find(&rows); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(rows) != 2 || rows[0].GroupID != 0 || rows[1].GroupID != 2 {
|
||||
t.Fatalf(`scoped membership changed an inaccessible group: %+v`, rows)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user