feat(P0②): 引擎ALTER安全通道 + AI安全门enforced
- AlterTableSqlGuard(legacy-core,纯静态白名单):只允许 加列/同族扩长/改可空,
拒 DROP COLUMN/RENAME/SET NOT NULL/多语句/跨族/小写绕过;放legacy-core避免反向依赖
- DataDicService.executeAlterSql 受控通道(过Guard再execute,defense-in-depth)
- MetaController POST /api/meta/entity/{table}/attributes 加列端点
(saveAttr元数据+alterAddColumnDdl镜像appendColumnDdl类型映射+evictByTable+补索引,恒可空)
- AiAgentService.applyLocalRelease 织入 AiToolRegistry.check:安全门 advisory→enforced
(local.apply工具身份,非本机/越权写路径403)
- 单测 Guard15/alter2/gate22(112基线无回归);scripts/p0-alter-acceptance.sh 真库验收
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -101,6 +101,13 @@ public interface DataDicService {
|
||||
* @return
|
||||
*/
|
||||
public String executeCreateSql(String sql);
|
||||
|
||||
/**
|
||||
* 受控变更实体表结构(只允许 加列 / 同族扩长 / 改可空,经 AlterTableSqlGuard 白名单校验)。
|
||||
* @param sql ALTER 语句
|
||||
* @return null=成功;非空=失败原因
|
||||
*/
|
||||
public String executeAlterSql(String sql);
|
||||
|
||||
/**
|
||||
* get entity by table name
|
||||
|
||||
@@ -0,0 +1,106 @@
|
||||
package com.dsasp.server.dataDic.service;
|
||||
|
||||
import java.util.Locale;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/**
|
||||
* P0② 引擎 ALTER 安全通道守卫(纯静态 / 无 Spring 依赖,便于单测)。
|
||||
*
|
||||
* <p>保真层(com.dsasp.*)的 DDL 此前只接受 CREATE({@code DataDicServiceImpl.executeCreateSql}),
|
||||
* 完全不支持 ALTER。本守卫把 ALTER 从「完全不可达」收窄为「只允许 加列 / 同族扩长 / 改可空」
|
||||
* 的最小安全集,显式拒绝一切破坏性 / 不可逆 DDL。
|
||||
*
|
||||
* <p>放在 legacy-core(而非 platform-metadata)以避免 legacy-core→metadata 的反向(循环)依赖:
|
||||
* 引擎层 {@code executeAlterSql} 与控制层 {@code MetaController} 都引用本类,形成 defense-in-depth
|
||||
* 双层校验。
|
||||
*
|
||||
* <p>受控形态(标识符大小写敏感,必须大写,匹配引擎建表正则;类型 token 小写,匹配
|
||||
* {@code MetaController.appendColumnDdl} 的输出):
|
||||
* <ul>
|
||||
* <li>{@code ALTER TABLE <T> ADD COLUMN <C> <type>} — 加列(可带 REFERENCES 引用)</li>
|
||||
* <li>{@code ALTER TABLE <T> ALTER COLUMN <C> TYPE <varchar(n)|numeric(p,s)>} — 同族扩长</li>
|
||||
* <li>{@code ALTER TABLE <T> ALTER COLUMN <C> DROP NOT NULL} — 改可空</li>
|
||||
* </ul>
|
||||
* 其余(DROP COLUMN / RENAME / SET NOT NULL / 跨族类型转换 / 多语句 / 子查询 / 注释 / 小写绕过)
|
||||
* 一律抛 {@link IllegalArgumentException}。
|
||||
*/
|
||||
public final class AlterTableSqlGuard {
|
||||
|
||||
private AlterTableSqlGuard() {
|
||||
}
|
||||
|
||||
/** 表名/列名规则与 MetaController 建表白名单一致(大写起头,大写数字下划线)。 */
|
||||
private static final String TABLE = "[A-Z][A-Z0-9_]{2,40}";
|
||||
private static final String COLUMN = "[A-Z][A-Z0-9_]{1,60}";
|
||||
|
||||
/** 加列允许的引擎类型(对齐 appendColumnDdl:字符串/数值/整型/时间戳/定长/引用列)。 */
|
||||
private static final String ADD_TYPE =
|
||||
"(?:character varying\\(\\d{1,4}\\)"
|
||||
+ "|numeric\\(\\d{1,2},\\d{1,2}\\)"
|
||||
+ "|integer"
|
||||
+ "|bigint"
|
||||
+ "|character\\(36\\)(?: REFERENCES " + TABLE + ")?)";
|
||||
|
||||
/** 扩长只允许同族(varchar 改宽 / numeric 改精度),不允许跨族(varchar→int 会丢数据)。 */
|
||||
private static final String WIDEN_TYPE =
|
||||
"(?:character varying\\(\\d{1,4}\\)|numeric\\(\\d{1,2},\\d{1,2}\\))";
|
||||
|
||||
private static final Pattern ADD_COLUMN = Pattern.compile(
|
||||
"ALTER TABLE (" + TABLE + ") ADD COLUMN (" + COLUMN + ") " + ADD_TYPE);
|
||||
private static final Pattern ALTER_TYPE = Pattern.compile(
|
||||
"ALTER TABLE (" + TABLE + ") ALTER COLUMN (" + COLUMN + ") TYPE " + WIDEN_TYPE);
|
||||
private static final Pattern DROP_NOT_NULL = Pattern.compile(
|
||||
"ALTER TABLE (" + TABLE + ") ALTER COLUMN (" + COLUMN + ") DROP NOT NULL");
|
||||
|
||||
/**
|
||||
* 注意:不含 " NOT NULL"(会误伤合法的 "DROP NOT NULL");ADD COLUMN ... NOT NULL 由
|
||||
* 「不匹配任何受控形态」自然拒绝。"SET NOT NULL" 明确列出(不会误伤 DROP NOT NULL)。
|
||||
*/
|
||||
private static final String[] DENY_TOKENS = {
|
||||
"--", "/*", "*/", " USING ", "(SELECT", " SELECT ",
|
||||
" DROP COLUMN", " RENAME ", " SET NOT NULL", " SET DEFAULT",
|
||||
" DROP TABLE", " DROP CONSTRAINT", " ADD CONSTRAINT",
|
||||
};
|
||||
|
||||
/**
|
||||
* 校验并归一化一条 ALTER 语句。
|
||||
*
|
||||
* @param sql 原始 SQL
|
||||
* @return 归一后的安全 SQL(折叠空白、去尾分号),可直接交给 jdbcTemplate.execute
|
||||
* @throws IllegalArgumentException 非白名单 / 危险 / 非受控形态
|
||||
*/
|
||||
public static String guard(String sql) {
|
||||
if (sql == null) {
|
||||
throw new IllegalArgumentException("ALTER 脚本为空");
|
||||
}
|
||||
String s = sql.strip();
|
||||
if (s.endsWith(";")) {
|
||||
s = s.substring(0, s.length() - 1).strip();
|
||||
}
|
||||
s = s.replaceAll("\\s+", " ");
|
||||
if (s.isEmpty()) {
|
||||
throw new IllegalArgumentException("ALTER 脚本为空");
|
||||
}
|
||||
// 单语句:折叠后不得再含分号(分号注入第二句)
|
||||
if (s.indexOf(';') >= 0) {
|
||||
throw new IllegalArgumentException("只允许单条 ALTER 语句: " + sql);
|
||||
}
|
||||
String upper = s.toUpperCase(Locale.ROOT);
|
||||
if (!upper.startsWith("ALTER TABLE ")) {
|
||||
throw new IllegalArgumentException("只允许 ALTER TABLE 语句: " + sql);
|
||||
}
|
||||
for (String bad : DENY_TOKENS) {
|
||||
if (upper.contains(bad)) {
|
||||
throw new IllegalArgumentException("ALTER 含禁止操作 [" + bad.trim() + "]: " + sql);
|
||||
}
|
||||
}
|
||||
// 必须精确匹配三种受控形态之一(整串 matches,标识符大小写敏感)
|
||||
if (ADD_COLUMN.matcher(s).matches()
|
||||
|| ALTER_TYPE.matcher(s).matches()
|
||||
|| DROP_NOT_NULL.matcher(s).matches()) {
|
||||
return s;
|
||||
}
|
||||
throw new IllegalArgumentException(
|
||||
"非受控的 ALTER 形态(只允许 加列 / 同族扩长 / 改可空): " + sql);
|
||||
}
|
||||
}
|
||||
@@ -204,6 +204,18 @@ public class DataDicServiceImpl implements DataDicService {
|
||||
return "非合法的创建表脚本";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String executeAlterSql(String sql) {
|
||||
String safe;
|
||||
try {
|
||||
safe = AlterTableSqlGuard.guard(sql);
|
||||
} 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,151 @@
|
||||
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② 引擎 ALTER 安全通道守卫。保真层(com.dsasp.*)的 DDL 此前只接受 CREATE
|
||||
* (DataDicServiceImpl.executeCreateSql),完全不支持 ALTER。本守卫把 ALTER 从
|
||||
* 「完全不可达」收窄为「只允许 加列 / 同族扩长 / 改可空」的最小安全集,显式拒绝
|
||||
* 一切破坏性/不可逆 DDL(DROP COLUMN / RENAME / SET NOT NULL / 多语句 / 跨族类型 /
|
||||
* 小写绕过 / 子查询)。规则与 MetaController.appendColumnDdl 的类型映射对齐。
|
||||
*/
|
||||
class AlterTableSqlGuardTest {
|
||||
|
||||
// ---------- 允许:加列 ----------
|
||||
@Test
|
||||
@DisplayName("加列:numeric/varchar/integer/bigint/character(36) 五类引擎类型通过,返回归一 SQL")
|
||||
void addColumnAllowedTypes() {
|
||||
assertEquals("ALTER TABLE EIP4_X ADD COLUMN AMOUNT numeric(18,6)",
|
||||
AlterTableSqlGuard.guard("ALTER TABLE EIP4_X ADD COLUMN AMOUNT numeric(18,6)"));
|
||||
assertEquals("ALTER TABLE EIP4_X ADD COLUMN NAME character varying(200)",
|
||||
AlterTableSqlGuard.guard("ALTER TABLE EIP4_X ADD COLUMN NAME character varying(200)"));
|
||||
assertEquals("ALTER TABLE EIP4_X ADD COLUMN QTY integer",
|
||||
AlterTableSqlGuard.guard("ALTER TABLE EIP4_X ADD COLUMN QTY integer"));
|
||||
assertEquals("ALTER TABLE EIP4_X ADD COLUMN WHEN_AT bigint",
|
||||
AlterTableSqlGuard.guard("ALTER TABLE EIP4_X ADD COLUMN WHEN_AT bigint"));
|
||||
assertEquals("ALTER TABLE EIP4_X ADD COLUMN CODE character(36)",
|
||||
AlterTableSqlGuard.guard("ALTER TABLE EIP4_X ADD COLUMN CODE character(36)"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("加引用列:character(36) REFERENCES 目标表 通过")
|
||||
void addReferenceColumnAllowed() {
|
||||
assertEquals("ALTER TABLE EIP4_ORDER ADD COLUMN CUSTOMERID character(36) REFERENCES EIP4_CUSTOMER",
|
||||
AlterTableSqlGuard.guard(
|
||||
"ALTER TABLE EIP4_ORDER ADD COLUMN CUSTOMERID character(36) REFERENCES EIP4_CUSTOMER"));
|
||||
}
|
||||
|
||||
// ---------- 允许:同族扩长 ----------
|
||||
@Test
|
||||
@DisplayName("扩长:ALTER COLUMN ... TYPE varchar(n) / numeric(p,s) 通过")
|
||||
void widenTypeAllowed() {
|
||||
assertEquals("ALTER TABLE EIP4_X ALTER COLUMN NAME TYPE character varying(400)",
|
||||
AlterTableSqlGuard.guard("ALTER TABLE EIP4_X ALTER COLUMN NAME TYPE character varying(400)"));
|
||||
assertEquals("ALTER TABLE EIP4_X ALTER COLUMN AMOUNT TYPE numeric(20,8)",
|
||||
AlterTableSqlGuard.guard("ALTER TABLE EIP4_X ALTER COLUMN AMOUNT TYPE numeric(20,8)"));
|
||||
}
|
||||
|
||||
// ---------- 允许:改可空 ----------
|
||||
@Test
|
||||
@DisplayName("改可空:ALTER COLUMN ... DROP NOT NULL 通过")
|
||||
void dropNotNullAllowed() {
|
||||
assertEquals("ALTER TABLE EIP4_X ALTER COLUMN NAME DROP NOT NULL",
|
||||
AlterTableSqlGuard.guard("ALTER TABLE EIP4_X ALTER COLUMN NAME DROP NOT NULL"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("空白容错:首尾空白 + 单个结尾分号 被归一掉,内部多空格折叠")
|
||||
void whitespaceNormalized() {
|
||||
assertEquals("ALTER TABLE EIP4_X ADD COLUMN AMOUNT numeric(18,6)",
|
||||
AlterTableSqlGuard.guard(" ALTER TABLE EIP4_X ADD COLUMN AMOUNT numeric(18,6) ; "));
|
||||
}
|
||||
|
||||
// ---------- 拒绝:破坏性/不可逆 ----------
|
||||
@Test
|
||||
@DisplayName("拒绝:DROP COLUMN(丢数据)")
|
||||
void rejectDropColumn() {
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> AlterTableSqlGuard.guard("ALTER TABLE EIP4_X DROP COLUMN NAME"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("拒绝:RENAME(破坏引用)")
|
||||
void rejectRename() {
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> AlterTableSqlGuard.guard("ALTER TABLE EIP4_X RENAME COLUMN NAME TO NAME2"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("拒绝:SET NOT NULL(收紧约束,对存量数据不可逆)")
|
||||
void rejectSetNotNull() {
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> AlterTableSqlGuard.guard("ALTER TABLE EIP4_X ALTER COLUMN NAME SET NOT NULL"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("拒绝:ADD COLUMN ... NOT NULL(有数据的表加非空列会失败)")
|
||||
void rejectAddColumnNotNull() {
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> AlterTableSqlGuard.guard("ALTER TABLE EIP4_X ADD COLUMN NAME character varying(200) NOT NULL"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("拒绝:跨族类型转换(varchar→int 会丢数据/报错)")
|
||||
void rejectCrossFamilyTypeChange() {
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> AlterTableSqlGuard.guard("ALTER TABLE EIP4_X ALTER COLUMN QTY TYPE integer"));
|
||||
}
|
||||
|
||||
// ---------- 拒绝:注入/越权 ----------
|
||||
@Test
|
||||
@DisplayName("拒绝:多语句(分号注入第二句)")
|
||||
void rejectMultiStatement() {
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> AlterTableSqlGuard.guard(
|
||||
"ALTER TABLE EIP4_X ADD COLUMN NAME integer; DROP TABLE EIP4_X"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("拒绝:DROP TABLE / CREATE 等非 ALTER 语句")
|
||||
void rejectNonAlter() {
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> AlterTableSqlGuard.guard("DROP TABLE EIP4_X"));
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> AlterTableSqlGuard.guard("CREATE TABLE EIP4_X (EIP4_X_ID character(36))"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("拒绝:小写绕过(标识符必须大写,匹配引擎建表规则)")
|
||||
void rejectLowercaseBypass() {
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> AlterTableSqlGuard.guard("alter table eip4_x add column amount numeric(18,6)"));
|
||||
// 表名小写
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> AlterTableSqlGuard.guard("ALTER TABLE eip4x ADD COLUMN AMOUNT integer"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("拒绝:子查询 / USING 强转 / 注释")
|
||||
void rejectSubqueryAndUsing() {
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> AlterTableSqlGuard.guard(
|
||||
"ALTER TABLE EIP4_X ALTER COLUMN QTY TYPE integer USING (SELECT 1)"));
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> AlterTableSqlGuard.guard("ALTER TABLE EIP4_X ADD COLUMN NAME integer -- drop"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("拒绝:未知类型 / 空 / null")
|
||||
void rejectUnknownTypeAndEmpty() {
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> AlterTableSqlGuard.guard("ALTER TABLE EIP4_X ADD COLUMN ID money(1)"));
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> AlterTableSqlGuard.guard(" "));
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> AlterTableSqlGuard.guard(null));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user