Merge branch 'feat/p0-ddl-guard' into main
P0② net-new 裸 JDBC 旁路收口:CREATE/DROP DDL 守卫白名单(CreateTableSqlGuard/ DropTableSqlGuard),对标已有 AlterTableSqlGuard。TDD+对抗审查(MERGE-ABLE)+478单测+ 真库e2e+5浏览器e2e全绿。
This commit is contained in:
@@ -108,6 +108,13 @@ public interface DataDicService {
|
||||
* @return null=成功;非空=失败原因
|
||||
*/
|
||||
public String executeAlterSql(String sql);
|
||||
|
||||
/**
|
||||
* 受控删除实体物理表(只允许 EIP4 前缀大写标识符,经 DropTableSqlGuard 白名单杜绝注入/误删)。
|
||||
* @param table 表名(非整句 SQL)
|
||||
* @return null=成功;非空=失败原因
|
||||
*/
|
||||
public String executeDropSql(String table);
|
||||
|
||||
/**
|
||||
* get entity by table name
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
package com.dsasp.server.dataDic.service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/**
|
||||
* P0② net-new 裸 JDBC 旁路收口:CREATE 安全通道守卫(纯静态 / 无 Spring 依赖,便于单测)。
|
||||
*
|
||||
* <p>保真层 {@code DataDicServiceImpl.executeCreateSql} 此前仅以 {@code startsWith("CREATE ")} 放行,
|
||||
* 会漏过两类危险:① 非建表 DDL({@code CREATE TRIGGER / FUNCTION / INDEX / EXTENSION / OR REPLACE …});
|
||||
* ② 单语句 CTAS({@code CREATE TABLE X AS SELECT * FROM SYS_USER},旧前缀检查也放行)。本守卫把 CREATE
|
||||
* 收窄为引擎仅有的两条真实生成路径,与 {@link AlterTableSqlGuard} 同为 defense-in-depth 双层校验。
|
||||
*
|
||||
* <p>放在 legacy-core(而非 platform-metadata)以避免 legacy-core→metadata 的反向(循环)依赖。
|
||||
*
|
||||
* <p>受控形态:
|
||||
* <ul>
|
||||
* <li>第一条(必须):{@code CREATE TABLE <T> ( <列定义...> )} —— {@code MetaController.createTableDdl} 的输出,
|
||||
* 表名须大写白名单(与引擎建表规则一致),且列定义括号紧随表名、语句以右括号收尾。</li>
|
||||
* <li>第二条(可选):{@code INSERT INTO order_entity(...) VALUES (...)} —— {@code Entity.createTableSql}
|
||||
* 在 devDB 追加的排序实体注册。</li>
|
||||
* </ul>
|
||||
* 其余(注释 / 子查询 / CTAS / ` AS ` / ` USING ` / 任意第三方语句 / 小写或非法表名)一律抛
|
||||
* {@link IllegalArgumentException}。
|
||||
*
|
||||
* <p>语句内危险 token 黑名单是 defense-in-depth 的第二道:单语句约束 + 「必须 CREATE TABLE 起头」+「括号紧随」
|
||||
* 已挡住绝大多数注入;黑名单额外拦住语句内的子查询 / CTAS / 注释 / 跨表 DML 关键字。
|
||||
*/
|
||||
public final class CreateTableSqlGuard {
|
||||
|
||||
private CreateTableSqlGuard() {
|
||||
}
|
||||
|
||||
/** 表名规则与 MetaController 建表白名单一致(大写起头,大写数字下划线),且列定义括号须紧随(可隔一个空格)。 */
|
||||
private static final Pattern CREATE_HEAD =
|
||||
Pattern.compile("^CREATE TABLE ([A-Z][A-Z0-9_]{2,40}) ?\\(");
|
||||
|
||||
/**
|
||||
* 语句内禁止 token(已折叠空白并转大写后比对,多以空格围拢避免误伤标识符/类型)。
|
||||
* 注:跨表 DML 关键字(DROP/DELETE/UPDATE/ALTER…)作为安全网——单语句约束已挡住分号注入,
|
||||
* 这些只能作为列名(均为 SQL 保留字,真实元数据不会、PG 也不允许裸用)或 DEFAULT 表达式出现,
|
||||
* 故空格围拢的误伤风险可忽略。
|
||||
*/
|
||||
private static final String[] DENY_TOKENS = {
|
||||
"--", "/*", "*/", "$$",
|
||||
"(SELECT", " SELECT ", " AS ", " USING ", " RETURNING ",
|
||||
" DROP ", " DELETE ", " UPDATE ", " ALTER ", " TRUNCATE ",
|
||||
" GRANT ", " REVOKE ", " EXECUTE ", " CALL ", " COPY ", " MERGE ",
|
||||
// 建表克隆/继承/分区(结构复制他表):引擎生成器从不产出,与「其余一律拒」契约一致
|
||||
"(LIKE ", " INHERITS ", " PARTITION ",
|
||||
};
|
||||
|
||||
/**
|
||||
* 校验一条建表脚本(可含 devDB 的 order_entity 第二句)。
|
||||
*
|
||||
* @param sql 原始 SQL
|
||||
* @return 去首尾空白后的原始 SQL(保留内部字面量与语句分隔,可直接交给 jdbcTemplate.execute)
|
||||
* @throws IllegalArgumentException 非白名单 / 危险 / 非受控形态
|
||||
*/
|
||||
public static String guard(String sql) {
|
||||
if (sql == null) {
|
||||
throw new IllegalArgumentException("CREATE 脚本为空");
|
||||
}
|
||||
String s = sql.strip();
|
||||
if (s.isEmpty()) {
|
||||
throw new IllegalArgumentException("CREATE 脚本为空");
|
||||
}
|
||||
String collapsed = s.replaceAll("\\s+", " ").strip();
|
||||
|
||||
// 拆语句:Java split 默认丢弃尾部空串;再剔除中间空白语句,得到非空语句序列
|
||||
List<String> stmts = new ArrayList<>();
|
||||
for (String part : collapsed.split(";")) {
|
||||
String t = part.strip();
|
||||
if (!t.isEmpty()) {
|
||||
stmts.add(t);
|
||||
}
|
||||
}
|
||||
if (stmts.isEmpty()) {
|
||||
throw new IllegalArgumentException("CREATE 脚本为空");
|
||||
}
|
||||
if (stmts.size() > 2) {
|
||||
throw new IllegalArgumentException(
|
||||
"只允许 CREATE TABLE [+ INSERT INTO order_entity] 至多两条语句: " + sql);
|
||||
}
|
||||
guardCreate(stmts.get(0));
|
||||
if (stmts.size() == 2) {
|
||||
guardOrderEntity(stmts.get(1));
|
||||
}
|
||||
return s;
|
||||
}
|
||||
|
||||
private static void guardCreate(String stmt) {
|
||||
String upper = stmt.toUpperCase(Locale.ROOT);
|
||||
if (!upper.startsWith("CREATE TABLE ")) {
|
||||
throw new IllegalArgumentException("只允许 CREATE TABLE 语句(非建表 DDL 一律拒): " + stmt);
|
||||
}
|
||||
if (!CREATE_HEAD.matcher(stmt).find()) {
|
||||
throw new IllegalArgumentException(
|
||||
"CREATE TABLE 表名非法(须大写字母起头)或列定义括号未紧随表名: " + stmt);
|
||||
}
|
||||
if (!stmt.endsWith(")")) {
|
||||
throw new IllegalArgumentException("CREATE TABLE 须以列定义右括号收尾(拒 CTAS / 尾部注入): " + stmt);
|
||||
}
|
||||
denyScan(upper, stmt);
|
||||
}
|
||||
|
||||
private static void guardOrderEntity(String stmt) {
|
||||
String upper = stmt.toUpperCase(Locale.ROOT);
|
||||
if (!upper.startsWith("INSERT INTO ORDER_ENTITY")) {
|
||||
throw new IllegalArgumentException(
|
||||
"第二条语句只允许 INSERT INTO order_entity(排序实体注册): " + stmt);
|
||||
}
|
||||
denyScan(upper, stmt);
|
||||
}
|
||||
|
||||
private static void denyScan(String upper, String stmt) {
|
||||
for (String bad : DENY_TOKENS) {
|
||||
if (upper.contains(bad)) {
|
||||
throw new IllegalArgumentException("CREATE 含禁止操作 [" + bad.trim() + "]: " + stmt);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -191,17 +191,16 @@ public class DataDicServiceImpl implements DataDicService {
|
||||
|
||||
@Override
|
||||
public String executeCreateSql(String sql) {
|
||||
if (!StringUtil.isEmpty(sql)
|
||||
&& (sql.toUpperCase().trim().startsWith("CREATE ") || sql.trim().startsWith("INSERT INTO order_entity"))
|
||||
&& sql.trim().split(";").length <= 2) {
|
||||
String[] sqls = sql.trim().split(";");
|
||||
if (sqls.length == 1
|
||||
|| sqls[1].trim().startsWith("INSERT INTO order_entity")) {
|
||||
jdbcTemplate.execute(sql);
|
||||
return null;
|
||||
}
|
||||
// P0②:收口到 CreateTableSqlGuard 白名单(只允许 CREATE TABLE [+ devDB order_entity 第二句]),
|
||||
// 杜绝 CREATE TRIGGER/FUNCTION/INDEX/EXTENSION 等非建表 DDL 及单语句 CTAS。与 executeAlterSql 同构。
|
||||
String safe;
|
||||
try {
|
||||
safe = CreateTableSqlGuard.guard(sql);
|
||||
} catch (IllegalArgumentException e) {
|
||||
return e.getMessage();
|
||||
}
|
||||
return "非合法的创建表脚本";
|
||||
jdbcTemplate.execute(safe);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -216,6 +215,20 @@ public class DataDicServiceImpl implements DataDicService {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String executeDropSql(String table) {
|
||||
// P0②:收口到 DropTableSqlGuard 白名单(只接表名,整串匹配 EIP4 前缀),
|
||||
// 杜绝 dropEntity 旧 startsWith("EIP4") 的分号注入面。与 executeCreateSql/executeAlterSql 同构。
|
||||
String safe;
|
||||
try {
|
||||
safe = DropTableSqlGuard.guard(table);
|
||||
} catch (IllegalArgumentException e) {
|
||||
return e.getMessage();
|
||||
}
|
||||
jdbcTemplate.execute(safe);
|
||||
return null;
|
||||
}
|
||||
|
||||
@OriginServiceMethod(name="新增实体的默认属性", type = "dataDic" , description = "新增实体,默认产生createby,updatby,createtime,updatetime,version,isactive,orgid,departid")
|
||||
@Override
|
||||
public GeneralPOJO getTableDefaultAttribute() {
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
package com.dsasp.server.dataDic.service;
|
||||
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/**
|
||||
* P0② net-new 裸 JDBC 旁路收口:DROP 安全通道守卫(纯静态 / 无 Spring 依赖,便于单测)。
|
||||
*
|
||||
* <p>{@code MetaController.dropEntity} 此前裸拼 {@code "DROP TABLE IF EXISTS " + t},仅以
|
||||
* {@code t.startsWith("EIP4")} 防误删。但 {@code startsWith} 对形如 {@code EIP4X;DROP TABLE SYS_USER}
|
||||
* 的 PathVariable 是真实分号注入面(前缀检查通过、分号注入第二句一起执行)。
|
||||
*
|
||||
* <p>本守卫只接受「表名」(而非整句 SQL),整串白名单匹配 {@code EIP4} 前缀的大写标识符——任何空格 /
|
||||
* 分号 / 引号 / 注释 / 通配符都会令整串匹配失败,从根上杜绝注入与误删非 EIP4 表;由守卫自身拼出安全的
|
||||
* {@code DROP TABLE IF EXISTS <T>}。与 {@link CreateTableSqlGuard}/{@link AlterTableSqlGuard} 同为
|
||||
* defense-in-depth。
|
||||
*/
|
||||
public final class DropTableSqlGuard {
|
||||
|
||||
private DropTableSqlGuard() {
|
||||
}
|
||||
|
||||
/** 只允许 EIP4 前缀的大写标识符(net-new 测试/AI 实体);整串匹配(matches),不接受任何额外字符。 */
|
||||
private static final Pattern EIP4_TABLE = Pattern.compile("EIP4[A-Z0-9_]{0,37}");
|
||||
|
||||
/**
|
||||
* 校验表名并拼出安全的 DROP 语句。
|
||||
*
|
||||
* @param table 表名(非整句 SQL)
|
||||
* @return {@code DROP TABLE IF EXISTS <T>}(可直接交给 jdbcTemplate.execute)
|
||||
* @throws IllegalArgumentException 非 EIP4 前缀 / 含非标识符字符(空格/分号/引号/注释/通配) / 空
|
||||
*/
|
||||
public static String guard(String table) {
|
||||
if (table == null) {
|
||||
throw new IllegalArgumentException("表名为空");
|
||||
}
|
||||
String t = table.strip();
|
||||
if (t.isEmpty()) {
|
||||
throw new IllegalArgumentException("表名为空");
|
||||
}
|
||||
if (!EIP4_TABLE.matcher(t).matches()) {
|
||||
throw new IllegalArgumentException(
|
||||
"只允许删除 EIP4 前缀的大写标识符表名(防注入/防误删): " + table);
|
||||
}
|
||||
return "DROP TABLE IF EXISTS " + t;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,185 @@
|
||||
package com.dsasp.server.dataDic.service;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
/**
|
||||
* P0② net-new 裸 JDBC 旁路收口:CREATE 安全通道守卫。
|
||||
*
|
||||
* <p>保真层 {@code DataDicServiceImpl.executeCreateSql} 此前仅以 {@code startsWith("CREATE ")}
|
||||
* 放行,会漏过 {@code CREATE TRIGGER/FUNCTION/INDEX/EXTENSION} 及单语句 CTAS
|
||||
* ({@code CREATE TABLE X AS SELECT * FROM SYS_USER})。本守卫把 CREATE 收窄为引擎两条真实
|
||||
* 生成路径:① {@code MetaController.createTableDdl} 的单条 {@code CREATE TABLE (...)};
|
||||
* ② {@code Entity.createTableSql} 在 devDB 追加的第二句 {@code INSERT INTO order_entity(...)}。
|
||||
* 其余形态(非 TABLE 的 CREATE / CTAS / 注释 / 子查询 / 任意多语句 / 小写或非法表名)一律拒。
|
||||
*/
|
||||
class CreateTableSqlGuardTest {
|
||||
|
||||
// ────────── 允许:createEntity → createTableDdl 单语句(标准列 + 业务列 + 引用 + unique) ──────────
|
||||
@Test
|
||||
@DisplayName("放行:createTableDdl 真实输出(标准+业务列/NOT NULL/numeric/bigint/REFERENCES/unique/primary key)")
|
||||
void allowsCreateTableDdlOutput() {
|
||||
String ddl = """
|
||||
CREATE TABLE EIP4_ORDER
|
||||
(
|
||||
EIP4_ORDER_ID character(36) NOT NULL ,\s
|
||||
VERSION integer ,\s
|
||||
CREATETIME bigint ,\s
|
||||
UPDATETIME bigint ,\s
|
||||
CREATEBY character(36) ,\s
|
||||
UPDATEBY character(36) ,\s
|
||||
ISACTIVE integer ,\s
|
||||
NAME character varying(100) NOT NULL ,\s
|
||||
QTY integer ,\s
|
||||
AMOUNT numeric(18,6) ,\s
|
||||
CUSTOMERID character(36) REFERENCES EIP4_CUSTOMER,\s
|
||||
unique (NAME),\s
|
||||
primary key (EIP4_ORDER_ID)
|
||||
);\s
|
||||
""";
|
||||
assertNotNull(assertDoesNotThrow(() -> CreateTableSqlGuard.guard(ddl)));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("放行:组合唯一约束 unique (A,B)(括号内逗号不得被误判为多语句/多列)")
|
||||
void allowsCombinedUnique() {
|
||||
String ddl = """
|
||||
CREATE TABLE EIP4_X
|
||||
(
|
||||
EIP4_X_ID character(36) NOT NULL ,\s
|
||||
A integer ,\s
|
||||
B integer ,\s
|
||||
unique (A,B),\s
|
||||
primary key (EIP4_X_ID)
|
||||
);\s
|
||||
""";
|
||||
assertNotNull(assertDoesNotThrow(() -> CreateTableSqlGuard.guard(ddl)));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("放行:整型/小数 DEFAULT 字面量(createTableDdl 对 INTEGER/DECIMAL 追加 DEFAULT)")
|
||||
void allowsNumericDefault() {
|
||||
String ddl = """
|
||||
CREATE TABLE EIP4_X
|
||||
(
|
||||
EIP4_X_ID character(36) NOT NULL ,\s
|
||||
FLAG integer DEFAULT 0,\s
|
||||
primary key (EIP4_X_ID)
|
||||
);\s
|
||||
""";
|
||||
assertNotNull(assertDoesNotThrow(() -> CreateTableSqlGuard.guard(ddl)));
|
||||
}
|
||||
|
||||
// ────────── 允许:Entity.createTableSql(devDB)→ CREATE + 第二句 order_entity ──────────
|
||||
@Test
|
||||
@DisplayName("放行:devDB 双语句 CREATE TABLE; INSERT INTO order_entity(...)")
|
||||
void allowsCreatePlusOrderEntity() {
|
||||
String ddl = """
|
||||
CREATE TABLE EIP4AI_DEMO
|
||||
(
|
||||
EIP4AI_DEMO_ID character(36) NOT NULL ,\s
|
||||
NAME character varying(100) ,\s
|
||||
primary key (EIP4AI_DEMO_ID)
|
||||
);\s
|
||||
INSERT INTO order_entity(order_entity_id, tablename, sys_entitytype, sequ, updatetime, version, updateby) VALUES ( 'a1b2c3', 'EIP4AI_DEMO', 'd4e5f6', '1', 1700000000000, 0, 'admin');\s
|
||||
""";
|
||||
assertNotNull(assertDoesNotThrow(() -> CreateTableSqlGuard.guard(ddl)));
|
||||
}
|
||||
|
||||
// ────────── 拒绝:非 TABLE 的 CREATE(原 startsWith("CREATE ") 的真实漏洞) ──────────
|
||||
@Test
|
||||
@DisplayName("拒绝:CREATE TRIGGER / FUNCTION / INDEX / EXTENSION / OR REPLACE(非建表 DDL)")
|
||||
void rejectsNonTableCreate() {
|
||||
assertThrows(IllegalArgumentException.class, () -> CreateTableSqlGuard.guard(
|
||||
"CREATE TRIGGER trg AFTER INSERT ON EIP4_X FOR EACH ROW EXECUTE FUNCTION f()"));
|
||||
assertThrows(IllegalArgumentException.class, () -> CreateTableSqlGuard.guard(
|
||||
"CREATE FUNCTION f() RETURNS void AS 'x' LANGUAGE sql"));
|
||||
assertThrows(IllegalArgumentException.class, () -> CreateTableSqlGuard.guard(
|
||||
"CREATE INDEX idx ON EIP4_X (A)"));
|
||||
assertThrows(IllegalArgumentException.class, () -> CreateTableSqlGuard.guard(
|
||||
"CREATE EXTENSION pgcrypto"));
|
||||
assertThrows(IllegalArgumentException.class, () -> CreateTableSqlGuard.guard(
|
||||
"CREATE OR REPLACE VIEW v AS SELECT * FROM SYS_USER"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("拒绝:CTAS(CREATE TABLE ... AS SELECT 拷贝/读取他表 —— 单语句也能绕过旧前缀检查)")
|
||||
void rejectsCtas() {
|
||||
assertThrows(IllegalArgumentException.class, () -> CreateTableSqlGuard.guard(
|
||||
"CREATE TABLE EIP4_X AS SELECT * FROM SYS_USER"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("拒绝:子查询作为列 DEFAULT")
|
||||
void rejectsSubqueryDefault() {
|
||||
assertThrows(IllegalArgumentException.class, () -> CreateTableSqlGuard.guard(
|
||||
"CREATE TABLE EIP4_X (EIP4_X_ID character(36) NOT NULL, N integer DEFAULT (SELECT 1))"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("拒绝:建表克隆/继承/分区(LIKE / INHERITS / PARTITION,结构复制他表)")
|
||||
void rejectsTableCloneForms() {
|
||||
assertThrows(IllegalArgumentException.class, () -> CreateTableSqlGuard.guard(
|
||||
"CREATE TABLE EIP4_X (LIKE SYS_USER INCLUDING ALL)"));
|
||||
assertThrows(IllegalArgumentException.class, () -> CreateTableSqlGuard.guard(
|
||||
"CREATE TABLE EIP4_X (EIP4_X_ID character(36) NOT NULL) INHERITS (SYS_USER)"));
|
||||
assertThrows(IllegalArgumentException.class, () -> CreateTableSqlGuard.guard(
|
||||
"CREATE TABLE EIP4_X (EIP4_X_ID character(36) NOT NULL) PARTITION BY RANGE (EIP4_X_ID)"));
|
||||
}
|
||||
|
||||
// ────────── 拒绝:多语句注入 ──────────
|
||||
@Test
|
||||
@DisplayName("拒绝:第二句不是 order_entity(分号注入 DROP/DELETE)")
|
||||
void rejectsSecondStatementInjection() {
|
||||
assertThrows(IllegalArgumentException.class, () -> CreateTableSqlGuard.guard(
|
||||
"CREATE TABLE EIP4_X (EIP4_X_ID character(36) NOT NULL); DROP TABLE SYS_USER"));
|
||||
assertThrows(IllegalArgumentException.class, () -> CreateTableSqlGuard.guard(
|
||||
"CREATE TABLE EIP4_X (EIP4_X_ID character(36) NOT NULL); DELETE FROM SYS_USER"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("拒绝:三条及以上语句(即便第二句是 order_entity,第三句注入)")
|
||||
void rejectsThreeStatements() {
|
||||
assertThrows(IllegalArgumentException.class, () -> CreateTableSqlGuard.guard(
|
||||
"CREATE TABLE EIP4_X (EIP4_X_ID character(36) NOT NULL); "
|
||||
+ "INSERT INTO order_entity(order_entity_id) VALUES ('x'); DROP TABLE SYS_USER"));
|
||||
}
|
||||
|
||||
// ────────── 拒绝:注释隐藏 ──────────
|
||||
@Test
|
||||
@DisplayName("拒绝:行注释 / 块注释(藏匿后续注入或绕过)")
|
||||
void rejectsComments() {
|
||||
assertThrows(IllegalArgumentException.class, () -> CreateTableSqlGuard.guard(
|
||||
"CREATE TABLE EIP4_X (EIP4_X_ID character(36) NOT NULL) -- ; DROP TABLE SYS_USER"));
|
||||
assertThrows(IllegalArgumentException.class, () -> CreateTableSqlGuard.guard(
|
||||
"CREATE TABLE EIP4_X /* hidden */ (EIP4_X_ID character(36) NOT NULL)"));
|
||||
}
|
||||
|
||||
// ────────── 拒绝:非法表名 / 小写绕过 / 缺括号 ──────────
|
||||
@Test
|
||||
@DisplayName("拒绝:表名小写(标识符必须大写,匹配引擎建表规则)")
|
||||
void rejectsLowercaseTable() {
|
||||
assertThrows(IllegalArgumentException.class, () -> CreateTableSqlGuard.guard(
|
||||
"create table eip4_x (eip4_x_id character(36) NOT NULL)"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("拒绝:非法表名(数字开头)")
|
||||
void rejectsBadTableName() {
|
||||
assertThrows(IllegalArgumentException.class, () -> CreateTableSqlGuard.guard(
|
||||
"CREATE TABLE 1X (ID character(36) NOT NULL)"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("拒绝:非 CREATE 语句 / 空 / null")
|
||||
void rejectsNonCreateAndEmpty() {
|
||||
assertThrows(IllegalArgumentException.class, () -> CreateTableSqlGuard.guard(
|
||||
"DROP TABLE EIP4_X"));
|
||||
assertThrows(IllegalArgumentException.class, () -> CreateTableSqlGuard.guard(" "));
|
||||
assertThrows(IllegalArgumentException.class, () -> CreateTableSqlGuard.guard(null));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
package com.dsasp.server.dataDic.service;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
/**
|
||||
* P0② net-new 裸 JDBC 旁路收口:DROP 安全通道守卫。
|
||||
*
|
||||
* <p>{@code MetaController.dropEntity} 此前裸拼 {@code "DROP TABLE IF EXISTS " + t},仅以
|
||||
* {@code t.startsWith("EIP4")} 防误删——但 {@code startsWith} 对形如 {@code EIP4X;DROP TABLE SYS_USER}
|
||||
* 的 PathVariable 是真实分号注入面(前缀通过、第二句注入)。本守卫只接受「表名」(非整句 SQL),
|
||||
* 整串白名单匹配 {@code EIP4} 前缀大写标识符,返回安全的 {@code DROP TABLE IF EXISTS <T>}。
|
||||
*/
|
||||
class DropTableSqlGuardTest {
|
||||
|
||||
@Test
|
||||
@DisplayName("放行:EIP4 前缀大写表名 → DROP TABLE IF EXISTS <T>")
|
||||
void allowsEip4Tables() {
|
||||
assertEquals("DROP TABLE IF EXISTS EIP4AI_DEMO",
|
||||
DropTableSqlGuard.guard("EIP4AI_DEMO"));
|
||||
assertEquals("DROP TABLE IF EXISTS EIP4_ORDER",
|
||||
DropTableSqlGuard.guard("EIP4_ORDER"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("放行:首尾空白被归一掉")
|
||||
void trimsWhitespace() {
|
||||
assertEquals("DROP TABLE IF EXISTS EIP4_X",
|
||||
DropTableSqlGuard.guard(" EIP4_X "));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("拒绝:分号注入第二句(EIP4 前缀也挡不住的 startsWith 漏洞)")
|
||||
void rejectsSemicolonInjection() {
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> DropTableSqlGuard.guard("EIP4X;DROP TABLE SYS_USER"));
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> DropTableSqlGuard.guard("EIP4X; DELETE FROM SYS_USER"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("拒绝:含空格 / 额外 token(整句而非表名)")
|
||||
void rejectsSpacesAndTokens() {
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> DropTableSqlGuard.guard("EIP4_X CASCADE"));
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> DropTableSqlGuard.guard("DROP TABLE EIP4_X"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("拒绝:非 EIP4 前缀(防删系统/业务表)")
|
||||
void rejectsNonEip4Prefix() {
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> DropTableSqlGuard.guard("SYS_USER"));
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> DropTableSqlGuard.guard("OA_NOTICEMANAGE"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("拒绝:小写绕过 / 引号 / 注释 / 通配")
|
||||
void rejectsLowercaseAndSpecials() {
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> DropTableSqlGuard.guard("eip4_x"));
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> DropTableSqlGuard.guard("EIP4_X'"));
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> DropTableSqlGuard.guard("EIP4--X"));
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> DropTableSqlGuard.guard("EIP4_*"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("拒绝:空 / null")
|
||||
void rejectsEmptyAndNull() {
|
||||
assertThrows(IllegalArgumentException.class, () -> DropTableSqlGuard.guard(" "));
|
||||
assertThrows(IllegalArgumentException.class, () -> DropTableSqlGuard.guard(null));
|
||||
}
|
||||
}
|
||||
@@ -270,7 +270,12 @@ public class MetaController {
|
||||
List<String> ids = jdbcTemplate.queryForList(
|
||||
"SELECT SYS_ENTITY_ID FROM SYS_ENTITY WHERE TABLENAME=?", String.class, t);
|
||||
String entityId = ids.isEmpty() ? null : ids.get(0);
|
||||
jdbcTemplate.execute("DROP TABLE IF EXISTS " + t);
|
||||
// P0②:DROP 收口到保真层 DropTableSqlGuard(整串白名单),关闭旧 startsWith("EIP4") 的分号注入面。
|
||||
// drop 在删元数据之前——拒绝时提前返回,不留孤儿元数据。
|
||||
String dropErr = dataDicService.executeDropSql(t);
|
||||
if (dropErr != null) {
|
||||
return err("删除物理表失败: " + dropErr);
|
||||
}
|
||||
int a = jdbcTemplate.update(
|
||||
"DELETE FROM SYS_ENTITYATTRIBUTE WHERE ENTITYID IN (SELECT SYS_ENTITY_ID FROM SYS_ENTITY WHERE TABLENAME=?)", t);
|
||||
int e = jdbcTemplate.update("DELETE FROM SYS_ENTITY WHERE TABLENAME=?", t);
|
||||
@@ -535,7 +540,12 @@ public class MetaController {
|
||||
String defValue = value(attr, "DEFAULTVALUE");
|
||||
if (defValue != null && !defValue.isBlank()
|
||||
&& ("INTEGER".equals(ref) || "BOOLEAN".equals(ref) || "DECIMAL".equals(ref) || "MONEY".equals(ref))) {
|
||||
sql.append(" DEFAULT ").append(defValue);
|
||||
// P0②(defense-in-depth):这些列均为数值存储,DEFAULT 只能是数值字面量。
|
||||
// 拒非数值(防 raw-append 的潜在注入,如 DEFAULT pg_sleep(10) / DEFAULT (SELECT ...))。
|
||||
if (!defValue.strip().matches("-?\\d+(\\.\\d+)?")) {
|
||||
throw new IllegalStateException("非法 DEFAULT(数值列只允许数值字面量): " + defValue);
|
||||
}
|
||||
sql.append(" DEFAULT ").append(defValue.strip());
|
||||
}
|
||||
sql.append(", \n");
|
||||
if (attr.get_ValueAsBoolean("ISIDENTIFIER")) {
|
||||
|
||||
@@ -97,7 +97,12 @@ public class PocWriteTestController {
|
||||
// 3. 动态建表(引擎生成 DDL → 执行)
|
||||
Entity newEnt = (Entity) dataDicService.getSYSEntity(newEntityId);
|
||||
String ddl = newEnt.createTableSql();
|
||||
dataDicService.executeCreateSql(ddl);
|
||||
// P0②:executeCreateSql 经 CreateTableSqlGuard,被拒时返回错误串(未执行)。
|
||||
// 必须检查返回值,否则会误报建表成功并吞掉守卫拒因。
|
||||
String ddlErr = dataDicService.executeCreateSql(ddl);
|
||||
if (ddlErr != null) {
|
||||
return fail(report, "建表被守卫拒绝: " + ddlErr);
|
||||
}
|
||||
tableCreated = true;
|
||||
Integer exists = jdbcTemplate.queryForObject(
|
||||
"SELECT COUNT(*) FROM information_schema.tables WHERE LOWER(table_name)=LOWER(?)",
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.eip4.platform.metadata.web;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
@@ -46,6 +47,25 @@ class MetaControllerDdlTest {
|
||||
"外键不得自指 EIP4_ORDER");
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("放行:数值列的数值字面量 DEFAULT")
|
||||
void allowsNumericDefaultLiteral() {
|
||||
String ddl = MetaController.createTableDdl("EIP4_X", List.of(
|
||||
attr("EIP4_X_ID", "CHAR", null, true),
|
||||
attrWithDefault("FLAG", "INTEGER", "0")
|
||||
), Map.of());
|
||||
assertTrue(ddl.contains("FLAG integer DEFAULT 0"), "实际: " + ddl);
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("拒绝:数值列的非数值 DEFAULT(防 raw-append 注入,如 pg_sleep / 子查询)")
|
||||
void rejectsNonNumericDefault() {
|
||||
assertThrows(IllegalStateException.class, () -> MetaController.createTableDdl("EIP4_X", List.of(
|
||||
attr("EIP4_X_ID", "CHAR", null, true),
|
||||
attrWithDefault("FLAG", "INTEGER", "pg_sleep(10)")
|
||||
), Map.of()));
|
||||
}
|
||||
|
||||
private static GeneralPOJO attr(String column, String referenceId, Integer length, boolean mandatory) {
|
||||
GeneralPOJO po = mock(GeneralPOJO.class);
|
||||
when(po.get_Value("COLUMNNAME")).thenReturn(column);
|
||||
@@ -54,4 +74,12 @@ class MetaControllerDdlTest {
|
||||
when(po.get_ValueAsBoolean("ISMANDATORY")).thenReturn(mandatory);
|
||||
return po;
|
||||
}
|
||||
|
||||
private static GeneralPOJO attrWithDefault(String column, String referenceId, String defaultValue) {
|
||||
GeneralPOJO po = mock(GeneralPOJO.class);
|
||||
when(po.get_Value("COLUMNNAME")).thenReturn(column);
|
||||
when(po.get_Value("REFERENCEID")).thenReturn(referenceId);
|
||||
when(po.get_Value("DEFAULTVALUE")).thenReturn(defaultValue);
|
||||
return po;
|
||||
}
|
||||
}
|
||||
|
||||
61
scripts/p0-createdrop-acceptance.sh
Normal file
61
scripts/p0-createdrop-acceptance.sh
Normal file
@@ -0,0 +1,61 @@
|
||||
#!/usr/bin/env bash
|
||||
# P0② net-new 裸 JDBC 旁路收口 · CREATE/DROP 安全通道端到端验收
|
||||
#
|
||||
# 证明(对真实 PG,经新 jar):
|
||||
# ① POST /api/meta/entity 建表仍走通(CreateTableSqlGuard 不误伤引擎生成的 createTableDdl);
|
||||
# ② psql 直查物理表确已创建;
|
||||
# ③ DELETE /api/meta/entity/{table} 删表走通(executeDropSql→DropTableSqlGuard),物理表+元数据均清除;
|
||||
# ④ 负控:删非 EIP4 前缀表(SYS_USER)被拒,系统表安然无恙。
|
||||
#
|
||||
# 用法:BASE=http://localhost:8094 bash scripts/p0-createdrop-acceptance.sh
|
||||
set -uo pipefail
|
||||
BASE=${BASE:-http://localhost:8094}
|
||||
ACCT=${ACCT:-admin}; PW=${PW:-111111}
|
||||
PGURL=${PGURL:-postgresql://zhengwr@localhost:5433/eip4dev}
|
||||
TS=$(date +%s)
|
||||
TABLE="EIP4PT_CD${TS}"
|
||||
TBL_LC=$(echo "$TABLE" | tr '[:upper:]' '[:lower:]')
|
||||
FAIL=0
|
||||
jqpy() { python3 -c "import sys,json;d=json.load(sys.stdin,strict=False);print(eval(\"d$1\"))" 2>/dev/null; }
|
||||
ok() { echo " ✓ $*"; }
|
||||
bad() { echo " ✗ $*"; FAIL=1; }
|
||||
pg() { psql "$PGURL" -At -c "$1" 2>/dev/null; }
|
||||
|
||||
TOK=$(curl -s -X POST "$BASE/api/auth/login" -H 'Content-Type: application/json' \
|
||||
-d "{\"account\":\"$ACCT\",\"password\":\"$PW\"}" | jqpy "['token']")
|
||||
H=(-H "Authorization: Bearer $TOK" -H 'Content-Type: application/json')
|
||||
[ -n "${TOK:-}" ] && [ "$TOK" != "None" ] && ok "login token len=${#TOK}" || { bad "login 失败"; exit 1; }
|
||||
|
||||
echo "[1] 建实体 $TABLE(CREATE TABLE 经 CreateTableSqlGuard)"
|
||||
ST=$(curl -s -X POST "$BASE/api/meta/entity" "${H[@]}" -d "{
|
||||
\"tablename\":\"$TABLE\",\"name\":\"建删验收\",
|
||||
\"attributes\":[{\"column\":\"TITLE\",\"display\":\"标题\",\"type\":\"string\",\"length\":200,\"mandatory\":true},
|
||||
{\"column\":\"QTY\",\"display\":\"数量\",\"type\":\"integer\"},
|
||||
{\"column\":\"OWNER\",\"display\":\"负责人\",\"type\":\"reference\",\"referenceTable\":\"SYS_USER\"}]}" | jqpy "['status']")
|
||||
[ "$ST" = "0" ] && ok "建表 status=0(守卫未误伤)" || bad "建表失败 status=$ST"
|
||||
|
||||
echo "[2] psql 物理表已创建"
|
||||
EXISTS=$(pg "SELECT count(*) FROM information_schema.tables WHERE table_schema='eip3' AND table_name='$TBL_LC';")
|
||||
[ "$EXISTS" = "1" ] && ok "物理表 $TBL_LC 存在" || bad "物理表缺失 (count=$EXISTS)"
|
||||
META=$(pg "SELECT count(*) FROM eip3.SYS_ENTITY WHERE TABLENAME='$TABLE';")
|
||||
[ "$META" = "1" ] && ok "元数据 SYS_ENTITY 有 1 行" || bad "元数据行数=$META"
|
||||
|
||||
echo "[3] DELETE /api/meta/entity/$TABLE(DROP TABLE 经 DropTableSqlGuard)"
|
||||
ST=$(curl -s -X DELETE "$BASE/api/meta/entity/$TABLE" "${H[@]}" | jqpy "['status']")
|
||||
[ "$ST" = "0" ] && ok "删表 status=0" || bad "删表失败 status=$ST"
|
||||
|
||||
echo "[4] psql 物理表+元数据已清除"
|
||||
EXISTS=$(pg "SELECT count(*) FROM information_schema.tables WHERE table_schema='eip3' AND table_name='$TBL_LC';")
|
||||
[ "$EXISTS" = "0" ] && ok "物理表已 DROP" || bad "物理表仍在 (count=$EXISTS)"
|
||||
META=$(pg "SELECT count(*) FROM eip3.SYS_ENTITY WHERE TABLENAME='$TABLE';")
|
||||
[ "$META" = "0" ] && ok "元数据已清" || bad "元数据残留=$META"
|
||||
|
||||
echo "[5] 负控:删非 EIP4 前缀表(SYS_USER)被拒 + 系统表无恙"
|
||||
ST=$(curl -s -X DELETE "$BASE/api/meta/entity/SYS_USER" "${H[@]}" | jqpy "['status']")
|
||||
[ "$ST" != "0" ] && ok "SYS_USER 删除被拒 status=$ST" || bad "危险:SYS_USER 删除返回 status=0"
|
||||
SYSU=$(pg "SELECT count(*) FROM information_schema.tables WHERE table_schema='eip3' AND table_name='sys_user';")
|
||||
[ "$SYSU" = "1" ] && ok "sys_user 物理表安然无恙" || bad "危险:sys_user 表受影响 (count=$SYSU)"
|
||||
|
||||
echo
|
||||
[ "$FAIL" = "0" ] && echo "✅ P0② CREATE/DROP 守卫端到端验收全绿" || echo "❌ 有失败项,见上 ✗"
|
||||
exit $FAIL
|
||||
Reference in New Issue
Block a user