fix(鉴权): 到期级联改标量聚合,后台入口按菜单授权放开
三件事同源于 10-06「非默认公司账号进不了数富后台」这条事故链,四种死法在界面上长得一样。 1) AccountExpiryService 读本公司公司超管的 expires_at 时把单列投影成实体列表再遍历—— MyBatis 对所选列全为 NULL 的行交出的是 null 元素,而"没设到期"是绝大多数公司的常态, 于是只要有一个永不过期的公司超管,该公司所有账号的登录与每个鉴权请求全部 500。 改成 mapper 侧一条 MIN(expires_at) 标量聚合;AuthChainQueryShapeTest 扫鉴权链路的 "单列投影"形状——这个判据落在 mock 边界外,单测挡不住,只能做源码扫描。 2) 后台入口放开:requireConsoleOperator = 管理员角色链 或 本公司树里 >=1 条后台菜单授权 (探针是带 company_id 条件的标量 COUNT,与下发口径一致,否则进得来而菜单树是空的)。 逐页另设 requireConsolePageAccess 锚住本页 key,勾父分组覆盖后代的既有语义照旧。 管理类 10 支控制器继续 requireAdmin,并且出口 2 不再把这些页下发给普通账号—— 下发出去就是一排点了必 403 的死链。内部令牌通道绕过到期与会话校验,不随入口放宽。 护栏 ConsoleWideningGuardrailTest 双向钉:管理页不得被授权打开、入口落点恰好那 13 支。 3) 前端:后端失败一律 HTTP 200 + success=false,登录页从未解包,所以"什么都不提示"。 补 login-feedback 归一文案(技术串不外露、兜底不再伪装成用户名或密码错误), 并修 isLoginLocation 拿路由内路径比 location.pathname——生产实际是 /admin-vue/login, 那条"已在登录页就别整页重刷"的守卫一次都没生效过。 验证:后端 mvn -o -B test 3924 例 0 红(457 支类);前端 node --test 1738 例 0 红; vue-tsc --noEmit rc=0;入口探针 SQL 已在生产库只读三档空跑(本公司 1 / 错公司 0 / 无授权 0)。
This commit is contained in:
+13
-16
@@ -42,7 +42,7 @@ class AccountExpiryServiceTest {
|
||||
groupMapper = mock(ShopManageGroupMapper.class);
|
||||
service = new AccountExpiryService(adminUserMapper, groupMapper);
|
||||
// 默认:无公司超管、无组长、无创建人约束
|
||||
when(adminUserMapper.selectList(any())).thenReturn(List.of());
|
||||
when(adminUserMapper.selectCompanySuperAdminEarliestExpiry(any())).thenReturn(null);
|
||||
when(adminUserMapper.selectById(any(Long.class))).thenReturn(null);
|
||||
when(groupMapper.selectLeaderIdsByMemberUserId(any())).thenReturn(List.of());
|
||||
}
|
||||
@@ -70,11 +70,7 @@ class AccountExpiryServiceTest {
|
||||
@Test
|
||||
void companySuperAdminExpiryCapsEveryoneInTheCompany() {
|
||||
LocalDateTime companyExpiry = LocalDateTime.now().plusDays(2);
|
||||
AdminUserEntity csa = new AdminUserEntity();
|
||||
csa.setId(9L);
|
||||
csa.setRole("company_super_admin");
|
||||
csa.setExpiresAt(companyExpiry);
|
||||
when(adminUserMapper.selectList(any())).thenReturn(List.of(csa));
|
||||
when(adminUserMapper.selectCompanySuperAdminEarliestExpiry(1L)).thenReturn(companyExpiry);
|
||||
|
||||
// 普通账号(自身无到期)被公司超管的到期拉进去
|
||||
assertThat(service.effectiveExpiresAt(entity(3L, "normal", null, 1L, null))).isEqualTo(companyExpiry);
|
||||
@@ -82,26 +78,27 @@ class AccountExpiryServiceTest {
|
||||
assertThat(service.effectiveExpiresAt(entity(2L, "admin", null, 1L, null))).isEqualTo(companyExpiry);
|
||||
}
|
||||
|
||||
/**
|
||||
* 生产现形(2026-10-06 先锋-团队 / company_id=3):本公司有公司超管、但它们全部没设到期。
|
||||
* 这一档必须既不构成约束、也不抛——曾经这里读的是「单列实体投影」,MyBatis 对所选列全为 NULL 的
|
||||
* 行返回 null 元素,遍历解引用即 NPE,而本方法是每次登录与每个鉴权请求的必经出口 ⇒ 该公司
|
||||
* 全部账号表现为「登录不了」。判据已改成 mapper 里的 MIN(expires_at) 标量,见 {@code AdminUserMapper}。
|
||||
*/
|
||||
@Test
|
||||
void companySuperAdminWithoutExpiryLeavesCompanyUnaffected() {
|
||||
AdminUserEntity csa = new AdminUserEntity();
|
||||
csa.setId(9L);
|
||||
csa.setRole("company_super_admin");
|
||||
csa.setExpiresAt(null);
|
||||
when(adminUserMapper.selectList(any())).thenReturn(List.of(csa));
|
||||
when(adminUserMapper.selectCompanySuperAdminEarliestExpiry(1L)).thenReturn(null);
|
||||
|
||||
assertThatCode(() -> service.assertLoginAllowed(entity(3L, "normal", null, 1L, null)))
|
||||
.doesNotThrowAnyException();
|
||||
assertThat(service.effectiveExpiresAt(entity(3L, "normal", null, 1L, null))).isNull();
|
||||
assertThat(service.effectiveExpiresAt(entity(2L, "admin", null, 1L, null))).isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
void earliestConstraintWinsOverOwnExpiry() {
|
||||
LocalDateTime own = LocalDateTime.now().plusDays(10);
|
||||
LocalDateTime company = LocalDateTime.now().plusDays(1);
|
||||
AdminUserEntity csa = new AdminUserEntity();
|
||||
csa.setId(9L);
|
||||
csa.setRole("company_super_admin");
|
||||
csa.setExpiresAt(company);
|
||||
when(adminUserMapper.selectList(any())).thenReturn(List.of(csa));
|
||||
when(adminUserMapper.selectCompanySuperAdminEarliestExpiry(1L)).thenReturn(company);
|
||||
|
||||
assertThat(service.effectiveExpiresAt(entity(3L, "normal", null, 1L, own))).isEqualTo(company);
|
||||
}
|
||||
|
||||
+184
@@ -0,0 +1,184 @@
|
||||
package com.nanri.aiimage.common.security;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.assertThatCode;
|
||||
import static org.assertj.core.api.Assertions.catchThrowableOfType;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyLong;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.mapper.AdminUserMapper;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import io.jsonwebtoken.Claims;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
/**
|
||||
* 后台入口门(2026-10-06 放开):普通账号凭本公司的后台菜单授权进后台。
|
||||
*
|
||||
* <p>放开的只是<b>入口</b>(current-user / current-user/menus 这类"我能不能进后台"的出口)。
|
||||
* 逐页的门在 {@code PermissionMenuService.requireConsolePageAccess},管理类出口
|
||||
* (用户/菜单/分组/密钥/公司/版本)继续走 {@link AdminAuthSupport#requireAdmin}。
|
||||
* 内部令牌通道更是一条都不放宽——它绕过到期与会话校验。</p>
|
||||
*/
|
||||
class AdminAuthSupportConsoleEntryTest {
|
||||
|
||||
@Test
|
||||
void normalAccountHoldingAnAdminMenuGrantEntersTheConsole() {
|
||||
AdminUserMapper userMapper = mock(AdminUserMapper.class);
|
||||
when(userMapper.countAdminMenuGrants(7L, 3L)).thenReturn(1L);
|
||||
AdminAuthSupport support = support(user(7L, "normal", 0, 3L), userMapper);
|
||||
|
||||
assertThatCode(() -> support.requireConsoleOperator(requestWithBearer("t")))
|
||||
.as("超管在权限页给它勾了后台菜单,就该进得来")
|
||||
.doesNotThrowAnyException();
|
||||
}
|
||||
|
||||
@Test
|
||||
void normalAccountWithoutAnyGrantIsStillRejected() {
|
||||
AdminUserMapper userMapper = mock(AdminUserMapper.class);
|
||||
when(userMapper.countAdminMenuGrants(7L, 3L)).thenReturn(0L);
|
||||
AdminAuthSupport support = support(user(7L, "normal", 0, 3L), userMapper);
|
||||
|
||||
BusinessException ex = catchThrowableOfType(
|
||||
() -> support.requireConsoleOperator(requestWithBearer("t")), BusinessException.class);
|
||||
|
||||
assertThat(ex.getCode()).isEqualTo(403);
|
||||
assertThat(ex.getMessage()).isEqualTo("需要管理员权限");
|
||||
}
|
||||
|
||||
/** 授权行的归属公司必须是操作者自己那棵树:别家树里的残留授权不能替本账号开门。 */
|
||||
@Test
|
||||
void grantProbeIsScopedToTheOperatorsOwnCompany() {
|
||||
AdminUserMapper userMapper = mock(AdminUserMapper.class);
|
||||
when(userMapper.countAdminMenuGrants(anyLong(), any())).thenReturn(9L);
|
||||
AdminAuthSupport support = support(user(7L, "normal", 0, 2L), userMapper);
|
||||
|
||||
support.requireConsoleOperator(requestWithBearer("t"));
|
||||
|
||||
verify(userMapper).countAdminMenuGrants(7L, 2L);
|
||||
}
|
||||
|
||||
@Test
|
||||
void adminRolesEnterWithoutAnyGrantLookup() {
|
||||
AdminUserMapper userMapper = mock(AdminUserMapper.class);
|
||||
AdminAuthSupport support = support(user(8L, "admin", 1, 1L), userMapper);
|
||||
|
||||
assertThatCode(() -> support.requireConsoleOperator(requestWithBearer("t"))).doesNotThrowAnyException();
|
||||
|
||||
verify(userMapper, never()).countAdminMenuGrants(anyLong(), any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void companySuperAdminEntersWithoutAnyGrantLookup() {
|
||||
AdminUserMapper userMapper = mock(AdminUserMapper.class);
|
||||
AdminAuthSupport support = support(user(9L, "company_super_admin", 1, 1L), userMapper);
|
||||
|
||||
assertThatCode(() -> support.requireConsoleOperator(requestWithBearer("t"))).doesNotThrowAnyException();
|
||||
|
||||
verify(userMapper, never()).countAdminMenuGrants(anyLong(), any());
|
||||
}
|
||||
|
||||
/** 内部令牌通道换不来入口:它不做到期与会话校验,只能凭管理员角色用。 */
|
||||
@Test
|
||||
void internalTokenChannelStillRejectsNormalOperator() {
|
||||
AdminUserMapper userMapper = mock(AdminUserMapper.class);
|
||||
when(userMapper.selectById(7L)).thenReturn(user(7L, "normal", 0, 3L));
|
||||
// 授权一条不少:这道门必须照样拒。若内部通道也改成"看授权",客户端凭这条通道
|
||||
// 就能替任意普通账号读到后台(它同时绕过到期拦截)。
|
||||
when(userMapper.countAdminMenuGrants(7L, 3L)).thenReturn(4L);
|
||||
AdminAuthSupport support = tokenSupport(userMapper, "tok");
|
||||
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
when(request.getHeader("X-Internal-Token")).thenReturn("tok");
|
||||
when(request.getParameter("operatorId")).thenReturn("7");
|
||||
|
||||
BusinessException ex = catchThrowableOfType(
|
||||
() -> support.requireConsoleOperatorOrInternal(request), BusinessException.class);
|
||||
|
||||
assertThat(ex).as("内部令牌 + 普通账号 operatorId 不得返回用户").isNotNull();
|
||||
// 冒出来的是 JWT 侧的"未登录",不是放行——内部分支自己把普通角色判成了"没有这个人"
|
||||
assertThat(ex.getCode()).isEqualTo(401);
|
||||
verify(userMapper, never()).countAdminMenuGrants(any(), any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void internalTokenChannelStillAdmitsAdminOperator() {
|
||||
AdminUserMapper userMapper = mock(AdminUserMapper.class);
|
||||
when(userMapper.selectById(8L)).thenReturn(user(8L, "admin", 1, 1L));
|
||||
AdminAuthSupport support = tokenSupport(userMapper, "tok");
|
||||
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
when(request.getHeader("X-Internal-Token")).thenReturn("tok");
|
||||
when(request.getParameter("operatorId")).thenReturn("8");
|
||||
|
||||
assertThat(support.requireConsoleOperatorOrInternal(request).getId()).isEqualTo(8L);
|
||||
}
|
||||
|
||||
/** 没登录仍然是 401,不能被入口门改写成 403(前端的整页跳转判据靠这个码)。 */
|
||||
@Test
|
||||
void anonymousRequestStaysUnauthorized() {
|
||||
AdminAuthSupport support = new AdminAuthSupport(mock(JwtService.class), mock(AdminUserMapper.class),
|
||||
mock(AuthProperties.class), mock(AccountExpiryService.class));
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
|
||||
BusinessException ex = catchThrowableOfType(
|
||||
() -> support.requireConsoleOperator(request), BusinessException.class);
|
||||
|
||||
assertThat(ex.getCode()).isEqualTo(401);
|
||||
}
|
||||
|
||||
/** 探针返回 null(库里根本没有授权行)时按"没有授权"处理,不能当成放行。 */
|
||||
@Test
|
||||
void nullGrantCountIsTreatedAsNoGrant() {
|
||||
AdminUserMapper userMapper = mock(AdminUserMapper.class);
|
||||
when(userMapper.countAdminMenuGrants(any(), any())).thenReturn(null);
|
||||
AdminAuthSupport support = support(user(7L, "normal", 0, 3L), userMapper);
|
||||
|
||||
assertThat(support.isConsoleOperator(user(7L, "normal", 0, 3L))).isFalse();
|
||||
}
|
||||
|
||||
private AdminAuthSupport support(AdminUserEntity user, AdminUserMapper userMapper) {
|
||||
JwtService jwtService = mock(JwtService.class);
|
||||
AuthProperties props = mock(AuthProperties.class);
|
||||
Claims claims = mock(Claims.class);
|
||||
when(claims.getSubject()).thenReturn(String.valueOf(user.getId()));
|
||||
when(claims.get("deviceId")).thenReturn("devA");
|
||||
when(jwtService.parse("t")).thenReturn(claims);
|
||||
when(userMapper.selectById(user.getId())).thenReturn(user);
|
||||
when(props.isSingleDeviceEnabled()).thenReturn(false);
|
||||
return new AdminAuthSupport(jwtService, userMapper, props, mock(AccountExpiryService.class));
|
||||
}
|
||||
|
||||
private AdminAuthSupport tokenSupport(AdminUserMapper userMapper, String token) {
|
||||
AdminAuthSupport support = new AdminAuthSupport(mock(JwtService.class), userMapper,
|
||||
mock(AuthProperties.class), mock(AccountExpiryService.class));
|
||||
ReflectionTestUtils.setField(support, "internalToken", token);
|
||||
ReflectionTestUtils.setField(support, "internalTokenPrevious", "");
|
||||
ReflectionTestUtils.setField(support, "internalTokenFile", "");
|
||||
return support;
|
||||
}
|
||||
|
||||
private HttpServletRequest requestWithBearer(String token) {
|
||||
HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
when(request.getHeader(org.springframework.http.HttpHeaders.AUTHORIZATION)).thenReturn("Bearer " + token);
|
||||
return request;
|
||||
}
|
||||
|
||||
private AdminUserEntity user(Long id, String role, int isAdmin, Long companyId) {
|
||||
AdminUserEntity user = new AdminUserEntity();
|
||||
user.setId(id);
|
||||
user.setUsername("u" + id);
|
||||
user.setRole(role);
|
||||
user.setIsAdmin(isAdmin);
|
||||
user.setCreatedById(1L);
|
||||
user.setCompanyId(companyId);
|
||||
user.setMachine("devA");
|
||||
return user;
|
||||
}
|
||||
}
|
||||
+140
@@ -0,0 +1,140 @@
|
||||
package com.nanri.aiimage.common.security;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.fail;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.List;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
/**
|
||||
* 鉴权链路上的 mapper 读出口不得把「可空列」投影成实体列表再遍历。
|
||||
*
|
||||
* <p>MyBatis 对<b>所选列全为 NULL</b> 的行返回 null 元素({@code returnInstanceForEmptyRow} 默认关)。
|
||||
* 于是 {@code selectList(wrapper.select(Entity::getNullableColumn))} 拿到的 List 里混着 null,
|
||||
* 一句 {@code row.getX()} 就是 NPE。这个形状出过一次事故(2026-10-06):{@code AccountExpiryService}
|
||||
* 读本公司公司超管的 {@code expires_at},而"没设到期"恰是绝大多数公司的常态 ⇒ 一家公司只要有一个
|
||||
* 永不过期的公司超管,该公司<b>所有账号</b>的登录与每个鉴权请求全部 500,前端表现为「登录不了」。</p>
|
||||
*
|
||||
* <p>单测挡不住它:mock 会如实交出「带 id 的实体」,而真库交出的是 null 元素——判据落在 mock 边界外,
|
||||
* 用例恒绿。所以这条做成源码扫描,规则本身走 {@link #authChainReadsCompanyCascadeAsScalarAggregate()}
|
||||
* 那类可实跑断言。</p>
|
||||
*/
|
||||
class AuthChainQueryShapeTest {
|
||||
|
||||
/** 只有一列的 {@code .select(Entity::getX)} —— 两列以上就不会出现"整行皆空"。 */
|
||||
private static final Pattern SINGLE_COLUMN_PROJECTION =
|
||||
Pattern.compile("\\.select\\(\\s*[A-Za-z]\\w*::get[A-Za-z]\\w*\\s*\\)");
|
||||
|
||||
/** 扫描面:登录与会话鉴权走过的包(这里抛异常 = 用户登录不了,不是某个页面少几行)。 */
|
||||
private static final String[] SCANNED_DIRS = {
|
||||
"src/main/java/com/nanri/aiimage/common/security",
|
||||
"src/main/java/com/nanri/aiimage/modules/auth",
|
||||
};
|
||||
|
||||
@Test
|
||||
void authChainNeverProjectsASingleColumnIntoAnEntityList() throws IOException {
|
||||
List<Path> files = scannedSources();
|
||||
List<String> offenders = files.stream()
|
||||
.filter(p -> SINGLE_COLUMN_PROJECTION.matcher(read(p)).find())
|
||||
.map(p -> p.getFileName().toString())
|
||||
.collect(Collectors.toList());
|
||||
|
||||
assertThat(offenders)
|
||||
.as("把单个可空列投影成实体列表的文件:整行皆 NULL 时 MyBatis 给的是 null 元素,"
|
||||
+ "遍历即 NPE,而它在鉴权链路上(改成标量聚合或按主键取全行)")
|
||||
.isEmpty();
|
||||
}
|
||||
|
||||
/** 取样集非空自检:扫描一旦 0 命中,上面那条就恒绿,等于没护栏。 */
|
||||
@Test
|
||||
void scannedSurfaceIsActuallyTheAuthChain() throws IOException {
|
||||
List<String> names = scannedSources().stream()
|
||||
.map(p -> p.getFileName().toString())
|
||||
.collect(Collectors.toList());
|
||||
assertThat(names)
|
||||
.as("这两处才是登录与每个鉴权请求走过的代码,扫描面漏了它们上面那条就是空转")
|
||||
.contains("AccountExpiryService.java", "AdminAuthSupport.java", "AuthService.java");
|
||||
}
|
||||
|
||||
/**
|
||||
* 公司级到期级联的读出口形状:mapper 侧一条 {@code MIN(expires_at)} 标量。
|
||||
* 只钉"Service 不再这么写"不够——回流成 {@code selectList} 之前,多半是先有人把 mapper
|
||||
* 的聚合改成"取全部行自己比",所以把 SQL 本身也钉住。
|
||||
*/
|
||||
@Test
|
||||
void authChainReadsCompanyCascadeAsScalarAggregate() throws IOException {
|
||||
String service = read(sourceNamed("AccountExpiryService.java"));
|
||||
assertThat(service).contains("selectCompanySuperAdminEarliestExpiry(");
|
||||
assertThat(service).doesNotContain("selectList(");
|
||||
|
||||
String mapper = read(sourceNamed("AdminUserMapper.java"));
|
||||
Matcher method = Pattern.compile(
|
||||
"LocalDateTime selectCompanySuperAdminEarliestExpiry\\([\\s\\S]{0,400}").matcher(mapper);
|
||||
assertThat(method.find()).as("mapper 里那个标量方法还在").isTrue();
|
||||
assertThat(mapper).contains("MIN(expires_at)");
|
||||
// 判据必须仍锁死在"本公司 + 公司超管",扩到全站会把别家的到期算进这家
|
||||
assertThat(mapper).contains("role = 'company_super_admin'");
|
||||
assertThat(mapper).contains("company_id = #{companyId}");
|
||||
}
|
||||
|
||||
private static List<Path> scannedSources() throws IOException {
|
||||
Path module = moduleRoot();
|
||||
List<Path> files = new java.util.ArrayList<>();
|
||||
for (String dir : SCANNED_DIRS) {
|
||||
Path root = module.resolve(dir);
|
||||
if (!Files.isDirectory(root)) {
|
||||
fail("找不到 " + root + " —— 用例依赖以 backend-java 为工作目录运行,别让守卫静默通过");
|
||||
}
|
||||
try (Stream<Path> walk = Files.walk(root)) {
|
||||
walk.filter(Files::isRegularFile)
|
||||
.filter(p -> p.getFileName().toString().endsWith(".java"))
|
||||
.forEach(files::add);
|
||||
}
|
||||
}
|
||||
return files;
|
||||
}
|
||||
|
||||
private static Path sourceNamed(String fileName) throws IOException {
|
||||
Path module = moduleRoot();
|
||||
for (String dir : SCANNED_DIRS) {
|
||||
Path candidate = module.resolve(dir).resolve(fileName);
|
||||
if (Files.isRegularFile(candidate)) {
|
||||
return candidate;
|
||||
}
|
||||
}
|
||||
Path mapper = module.resolve("src/main/java/com/nanri/aiimage/common/mapper").resolve(fileName);
|
||||
if (Files.isRegularFile(mapper)) {
|
||||
return mapper;
|
||||
}
|
||||
throw new IllegalStateException("找不到 " + fileName);
|
||||
}
|
||||
|
||||
/** surefire 的工作目录是模块目录;从仓库根或 IDE 跑时退到 backend-java/。 */
|
||||
private static Path moduleRoot() {
|
||||
Path here = Path.of("").toAbsolutePath();
|
||||
if (Files.isDirectory(here.resolve("src/main/java"))) {
|
||||
return here;
|
||||
}
|
||||
Path nested = here.resolve("backend-java");
|
||||
if (Files.isDirectory(nested.resolve("src/main/java"))) {
|
||||
return nested;
|
||||
}
|
||||
throw new IllegalStateException("无法定位 backend-java 模块目录(cwd=" + here + ")");
|
||||
}
|
||||
|
||||
private static String read(Path file) {
|
||||
try {
|
||||
return Files.readString(file, StandardCharsets.UTF_8);
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException("读取失败: " + file, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
+320
@@ -0,0 +1,320 @@
|
||||
package com.nanri.aiimage.common.security;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.fail;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
/**
|
||||
* 后台入口放开(2026-10-06)的三向绊线:入口门只长在"该页自己有门"的控制器上。
|
||||
*
|
||||
* <p>这次改动的形状是:{@code current-user/menus} 这道<b>入口</b>从"必须是管理员角色"改成
|
||||
* "管理员角色 <b>或</b> 本公司树里至少有一条后台菜单授权",而每一页另有一道<b>页面门</b>
|
||||
* ({@code PermissionMenuService.requireConsolePageAccess},判据是<b>这一页</b>的授权)。
|
||||
* 两层分开是刻意的:只放开入口 = 把密钥页、扣次数的 ASIN 查询页一并送给了勾了一页的账号。</p>
|
||||
*
|
||||
* <p>所以这个类钉三件事,缺一件就是"显示宽于权限"或"权限宽于显示":</p>
|
||||
* <ol>
|
||||
* <li>管理/平台类 10 个控制器(用户、菜单、公司、密钥、版本、教程、设备日志、紫鸟授权)
|
||||
* <b>仍走 requireAdmin</b> 且<b>没有</b> requireConsoleOperator —— 正向挡"授权能进管理页",
|
||||
* 反向挡"顺手把 requireAdmin 删了导致谁都进不去"。</li>
|
||||
* <li>用了入口门的控制器<b>恰好</b>是那 14 个:多一个就是有人把新页面接进了"有授权就能进"的通道,
|
||||
* 少一个就是有人回滚了某页。分母钉死,不靠抽样。</li>
|
||||
* <li>带页面门的 6 个控制器,那一行里必须出现<b>本页的 column_key</b>;不带的 8 个必须逐个登记
|
||||
* 它靠什么把关(服务门 / 自己的 hasAnyAdminMenu / 只按 uid 取自己的数据)——
|
||||
* "没页面门"必须是已知豁免,不能是漏了。</li>
|
||||
* </ol>
|
||||
*
|
||||
* <p>另外两支钉实现细节:{@code PermissionMenuService} 那两个服务门里不得再残留
|
||||
* {@code ensureAdminOperatorIfPresent}(它会让下面的授权判定变成普通账号永远走不到的死代码),
|
||||
* 以及入口探针 {@code countAdminMenuGrants} 必须是标量 {@code COUNT(1)}
|
||||
* (单列投影会让"整行皆 NULL"变成 List 里的 null 元素,鉴权链路上出过一次事故,
|
||||
* 见 {@link AuthChainQueryShapeTest})。</p>
|
||||
*
|
||||
* <p>每支都带"取样集非空 / 切片截到了方法体"自检:扫描扫不到东西就恒绿,等于没护栏。</p>
|
||||
*/
|
||||
class ConsoleWideningGuardrailTest {
|
||||
|
||||
/** 管理/平台类页面:只能由管理员角色链进,菜单授权一律无效。 */
|
||||
private static final List<String> ADMIN_ONLY_CONTROLLERS = List.of(
|
||||
"modules/admin/controller/AdminUserController.java",
|
||||
"modules/permission/controller/PermissionMenuController.java",
|
||||
"modules/company/controller/CompanyController.java",
|
||||
"modules/usersecret/controller/AdminUserApiSecretController.java",
|
||||
"modules/usersecret/controller/AdminUserSecretUsageController.java",
|
||||
"modules/softwareversion/controller/SoftwareVersionAdminController.java",
|
||||
"modules/digitalhuman/controller/DigitalHumanVersionController.java",
|
||||
"modules/tutorial/controller/TutorialAdminController.java",
|
||||
"modules/devicelog/controller/AdminDeviceLogController.java",
|
||||
"modules/ziniao/controller/ZiniaoAuthController.java");
|
||||
|
||||
/** 允许使用新入口门的全部控制器(多一个少一个都算有人改了这次的边界)。 */
|
||||
private static final Set<String> ENTRY_DOOR_CONTROLLERS = Set.of(
|
||||
"modules/admin/controller/AdminConsoleController.java",
|
||||
"modules/imagehistory/controller/ImageHistoryController.java",
|
||||
"modules/imagevideo/controller/AdminImageVideoTaskController.java",
|
||||
"modules/notification/controller/AdminNotificationController.java",
|
||||
"modules/productcategory/controller/ProductCategoryController.java",
|
||||
"modules/shopdatacrawl/controller/AdminShopDataCrawlTaskController.java",
|
||||
"modules/shopdatacrawl/controller/AdminShopDataCrawlTasksController.java",
|
||||
"modules/shopduplicatecheck/controller/AdminShopDataDuplicateCheckController.java",
|
||||
"modules/shopkey/controller/QueryAsinController.java",
|
||||
"modules/shopkey/controller/ShopKeyController.java",
|
||||
"modules/shopkey/controller/ShopManageController.java",
|
||||
"modules/shopkey/controller/SkipPriceAsinController.java",
|
||||
"modules/taskcenter/controller/AdminTaskCenterController.java");
|
||||
|
||||
/** 页面门:控制器 → 它自己那一页的 column_key。 */
|
||||
private static final Map<String, String> PAGE_DOOR_KEYS = pageDoorKeys();
|
||||
|
||||
/** 有入口门但<b>没有</b> requireConsolePageAccess 的控制器 → 它靠什么把关(豁免登记)。 */
|
||||
private static final Map<String, String> NO_PAGE_DOOR_EXEMPTIONS = noPageDoorExemptions();
|
||||
|
||||
private static Map<String, String> pageDoorKeys() {
|
||||
Map<String, String> keys = new LinkedHashMap<>();
|
||||
keys.put("modules/shopkey/controller/ShopManageController.java", "admin_shop_manage");
|
||||
keys.put("modules/shopkey/controller/ShopKeyController.java", "admin_shop_keys");
|
||||
keys.put("modules/shopkey/controller/QueryAsinController.java", "admin_query_asin");
|
||||
keys.put("modules/shopkey/controller/SkipPriceAsinController.java", "admin_skip_price_asin");
|
||||
keys.put("modules/productcategory/controller/ProductCategoryController.java", "admin_product_categories");
|
||||
keys.put("modules/imagevideo/controller/AdminImageVideoTaskController.java", "admin_image_video_tasks");
|
||||
return keys;
|
||||
}
|
||||
|
||||
private static Map<String, String> noPageDoorExemptions() {
|
||||
Map<String, String> exemptions = new LinkedHashMap<>();
|
||||
// 这两支只回"我自己"的数据:一份是当前用户与他的菜单树(下发侧自己按角色剪枝),
|
||||
// 一份是按 uid 取的通知——值就是那一行可执行锚点,不是描述文字
|
||||
exemptions.put("modules/admin/controller/AdminConsoleController.java", "getUserColumnPermissions(");
|
||||
exemptions.put("modules/notification/controller/AdminNotificationController.java", "return operator.getId();");
|
||||
// 其余三支各自有专门的服务门 / 页内判定
|
||||
exemptions.put("modules/imagehistory/controller/ImageHistoryController.java", "admin_history");
|
||||
exemptions.put("modules/shopdatacrawl/controller/AdminShopDataCrawlTaskController.java",
|
||||
"requireShopDataCrawlTaskAccess(");
|
||||
exemptions.put("modules/shopdatacrawl/controller/AdminShopDataCrawlTasksController.java",
|
||||
"requireShopDataCrawlTaskAccess(");
|
||||
exemptions.put("modules/shopduplicatecheck/controller/AdminShopDataDuplicateCheckController.java",
|
||||
"requireShopDataCrawlTaskAccess(");
|
||||
exemptions.put("modules/taskcenter/controller/AdminTaskCenterController.java",
|
||||
"requireClientTaskCenterAccess(");
|
||||
return exemptions;
|
||||
}
|
||||
|
||||
/** 出口 1(正向):管理类页面不得被菜单授权打开。 */
|
||||
@Test
|
||||
void adminOnlyPagesKeepTheRoleGateAndGainNoGrantDoor() throws IOException {
|
||||
for (String rel : ADMIN_ONLY_CONTROLLERS) {
|
||||
String source = read(mainSource(rel));
|
||||
List<String> gateLines = executableLinesContaining(source, "requireAdmin");
|
||||
assertThat(gateLines)
|
||||
.as(rel + " 必须仍由 requireAdmin 把关:删了它 = 管理员也进不去(反向杀)")
|
||||
.isNotEmpty();
|
||||
assertThat(executableLinesContaining(source, "requireConsoleOperator"))
|
||||
.as(rel + " 不得改用入口门:那等于" +
|
||||
"勾一条菜单授权就能进用户管理/密钥管理(正向杀)")
|
||||
.isEmpty();
|
||||
}
|
||||
}
|
||||
|
||||
/** 出口 2:入口门的落点恰好是登记过的那 13 支,分母从全树反推,不抽样。 */
|
||||
@Test
|
||||
void entryDoorSitesAreExactlyTheRegisteredControllers() throws IOException {
|
||||
List<Path> controllers = allControllers();
|
||||
Set<String> users = new LinkedHashSet<>();
|
||||
for (Path p : controllers) {
|
||||
if (!executableLinesContaining(read(p), "requireConsoleOperator").isEmpty()) {
|
||||
users.add(relative(p));
|
||||
}
|
||||
}
|
||||
assertThat(users)
|
||||
.as("用了入口门的控制器集合必须与登记一致;多出的一支没人给它配页面门,"
|
||||
+ "少的一支是有人把某页回滚成了 requireAdmin")
|
||||
.containsExactlyInAnyOrderElementsOf(ENTRY_DOOR_CONTROLLERS);
|
||||
}
|
||||
|
||||
/** 出口 3(正向杀):带页面门的每一支,那一行必须锚住<b>本页</b>的 key。 */
|
||||
@Test
|
||||
void eachWidenedPageDoorCarriesItsOwnMenuKey() throws IOException {
|
||||
for (Map.Entry<String, String> e : PAGE_DOOR_KEYS.entrySet()) {
|
||||
List<String> lines = executableLinesContaining(read(mainSource(e.getKey())), "requireConsolePageAccess");
|
||||
assertThat(lines)
|
||||
.as(e.getKey() + " 必须真的调页面门")
|
||||
.isNotEmpty();
|
||||
assertThat(lines)
|
||||
.as(e.getKey() + " 的页面门必须判本页的 key(写成别的 key = 这页对普通账号永远 403)")
|
||||
.anyMatch(line -> line.contains("\"" + e.getValue() + "\""));
|
||||
}
|
||||
}
|
||||
|
||||
/** 出口 3 的另一半:有入口门却没有页面门的,只能是需要逐个登记的豁免,不得是"忘了加"。 */
|
||||
@Test
|
||||
void controllersWithoutAPageDoorAreRegisteredExemptions() throws IOException {
|
||||
List<String> missing = new ArrayList<>();
|
||||
for (String rel : ENTRY_DOOR_CONTROLLERS) {
|
||||
String source = read(mainSource(rel));
|
||||
if (executableLinesContaining(source, "requireConsolePageAccess").isEmpty()) {
|
||||
missing.add(rel);
|
||||
}
|
||||
}
|
||||
assertThat(missing)
|
||||
.as("未登记:有入口门、没有页面门、豁免表里也没有它")
|
||||
.containsExactlyInAnyOrderElementsOf(NO_PAGE_DOOR_EXEMPTIONS.keySet());
|
||||
|
||||
for (Map.Entry<String, String> e : NO_PAGE_DOOR_EXEMPTIONS.entrySet()) {
|
||||
String source = read(mainSource(e.getKey()));
|
||||
String witness = e.getValue();
|
||||
List<String> lines = executableLinesContaining(source, witness);
|
||||
assertThat(lines)
|
||||
.as(e.getKey() + " 的豁免理由(" + witness + ")必须真的在代码里,而不是只在注释里")
|
||||
.isNotEmpty();
|
||||
}
|
||||
}
|
||||
|
||||
/** 页面门与入口门都不得被"先判管理员角色"抢跑,否则下面的授权判定变死代码。 */
|
||||
@Test
|
||||
void serviceDoorsJudgeByGrantNotByRole() throws IOException {
|
||||
String service = read(mainSource("modules/permission/service/PermissionMenuService.java"));
|
||||
|
||||
String shopData = methodSlice(service, "public void requireShopDataCrawlTaskAccess(");
|
||||
assertThat(shopData).as("切片必须截到方法体,否则下面的" +
|
||||
" doesNotContain 会因为切到空串而恒绿").contains("无权查看店铺数据任务");
|
||||
assertThat(shopData).doesNotContain("ensureAdminOperatorIfPresent");
|
||||
assertThat(shopData).contains("hasEffectiveColumnPermission");
|
||||
|
||||
String taskCenter = methodSlice(service, "public void requireClientTaskCenterAccess(");
|
||||
assertThat(taskCenter).contains("无权查看客户端任务管理");
|
||||
assertThat(taskCenter).doesNotContain("ensureAdminOperatorIfPresent");
|
||||
assertThat(taskCenter).contains("hasEffectiveColumnPermission");
|
||||
|
||||
String pageDoor = methodSlice(service, "public void requireConsolePageAccess(");
|
||||
assertThat(pageDoor).contains("hasAnyAdminMenu");
|
||||
// 页面门对管理员角色链恒放行(不改存量行为),普通账号才落到授权判定
|
||||
assertThat(pageDoor).contains("isAdmin(operator)");
|
||||
|
||||
// 同一文件里 ensureAdminOperatorIfPresent 仍在别处使用 ⇒ 上面的"不再出现"是真的切片判定,
|
||||
// 不是有人把这个方法整个删掉后两不找
|
||||
assertThat(executableLinesContaining(service, "ensureAdminOperatorIfPresent(")).isNotEmpty();
|
||||
}
|
||||
|
||||
/** 入口探针必须是标量 COUNT:单列投影在鉴权链路上出过一次全站 500。 */
|
||||
@Test
|
||||
void entryGrantProbeStaysAScalarCount() throws IOException {
|
||||
String mapper = read(mainSource("common/mapper/AdminUserMapper.java"));
|
||||
int at = mapper.indexOf("Long countAdminMenuGrants(");
|
||||
assertThat(at).as("入口探针方法还在").isGreaterThan(0);
|
||||
String head = mapper.substring(Math.max(0, at - 400), at);
|
||||
assertThat(head).contains("SELECT COUNT(1)");
|
||||
assertThat(head).doesNotContain(".select(");
|
||||
// 探针必须仍限定本公司:否则别家公司的授权能给这条账号开门
|
||||
assertThat(head).contains("cm.company_id");
|
||||
assertThat(head).contains("ucp.user_id = #{userId}");
|
||||
assertThat(head).contains("cm.menu_type = 'admin'");
|
||||
assertThat(mapper.substring(at)).contains("@Param(\"companyId\")");
|
||||
}
|
||||
|
||||
/** 自检:扫描面与两个分母都必须是实打实的非空,且页面门/豁免恰好铺满入口门清单。 */
|
||||
@Test
|
||||
void scannedSurfaceIsNotEmptyAndRegistersEverySite() throws IOException {
|
||||
assertThat(allControllers()).as("一个控制器都没扫到 = 路径写错了,上面全是空转").isNotEmpty();
|
||||
assertThat(ENTRY_DOOR_CONTROLLERS).hasSize(13);
|
||||
assertThat(NO_PAGE_DOOR_EXEMPTIONS.keySet()).containsAll(
|
||||
ENTRY_DOOR_CONTROLLERS.stream()
|
||||
.filter(rel -> !PAGE_DOOR_KEYS.containsKey(rel))
|
||||
.collect(Collectors.toSet()));
|
||||
assertThat(PAGE_DOOR_KEYS).hasSize(6);
|
||||
// 管理类清单必须真能扫到 requireAdmin,否则"没有 requireConsoleOperator"是扫了个空文件
|
||||
for (String rel : ADMIN_ONLY_CONTROLLERS) {
|
||||
assertThat(executableLinesContaining(read(mainSource(rel)), "requireAdmin"))
|
||||
.as(rel + " 取样后仍要有可执行的 requireAdmin 调用").isNotEmpty();
|
||||
}
|
||||
}
|
||||
|
||||
// ---------- 取样 ----------
|
||||
|
||||
private static List<Path> allControllers() throws IOException {
|
||||
Path root = mainRoot().resolve("modules");
|
||||
try (Stream<Path> walk = Files.walk(root)) {
|
||||
return walk
|
||||
.filter(Files::isRegularFile)
|
||||
.filter(p -> p.getFileName().toString().endsWith("Controller.java"))
|
||||
.sorted()
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 可执行行:跳过注释行与 javadoc,避免"在注释里写了一句 requireAdmin"被当成锚点。
|
||||
* 同时把 {@code * } 开头的续行排除掉——本类的说明文字里有这些方法名。
|
||||
*/
|
||||
private static List<String> executableLinesContaining(String source, String needle) {
|
||||
return source.lines()
|
||||
.map(String::trim)
|
||||
.filter(line -> !line.startsWith("//") && !line.startsWith("*")
|
||||
&& !line.startsWith("/*") && !line.startsWith("*/"))
|
||||
.filter(line -> line.contains(needle))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
/** 从签名开始截到下一个同缩进的成员声明,取的就是那一支方法体(含其上方的注解)。 */
|
||||
private static String methodSlice(String source, String signature) {
|
||||
int start = source.indexOf(signature);
|
||||
if (start < 0) {
|
||||
fail("找不到 " + signature + " —— 方法被改名或这次改动没落进这个文件");
|
||||
}
|
||||
int next = source.indexOf("\n public ", start + signature.length());
|
||||
int nextPrivate = source.indexOf("\n private ", start + signature.length());
|
||||
int end = source.length();
|
||||
if (next >= 0) {
|
||||
end = Math.min(end, next);
|
||||
}
|
||||
if (nextPrivate >= 0) {
|
||||
end = Math.min(end, nextPrivate);
|
||||
}
|
||||
return source.substring(start, end);
|
||||
}
|
||||
|
||||
private static Path mainSource(String relative) {
|
||||
Path file = mainRoot().resolve(relative);
|
||||
if (!Files.isRegularFile(file)) {
|
||||
fail("找不到 " + file + " —— 用例依赖以 backend-java 为工作目录运行,别让扫描静默通过");
|
||||
}
|
||||
return file;
|
||||
}
|
||||
|
||||
private static String relative(Path file) {
|
||||
return mainRoot().relativize(file).toString().replace('\\', '/');
|
||||
}
|
||||
|
||||
private static Path mainRoot() {
|
||||
Path here = Path.of("").toAbsolutePath();
|
||||
Path direct = here.resolve("src/main/java/com/nanri/aiimage");
|
||||
if (Files.isDirectory(direct)) {
|
||||
return direct;
|
||||
}
|
||||
Path nested = here.resolve("backend-java").resolve("src/main/java/com/nanri/aiimage");
|
||||
if (Files.isDirectory(nested)) {
|
||||
return nested;
|
||||
}
|
||||
throw new IllegalStateException("无法定位 backend-java 源码目录(cwd=" + here + ")");
|
||||
}
|
||||
|
||||
private static String read(Path file) {
|
||||
try {
|
||||
return Files.readString(file, StandardCharsets.UTF_8);
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException("读取失败: " + file, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user