From 0106088084587dc0030bfcebf736d0c27be10246 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 24 Jun 2026 10:36:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(stability):=20perPage=20=E5=B0=81=E9=A1=B6?= =?UTF-8?q?=20+=20statement=5Ftimeout=20+=20=E8=BF=9E=E6=8E=A5=E6=B1=A0=20?= =?UTF-8?q?5=E2=86=9220?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 防 perPage=999999 一次物化全表致 OOM/连接耗尽: - Pagination.clampPerPage(上限 5000,安全护栏非产品限),接入 FlowController/PickerController 两 REST 入口(page 不封) - application.yml 加 hikari.connection-init-sql=SET statement_timeout='${EIP4_DB_STATEMENT_TIMEOUT:120s}'(dev/local/prod 继承 base,可覆盖/设0关闭) - maximum-pool-size 5→20(prod 无 profile 继承 base 受益) 验证:68/68 绿(PaginationTest+经真实 executeGet 集成+无回归);statement_timeout 经真实 PG SHOW=2min。见总览 §10.2。 Co-Authored-By: Claude Opus 4.8 (1M context) --- .../src/main/resources/application.yml | 8 ++++- .../platform/metadata/web/FlowController.java | 3 +- .../platform/metadata/web/Pagination.java | 25 ++++++++++++++ .../metadata/web/PickerController.java | 6 ++-- .../metadata/web/FlowControllerTest.java | 20 +++++++++++ .../platform/metadata/web/PaginationTest.java | 33 +++++++++++++++++++ 6 files changed, 91 insertions(+), 4 deletions(-) create mode 100644 platform-metadata/src/main/java/com/eip4/platform/metadata/web/Pagination.java create mode 100644 platform-metadata/src/test/java/com/eip4/platform/metadata/web/PaginationTest.java diff --git a/platform-app/src/main/resources/application.yml b/platform-app/src/main/resources/application.yml index a7715f2..842a3cc 100644 --- a/platform-app/src/main/resources/application.yml +++ b/platform-app/src/main/resources/application.yml @@ -10,9 +10,15 @@ spring: username: ceshi password: ceshi hikari: - maximum-pool-size: 5 + # 基础默认池(总览 §10.2)。default/prod profile 无独立 yml 时继承本值; + # dev/local 各自覆盖为更小值。生产高负载可经独立 prod profile 或环境进一步上调。 + maximum-pool-size: 20 # PoC 阶段对共享测试库默认只读,对拍写操作需显式改 false read-only: false + # 慢查询熔断(总览 §10.2):杀死单条运行超时的 SQL,防失控/恶意查询(如超大 perPage 全表扫) + # 长期占用连接、与小池叠加拖垮实例。会话级,随连接复用持续生效;dev/local 继承本项。 + # 默认 120s 对 OLTP 足够宽,重报表/批量场景经环境变量放宽,设 0 关闭。 + connection-init-sql: "SET statement_timeout = '${EIP4_DB_STATEMENT_TIMEOUT:120s}'" server: port: 8084 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 1b43c0d..f358566 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 @@ -300,7 +300,8 @@ public class FlowController { return; } int page = parsePositiveInt(map.remove("page"), 1); - int perPage = parsePositiveInt(map.remove("perPage"), DEFAULT_PER_PAGE); + // perPage 封顶(总览 §10.2):防 perPage=999999 一次物化全表致 OOM/连接耗尽;page 不封(深翻页合法) + int perPage = Pagination.clampPerPage(parsePositiveInt(map.remove("perPage"), DEFAULT_PER_PAGE)); map.put(POJOCRUDService.PAGE_START, (page - 1) * perPage); map.put(POJOCRUDService.PAGE_SIZE, perPage); } diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/Pagination.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/Pagination.java new file mode 100644 index 0000000..62f6b5c --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/Pagination.java @@ -0,0 +1,25 @@ +package com.eip4.platform.metadata.web; + +/** + * 分页参数安全护栏(总览 §10.2 稳定性)。 + * + *

