picker: 用户选择走系统上下文(任何登录用户可选人)+ 兜 PrivilegeException
ceshi 等非 admin 受数据权限限制查用户视图抛 PrivilegeException→裸500。用户目录 picker(VIEW_SYS_USER)走 ADMIN 上下文绕过 per-user 数据权限(选收件人是基本操作); 非用户 picker 被拒→友好空响应非500。11+ 单测。 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -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<String, Object> 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<String, Object> result = pojoCRUDService.listSelect(cond, table, ctx);
|
||||
Map<String, Object> result;
|
||||
try {
|
||||
result = pojoCRUDService.listSelect(cond, table, ctx);
|
||||
} catch (PrivilegeException ex) {
|
||||
// 数据权限拒绝(如 per-user 上下文缺少某视图权限)→ 返回友好空响应,绝不吐裸 500。
|
||||
// 前端收到 status=0 + 空 options/items,选择窗显示无数据而非报错页面。
|
||||
Map<String, Object> empty = new HashMap<>();
|
||||
empty.put("items", List.of());
|
||||
empty.put("options", List.of());
|
||||
empty.put("total", 0L);
|
||||
Map<String, Object> degraded = new HashMap<>();
|
||||
degraded.put("status", 0);
|
||||
degraded.put("msg", "当前用户暂无该数据源的查询权限");
|
||||
degraded.put("data", empty);
|
||||
return degraded;
|
||||
}
|
||||
|
||||
List<Map<String, Object>> rows = toRows(result.get(POJOCRUDService.LIST_RESULT));
|
||||
List<Map<String, Object>> options = new ArrayList<>();
|
||||
@@ -387,6 +409,28 @@ public class PickerController {
|
||||
return UserSession.getAdmin();
|
||||
}
|
||||
|
||||
/**
|
||||
* 判定解析出的实体表名是否属于「用户/人员目录类」——此类实体的 picker 需走系统(ADMIN)上下文,
|
||||
* 使任何登录用户都能搜索收件人/经办人,而无需持有「用户视图数据访问权限」。
|
||||
*
|
||||
* <p>判定口径:表名命中已知用户目录实体白名单(全大写精确匹配)。当前登记:
|
||||
* <ul>
|
||||
* <li>{@code VIEW_SYS_USER} — 主用户选择视图(老引擎「用户选择框」全部路由到此);</li>
|
||||
* </ul>
|
||||
* 扩展时直接在集合里追加表名,如 {@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<Map<String, Object>> toRows(Object listResult) {
|
||||
List<Map<String, Object>> rows = new ArrayList<>();
|
||||
|
||||
Reference in New Issue
Block a user