diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FlowController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FlowController.java index 09c1862..ad313dc 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FlowController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FlowController.java @@ -164,24 +164,50 @@ public class FlowController { private static final Set BUSINESS_EX_NAMES = Set.of( "ValidationException", "PrivilegeException", "SameCodeException"); + /** 透出消息的技术标记黑名单(命中即视为内部细节,不透出)。 */ + private static final String[] TECH_MARKERS = { + "exception", "sql", "grammar", "statementcallback", "java.", "com.dsasp", + "groovy", "class:", "nullpointer", " at "}; + /** - * 沿 cause 链找首个业务异常(保真层 com.dsasp.server.common.exception.*)的非空消息—— - * 这类消息是设计给最终用户看的(如「单号必填」/「无权限」/「编码重复」),可安全透出; + * 沿 cause 链找首个业务异常(保真层 com.dsasp.server.common.exception.*)的干净消息—— + * 这类消息设计给最终用户看(如「单号必填」/「无权限」/「编码重复」),可安全透出; * NPE/SQL/脚本等内部异常返回 null(由调用方兜泛化提示 + 记栈)。按 simpleName 匹配避免硬依赖。 + * + *

关键(QA dogfooding 发现):老引擎会把 SQL/脚本等内部异常也包进 ValidationException + * (消息含原始 SQL/堆栈/脚本细节),故仅按异常类型透出会泄露内部。叠加 {@link #isUserFacing} 内容过滤: + * 仅透出单行、短、无技术标记的消息,拦下「bad SQL grammar...」「错误的脚本\n\tkey...」之类。 */ static String businessMessage(Throwable t) { int guard = 0; while (t != null && guard++ < 20) { - String m = t.getMessage(); if (BUSINESS_EX_NAMES.contains(t.getClass().getSimpleName()) - && m != null && !m.isBlank()) { - return m.trim(); + && isUserFacing(t.getMessage())) { + return t.getMessage().trim(); } t = t.getCause(); } return null; } + /** 干净的面向用户消息:非空、单行、长度合理、无技术标记。 */ + static boolean isUserFacing(String m) { + if (m == null) { + return false; + } + String s = m.trim(); + if (s.isEmpty() || s.length() > 120 || s.indexOf('\n') >= 0 || s.indexOf('\t') >= 0) { + return false; + } + String low = s.toLowerCase(); + for (String marker : TECH_MARKERS) { + if (low.contains(marker)) { + return false; + } + } + return true; + } + /** * 把 amis crud 的字面分页参数 {@code page}/{@code perPage} 翻译成合成搜索流引擎 * ({@code POJOCRUDService.listSelect})认得的分页键 {@link POJOCRUDService#PAGE_START}/ diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/FlowControllerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/FlowControllerTest.java index 61386f0..1ecd10d 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/FlowControllerTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/FlowControllerTest.java @@ -645,6 +645,17 @@ class FlowControllerTest { assertNull(FlowController.businessMessage(new RuntimeException("错误的脚本。"))); assertNull(FlowController.businessMessage(new RuntimeException("bad SQL grammar [INSERT INTO SYS_X]"))); assertNull(FlowController.businessMessage(new RuntimeException("x", new IllegalStateException("y")))); + // QA dogfooding 关键:老引擎把 SQL/脚本异常也包进 ValidationException → 内容启发式过滤,不泄露内部 + assertNull(FlowController.businessMessage(new ValidationException( + "StatementCallback; bad SQL grammar [INSERT INTO SYS_CATEGORYUSER () VALUES ()]"))); + assertNull(FlowController.businessMessage(new ValidationException( + "错误的脚本。\n\tkey:65f7c564\n\tvalue: groovy.lang.MissingPropertyException: No such property"))); + assertNull(FlowController.businessMessage(new ValidationException( + "java.lang.NullPointerException: Cannot invoke method get_Value()"))); + // 干净的短业务提示仍透出 + assertEquals("单号必填", FlowController.businessMessage(new ValidationException("单号必填"))); + assertEquals("该记录已经被删除,请重新选择!", + FlowController.businessMessage(new ValidationException("该记录已经被删除,请重新选择!"))); } /** ADMIN 上下文桩(CURRENTUSER=ADMIN)。 */