仅作「安全上限」用途——防止客户端传 {@code perPage=999999} 让引擎一次把全表物化进内存, + * 与小连接池叠加即可单请求耗尽连接 / OOM。这不是产品级分页上限: + * 交互式大数据集应走服务端搜索({@code q});超大导出应走流式通道(未来工作)。 + */ +final class Pagination { + + /** 每页条数硬上限:远超任何真实页大小(amis 默认 10 / picker 20),远低于 OOM 阈值。 */ + static final int MAX_PER_PAGE = 5000; + + private Pagination() { + } + + /** 把每页条数夹到 {@code [1, MAX_PER_PAGE]};用于所有 REST 分页入口。 */ + static int clampPerPage(int perPage) { + if (perPage > MAX_PER_PAGE) { + return MAX_PER_PAGE; + } + return Math.max(perPage, 1); + } +} 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 1a06b8c..d423527 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 @@ -174,8 +174,10 @@ public class PickerController { : buildCtx(asUser, roles, asDepart, asOrg); Map cond = new HashMap<>(); - cond.put(POJOCRUDService.PAGE_START, (page - 1) * perPage); - cond.put(POJOCRUDService.PAGE_SIZE, perPage); + // perPage 封顶(总览 §10.2):防客户端传超大 perPage 一次拉全表致 OOM/连接耗尽 + int safePerPage = Pagination.clampPerPage(perPage); + cond.put(POJOCRUDService.PAGE_START, (page - 1) * safePerPage); + cond.put(POJOCRUDService.PAGE_SIZE, safePerPage); // 模糊搜索:仅当有关键字且存在可读标识列时下推 LIKE。q 经转义后进引擎(引擎对 String 条件裸拼 // col like '%值%',转义单引号与 LIKE 通配符,杜绝注入与通配符逃逸)。标识列名本身来自元数据,天然合法。 if (q != null && !q.isBlank() && labelColumn != null) { 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 2aee45b..cf5ebcc 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 @@ -616,6 +616,26 @@ class FlowControllerTest { assertEquals("放假", sent.get("TITLE"), "其它 query 参数仍作过滤条件保留"); } + @Test + @DisplayName("14. perPage 超大封顶: 防一次拉全表致 OOM/连接耗尽(总览 §10.2)") + void clampsExcessivePerPage() { + String flowId = "PM_PROJECT_SEARCH"; + FlowExcuteService engine = mock(FlowExcuteService.class); + when(engine.excute(any(), any(), any())).thenReturn(new HashMap<>()); + FlowController controller = new FlowController(engine, resolverReturning(flowId, synthesized(flowId))); + + Map params = new HashMap<>(); + params.put("perPage", "999999"); // 恶意/失误的超大每页 + controller.executeGet(flowId, params); + + @SuppressWarnings("unchecked") + ArgumentCaptor> mapCap = ArgumentCaptor.forClass(Map.class); + org.mockito.Mockito.verify(engine).excute(mapCap.capture(), any(Properties.class), eq(flowId)); + Map sent = mapCap.getValue(); + assertEquals(Pagination.MAX_PER_PAGE, sent.get(POJOCRUDService.PAGE_SIZE), + "perPage 超上限应被夹到 MAX_PER_PAGE,不得原样下传引擎"); + } + @Test @DisplayName("13. 分页缺省: 只给 page,perPage 回落 amis 默认 10;page 缺省 1") void pagingDefaults() { diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PaginationTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PaginationTest.java new file mode 100644 index 0000000..26e9fb9 --- /dev/null +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PaginationTest.java @@ -0,0 +1,33 @@ +package com.eip4.platform.metadata.web; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +/** 分页护栏单测(总览 §10.2):封顶 perPage,挡住一次拉全表的 OOM/DoS 向量。 */ +class PaginationTest { + + @Test + @DisplayName("超大 perPage 夹到上限") + void clampsExcessive() { + assertEquals(Pagination.MAX_PER_PAGE, Pagination.clampPerPage(999999)); + assertEquals(Pagination.MAX_PER_PAGE, Pagination.clampPerPage(Integer.MAX_VALUE)); + assertEquals(Pagination.MAX_PER_PAGE, Pagination.clampPerPage(Pagination.MAX_PER_PAGE + 1)); + } + + @Test + @DisplayName("正常与边界值原样保留") + void keepsNormal() { + assertEquals(10, Pagination.clampPerPage(10)); + assertEquals(20, Pagination.clampPerPage(20)); + assertEquals(Pagination.MAX_PER_PAGE, Pagination.clampPerPage(Pagination.MAX_PER_PAGE)); + } + + @Test + @DisplayName("非正数夹到 1,避免 PAGE_SIZE<=0 的退化语义") + void clampsNonPositive() { + assertEquals(1, Pagination.clampPerPage(0)); + assertEquals(1, Pagination.clampPerPage(-1)); + } +}