Merge: 报表 CVE 依赖替换(reload4j/cc3.2.2)+只读数据源(残留1/CVE),73单测+依赖树+live全绿
Some checks failed
ci / build-test-parity (push) Has been cancelled
Some checks failed
ci / build-test-parity (push) Has been cancelled
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
25
platform-report/docs/security/credential-leak-scan.sql
Normal file
25
platform-report/docs/security/credential-leak-scan.sql
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
-- 凭据外泄巡检:找出 type=200 报表模板里把 property("DB...") 用在 <Connection> 之外的可疑模板
|
||||||
|
-- =============================================================================
|
||||||
|
-- <Connection> 内的 ${property("DBJdbcUrl/DBUser/DBPassword")} 是引擎解析连接所需,合法
|
||||||
|
-- (本库实测 326 个模板如此)。出现在 <Connection> 之外(如某单元格/SQL select 列)即可疑:
|
||||||
|
-- 渲染时会把库连接信息渲进输出 → 凭据外泄。建议纳入迁移/上线检查,命中即人工核查并清理。
|
||||||
|
-- 粗筛口径:property("DBPassword") 出现次数 > <Connection 元素个数。
|
||||||
|
-- =============================================================================
|
||||||
|
SET search_path = eip3;
|
||||||
|
|
||||||
|
WITH counts AS (
|
||||||
|
SELECT
|
||||||
|
trim(view_template_id) AS template_id,
|
||||||
|
name,
|
||||||
|
(char_length(xml::text) - char_length(replace(xml::text, 'property("DBPassword"', '')))
|
||||||
|
/ char_length('property("DBPassword"') AS pw_uses,
|
||||||
|
(char_length(lower(xml::text)) - char_length(replace(lower(xml::text), '<connection', '')))
|
||||||
|
/ char_length('<connection') AS conn_cnt
|
||||||
|
FROM view_template
|
||||||
|
WHERE type = 200
|
||||||
|
AND position('property("DBPassword"' IN xml::text) > 0
|
||||||
|
)
|
||||||
|
SELECT template_id, name, pw_uses, conn_cnt
|
||||||
|
FROM counts
|
||||||
|
WHERE pw_uses > conn_cnt
|
||||||
|
ORDER BY pw_uses - conn_cnt DESC;
|
||||||
30
platform-report/docs/security/report-readonly-db-account.sql
Normal file
30
platform-report/docs/security/report-readonly-db-account.sql
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
-- 报表专用「只读最小权」DB 账号 —— 残留 1(凭据外泄)+ SQLi 的爆炸半径收口
|
||||||
|
-- =============================================================================
|
||||||
|
-- 背景:报表 SQL 由 jatools 引擎以 JatoolsConfig 注入的 DBUser 身份执行。默认回落主数据源
|
||||||
|
-- (spring.datasource.*),与主应用同账号、高权限。改为指向本只读账号后:
|
||||||
|
-- * 即便某模板含 ${property("DBPassword")} 被渲出,泄露的也只是只读账号口令;
|
||||||
|
-- * 报表 SQL 注入(已被 ReportParamGuard 收口)即便被绕过,也只能读、不能写。
|
||||||
|
--
|
||||||
|
-- 用法:
|
||||||
|
-- 1) 在报表库执行本脚本(改掉 PASSWORD);
|
||||||
|
-- 2) 配置 eip4.report.db.username / eip4.report.db.password / eip4.report.db.url 指向它
|
||||||
|
-- (未配置则 JatoolsConfig 回落 spring.datasource.*,行为不变)。
|
||||||
|
-- =============================================================================
|
||||||
|
|
||||||
|
-- 1) 建只读登录角色(口令请改)
|
||||||
|
CREATE ROLE eip4_report_ro WITH LOGIN PASSWORD 'CHANGE_ME_STRONG';
|
||||||
|
|
||||||
|
-- 2) 只授 eip3 schema 的 USAGE + 现有及未来表的 SELECT
|
||||||
|
GRANT USAGE ON SCHEMA eip3 TO eip4_report_ro;
|
||||||
|
GRANT SELECT ON ALL TABLES IN SCHEMA eip3 TO eip4_report_ro;
|
||||||
|
ALTER DEFAULT PRIVILEGES IN SCHEMA eip3 GRANT SELECT ON TABLES TO eip4_report_ro;
|
||||||
|
|
||||||
|
-- 3) 会话级强制只读 + 服务端硬超时(与 JatoolsConfig 注入的 statement_timeout 双保险)
|
||||||
|
ALTER ROLE eip4_report_ro SET default_transaction_read_only = on;
|
||||||
|
ALTER ROLE eip4_report_ro SET statement_timeout = '30s';
|
||||||
|
|
||||||
|
-- 4) 显式收回建表等危险权限(默认通常已无,显式声明意图)
|
||||||
|
REVOKE CREATE ON SCHEMA eip3 FROM eip4_report_ro;
|
||||||
|
|
||||||
|
-- 注意:default_transaction_read_only=on 会让一切写/DDL 失败。若个别报表确需写
|
||||||
|
-- (jatools 的 "="-前缀执行路径,报表查看场景罕见),需单独评估,不应放进只读报表账号。
|
||||||
@@ -57,11 +57,15 @@
|
|||||||
<dependency><groupId>com.dsasp.thirdparty</groupId><artifactId>zxing</artifactId><version>eip3</version></dependency>
|
<dependency><groupId>com.dsasp.thirdparty</groupId><artifactId>zxing</artifactId><version>eip3</version></dependency>
|
||||||
<!-- 引擎运行期依赖的旧版 commons / log4j1 / jaxen / xerces。给独立坐标避免与平台托管版本误判去重。 -->
|
<!-- 引擎运行期依赖的旧版 commons / log4j1 / jaxen / xerces。给独立坐标避免与平台托管版本误判去重。 -->
|
||||||
<dependency><groupId>com.dsasp.thirdparty</groupId><artifactId>commons-beanutils</artifactId><version>eip3</version></dependency>
|
<dependency><groupId>com.dsasp.thirdparty</groupId><artifactId>commons-beanutils</artifactId><version>eip3</version></dependency>
|
||||||
<dependency><groupId>com.dsasp.thirdparty</groupId><artifactId>commons-collections</artifactId><version>eip3</version></dependency>
|
<!-- 安全升级:commons-collections 3.0 → 3.2.2,关掉 InvokerTransformer 反序列化 gadget(CVE-2015-7501)。
|
||||||
|
引擎源码不直接引用 commons-collections,3.2.x API 向后兼容,且 3.2.2 已在本地仓。 -->
|
||||||
|
<dependency><groupId>commons-collections</groupId><artifactId>commons-collections</artifactId><version>3.2.2</version></dependency>
|
||||||
<dependency><groupId>com.dsasp.thirdparty</groupId><artifactId>commons-httpclient</artifactId><version>eip3</version></dependency>
|
<dependency><groupId>com.dsasp.thirdparty</groupId><artifactId>commons-httpclient</artifactId><version>eip3</version></dependency>
|
||||||
<dependency><groupId>com.dsasp.thirdparty</groupId><artifactId>commons-lang</artifactId><version>eip3</version></dependency>
|
<dependency><groupId>com.dsasp.thirdparty</groupId><artifactId>commons-lang</artifactId><version>eip3</version></dependency>
|
||||||
<dependency><groupId>com.dsasp.thirdparty</groupId><artifactId>commons-logging</artifactId><version>eip3</version></dependency>
|
<dependency><groupId>com.dsasp.thirdparty</groupId><artifactId>commons-logging</artifactId><version>eip3</version></dependency>
|
||||||
<dependency><groupId>com.dsasp.thirdparty</groupId><artifactId>log4j</artifactId><version>eip3</version></dependency>
|
<!-- 安全升级:log4j 1.2.8 → reload4j 1.2.25(drop-in,关 SocketServer/JMSAppender 等 RCE CVE)。
|
||||||
|
引擎仅用 org.apache.log4j.Logger / PropertyConfigurator,reload4j 同包同 API 完全兼容。 -->
|
||||||
|
<dependency><groupId>ch.qos.reload4j</groupId><artifactId>reload4j</artifactId><version>1.2.25</version></dependency>
|
||||||
<dependency><groupId>com.dsasp.thirdparty</groupId><artifactId>jaxen</artifactId><version>eip3</version></dependency>
|
<dependency><groupId>com.dsasp.thirdparty</groupId><artifactId>jaxen</artifactId><version>eip3</version></dependency>
|
||||||
<dependency><groupId>com.dsasp.thirdparty</groupId><artifactId>xerces</artifactId><version>eip3</version></dependency>
|
<dependency><groupId>com.dsasp.thirdparty</groupId><artifactId>xerces</artifactId><version>eip3</version></dependency>
|
||||||
|
|
||||||
|
|||||||
@@ -41,13 +41,15 @@ public class JatoolsConfig {
|
|||||||
|
|
||||||
private static final Logger log = LoggerFactory.getLogger(JatoolsConfig.class);
|
private static final Logger log = LoggerFactory.getLogger(JatoolsConfig.class);
|
||||||
|
|
||||||
@Value("${spring.datasource.url:jdbc:postgresql://localhost:5433/eip4dev?currentSchema=eip3}")
|
// 报表查询连接:优先用报表专用数据源 eip4.report.db.*(供配置独立的<strong>只读最小权账号</strong>,
|
||||||
|
// 收口 SQLi/凭据外泄的爆炸半径),未配置则回落主数据源 spring.datasource.*(向后兼容,默认零行为变化)。
|
||||||
|
@Value("${eip4.report.db.url:${spring.datasource.url:jdbc:postgresql://localhost:5433/eip4dev?currentSchema=eip3}}")
|
||||||
private String jdbcUrl;
|
private String jdbcUrl;
|
||||||
|
|
||||||
@Value("${spring.datasource.username:zhengwr}")
|
@Value("${eip4.report.db.username:${spring.datasource.username:zhengwr}}")
|
||||||
private String dbUser;
|
private String dbUser;
|
||||||
|
|
||||||
@Value("${spring.datasource.password:}")
|
@Value("${eip4.report.db.password:${spring.datasource.password:}}")
|
||||||
private String dbPassword;
|
private String dbPassword;
|
||||||
|
|
||||||
@Value("${eip4.report.company:EIP4}")
|
@Value("${eip4.report.company:EIP4}")
|
||||||
|
|||||||
Reference in New Issue
Block a user