fix(菜单权限): 授权树按操作者置灰不可授予项 + 放行保留既有授权
普通管理员勾到无权授予的菜单后,ensureGrantable 抛 403,而 createUser/updateUser 都是 @Transactional,整笔回滚——线上表现就是「后台不能保存权限,也不能创建用户」 (2026-09-16 周丽娥账号创建用户与保存 uid=45 权限双双失败,库里查无新用户)。 根因是校验 2026-07-28 就加了,但授权树一直拿全量菜单,两边规则不一致。 - permission-menus 按操作者标记 grantable;授权树据此置灰(不隐藏:授权是整树替换, 隐藏会把超管授予过、操作者自己没有的菜单当取消勾选删掉,与 09-13「权限自己没掉」同类) - ensureGrantable 放行目标已持有的授权,只拦新增,不构成提权 - GlobalExceptionHandler 补业务异常日志:此前普通业务异常一行都不记,本次排查只能靠 反推响应体字节数(nginx body_bytes_sent 含 chunked 开销)才定位到根因
This commit is contained in:
+2
-2
@@ -56,8 +56,8 @@ public class PermissionMenuController {
|
||||
@Operation(summary = "查询菜单权限列表")
|
||||
public ApiResponse<List<PermissionMenuItemVo>> listMenus(HttpServletRequest request,
|
||||
@Parameter(description = "菜单类型: app/admin") @RequestParam(required = false) String menuType) {
|
||||
requireAdmin(request);
|
||||
return ApiResponse.success(permissionMenuService.list(menuType));
|
||||
// 传入操作者:授权树据此把「非超管无权授予」的菜单标记为不可勾选
|
||||
return ApiResponse.success(permissionMenuService.list(requireAdmin(request), menuType));
|
||||
}
|
||||
|
||||
@PostMapping("/permission-menus")
|
||||
|
||||
+6
@@ -24,4 +24,10 @@ public class PermissionMenuItemVo {
|
||||
private Integer sortOrder;
|
||||
@JsonProperty("created_at")
|
||||
private LocalDateTime createdAt;
|
||||
|
||||
/**
|
||||
* 当前操作者能否把该菜单授予他人。仅授权树接口(list)填充;菜单 CRUD 回显等
|
||||
* 其他接口留空,语义为「不限制」。
|
||||
*/
|
||||
private Boolean grantable;
|
||||
}
|
||||
|
||||
+44
-6
@@ -57,8 +57,35 @@ public class PermissionMenuService {
|
||||
|
||||
/** Returns the flat menu catalog, including each item's direct parent ID. */
|
||||
public List<PermissionMenuItemVo> list(String menuType) {
|
||||
return list(null, menuType);
|
||||
}
|
||||
|
||||
/**
|
||||
* 授权树用:非超管只能授予自己已持有的菜单(与 {@link #ensureGrantable} 同一判据),
|
||||
* 这里把结论标进 {@code grantable},让前端把不可授予的节点置灰,避免「勾了才在保存时
|
||||
* 整单被 403 回滚」——创建用户与保存权限共用这一棵树,勾到一个越权项会连建号一起失败。
|
||||
* operator 为空或超管时不限制。
|
||||
*/
|
||||
public List<PermissionMenuItemVo> list(AdminUserEntity operator, String menuType) {
|
||||
List<PermissionMenuEntity> menus = loadMenus(menuType);
|
||||
return toItemVos(menus, menus);
|
||||
List<PermissionMenuItemVo> items = toItemVos(menus, menus);
|
||||
Set<Long> grantableIds = resolveGrantableMenuIds(operator);
|
||||
for (PermissionMenuItemVo item : items) {
|
||||
item.setGrantable(grantableIds == null || grantableIds.contains(item.getId()));
|
||||
}
|
||||
return items;
|
||||
}
|
||||
|
||||
/**
|
||||
* 操作者可授予的菜单 id 全集(自身直接授权 + 其后代)。
|
||||
*
|
||||
* @return null 表示不限制(超管或无操作者)
|
||||
*/
|
||||
private Set<Long> resolveGrantableMenuIds(AdminUserEntity operator) {
|
||||
if (operator == null || operator.getId() == null || isSuperAdmin(operator)) {
|
||||
return null;
|
||||
}
|
||||
return expandDescendantIds(new LinkedHashSet<>(loadDirectColumnIds(operator.getId())), loadMenus(null));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -543,7 +570,7 @@ public class PermissionMenuService {
|
||||
.filter(id -> !protectedIds.contains(id))
|
||||
.toList();
|
||||
}
|
||||
ensureGrantable(operator, grantIds);
|
||||
ensureGrantable(operator, grantIds, userId);
|
||||
LinkedHashSet<Long> finalGrantIds = new LinkedHashSet<>(grantIds);
|
||||
|
||||
if (!protectedIds.isEmpty()) {
|
||||
@@ -833,14 +860,25 @@ public class PermissionMenuService {
|
||||
}
|
||||
}
|
||||
|
||||
/** Throws 403 when a non-super admin requests grants outside their own effective set. */
|
||||
private void ensureGrantable(AdminUserEntity operator, List<Long> requestedIds) {
|
||||
/**
|
||||
* Throws 403 when a non-super admin **新增** grants outside their own effective set.
|
||||
*
|
||||
* <p>目标用户已持有的直接授权不参与校验:那是既有事实(通常由超管分配),普通管理员
|
||||
* 编辑该用户时整树提交会把它原样带回,若一并判为越权,整笔事务会回滚——连建号、改密
|
||||
* 都做不成(生产 2026-09-16 现象:勾到一个越权项,创建用户与保存权限双双失败)。
|
||||
* 只放行「保留已有」不放行「新增」,因此不构成提权。
|
||||
*/
|
||||
private void ensureGrantable(AdminUserEntity operator, List<Long> requestedIds, Long targetUserId) {
|
||||
if (operator == null || isSuperAdmin(operator)) {
|
||||
return;
|
||||
}
|
||||
List<PermissionMenuEntity> menus = loadMenus(null);
|
||||
Set<Long> effective = expandDescendantIds(new LinkedHashSet<>(loadDirectColumnIds(operator.getId())), menus);
|
||||
// 操作者自身 id 缺失(异常数据)时按「无任何可授予项」从严处理,不放行
|
||||
Set<Long> effective = Objects.requireNonNullElse(resolveGrantableMenuIds(operator), Set.of());
|
||||
Set<Long> keptIds = targetUserId == null
|
||||
? Set.of()
|
||||
: new LinkedHashSet<>(loadDirectColumnIds(targetUserId));
|
||||
Set<Long> denied = requestedIds.stream()
|
||||
.filter(id -> !keptIds.contains(id))
|
||||
.filter(id -> !effective.contains(id))
|
||||
.collect(Collectors.toCollection(LinkedHashSet::new));
|
||||
if (!denied.isEmpty()) {
|
||||
|
||||
Reference in New Issue
Block a user