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:
2026-09-16 18:46:21 +08:00
parent f164c7b8ef
commit 766ea5e35d
9 changed files with 275 additions and 17 deletions
@@ -19,6 +19,7 @@ import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
@@ -125,12 +126,12 @@ class PermissionMenuControllerTest {
when(request.getHeader("X-Internal-Token")).thenReturn("shared-token");
when(request.getParameter("operatorId")).thenReturn("12");
when(service.requireAdminOperator(12L)).thenReturn(operator);
when(service.list("app")).thenReturn(List.of());
when(service.list(operator, "app")).thenReturn(List.of());
controller.listMenus(request, "app");
verify(service).requireAdminOperator(12L);
verify(service).list("app");
verify(service).list(operator, "app");
verify(request, never()).getParameter("superAdmin");
}
@@ -149,7 +150,7 @@ class PermissionMenuControllerTest {
assertThatThrownBy(() -> controller.listMenus(request, "app"))
.isSameAs(authFailure);
verify(service, never()).requireAdminOperator(anyLong());
verify(service, never()).list("app");
verify(service, never()).list(any(AdminUserEntity.class), eq("app"));
}
@Test
@@ -170,12 +171,12 @@ class PermissionMenuControllerTest {
when(request.getHeader("X-Internal-Token")).thenReturn("file-token");
when(request.getParameter("operatorId")).thenReturn("12");
when(service.requireAdminOperator(12L)).thenReturn(operator);
when(service.list("admin")).thenReturn(List.of());
when(service.list(operator, "admin")).thenReturn(List.of());
controller.listMenus(request, "admin");
verify(service).requireAdminOperator(12L);
verify(service).list("admin");
verify(service).list(operator, "admin");
}
@Test
@@ -25,6 +25,7 @@ import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assertions.tuple;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
@@ -1168,6 +1169,109 @@ class PermissionMenuServiceTest {
assertThat(updated.getValue().getName()).isEqualTo("改名");
}
/**
* 授权树接口:非超管只能授予自己已持有的菜单,越界的项必须被标记为不可授予,
* 否则前端会渲染成可勾选,用户勾了才在保存时整单被 403 回滚。
*/
@Test
void listMarksMenusOutsideOperatorGrantableSetAsNonGrantable() {
PermissionMenuMapper menuMapper = mock(PermissionMenuMapper.class);
UserColumnPermissionMapper permissionMapper = mock(UserColumnPermissionMapper.class);
AdminUserMapper userMapper = mock(AdminUserMapper.class);
PermissionMenuService service = new PermissionMenuService(menuMapper, permissionMapper, userMapper);
when(menuMapper.selectList(any())).thenReturn(List.of(
menu(1L, null, "admin", 1),
menu(2L, 1L, "admin", 2),
menu(3L, null, "admin", 3)));
// 操作者只有 1(子菜单 2 随父展开),3 在他可授予范围之外
when(permissionMapper.selectByUserId(30L)).thenReturn(List.of(grant(30L, 1L)));
List<PermissionMenuItemVo> items = service.list(user(30L, "admin", 1), null);
assertThat(items)
.extracting(PermissionMenuItemVo::getId, PermissionMenuItemVo::getGrantable)
.containsExactlyInAnyOrder(tuple(1L, true), tuple(2L, true), tuple(3L, false));
}
@Test
void listMarksEveryMenuGrantableForSuperAdmin() {
PermissionMenuMapper menuMapper = mock(PermissionMenuMapper.class);
UserColumnPermissionMapper permissionMapper = mock(UserColumnPermissionMapper.class);
AdminUserMapper userMapper = mock(AdminUserMapper.class);
PermissionMenuService service = new PermissionMenuService(menuMapper, permissionMapper, userMapper);
when(menuMapper.selectList(any())).thenReturn(List.of(
menu(1L, null, "admin", 1),
menu(3L, null, "admin", 3)));
List<PermissionMenuItemVo> items = service.list(user(31L, "super_admin", 1), null);
assertThat(items).extracting(PermissionMenuItemVo::getGrantable).containsOnly(true);
verify(permissionMapper, never()).selectByUserId(any());
}
/**
* 目标用户已持有的授权(通常由超管分配)不参与「只能授自己已有的」校验:
* 普通管理员编辑该用户时整树提交会把它原样带回,若一并判为越权,整笔事务回滚,
* 连建号/改密都做不成——即生产 2026-09-16 的现象。
*/
@Test
void allowsNonSuperAdminToKeepExistingGrantsOutsideOwnSet() {
PermissionMenuMapper menuMapper = mock(PermissionMenuMapper.class);
UserColumnPermissionMapper permissionMapper = mock(UserColumnPermissionMapper.class);
AdminUserMapper userMapper = mock(AdminUserMapper.class);
PermissionMenuService service = new PermissionMenuService(menuMapper, permissionMapper, userMapper);
when(userMapper.selectById(7L)).thenReturn(ownedNormalUser(7L, 30L));
when(menuMapper.selectList(any())).thenReturn(List.of(
menu(1L, null, "admin", 1),
menu(2L, null, "admin", 2)));
when(menuMapper.selectCount(any())).thenReturn(2L);
when(menuMapper.selectOne(any())).thenReturn(null);
when(permissionMapper.selectByUserId(30L)).thenReturn(List.of(grant(30L, 2L)));
when(permissionMapper.selectByUserId(7L)).thenReturn(List.of(grant(7L, 1L)));
UserColumnPermissionUpdateRequest request = new UserColumnPermissionUpdateRequest();
request.setColumnIds(List.of(1L, 2L));
service.updateUserColumnPermissions(user(30L, "admin", 1), 7L, request);
ArgumentCaptor<UserColumnPermissionEntity> captor = ArgumentCaptor.forClass(UserColumnPermissionEntity.class);
verify(permissionMapper, times(2)).insert(captor.capture());
assertThat(captor.getAllValues())
.extracting(UserColumnPermissionEntity::getColumnId)
.containsExactly(1L, 2L);
}
/** 只放行「保留已有」,不放行「新增」:越权新增仍然拒绝,不构成提权。 */
@Test
void rejectsNewGrantOutsideOperatorSet() {
PermissionMenuMapper menuMapper = mock(PermissionMenuMapper.class);
UserColumnPermissionMapper permissionMapper = mock(UserColumnPermissionMapper.class);
AdminUserMapper userMapper = mock(AdminUserMapper.class);
PermissionMenuService service = new PermissionMenuService(menuMapper, permissionMapper, userMapper);
when(userMapper.selectById(7L)).thenReturn(ownedNormalUser(7L, 30L));
when(menuMapper.selectList(any())).thenReturn(List.of(
menu(1L, null, "admin", 1),
menu(2L, null, "admin", 2),
menu(3L, null, "admin", 3)));
when(menuMapper.selectCount(any())).thenReturn(1L);
when(menuMapper.selectOne(any())).thenReturn(null);
when(permissionMapper.selectByUserId(30L)).thenReturn(List.of(grant(30L, 2L)));
when(permissionMapper.selectByUserId(7L)).thenReturn(List.of(grant(7L, 1L)));
UserColumnPermissionUpdateRequest request = new UserColumnPermissionUpdateRequest();
request.setColumnIds(List.of(3L));
assertThatThrownBy(() -> service.updateUserColumnPermissions(user(30L, "admin", 1), 7L, request))
.isInstanceOf(BusinessException.class)
.hasMessageContaining("只能分配自己已有的菜单权限");
verify(permissionMapper, never()).insert(any(UserColumnPermissionEntity.class));
}
private AdminUserEntity ownedNormalUser(Long id, Long createdById) {
AdminUserEntity entity = user(id, "normal", 0);
entity.setCreatedById(createdById);
return entity;
}
private PermissionMenuCreateRequest createRequest(Long parentId, String menuType) {
PermissionMenuCreateRequest request = new PermissionMenuCreateRequest();
request.setName("child");