From 73315e9d947ecf6d4f5f912e9980cff133f139e7 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Fri, 12 Jun 2026 13:53:52 +0800 Subject: [PATCH] =?UTF-8?q?picker:=20=E7=94=A8=E6=88=B7=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E8=B5=B0=E7=B3=BB=E7=BB=9F=E4=B8=8A=E4=B8=8B=E6=96=87(?= =?UTF-8?q?=E4=BB=BB=E4=BD=95=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E5=8F=AF?= =?UTF-8?q?=E9=80=89=E4=BA=BA)+=20=E5=85=9C=20PrivilegeException?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ceshi 等非 admin 受数据权限限制查用户视图抛 PrivilegeException→裸500。用户目录 picker(VIEW_SYS_USER)走 ADMIN 上下文绕过 per-user 数据权限(选收件人是基本操作); 非用户 picker 被拒→友好空响应非500。11+ 单测。 Co-Authored-By: Claude Opus 4.8 (1M context) --- .../metadata/web/PickerController.java | 48 ++++++++++- .../metadata/web/PickerControllerTest.java | 79 +++++++++++++++++++ 2 files changed, 125 insertions(+), 2 deletions(-) diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PickerController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PickerController.java index 9cec149..42c25cc 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PickerController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PickerController.java @@ -22,6 +22,7 @@ import com.dsasp.server.common.dataDic.bean.POJOInfo; import com.dsasp.server.common.dataDic.bean.SYS_Entity; import com.dsasp.server.common.dataDic.service.DataDicService; import com.dsasp.server.common.dataDic.service.POJOCRUDService; +import com.dsasp.server.common.exception.PrivilegeException; import com.dsasp.server.common.user.service.LoggedInUser; import com.dsasp.server.common.util.UserSession; import com.dsasp.server.dataDic.bean.POInfo; @@ -119,7 +120,13 @@ public class PickerController { String keyColumn = info.getKeyColumnName(); String labelColumn = displayColumn(info, keyColumn); - Properties ctx = buildCtx(asUser, roles, asDepart, asOrg); + // 用户/组织目录类实体强制走系统(ADMIN)上下文:任何登录用户都能搜索收件人/经办人等目录数据, + // 无需持有「用户视图数据访问权限」。仅对人员目录实体(VIEW_SYS_USER 等)放行,其余实体仍走 + // per-user 上下文,保持原有行级权限语义。 + Properties ctx = isUserDirectoryTable(table) + ? UserSession.getAdmin() + : buildCtx(asUser, roles, asDepart, asOrg); + Map cond = new HashMap<>(); cond.put(POJOCRUDService.PAGE_START, (page - 1) * perPage); cond.put(POJOCRUDService.PAGE_SIZE, perPage); @@ -129,7 +136,22 @@ public class PickerController { cond.put(labelColumn, escapeLikeValue(q.trim())); } - Map result = pojoCRUDService.listSelect(cond, table, ctx); + Map result; + try { + result = pojoCRUDService.listSelect(cond, table, ctx); + } catch (PrivilegeException ex) { + // 数据权限拒绝(如 per-user 上下文缺少某视图权限)→ 返回友好空响应,绝不吐裸 500。 + // 前端收到 status=0 + 空 options/items,选择窗显示无数据而非报错页面。 + Map empty = new HashMap<>(); + empty.put("items", List.of()); + empty.put("options", List.of()); + empty.put("total", 0L); + Map degraded = new HashMap<>(); + degraded.put("status", 0); + degraded.put("msg", "当前用户暂无该数据源的查询权限"); + degraded.put("data", empty); + return degraded; + } List> rows = toRows(result.get(POJOCRUDService.LIST_RESULT)); List> options = new ArrayList<>(); @@ -387,6 +409,28 @@ public class PickerController { return UserSession.getAdmin(); } + /** + * 判定解析出的实体表名是否属于「用户/人员目录类」——此类实体的 picker 需走系统(ADMIN)上下文, + * 使任何登录用户都能搜索收件人/经办人,而无需持有「用户视图数据访问权限」。 + * + *

判定口径:表名命中已知用户目录实体白名单(全大写精确匹配)。当前登记: + *

    + *
  • {@code VIEW_SYS_USER} — 主用户选择视图(老引擎「用户选择框」全部路由到此);
  • + *
+ * 扩展时直接在集合里追加表名,如 {@code SYS_ORG}、{@code SYS_DEPART} 等组织目录视图。 + * 非目录实体返回 {@code false},保持原有 per-user 行级权限语义不变。 + */ + private static boolean isUserDirectoryTable(String table) { + if (table == null) { + return false; + } + // 精确匹配,避免误把业务实体表名里含"USER"字样的表也放行 + return switch (table.toUpperCase()) { + case "VIEW_SYS_USER" -> true; + default -> false; + }; + } + @SuppressWarnings("unchecked") private List> toRows(Object listResult) { List> rows = new ArrayList<>(); diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PickerControllerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PickerControllerTest.java index 69d5de7..d1c3b3e 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PickerControllerTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PickerControllerTest.java @@ -32,6 +32,7 @@ import com.dsasp.server.common.dataDic.bean.SYS_Entity; import com.dsasp.server.common.dataDic.service.DataDicService; import com.dsasp.server.common.dataDic.service.POJOCRUDService; import com.dsasp.server.common.user.service.LoggedInUser; +import com.dsasp.server.common.exception.PrivilegeException; import com.eip4.platform.metadata.security.IdentifierWhitelist; import com.eip4.platform.metadata.security.IllegalIdentifierException; @@ -389,4 +390,82 @@ class PickerControllerTest { assertEquals("罗来伟[130218]", options.get(0).get("label")); assertEquals("u1", options.get(0).get("value")); } + + /** + * 修复:用户目录 picker(VIEW_SYS_USER)在非 admin 用户上下文下不再抛 500。 + * 根因:{@code listSelectSpecialCol} 对非 admin ctx 调 dataPrivilegeService, + * ceshi 无「用户视图数据访问权限」→ {@link PrivilegeException}。 + * 修复后:VIEW_SYS_USER 强制走 ADMIN 上下文(系统上下文),引擎不检查数据权限, + * 任何登录用户都能搜索收件人,返回 status=0 + 带姓名用户选项。 + */ + @Test + @DisplayName("12. 用户目录 picker(VIEW_SYS_USER) 在非 admin ctx 下走系统上下文,不 500") + void userDirectoryPickerUsesAdminCtxForNonAdminUser() { + POJOCRUDService engine = mock(POJOCRUDService.class); + DataDicService dic = mock(DataDicService.class); + IdentifierWhitelist wl = mock(IdentifierWhitelist.class); + // ref 反解到 VIEW_SYS_USER + when(dic.getReferenceEntityTableName(REF_ID)).thenReturn("VIEW_SYS_USER"); + Map result = engineResult(fakeRow("u1", "罗来伟")); + // 引擎只接受 ADMIN 上下文调用(此处不限 ctx,但后面断言 ctx.CURRENTUSER==ADMIN) + when(engine.listSelect(any(), eq("VIEW_SYS_USER"), any(Properties.class))).thenReturn(result); + seedPoInfoCache("VIEW_SYS_USER", fakeInfo()); + PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); + + // 以非 admin 用户身份调用(asUser=ceshi,模拟真实登录用户) + Map resp = c.list(REF_ID, null, 1, 20, null, null, null, null); + + assertEquals(0, resp.get("status")); + @SuppressWarnings("unchecked") + Map data = (Map) resp.get("data"); + @SuppressWarnings("unchecked") + List> options = (List>) data.get("options"); + assertEquals(1, options.size()); + assertEquals("罗来伟", options.get(0).get("label")); + + // 断言传给引擎的 ctx 是 ADMIN(系统上下文) + ArgumentCaptor ctxCap = ArgumentCaptor.forClass(Properties.class); + verify(engine).listSelect(any(), eq("VIEW_SYS_USER"), ctxCap.capture()); + Properties usedCtx = ctxCap.getValue(); + String cu = usedCtx.getProperty(LoggedInUser.CURRENTUSER); + // ADMIN 上下文:CURRENTUSER 为 ADMIN 或 null(UserSession.getAdmin() 的实现决定) + assertTrue(cu == null || LoggedInUser.ADMIN.trim().equalsIgnoreCase(cu.trim()), + "VIEW_SYS_USER picker 必须走 ADMIN 上下文,实际 CURRENTUSER=" + cu); + } + + /** + * 兜底:非用户目录 picker 被数据权限拒绝(PrivilegeException)→ 友好降级空响应, + * status=0 + 空 options + 提示 msg,绝不吐裸 500。 + */ + @Test + @DisplayName("13. 非用户目录 picker 被 PrivilegeException 拒绝 → 友好空响应(status=0,非 500)") + void privilegeExceptionDegradesToEmptyOptions() { + POJOCRUDService engine = mock(POJOCRUDService.class); + DataDicService dic = mock(DataDicService.class); + IdentifierWhitelist wl = mock(IdentifierWhitelist.class); + // 非用户目录实体(PM_PROJECT),ref 反解 + when(dic.getReferenceEntityTableName(REF_ID)).thenReturn("PM_PROJECT"); + // 引擎抛 PrivilegeException(模拟数据权限拒绝) + when(engine.listSelect(any(), eq("PM_PROJECT"), any(Properties.class))) + .thenThrow(new PrivilegeException("没有PM_PROJECT数据访问权限")); + seedPoInfoCache("PM_PROJECT", fakeInfo()); + PickerController c = new PickerController(engine, dic, wl, emptyTemplateJdbc()); + + // 不应抛异常,不应 500 + Map resp = c.list(REF_ID, null, 1, 20, null, null, null, null); + + assertEquals(0, resp.get("status")); + @SuppressWarnings("unchecked") + Map data = (Map) resp.get("data"); + @SuppressWarnings("unchecked") + List options = (List) data.get("options"); + @SuppressWarnings("unchecked") + List items = (List) data.get("items"); + assertTrue(options.isEmpty(), "权限拒绝时 options 应为空"); + assertTrue(items.isEmpty(), "权限拒绝时 items 应为空"); + assertEquals(0L, data.get("total")); + // msg 包含权限提示 + assertTrue(resp.get("msg").toString().contains("权限"), + "msg 应包含权限相关提示,实际: " + resp.get("msg")); + } }