修复管理员成员分组权限检查点

提交分组成员管理权限和前端入口调整,作为继续开发前的安全检查点。
This commit is contained in:
xuans committed 2026-10-02 03:48:27 +08:00
1 parent c0cab4004e
commit 60ef7a74ec
7 files changed
+69 -11

No files matched your search

+4
View File
@@ -28,6 +28,7 @@ const (
CapabilityNotificationManage Capability = "notification.manage"
CapabilityNotificationReveal Capability = "notification.reveal"
CapabilityAccountGroupManage Capability = "account_group.manage"
CapabilityAccountGroupMemberManage Capability = "account_group.member_manage"
)
type Policy struct {
@@ -41,6 +42,7 @@ type Policy struct {
var policies = map[Capability]Policy{
CapabilityNotificationReveal: {Capability: CapabilityNotificationReveal, HighRisk: true, RequiresTarget: true},
CapabilityAccountGroupManage: {Capability: CapabilityAccountGroupManage, HighRisk: true, RequiresRecentAuth: true},
CapabilityAccountGroupMemberManage: {Capability: CapabilityAccountGroupMemberManage, HighRisk: true, RequiresRecentAuth: true},
CapabilityNotificationManage: {Capability: CapabilityNotificationManage, HighRisk: true, RequiresRecentAuth: true, RequiresRecoveryCode: true, RequiresTarget: true},
CapabilityConfigRead: {Capability: CapabilityConfigRead},
CapabilityConfigWriteGlobal: {Capability: CapabilityConfigWriteGlobal, HighRisk: true, RequiresRecentAuth: true, RequiresRecoveryCode: true},
@@ -70,6 +72,7 @@ var grants = map[Role]map[Capability]struct{}{
RoleSuperAdmin: grant(
CapabilityNotificationReveal,
CapabilityAccountGroupManage,
CapabilityAccountGroupMemberManage,
CapabilityNotificationManage,
CapabilityPluginReadGlobal, CapabilityUserCreate, CapabilityProfileWriteOwn,
CapabilityConfigRead, CapabilityConfigWriteGlobal, CapabilityConfigRollback,
@@ -81,6 +84,7 @@ var grants = map[Role]map[Capability]struct{}{
),
RoleAdmin: grant(
CapabilityNotificationReveal,
CapabilityAccountGroupMemberManage,
CapabilityNotificationManage,
CapabilityPluginReadGlobal, CapabilityPluginRead, CapabilityPluginWriteGlobal, CapabilityProfileWriteOwn,
CapabilityPluginWriteAnyUser, CapabilityPluginWriteOwn, CapabilityUserRead,
+2 -2
View File
@@ -14,9 +14,9 @@ var managementEndpoints = []Endpoint{
{Method: "POST", Path: "/api/system/notification/authorization", Capability: CapabilityNotificationManage},
{Method: "POST", Path: "/api/system/notification/credential", Capability: CapabilityNotificationManage},
{Method: "POST", Path: "/api/v1/user/groups/save", Capability: CapabilityAccountGroupManage},
{Method: "POST", Path: "/api/v1/user/groups/membership", Capability: CapabilityAccountGroupManage},
{Method: "POST", Path: "/api/v1/user/groups/membership", Capability: CapabilityAccountGroupMemberManage},
{Method: "POST", Path: "/api/user/groups/save", Capability: CapabilityAccountGroupManage},
{Method: "POST", Path: "/api/user/groups/membership", Capability: CapabilityAccountGroupManage},
{Method: "POST", Path: "/api/user/groups/membership", Capability: CapabilityAccountGroupMemberManage},
{Method: "POST", Path: "/api/v1/system/notification/authorization", Capability: CapabilityNotificationManage},
{Method: "POST", Path: "/api/v1/system/notification/credential", Capability: CapabilityNotificationManage},
{Method: "POST", Path: "/api/settings/modify_password", Capability: CapabilityPasswordChangeOwn},
+32
View File
@@ -170,6 +170,38 @@ func ValidateMembership(tx *xorm.Session, role access.Role, input []int) ([]int,
return ids, nil
}
// MembershipScopeGuard 限制管理员只能把成员放入自己所属的分组。
func MembershipScopeGuard(actorID int, role access.Role, input []int) WriteGuard {
return func(tx *xorm.Session) error {
if tx == nil || actorID <= 0 || !role.Valid() {
return ErrDenied
}
if role == access.RoleSuperAdmin {
return nil
}
if role != access.RoleAdmin {
return ErrDenied
}
allowedRows := make([]models.AccountGroupMember, 0)
if err := tx.Where("user_id = ?", actorID).Find(&allowedRows); err != nil {
return err
}
allowed := make(map[int]struct{}, len(allowedRows))
for _, row := range allowedRows {
allowed[row.GroupID] = struct{}{}
}
if len(allowed) == 0 {
allowed[0] = struct{}{}
}
for _, groupID := range input {
if _, ok := allowed[groupID]; !ok {
return ErrDenied
}
}
return nil
}
}
func ReplaceMembership(tx *xorm.Session, userID int, ids []int) error {
if _, err := tx.Where("user_id = ?", userID).Delete(&models.AccountGroupMember{}); err != nil {
return err