From b15acfa2f39b8b306b32f0537b5716a1b4e4f3aa Mon Sep 17 00:00:00 2001 From: zhengwr Date: Fri, 26 Jun 2026 08:08:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BF=9D=E7=9C=9F=E5=B1=82:?= =?UTF-8?q?=E6=94=B6=E5=8F=A3=E6=AE=8B=E7=95=992(=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E9=9B=86OOM)+=E6=AE=8B=E7=95=994(=E5=A4=9A=E5=80=BCIN=E5=88=97?= =?UTF-8?q?=E8=A1=A8),=E7=BB=AD=20feat/report-fidelity-security-hardening?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 残留2(结果集全量物化OOM):JatoolsConfig 给报表DB URL追加 pgjdbc maxResultBuffer(默认60p=最大堆60%, 可配)。引擎用TYPE_SCROLL_INSENSITIVE整集物化,无此上限时海量结果集可在产出前OOM;设此值则驱动层超限 抛PSQLException而非OOM。JDBC实证:同款scroll-insensitive查询over view_template(1516行/14.5MB), cap=null读全表;cap=100/10k/1m分别在对应字节数抛"Result set exceeded maxResultBuffer limit"。 - 残留4(多值IN列表被误拒):isSafeValue允许逗号——真实模板有 in (${WELFARECATEGORYID})/in (${SCHEMEITEM}) 多值列表。逗号安全:UNION/子查询/注释/堆叠仍需空格/括号/引号/分号(均被拒),逗号单独无法构成注入。 live:?WELFARECATEGORYID=1,2,3 渲染200(不再400)。 验证:73单测全绿(TDD,+4);live(8095默认60p正常render=200;8096 cap注入URL实证;逗号IN列表=200); maxResultBuffer机制经独立JDBC探针在同一scroll-insensitive代码路径上证实超限即抛。 Co-Authored-By: Claude Opus 4.8 (1M context) --- .../eip4/platform/report/JatoolsConfig.java | 30 +++++++++++++++++-- .../platform/report/ReportParamGuard.java | 8 +++-- .../platform/report/JatoolsConfigUrlTest.java | 29 ++++++++++++++++++ .../platform/report/ReportParamGuardTest.java | 11 ++++++- 4 files changed, 73 insertions(+), 5 deletions(-) diff --git a/platform-report/src/main/java/com/eip4/platform/report/JatoolsConfig.java b/platform-report/src/main/java/com/eip4/platform/report/JatoolsConfig.java index fa539ef..90ece83 100644 --- a/platform-report/src/main/java/com/eip4/platform/report/JatoolsConfig.java +++ b/platform-report/src/main/java/com/eip4/platform/report/JatoolsConfig.java @@ -61,6 +61,13 @@ public class JatoolsConfig { @Value("${eip4.report.db.socket-timeout-sec:35}") private int socketTimeoutSec; + /** + * 报表查询的驱动结果集缓冲上限(pgjdbc maxResultBuffer,如 {@code 60p}=最大堆 60% / {@code 256m};空=不设)。 + * 引擎用 TYPE_SCROLL_INSENSITIVE 整集物化,无此上限时海量结果集可在产出前 OOM;设此值则超限抛异常而非 OOM。 + */ + @Value("${eip4.report.db.max-result-buffer:60p}") + private String maxResultBuffer; + /** * PDF 导出兜底字体(CJK 保真)候选路径,按序探测,取首个可加载者注册为 * iText {@code DefaultFontMapper.defaultFont}。覆盖 macOS(本地验证)与常见 Linux 路径。 @@ -96,8 +103,11 @@ public class JatoolsConfig { p.setProperty("font.dirs", "/System/Library/Fonts;/Library/Fonts;" + "/usr/share/fonts;/usr/share/fonts/truetype;/usr/local/share/fonts"); - // 报表模板 解析到 EIP4 数据源(URL 追加 statement_timeout/socketTimeout 超时加固) - String hardenedUrl = appendPgTimeouts(jdbcUrl == null ? "" : jdbcUrl, statementTimeoutMs, socketTimeoutSec); + // 报表模板 解析到 EIP4 数据源:追加 statement_timeout/socketTimeout 超时加固 + // + maxResultBuffer 结果集缓冲上限(防全量物化 OOM) + String hardenedUrl = appendPgResultBufferCap( + appendPgTimeouts(jdbcUrl == null ? "" : jdbcUrl, statementTimeoutMs, socketTimeoutSec), + maxResultBuffer); p.setProperty("DBJdbcUrl", hardenedUrl); p.setProperty("DBUser", dbUser == null ? "" : dbUser); p.setProperty("DBPassword", dbPassword == null ? "" : dbPassword); @@ -158,6 +168,22 @@ public class JatoolsConfig { * 仅作用于 {@code jdbc:postgresql} URL;已含同名参数则不重复(幂等);非正值则跳过对应项; * null/空/非 PG URL 原样返回。 */ + /** + * 给 PostgreSQL JDBC URL 追加 pgjdbc {@code maxResultBuffer}(残留 2 收口):限制驱动为单条结果集 + * 缓冲的内存上限,超出即抛异常而非 OOM —— 对 jatools 引擎用的 {@code TYPE_SCROLL_INSENSITIVE} + * (客户端整集物化)尤为关键。值如 {@code 60p}(占最大堆 60%)或 {@code 256m}。仅作用于 + * {@code jdbc:postgresql} URL;空值/已含同参/非 PG URL 原样返回。 + */ + static String appendPgResultBufferCap(String url, String maxResultBuffer) { + if (url == null || url.isBlank() || !url.startsWith("jdbc:postgresql") + || maxResultBuffer == null || maxResultBuffer.isBlank() + || url.contains("maxResultBuffer=")) { + return url; + } + char sep = url.indexOf('?') >= 0 ? '&' : '?'; + return url + sep + "maxResultBuffer=" + maxResultBuffer.trim(); + } + static String appendPgTimeouts(String url, long statementTimeoutMs, int socketTimeoutSec) { if (url == null || url.isBlank() || !url.startsWith("jdbc:postgresql")) { return url; diff --git a/platform-report/src/main/java/com/eip4/platform/report/ReportParamGuard.java b/platform-report/src/main/java/com/eip4/platform/report/ReportParamGuard.java index 285a91b..cc6007e 100644 --- a/platform-report/src/main/java/com/eip4/platform/report/ReportParamGuard.java +++ b/platform-report/src/main/java/com/eip4/platform/report/ReportParamGuard.java @@ -48,8 +48,12 @@ public final class ReportParamGuard { private static final Pattern IDENT = Pattern.compile("[A-Za-z_][A-Za-z0-9_]*"); /** 多字符危险子串:行注释 {@code --}、类型转换 {@code ::}(白名单已排除其它注释/星号字符)。 */ private static final Pattern UNSAFE_SUBSTR = Pattern.compile("--|::"); - /** 除字母/数字(含 CJK)外允许的安全标点:ID/编码/日期所需。不含空格是挡住无引号注入的关键。 */ - private static final String EXTRA_SAFE_CHARS = "-_./:"; + /** + * 除字母/数字(含 CJK)外允许的安全标点:ID/编码/日期/多值 IN 列表所需。 + * 不含空格/括号/引号/等号是挡住无引号注入的关键;逗号安全(单独无法构成 + * UNION/子查询/注释/堆叠,后者均需空格/括号/引号/分号)。 + */ + private static final String EXTRA_SAFE_CHARS = "-_./:,"; /** * 从模板文本里抽出所有在 {@code ${...}} 宏内出现过的标识符 token(自校准白名单)。 diff --git a/platform-report/src/test/java/com/eip4/platform/report/JatoolsConfigUrlTest.java b/platform-report/src/test/java/com/eip4/platform/report/JatoolsConfigUrlTest.java index 2b13acb..60009b0 100644 --- a/platform-report/src/test/java/com/eip4/platform/report/JatoolsConfigUrlTest.java +++ b/platform-report/src/test/java/com/eip4/platform/report/JatoolsConfigUrlTest.java @@ -71,4 +71,33 @@ class JatoolsConfigUrlTest { assertEquals("", JatoolsConfig.appendPgTimeouts("", 5000, 30)); assertEquals(null, JatoolsConfig.appendPgTimeouts(null, 5000, 30)); } + + // ---- maxResultBuffer:驱动层结果集缓冲上限,把「全量物化 OOM」变成「超限即抛」(残留 2 收口) ---- + + @Test + void appends_max_result_buffer_with_existing_query() { + String url = JatoolsConfig.appendPgResultBufferCap( + "jdbc:postgresql://h/db?currentSchema=eip3", "60p"); + assertTrue(url.contains("currentSchema=eip3"), url); + assertTrue(url.contains("maxResultBuffer=60p"), url); + assertFalse(url.contains("??"), url); + } + + @Test + void appends_max_result_buffer_with_question_mark_when_no_query() { + String url = JatoolsConfig.appendPgResultBufferCap("jdbc:postgresql://h/db", "256m"); + assertEquals("jdbc:postgresql://h/db?maxResultBuffer=256m", url); + } + + @Test + void max_result_buffer_blank_or_nonpg_unchanged_and_idempotent() { + assertEquals("jdbc:postgresql://h/db", + JatoolsConfig.appendPgResultBufferCap("jdbc:postgresql://h/db", "")); + assertEquals("jdbc:postgresql://h/db", + JatoolsConfig.appendPgResultBufferCap("jdbc:postgresql://h/db", null)); + assertEquals("jdbc:oracle:thin:@h", + JatoolsConfig.appendPgResultBufferCap("jdbc:oracle:thin:@h", "60p")); + String once = JatoolsConfig.appendPgResultBufferCap("jdbc:postgresql://h/db", "60p"); + assertEquals(once, JatoolsConfig.appendPgResultBufferCap(once, "60p")); // 幂等 + } } diff --git a/platform-report/src/test/java/com/eip4/platform/report/ReportParamGuardTest.java b/platform-report/src/test/java/com/eip4/platform/report/ReportParamGuardTest.java index e41be61..41fd2d5 100644 --- a/platform-report/src/test/java/com/eip4/platform/report/ReportParamGuardTest.java +++ b/platform-report/src/test/java/com/eip4/platform/report/ReportParamGuardTest.java @@ -79,7 +79,16 @@ class ReportParamGuardTest { assertFalse(ReportParamGuard.isSafeValue("1=1")); // 等号 assertFalse(ReportParamGuard.isSafeValue("a b")); // 空格 assertFalse(ReportParamGuard.isSafeValue("f(x)")); // 括号 - assertFalse(ReportParamGuard.isSafeValue("a,b")); // 逗号 + } + + @Test + void isSafeValue_allows_comma_lists_for_in_clause() { + // 真实模板存在 in (${WELFARECATEGORYID})/in (${SCHEMEITEM}) 多值 IN 列表,需允许逗号。 + // 逗号本身无法构成注入:UNION/子查询/注释/堆叠仍需空格/括号/引号/分号(均被拒)。 + assertTrue(ReportParamGuard.isSafeValue("1,2,3")); + assertTrue(ReportParamGuard.isSafeValue("a1b2,c3d4,e5f6")); + assertFalse(ReportParamGuard.isSafeValue("1, 2")); // 逗号+空格仍拒 + assertFalse(ReportParamGuard.isSafeValue("1,(2)")); // 逗号+括号仍拒 } @Test