From 3090906f9eb6117ea1c7853a412873018e5f2726 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 25 Jun 2026 22:19:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(report):=20/api/report/frame=20?= =?UTF-8?q?=E7=AB=AF=E7=82=B9=20+=20Phase=202/3=20=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=99=A8=E8=AE=BE=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 报表查看器数据源端点 GET /api/report/frame/{templateId}:回显 amis CRUD 单行信封 {status:0,data:{items:[{__url}],total:1}},__url=/api/report/render/{id}?format=html&<查询参数>。 报表页是 amis crud——查询条件落 crud.filter(实测唯一能让 picker 正常加载选项的上下文; 独立 form 里 picker 弹窗恒空),单 html 列把 __url 渲成 "); + List> cols = new ArrayList<>(); + cols.add(col); + crud.put("columns", cols); + + result.note("report 含 JOR 套打版式(" + jorLen + " 字符) → 报表查看器:crud.filter 查询条件 + html 列 iframe 加载 " + + "/api/report/render/" + tid + "(jatools 引擎渲染保真版式;图表 ischart 亦由引擎 jfreechart 出图)"); + noteScripts(report, result); + return page(title, crud); + } + // ────────────────────────────────────────────────────────────────────── // group(分组容器)—— 子模板跨引用 // ────────────────────────────────────────────────────────────────────── diff --git a/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java b/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java index 7a1dcf7..95d419c 100644 --- a/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java +++ b/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java @@ -2705,14 +2705,70 @@ class TemplateToAmisConverterTest { } @Test - void report_jor套打版式降级() { + @SuppressWarnings("unchecked") + void report_含JOR套打版式_改产报表查看器crud() { + // Phase 3:含 JOR 套打版式 → 报表查看器(jatools 引擎渲染保真版式), + // 不再降级成 amis 表格。crud.api 指向 /api/report/frame,单个 html 列把 __url 渲成 iframe。 String xml = "" + "" + "" + "非空版式定义内容占位非空版式]]>"; ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage); - assertEquals(ConversionGrade.PARTIAL, r.getGrade()); - assertTrue(r.getDegrades().stream().anyMatch(d -> d.contains("JOR"))); + Map crud = body(r.getSchema()); + assertEquals("crud", crud.get("type")); + assertTrue(((String) crud.get("api")).startsWith("/api/report/frame/"), "api=" + crud.get("api")); + List> cols = (List>) crud.get("columns"); + assertEquals(1, cols.size(), "报表查看器只有一个 html 列"); + assertEquals("html", cols.get(0).get("type")); + String html = (String) cols.get(0).get("html"); + assertTrue(html.contains(" d.contains("不迁移引擎")), + "JOR 应被引擎渲染而非降级: " + r.getDegrades()); + } + + @Test + @SuppressWarnings("unchecked") + void report_查询条件picker落在crud_filter上下文() { + // 工程(SelectDialog) → picker,且必须落在 crud.filter(实测唯一能让 picker 正常加载选项的上下文)。 + // 有查询条件时 initFetch=false:等用户选条件并「查询」后再加载报表(避免必填空参渲染报错)。 + String xml = "" + + "" + + "" + + "" + + "" + + "版式占位非空版式占位]]>"; + ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage); + Map crud = body(r.getSchema()); + Map filter = (Map) crud.get("filter"); + assertNotNull(filter, "查询条件应落在 crud.filter"); + List> fbody = (List>) filter.get("body"); + Map projectField = fbody.stream() + .filter(f -> "PROJECTID".equals(f.get("name"))).findFirst().orElseThrow(); + assertEquals("picker", projectField.get("type"), "工程 SelectDialog 应转 picker"); + assertEquals(Boolean.FALSE, crud.get("initFetch"), "有查询条件时等用户查询再加载"); + } + + @Test + void report_templateId入查看器api() { + String xml = "" + + "" + + "版式占位非空版式占位]]>"; + ConversionResult r = converter.convertGraded(xml, "TID-123", "套打", new ArrayList<>(), noPage); + Map crud = body(r.getSchema()); + assertEquals("/api/report/frame/TID-123", crud.get("api")); + } + + @Test + void report_无reportfile_保留数据表降级() { + // 9/339 无 JOR 套打版式 → 保留原数据表行为(/api/flow 列实体行),不走查看器 + String xml = "" + + "" + + ""; + ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage); + Map crud = body(r.getSchema()); + assertTrue(((String) crud.get("api")).startsWith("/api/flow/PM_X_SEARCH"), "api=" + crud.get("api")); } @Test From 9a99754f72c8a1771755179d09738359b9b563ad Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 25 Jun 2026 22:19:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(auth):=20admin=20=E5=BC=95=E6=93=8E?= =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E6=96=87=E5=BD=92=E4=B8=80=E4=B8=BA=E8=A7=84?= =?UTF-8?q?=E8=8C=83=20ADMIN=20=E5=B8=B8=E9=87=8F(=E4=BF=AE=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=20picker=E3=80=8C=E6=9A=82=E6=97=A0=E6=9D=83=E9=99=90?= =?UTF-8?q?=E3=80=8D)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 工程 picker「选不到」的真因不是转换器/页面结构,而是认证 admin 的引擎身份未被识别成超管: JWT 注入 CURRENTUSER="ADMIN"(5 字符),而引擎跳过行级数据过滤的判定是 exact ctx.get(CURRENTUSER).equals(LoggedInUser.ADMIN)——该常量是 CHAR(36) 补白的 "ADMIN"+31 空格。 5 字符 ≠ 36 字符 → admin 被当普通用户走数据权限 → PM_PROJECT 无规则 → PrivilegeException → picker/列表「暂无该数据源的查询权限」。(无 token 的 curl 走 ADMIN 默认上下文,故易误判后端正常。) 修:EngineContextBinder.bind() 对系统管理员把 CURRENTUSER 归一为引擎规范 36 字符 LoggedInUser.ADMIN, 引擎识别超管→跳过行级过滤(恢复引擎本就设计的 ADMIN 豁免)。isSystemAdmin 与全站 requireAdmin 逐口径对齐:userId trim 后 equalsIgnoreCase "ADMIN";account trim 后精确小写 ='admin' (不放宽大小写——SYS_USER.ACCOUNT 无唯一约束、建号去重又区分大小写,防 'Admin' 变体账号静默提权, 安全评审 M-1)。各 requireAdmin 门控均 trim().equalsIgnoreCase,对补白形式同样判真,不破鉴权门。 非 admin 行为逐字节不变。 测试:4 个新用例(admin→36字符归一/USER_ADMINISTRATOR 不误判/account='Admin' 变体不提权/ account='admin' 精确小写识别);全 platform-auth 46 测试绿。 Co-Authored-By: Claude Opus 4.8 (1M context) --- .../auth/security/EngineContextBinder.java | 31 +++++++++- .../security/EngineContextIsolationTest.java | 58 +++++++++++++++++++ 2 files changed, 88 insertions(+), 1 deletion(-) 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})误判: + *
    + *
  • {@code userId}(引擎 CURRENTUSER 来源)去补白后 {@code equalsIgnoreCase "ADMIN"} + * (= {@code LoggedInUser.ADMIN.trim()})—— 同 requireAdmin 的 {@code "ADMIN".equalsIgnoreCase(cu)};
  • + *
  • {@code account} 去补白后大小写敏感等于 {@code "admin"} —— 同 requireAdmin 兜底的 + * DB 校验 {@code TRIM(account)='admin'}(精确小写)。不放宽成大小写不敏感,避免因 {@code SYS_USER.ACCOUNT} + * 无唯一约束、建号去重又区分大小写而把 {@code 'Admin'} 这类变体账号静默提权(安全评审 M-1)。
  • + *
+ */ + 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();