diff --git a/platform-auth/src/main/java/com/eip4/platform/auth/security/EngineContextBinder.java b/platform-auth/src/main/java/com/eip4/platform/auth/security/EngineContextBinder.java index b50a0b6..3e7e1e0 100644 --- a/platform-auth/src/main/java/com/eip4/platform/auth/security/EngineContextBinder.java +++ b/platform-auth/src/main/java/com/eip4/platform/auth/security/EngineContextBinder.java @@ -32,7 +32,14 @@ public final class EngineContextBinder { */ public static void bind(AuthPrincipal principal) { Properties ctx = new Properties(); - if (principal.userId() != null) { + if (isSystemAdmin(principal)) { + // 系统管理员:CURRENTUSER 归一为引擎规范的 CHAR(36) 补白 ADMIN 常量。 + // 引擎跳过行级数据过滤的判定是 exact-equals:ctx.get(CURRENTUSER).equals(LoggedInUser.ADMIN) + // (POJOCRUDServiceImpl#114/377)。JWT 注入的 userId="ADMIN"(5字符) 与 36字符补白常量不相等, + // 会令 admin 被当普通用户走数据权限 → picker/列表「暂无该数据源的查询权限」。归一后引擎识别超管。 + // 各 requireAdmin 门控均 trim().equalsIgnoreCase 比较,对补白形式同样判真,故不影响管理员鉴权门。 + ctx.setProperty(LoggedInUser.CURRENTUSER, LoggedInUser.ADMIN); + } else if (principal.userId() != null) { ctx.setProperty(LoggedInUser.CURRENTUSER, principal.userId()); } if (principal.depart() != null) { @@ -46,6 +53,28 @@ public final class EngineContextBinder { UserSession.set(ctx); } + /** + * 系统管理员判定,与全站 {@code requireAdmin}({@code PageSchemaController/AdminWriteController/ + * AiAgentController/AdminUserController})逐口径对齐,绝不把含 "admin" 字样的普通用户 + * (如 {@code USER_ADMINISTRATOR})误判: + * + */ + private static boolean isSystemAdmin(AuthPrincipal principal) { + String adminId = LoggedInUser.ADMIN.trim(); // "ADMIN" + String userId = principal.userId(); + if (userId != null && adminId.equalsIgnoreCase(userId.trim())) { + return true; + } + String account = principal.account(); + return account != null && "admin".equals(account.trim()); + } + /** 清空当前线程的引擎上下文(请求收尾,防跨请求泄漏)。 */ public static void clear() { UserSession.remove(); diff --git a/platform-auth/src/test/java/com/eip4/platform/auth/security/EngineContextIsolationTest.java b/platform-auth/src/test/java/com/eip4/platform/auth/security/EngineContextIsolationTest.java index 5a9b32c..fdd4abb 100644 --- a/platform-auth/src/test/java/com/eip4/platform/auth/security/EngineContextIsolationTest.java +++ b/platform-auth/src/test/java/com/eip4/platform/auth/security/EngineContextIsolationTest.java @@ -1,6 +1,7 @@ package com.eip4.platform.auth.security; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.anyString; @@ -77,6 +78,63 @@ class EngineContextIsolationTest { assertNull(UserSession.get(), "clear 后引擎上下文必须为空,杜绝跨请求泄漏"); } + @Test + void 系统管理员归一为引擎规范ADMIN常量() { + // 根因修:JWT 注入的 admin userId="ADMIN"(5字符) 与引擎 LoggedInUser.ADMIN(CHAR(36) 补白 36字符) + // exact-equals 不相等 → admin 被当普通用户走行级数据过滤 → picker/列表「暂无该数据源的查询权限」。 + // bind 须把系统管理员的 CURRENTUSER 归一成引擎规范的 36 字符补白常量,使引擎识别超管、跳过过滤。 + AuthPrincipal admin = new AuthPrincipal("ADMIN", "admin", "系统管理员", + "DEPT_ADMIN", "ORG_ROOT", List.of()); + EngineContextBinder.bind(admin); + + Properties ctx = UserSession.get(); + // 与引擎 exact-equals 口径一致:必须等于 36 字符补白常量本身(这是引擎跳过行级过滤的判定) + assertEquals(LoggedInUser.ADMIN, ctx.getProperty(LoggedInUser.CURRENTUSER), + "admin 的 CURRENTUSER 必须归一为引擎规范 ADMIN 常量"); + // depart/org 仍来自 principal(不丢身份维度) + assertEquals("DEPT_ADMIN", ctx.getProperty(LoggedInUser.CURRENTDEPART)); + assertEquals("ORG_ROOT", ctx.getProperty(LoggedInUser.CURRENTORG)); + } + + @Test + void 普通用户不被误判为超管不归一() { + // 安全护栏:userId 含 admin 字样但非系统管理员,绝不能被归一成 ADMIN(否则越权拿超管数据权限)。 + AuthPrincipal regular = new AuthPrincipal("USER_ADMINISTRATOR", "administrator", "张三", + "DEPT_A", "ORG_1", List.of("ROLE_CUSTOMER")); + EngineContextBinder.bind(regular); + + Properties ctx = UserSession.get(); + assertEquals("USER_ADMINISTRATOR", ctx.getProperty(LoggedInUser.CURRENTUSER), + "普通用户 CURRENTUSER 必须原样,不得归一为 ADMIN"); + assertNotEquals(LoggedInUser.ADMIN, ctx.getProperty(LoggedInUser.CURRENTUSER), + "普通用户绝不能被引擎判定为超管"); + } + + @Test + void account大小写变体不被误判为超管() { + // 安全评审 M-1:account 判定大小写敏感(同 requireAdmin 的 TRIM(account)='admin')。 + // SYS_USER.ACCOUNT 无唯一约束、建号去重区分大小写 → 'Admin' 这类变体账号绝不能静默提权成超管。 + AuthPrincipal variant = new AuthPrincipal("402881-some-uuid", "Admin", "李四", + "DEPT_B", "ORG_2", List.of("ROLE_CUSTOMER")); + EngineContextBinder.bind(variant); + + Properties ctx = UserSession.get(); + assertEquals("402881-some-uuid", ctx.getProperty(LoggedInUser.CURRENTUSER), + "account='Admin'(变体) 不得归一为 ADMIN"); + assertNotEquals(LoggedInUser.ADMIN, ctx.getProperty(LoggedInUser.CURRENTUSER)); + } + + @Test + void account为小写admin识别为超管() { + // userId 非 ADMIN 但 account='admin'(精确小写)→ 仍归一为超管,与 requireAdmin 账号兜底一致。 + AuthPrincipal byAccount = new AuthPrincipal("402881-uuid-x", "admin", "系统管理员", + null, null, List.of()); + EngineContextBinder.bind(byAccount); + + assertEquals(LoggedInUser.ADMIN, UserSession.get().getProperty(LoggedInUser.CURRENTUSER), + "account='admin'(精确小写) 应识别为超管并归一"); + } + @Test void 过滤器请求收尾后清空上下文() throws Exception { JwtService svc = jwtService();