修复管理员成员分组权限检查点
提交分组成员管理权限和前端入口调整,作为继续开发前的安全检查点。
This commit is contained in:
1 parent
c0cab4004e
commit
60ef7a74ec
7 files changed
+69
-11
No files matched your search
@@ -49,6 +49,14 @@ func requireAccountGroupManagement(ctx *context.Context, w http.ResponseWriter)
|
||||
return true
|
||||
}
|
||||
|
||||
func requireAccountGroupMembershipManagement(ctx *context.Context, w http.ResponseWriter) bool {
|
||||
if err := authorizeCapability(ctx, access.CapabilityAccountGroupMemberManage, "", false); err != nil {
|
||||
writeUserAuthorizationError(w, err, "无权管理账号所属分组")
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
func SaveAccountGroup(ctx *context.Context, w http.ResponseWriter, req *http.Request) {
|
||||
if !requireAccountGroupManagement(ctx, w) {
|
||||
return
|
||||
@@ -91,7 +99,7 @@ func SaveAccountGroup(ctx *context.Context, w http.ResponseWriter, req *http.Req
|
||||
}
|
||||
|
||||
func SetAccountGroupMembership(ctx *context.Context, w http.ResponseWriter, req *http.Request) {
|
||||
if !requireAccountGroupManagement(ctx, w) {
|
||||
if !requireAccountGroupMembershipManagement(ctx, w) {
|
||||
return
|
||||
}
|
||||
var input struct {
|
||||
@@ -117,7 +125,13 @@ func SetAccountGroupMembership(ctx *context.Context, w http.ResponseWriter, req
|
||||
writeAccountGroupError(w, accountgroup.ErrConflict)
|
||||
return
|
||||
}
|
||||
if err := accountgroup.SetMembership(db.Instance, user, input.GroupIDs, accountWriteGuard(ctx, user)); err != nil {
|
||||
if err := accountgroup.SetMembership(
|
||||
db.Instance,
|
||||
user,
|
||||
input.GroupIDs,
|
||||
accountWriteGuard(ctx, user),
|
||||
accountgroup.MembershipScopeGuard(ctx.UserID, ctx.EffectiveRole(), input.GroupIDs),
|
||||
); err != nil {
|
||||
writeAccountGroupError(w, err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -99,7 +99,7 @@ func CreateUser(ctx *context.Context, w http.ResponseWriter, req *http.Request)
|
||||
groupIDs = *reqData.GroupIDs
|
||||
}
|
||||
if len(groupIDs) > 0 && (len(groupIDs) != 1 || groupIDs[0] != 0) {
|
||||
if !requireAccountGroupManagement(ctx, w) {
|
||||
if !requireAccountGroupMembershipManagement(ctx, w) {
|
||||
return
|
||||
}
|
||||
}
|
||||
@@ -378,7 +378,7 @@ func EditUser(ctx *context.Context, w http.ResponseWriter, req *http.Request) {
|
||||
targetRole := user.EffectiveRole()
|
||||
writeGuard := accountWriteGuard(ctx, user)
|
||||
if reqData.GroupIDs != nil {
|
||||
if !requireAccountGroupManagement(ctx, w) {
|
||||
if !requireAccountGroupMembershipManagement(ctx, w) {
|
||||
return
|
||||
}
|
||||
if reqData.MembershipVersion < 1 || reqData.MembershipVersion != user.SecurityVersion {
|
||||
@@ -492,6 +492,13 @@ func EditUser(ctx *context.Context, w http.ResponseWriter, req *http.Request) {
|
||||
writeAccountGroupError(w, err)
|
||||
return
|
||||
}
|
||||
if reqData.GroupIDs != nil {
|
||||
if err := accountgroup.CheckWrite(tx, accountgroup.MembershipScopeGuard(ctx.UserID, ctx.EffectiveRole(), *reqData.GroupIDs)); err != nil {
|
||||
_ = tx.Rollback()
|
||||
writeAccountGroupError(w, err)
|
||||
return
|
||||
}
|
||||
}
|
||||
if reqData.Password != "" {
|
||||
updateColumns = append(updateColumns, "password", "must_change_password", "password_changed_at")
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user