From ffb2f042d0b5ed1497f7f22913714d4da2aa5458 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Fri, 26 Jun 2026 07:51:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BF=9D=E7=9C=9F=E5=B1=82?= =?UTF-8?q?=E5=AE=89=E5=85=A8/OOM=E6=94=B6=E5=8F=A3(platform-report):SQLi?= =?UTF-8?q?=E9=97=A8/IDOR=E6=8E=88=E6=9D=83/XXE/=E5=B9=B6=E5=8F=91?= =?UTF-8?q?=E5=AD=97=E8=8A=82=E8=B6=85=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 审计揪出真问题(jatools引擎预编译不可改,全在包装层收口): - SQL注入(Critical):${PARAM}经evalTemplate字符串拼接进SQL后prepareStatement执行(无占位符绑定) - IDOR:render/frame对templateId无对象级授权,任意已认证用户可渲染任意报表 - XXE:报表XML经裸DocumentBuilderFactory解析(外部实体/SSRF/OOB) - ?tpl任意本地文件读+路径穿越;RBAC旁路(固定DB账号);OOM链(结果集全量物化+无并发闸+无超时+产物多副本) 实现: - ReportParamGuard:模板${name}引用白名单 + isSafeValue字符白名单(拒空格挡无引号注入/拒--/::) + 身份数据域保留集{CURRENTUSER,CURRENTDEPART,CURRENTORG,USERID,DEPARTID,ORGID}剥客户端+服务端注入可信值 - ReportXmlGuard.hasDoctypeInBytes:字节级拒DOCTYPE(防BOM/UTF-16编码绕过) - ReportTplGuard + profile守卫:?tpl限定templates-dir内、仅.xml、仅旁路profile - ReportController.enforceReportAccess:菜单授权对象级鉴权(超管bypass/匿名跳过/认证态无身份fail-closed) - RenderConcurrencyLimiter(429)/LimitedByteArrayOutputStream(413)/JatoolsConfig注入statement_timeout+socketTimeout - 错误响应改通用文案(细节仅落日志) 验证:69单测全绿(TDD);真库live e2e全绿(数值注入=400/IDOR=403/合法render+PDF=200/forged USERID剥离); 对象授权SQL逐对实证;独立security-reviewer对抗复审揪修2真漏(无引号数值注入绕黑名单、身份注入护错变量名)。 残留(非本层可修):凭据外泄(模板${property("DBPassword")}同解析路径,需模板创作授权+DB只读账号); 结果集全量物化OOM根因在引擎;预编译jar高危CVE(log4j1.2.8/commons-collections3.0/bsh)。 Co-Authored-By: Claude Opus 4.8 (1M context) --- platform-report/pom.xml | 5 + .../eip4/platform/report/JatoolsConfig.java | 42 +++- .../report/LimitedByteArrayOutputStream.java | 35 +++ .../report/RenderConcurrencyLimiter.java | 42 ++++ .../platform/report/ReportBusyException.java | 19 ++ .../platform/report/ReportController.java | 238 ++++++++++++------ .../platform/report/ReportParamGuard.java | 142 +++++++++++ .../eip4/platform/report/ReportService.java | 29 ++- .../report/ReportSizeExceededException.java | 19 ++ .../report/ReportTemplateRepository.java | 24 ++ .../eip4/platform/report/ReportTplGuard.java | 41 +++ .../eip4/platform/report/ReportXmlGuard.java | 99 ++++++++ .../platform/report/JatoolsConfigUrlTest.java | 74 ++++++ .../LimitedByteArrayOutputStreamTest.java | 52 ++++ .../report/RenderConcurrencyLimiterTest.java | 42 ++++ .../platform/report/ReportParamGuardTest.java | 195 ++++++++++++++ .../platform/report/ReportTplGuardTest.java | 70 ++++++ .../platform/report/ReportXmlGuardTest.java | 108 ++++++++ 18 files changed, 1195 insertions(+), 81 deletions(-) create mode 100644 platform-report/src/main/java/com/eip4/platform/report/LimitedByteArrayOutputStream.java create mode 100644 platform-report/src/main/java/com/eip4/platform/report/RenderConcurrencyLimiter.java create mode 100644 platform-report/src/main/java/com/eip4/platform/report/ReportBusyException.java create mode 100644 platform-report/src/main/java/com/eip4/platform/report/ReportParamGuard.java create mode 100644 platform-report/src/main/java/com/eip4/platform/report/ReportSizeExceededException.java create mode 100644 platform-report/src/main/java/com/eip4/platform/report/ReportTplGuard.java create mode 100644 platform-report/src/main/java/com/eip4/platform/report/ReportXmlGuard.java create mode 100644 platform-report/src/test/java/com/eip4/platform/report/JatoolsConfigUrlTest.java create mode 100644 platform-report/src/test/java/com/eip4/platform/report/LimitedByteArrayOutputStreamTest.java create mode 100644 platform-report/src/test/java/com/eip4/platform/report/RenderConcurrencyLimiterTest.java create mode 100644 platform-report/src/test/java/com/eip4/platform/report/ReportParamGuardTest.java create mode 100644 platform-report/src/test/java/com/eip4/platform/report/ReportTplGuardTest.java create mode 100644 platform-report/src/test/java/com/eip4/platform/report/ReportXmlGuardTest.java diff --git a/platform-report/pom.xml b/platform-report/pom.xml index 449549e..520f737 100644 --- a/platform-report/pom.xml +++ b/platform-report/pom.xml @@ -82,6 +82,11 @@ postgresql + + com.eip4platform-legacy-core + com.eip4platform-auth + org.junit.jupiter junit-jupiter 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 d8f7fd3..fa539ef 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 @@ -53,6 +53,14 @@ public class JatoolsConfig { @Value("${eip4.report.company:EIP4}") private String company; + /** 报表查询的 PG 服务端 statement_timeout(毫秒,0=不设)。慢/重 SQL 超时即被 DB 中止,防长时间占连接/堆。 */ + @Value("${eip4.report.db.statement-timeout-ms:30000}") + private long statementTimeoutMs; + + /** 报表连接的 pgjdbc socketTimeout(秒,0=不设)。网络层兜底,泄露/挂死的裸连接最终被 OS 断开。 */ + @Value("${eip4.report.db.socket-timeout-sec:35}") + private int socketTimeoutSec; + /** * PDF 导出兜底字体(CJK 保真)候选路径,按序探测,取首个可加载者注册为 * iText {@code DefaultFontMapper.defaultFont}。覆盖 macOS(本地验证)与常见 Linux 路径。 @@ -88,8 +96,9 @@ public class JatoolsConfig { p.setProperty("font.dirs", "/System/Library/Fonts;/Library/Fonts;" + "/usr/share/fonts;/usr/share/fonts/truetype;/usr/local/share/fonts"); - // 报表模板 解析到 EIP4 数据源 - p.setProperty("DBJdbcUrl", jdbcUrl == null ? "" : jdbcUrl); + // 报表模板 解析到 EIP4 数据源(URL 追加 statement_timeout/socketTimeout 超时加固) + String hardenedUrl = appendPgTimeouts(jdbcUrl == null ? "" : jdbcUrl, statementTimeoutMs, socketTimeoutSec); + p.setProperty("DBJdbcUrl", hardenedUrl); p.setProperty("DBUser", dbUser == null ? "" : dbUser); p.setProperty("DBPassword", dbPassword == null ? "" : dbPassword); @@ -99,7 +108,8 @@ public class JatoolsConfig { p.store(baos, "EIP4 injected jatools config"); System2.properties = new java.util.PropertyResourceBundle( new ByteArrayInputStream(baos.toByteArray())); - log.info("jatools 配置已注入 System2.properties: DBJdbcUrl={}, DBUser={}", jdbcUrl, dbUser); + log.info("jatools 配置已注入 System2.properties: DBJdbcUrl={}, DBUser={} (statementTimeoutMs={}, socketTimeoutSec={})", + hardenedUrl, dbUser, statementTimeoutMs, socketTimeoutSec); } catch (Exception e) { throw new IllegalStateException("注入 jatools System2 配置失败: " + e.getMessage(), e); } @@ -140,4 +150,30 @@ public class JatoolsConfig { init(); } } + + /** + * 给 PostgreSQL JDBC URL 追加超时加固参数(P1):pgjdbc {@code socketTimeout}(秒,网络层兜底, + * 泄露/挂死连接最终被 OS 断开)与服务端 {@code statement_timeout}(毫秒,经 {@code options=-c ...}, + * pgjdbc 会对参数值做 URL 解码故用 {@code %20}/{@code %3D} 编码空格与等号)。 + * 仅作用于 {@code jdbc:postgresql} URL;已含同名参数则不重复(幂等);非正值则跳过对应项; + * null/空/非 PG URL 原样返回。 + */ + static String appendPgTimeouts(String url, long statementTimeoutMs, int socketTimeoutSec) { + if (url == null || url.isBlank() || !url.startsWith("jdbc:postgresql")) { + return url; + } + StringBuilder sb = new StringBuilder(url); + boolean hasQuery = url.indexOf('?') >= 0; + if (socketTimeoutSec > 0 && !url.contains("socketTimeout=")) { + sb.append(hasQuery ? '&' : '?').append("socketTimeout=").append(socketTimeoutSec); + hasQuery = true; + } + // 经 options= 设 statement_timeout;若 URL 已有 options=(如 search_path),不重复追加 + // (pgjdbc 同名后者覆盖前者会丢原配置),由部署方在既有 options 内自行加 statement_timeout。 + if (statementTimeoutMs > 0 && !url.contains("statement_timeout") && !url.contains("options=")) { + sb.append(hasQuery ? '&' : '?') + .append("options=-c%20statement_timeout%3D").append(statementTimeoutMs); + } + return sb.toString(); + } } diff --git a/platform-report/src/main/java/com/eip4/platform/report/LimitedByteArrayOutputStream.java b/platform-report/src/main/java/com/eip4/platform/report/LimitedByteArrayOutputStream.java new file mode 100644 index 0000000..c95459f --- /dev/null +++ b/platform-report/src/main/java/com/eip4/platform/report/LimitedByteArrayOutputStream.java @@ -0,0 +1,35 @@ +package com.eip4.platform.report; + +import java.io.ByteArrayOutputStream; + +/** + * 带字节上限的 {@link ByteArrayOutputStream}:写入累计超过 {@code limitBytes} 时抛 + * {@link ReportSizeExceededException}。用于给报表渲染产物在堆里设硬上限(P1 OOM 收口) —— + * 原实现把整篇产物无上限缓冲,单请求即可 OOM。{@code limitBytes <= 0} 表示不限。 + */ +public class LimitedByteArrayOutputStream extends ByteArrayOutputStream { + + private final long limitBytes; + + public LimitedByteArrayOutputStream(long limitBytes) { + this.limitBytes = limitBytes; + } + + @Override + public synchronized void write(int b) { + ensureCapacity(1); + super.write(b); + } + + @Override + public synchronized void write(byte[] b, int off, int len) { + ensureCapacity(len); + super.write(b, off, len); + } + + private void ensureCapacity(long additional) { + if (limitBytes > 0 && (long) size() + additional > limitBytes) { + throw new ReportSizeExceededException(limitBytes); + } + } +} diff --git a/platform-report/src/main/java/com/eip4/platform/report/RenderConcurrencyLimiter.java b/platform-report/src/main/java/com/eip4/platform/report/RenderConcurrencyLimiter.java new file mode 100644 index 0000000..0448257 --- /dev/null +++ b/platform-report/src/main/java/com/eip4/platform/report/RenderConcurrencyLimiter.java @@ -0,0 +1,42 @@ +package com.eip4.platform.report; + +import java.util.concurrent.Semaphore; +import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; + +/** + * 渲染并发闸(P1):用有界信号量限制同时渲染数,在 {@code acquireTimeoutMs} 内取不到许可即抛 + * {@link ReportBusyException}(控制器映射 429)。把峰值堆收敛到「并发上限 × 单请求」,防止 N 个 + * 并发大报表线性叠加(全量结果集 + 全量文档 + 全量产物)撑爆 JVM。 + */ +public class RenderConcurrencyLimiter { + + private final Semaphore semaphore; + private final int maxConcurrent; + private final long acquireTimeoutMs; + + public RenderConcurrencyLimiter(int maxConcurrent, long acquireTimeoutMs) { + this.maxConcurrent = maxConcurrent; + this.acquireTimeoutMs = acquireTimeoutMs; + this.semaphore = new Semaphore(maxConcurrent, true); // 公平,防饥饿 + } + + /** 取得许可后执行 {@code task};取不到则抛 {@link ReportBusyException}。许可在 finally 中必释放。 */ + public T call(Supplier task) { + boolean acquired; + try { + acquired = semaphore.tryAcquire(acquireTimeoutMs, TimeUnit.MILLISECONDS); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new ReportBusyException(maxConcurrent); + } + if (!acquired) { + throw new ReportBusyException(maxConcurrent); + } + try { + return task.get(); + } finally { + semaphore.release(); + } + } +} diff --git a/platform-report/src/main/java/com/eip4/platform/report/ReportBusyException.java b/platform-report/src/main/java/com/eip4/platform/report/ReportBusyException.java new file mode 100644 index 0000000..dca83e6 --- /dev/null +++ b/platform-report/src/main/java/com/eip4/platform/report/ReportBusyException.java @@ -0,0 +1,19 @@ +package com.eip4.platform.report; + +/** + * 渲染并发已达上限({@code eip4.report.max-concurrent-renders}),在等待超时内未取得许可。 + * 控制器据此返回 429 Too Many Requests,避免 N 个并发大报表线性叠加堆占用导致 OOM。 + */ +public class ReportBusyException extends RuntimeException { + + private final int maxConcurrent; + + public ReportBusyException(int maxConcurrent) { + super("报表渲染并发已达上限 " + maxConcurrent + ",请稍后重试"); + this.maxConcurrent = maxConcurrent; + } + + public int getMaxConcurrent() { + return maxConcurrent; + } +} diff --git a/platform-report/src/main/java/com/eip4/platform/report/ReportController.java b/platform-report/src/main/java/com/eip4/platform/report/ReportController.java index 8fcda6a..f6a4154 100644 --- a/platform-report/src/main/java/com/eip4/platform/report/ReportController.java +++ b/platform-report/src/main/java/com/eip4/platform/report/ReportController.java @@ -1,6 +1,7 @@ package com.eip4.platform.report; -import java.io.InputStream; +import java.io.ByteArrayInputStream; +import java.io.IOException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -8,11 +9,13 @@ import java.nio.file.Path; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Properties; import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.env.Environment; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -23,26 +26,27 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; +import com.dsasp.server.common.user.service.LoggedInUser; +import com.dsasp.server.common.util.UserSession; +import com.eip4.platform.auth.security.SecurityProfiles; + import jakarta.servlet.http.HttpServletRequest; /** - * 报表渲染端点。 + * 报表渲染端点(含安全收口)。 * *

{@code GET /api/report/render/{templateId}?format=html|pdf|xls&<查询参数...>} - * → 把 {@code templateId} 解析为 JOR 模板 .xml → {@link ReportService#render} → 返回 - * 渲染产物(HTML/PDF/XLS)。除 {@code format}/{@code tpl} 外的全部查询参数原样作为报表参数 - * 透传(报表 SQL 里的 {@code ${PARAM}} 据此绑定)。 + * → 把 {@code templateId} 解析为 JOR 模板 → {@link ReportService#render} → 返回渲染产物。 * - *

模板解析(v1): + *

安全门(P0/P1,见各 {@code ReportXxxGuard}): *

    - *
  • {@code ?tpl=<绝对路径>} —— 验证/演示用,直接指定 .xml 绝对路径(仅 dev/local 便利)。
  • - *
  • 否则把 {@code templateId} 当作相对 {@code eip4.report.templates-dir} 的路径解析, - * 默认基目录指向 EIP3 report 根。Phase 3 改为查 {@code sys_report_template} 表。
  • + *
  • 对象级授权 {@link #enforceReportAccess}:已认证非超管用户只能渲染其可见菜单暴露的报表(防 IDOR);
  • + *
  • SQL 注入门 {@link ReportParamGuard}:只放行模板引用过的参数名 + 值校验 + 剥离身份保留位;
  • + *
  • 可信身份注入:{@code ${CURRENTUSER}} 等由服务端从 JWT 上下文注入,杜绝客户端伪造越权;
  • + *
  • {@code ?tpl} 守卫 {@link ReportTplGuard}:仅旁路 profile 允许,且限定在 templates-dir 内、仅 .xml;
  • + *
  • XXE/并发/字节上限/超时在 {@link ReportService}/{@link JatoolsConfig} 侧。
  • *
- * - *

注:不与既有 {@code /api/report/menu-tree}(platform-metadata)冲突 —— 该控制器只占 - * {@code /api/report/render/**}。安全:这是 {@code /api/**} 端点,在 dev/local/ci 宽松链下放行, - * 严格 profile 下走 {@code authenticated()},沿用既有安全模型,无需改 SecurityConfig。 + * 错误响应只回通用文案(底层 SQL/路径/异常细节仅写服务端日志,杜绝信息泄露)。 */ @RestController public class ReportController { @@ -51,14 +55,21 @@ public class ReportController { private final ReportService reportService; private final ReportTemplateRepository templateRepository; + private final Environment environment; @Value("${eip4.report.templates-dir:/Users/zhengwr/workspace/EIP-3.0}") private String templatesDir; + /** 是否要求报表对象级菜单授权(默认开)。关闭后已认证非超管用户可渲染任意报表(仅排障用)。 */ + @Value("${eip4.report.require-menu-grant:true}") + private boolean requireMenuGrant; + public ReportController(ReportService reportService, - ReportTemplateRepository templateRepository) { + ReportTemplateRepository templateRepository, + Environment environment) { this.reportService = reportService; this.templateRepository = templateRepository; + this.environment = environment; } @GetMapping("/api/report/render/{templateId}") @@ -66,33 +77,42 @@ public class ReportController { @RequestParam(value = "format", required = false, defaultValue = "html") String format, @RequestParam(value = "tpl", required = false) String tplPath, HttpServletRequest request) { - Map params = collectReportParams(request); - ReportService.Format fmt = ReportService.Format.parse(format); + ReportService.Format fmt; + try { + fmt = ReportService.Format.parse(format); + } catch (IllegalArgumentException e) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "不支持的报表格式"); + } + enforceReportAccess(templateId); byte[] body; try { - if (tplPath != null && !tplPath.isBlank()) { - // dev/演示覆盖:直接渲染指定 .xml 文件(可为 JOR 文档或 view_template 外壳)。 - Path xml = resolveTemplate(templateId, tplPath); - try (InputStream is = Files.newInputStream(xml)) { - body = reportService.render(is, params, format); - } - } else { - // 标准路径:按 templateId 从 view_template(type=200) 取 JOR 文档并渲染。 - String jorXml = templateRepository.loadJorXml(templateId); - body = reportService.render(jorXml, params, format); - } + byte[] xmlBytes = loadTemplateBytes(templateId, tplPath); + Map params = buildReportParams(request, xmlBytes); + body = reportService.render(new ByteArrayInputStream(xmlBytes), params, format); } catch (ReportTemplateRepository.ReportTemplateNotFoundException e) { log.warn("报表模板未找到 templateId={} : {}", templateId, e.getMessage()); - throw new ResponseStatusException(HttpStatus.NOT_FOUND, e.getMessage(), e); + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "报表模板未找到"); + } catch (ReportBusyException e) { + log.warn("报表渲染并发已满 templateId={} : {}", templateId, e.getMessage()); + throw new ResponseStatusException(HttpStatus.TOO_MANY_REQUESTS, "报表渲染繁忙,请稍后重试"); + } catch (ReportSizeExceededException e) { + log.warn("报表产物超限 templateId={} : {}", templateId, e.getMessage()); + throw new ResponseStatusException(HttpStatus.PAYLOAD_TOO_LARGE, "报表数据过大,请缩小查询范围"); + } catch (SecurityException e) { + log.warn("报表请求被安全门拒绝 templateId={} tpl={} : {}", templateId, tplPath, e.getMessage()); + throw new ResponseStatusException(HttpStatus.FORBIDDEN, "请求被拒绝"); + } catch (IllegalArgumentException e) { + log.warn("报表请求参数非法 templateId={} tpl={} : {}", templateId, tplPath, e.getMessage()); + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "请求参数非法"); } catch (ReportService.ReportRenderException e) { log.warn("报表渲染失败 templateId={} tpl={} : {}", templateId, tplPath, e.getMessage()); - throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, e.getMessage(), e); + throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "报表渲染失败"); } catch (ResponseStatusException e) { throw e; } catch (Exception e) { - throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, - "读取/渲染报表模板失败: " + e.getMessage(), e); + log.warn("报表处理失败 templateId={} : {}", templateId, e.toString()); + throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "报表处理失败"); } ResponseEntity.BodyBuilder rb = ResponseEntity.ok() @@ -113,28 +133,124 @@ public class ReportController { * → 返回 amis CRUD 单行信封 {@code {status:0,msg:"",data:{items:[{__url}],total:1}}}, * {@code __url} = {@code /api/report/render/{id}?format=html&<回显的查询参数>}。 * - *

报表页是 amis {@code crud}:查询条件放在 {@code crud.filter}(实测唯一能让 picker - * 正常加载选项的上下文;放在独立 form 里 picker 弹窗「暂无数据」)。crud 的单个 html 列把 - * {@code __url} 渲成 {@code