fix(P0②/P1⑥): 对抗审查收口 4 major + minor
对抗审查 workflow(3 lens)揪出并修复: - [major] AlterTableSqlGuard 移除 ALTER COLUMN TYPE:静态守卫拿不到旧尺寸,无法 保证扩长(varchar(1)/numeric(1,0) 缩短会截断/溢出存量数据),一律拒;扩长须由 MetaController 比对旧列长度后再生成 - [major] addAttributes 校验-写分离 + @Transactional + ALTER 失败抛异常: 杜绝「元数据写了但物理表没加」孤儿(PG 事务性 DDL 一起回滚) - [major] createEntity 检查 executeCreateSql 返回值 + @Transactional:引擎拒建表 不再静默成功 - [major] AiToolRegistry isLocalEnv/isProductionEnv 改 URI host 精确解析:防 http://127.0.0.1.evil.com / localhost.evil.com 伪本地前缀绕过安全门 - [minor] deleteStandard templateId trim + 菜单查询限 isactive=1(两表口径一致, 不连带删历史同 templateId 菜单/授权) - [minor] publish roleIds 只接 String 元素(滤 null/非串);warning 改依据 roleIds.isEmpty()(重复发布不误报) - [minor] menuauth grantToRoles 改 INSERT...WHERE NOT EXISTS(sys_role_menu 无 唯一约束,ON CONFLICT 不去重,重复发布会插重复行)+ columnSqlType 空 refTable 抛错 全单测绿(Failures=0)、p0-alter/p1-6 真库验收绿(含幂等+负控)、浏览器 e2e 6/6 绿 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -74,25 +74,30 @@ public class MenuRegistrar {
|
||||
|
||||
/**
|
||||
* P1⑥:给菜单授权角色(写 sys_role_menu)。发布后若不授权,非超管(无 sys_role_menu 行)看不见新功能。
|
||||
* 复用 {@code AdminWriteController.setRoleMenus} 的 {@code (roleid,menuid) ON CONFLICT DO NOTHING} 幂等范式。
|
||||
*
|
||||
* <p><b>幂等实现</b>:{@code sys_role_menu} 无唯一约束/索引(实测),故 {@code ON CONFLICT DO NOTHING}
|
||||
* 不去重——重复发布会插重复行。这里改用 {@code INSERT ... SELECT ... WHERE NOT EXISTS} 保证幂等
|
||||
* (已存在则插 0 行)。返回值只计真正新增的授权数。
|
||||
*
|
||||
* @param menuId 菜单 id
|
||||
* @param roleIds 授权角色 id 列表
|
||||
* @param operator 操作人(审计)
|
||||
* @return 实际写入(授权)的角色数;menuId/roleIds 为空则 0(不写库)
|
||||
* @return 实际新增(授权)的角色数;menuId/roleIds 为空则 0(不写库)
|
||||
*/
|
||||
public int grantToRoles(String menuId, List<String> roleIds, String operator) {
|
||||
if (menuId == null || menuId.isBlank() || roleIds == null || roleIds.isEmpty()) {
|
||||
return 0;
|
||||
}
|
||||
String mid = menuId.trim();
|
||||
int granted = 0;
|
||||
for (String roleId : roleIds) {
|
||||
if (roleId == null || roleId.isBlank()) {
|
||||
continue;
|
||||
}
|
||||
granted += jdbcTemplate.update(
|
||||
"INSERT INTO sys_role_menu(roleid, menuid) VALUES(?,?) ON CONFLICT DO NOTHING",
|
||||
roleId.trim(), menuId.trim());
|
||||
"INSERT INTO sys_role_menu(roleid, menuid) SELECT ?, ?"
|
||||
+ " WHERE NOT EXISTS (SELECT 1 FROM sys_role_menu WHERE TRIM(roleid)=? AND TRIM(menuid)=?)",
|
||||
roleId.trim(), mid, roleId.trim(), mid);
|
||||
}
|
||||
return granted;
|
||||
}
|
||||
|
||||
@@ -396,13 +396,15 @@ public class DesignFeatureController {
|
||||
data.put("menuId", menuId);
|
||||
|
||||
// P1⑥:可选 roleIds 给菜单授权(写 sys_role_menu);缺省则新功能仅超管可见,返 warning。
|
||||
@SuppressWarnings("unchecked")
|
||||
// 只接 String 元素(滤掉 null/非字符串,避免 String.valueOf 把 null→"null" 写脏授权);
|
||||
// warning 依据「是否传了 roleIds」而非「本次新增数」——否则重复发布(已授权→新增0)会误报。
|
||||
List<String> roleIds = body.get("roleIds") instanceof List<?> rs
|
||||
? rs.stream().map(String::valueOf).filter(s -> !s.isBlank()).toList()
|
||||
? rs.stream().filter(String.class::isInstance).map(String.class::cast)
|
||||
.map(String::trim).filter(s -> !s.isEmpty()).toList()
|
||||
: List.of();
|
||||
int grantedRoles = publishOrchestrator.grantMenuRoles(menuId, roleIds, operator);
|
||||
data.put("grantedRoleCount", grantedRoles);
|
||||
if (grantedRoles == 0) {
|
||||
if (roleIds.isEmpty()) {
|
||||
data.put("menuVisibilityWarning",
|
||||
"未指定 roleIds,新功能菜单仅超管可见;请到「角色菜单授权」为业务角色授权");
|
||||
}
|
||||
|
||||
@@ -71,6 +71,7 @@ public class MetaController {
|
||||
|
||||
@Operation(summary = "创建实体:写入 SYS_ENTITY/SYS_ENTITYATTRIBUTE 元数据并动态创建物理表")
|
||||
@PostMapping("/api/meta/entity")
|
||||
@org.springframework.transaction.annotation.Transactional
|
||||
public Map<String, Object> createEntity(@RequestBody Map<String, Object> req) {
|
||||
Properties ctx = UserSession.getAdmin();
|
||||
String table = String.valueOf(req.get("tablename")).toUpperCase();
|
||||
@@ -169,7 +170,13 @@ public class MetaController {
|
||||
// 动态建表前先清刚保存实体/属性带来的 POInfo 缓存,保证后续读写立即拿到新字段。
|
||||
cacheInvalidator.evictByEntityId(entityId, table);
|
||||
String ddl = createTableDdl(table, created, refTargets);
|
||||
dataDicService.executeCreateSql(ddl);
|
||||
// 检查 DDL 返回值:引擎判非法时返回非空错误串。@Transactional + 抛异常 → 回滚已写的实体/属性
|
||||
// 元数据(对抗审查 major:否则元数据建好但物理表不存在,运行时 list 500)。
|
||||
String ddlErr = dataDicService.executeCreateSql(ddl);
|
||||
if (ddlErr != null) {
|
||||
throw new org.springframework.web.server.ResponseStatusException(
|
||||
org.springframework.http.HttpStatus.BAD_REQUEST, "建表失败: " + ddlErr);
|
||||
}
|
||||
|
||||
// P1-5:建表后按元数据补索引(外键 uuid 列 + UPDATETIME),引擎只建表不建索引
|
||||
List<String> indexes = indexEnhancer.enhanceForNewEntity(table);
|
||||
@@ -277,6 +284,7 @@ public class MetaController {
|
||||
|
||||
@Operation(summary = "为已建实体加列(ALTER ADD COLUMN):写 SYS_ENTITYATTRIBUTE 元数据 + 受控 ALTER 物理表(只加列,恒可空)")
|
||||
@PostMapping("/api/meta/entity/{table}/attributes")
|
||||
@org.springframework.transaction.annotation.Transactional
|
||||
public Map<String, Object> addAttributes(@PathVariable String table, @RequestBody Map<String, Object> req) {
|
||||
Properties ctx = UserSession.getAdmin();
|
||||
String t = table.toUpperCase();
|
||||
@@ -293,11 +301,8 @@ public class MetaController {
|
||||
if (attrs == null || attrs.isEmpty()) {
|
||||
return err("attributes 为空");
|
||||
}
|
||||
// saveAttr 载体:沿用 createEntity 的 SYS_USERGROUP.NAME 属性行模板
|
||||
Entity tplEnt = (Entity) dataDicService.getSYSEntityByTableName("SYS_USERGROUP");
|
||||
Map<String, Object> attrTpl = loadAttrTemplate(idOf(tplEnt));
|
||||
|
||||
List<String> added = new ArrayList<>();
|
||||
// ── 校验全部列(不写库)── 任一不合法原子返回 err;此时尚无写入,无回滚问题。
|
||||
for (Map<String, Object> a : attrs) {
|
||||
String col = String.valueOf(a.get("column")).toUpperCase();
|
||||
if (!col.matches("[A-Z][A-Z0-9_]{1,60}")) {
|
||||
@@ -309,16 +314,28 @@ public class MetaController {
|
||||
if (exists != null && exists > 0) {
|
||||
return err("字段已存在: " + col);
|
||||
}
|
||||
String type = String.valueOf(a.getOrDefault("type", "string"));
|
||||
String display = String.valueOf(a.getOrDefault("display", col));
|
||||
// ALTER 加列一律可空:对有数据的表加 NOT NULL 列会失败,故忽略 mandatory。
|
||||
String ddl;
|
||||
if ("reference".equals(type)) {
|
||||
if ("reference".equals(String.valueOf(a.getOrDefault("type", "string")))) {
|
||||
String refTable = a.get("referenceTable") == null
|
||||
? null : String.valueOf(a.get("referenceTable")).toUpperCase();
|
||||
if (refTable == null || dataDicService.getSYSEntityByTableName(refTable) == null) {
|
||||
return err("引用目标实体不存在: " + refTable);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ── 写库 + 受控 ALTER ── @Transactional + PG 事务性 DDL:任一列 ALTER 失败抛异常 → 整批
|
||||
// (元数据 saveAttr + 已执行的 ALTER)回滚,杜绝「元数据写了但物理表没加」的孤儿(对抗审查 major)。
|
||||
Entity tplEnt = (Entity) dataDicService.getSYSEntityByTableName("SYS_USERGROUP");
|
||||
Map<String, Object> attrTpl = loadAttrTemplate(idOf(tplEnt));
|
||||
List<String> added = new ArrayList<>();
|
||||
for (Map<String, Object> a : attrs) {
|
||||
String col = String.valueOf(a.get("column")).toUpperCase();
|
||||
String type = String.valueOf(a.getOrDefault("type", "string"));
|
||||
String display = String.valueOf(a.getOrDefault("display", col));
|
||||
// ALTER 加列一律可空:对有数据的表加 NOT NULL 列会失败,故忽略 mandatory。
|
||||
String ddl;
|
||||
if ("reference".equals(type)) {
|
||||
String refTable = String.valueOf(a.get("referenceTable")).toUpperCase();
|
||||
String referenceId = findOrCreateReference(refTable, col, ctx);
|
||||
saveAttr(attrTpl, entityId, col, display, referenceId, 36, false, false, ctx);
|
||||
ddl = alterAddColumnDdl(t, col, referenceId, 36, refTable);
|
||||
@@ -336,10 +353,11 @@ public class MetaController {
|
||||
saveAttr(attrTpl, entityId, col, display, ref, len, false, false, ctx);
|
||||
ddl = alterAddColumnDdl(t, col, ref, len, null);
|
||||
}
|
||||
// 受控 ALTER:经 AlterTableSqlGuard 白名单(defense-in-depth,executeAlterSql 内也再校验)
|
||||
// 受控 ALTER:经 AlterTableSqlGuard 白名单(defense-in-depth)。失败抛异常 → 事务回滚。
|
||||
String alterErr = dataDicService.executeAlterSql(ddl);
|
||||
if (alterErr != null) {
|
||||
return err("加列失败[" + col + "]: " + alterErr);
|
||||
throw new org.springframework.web.server.ResponseStatusException(
|
||||
org.springframework.http.HttpStatus.BAD_REQUEST, "加列失败[" + col + "]: " + alterErr);
|
||||
}
|
||||
added.add(col);
|
||||
}
|
||||
@@ -555,8 +573,11 @@ public class MetaController {
|
||||
} else if ("CHAR".equals(ref)) {
|
||||
return "character(36)";
|
||||
}
|
||||
// 引用列:ref=SYS_REFERENCE_ID(uuid),外键指向 refTable
|
||||
return "character(36) REFERENCES " + (refTable != null ? refTable : "");
|
||||
// 引用列:ref=SYS_REFERENCE_ID(uuid),外键指向 refTable(不可为空,否则产无效 DDL)
|
||||
if (refTable == null || refTable.isBlank()) {
|
||||
throw new IllegalStateException("引用列缺目标表,无法生成 ALTER: ref=" + ref);
|
||||
}
|
||||
return "character(36) REFERENCES " + refTable;
|
||||
}
|
||||
|
||||
private static int positiveInt(Object value, int defaultValue) {
|
||||
|
||||
@@ -350,22 +350,26 @@ public class PageSchemaController {
|
||||
public ResponseEntity<Map<String, Object>> deleteStandard(@PathVariable String templateId) {
|
||||
requireAdmin();
|
||||
String operator = currentUserId();
|
||||
// 1. 关联菜单(view_templateid=该页),清角色授权 + 软删菜单(对称 publish 的菜单注册/授权)
|
||||
// templateId 统一 trim:sys_page_schema 用精确 template_id=?,sys_menu 用 TRIM(view_templateid)=?,
|
||||
// 两表对 templateId 的口径保持一致,避免一表命中另一表不命中的半删(对抗审查 minor)。
|
||||
String tpl = templateId == null ? "" : templateId.trim();
|
||||
// 1. 关联菜单(只取 active),清角色授权 + 软删菜单(对称 publish 的菜单注册/授权)。
|
||||
// 限 isactive=1 避免连带删历史已停用的同 templateId 菜单及其授权(对抗审查 minor)。
|
||||
List<String> menuIds = jdbcTemplate.queryForList(
|
||||
"SELECT sys_menu_id FROM sys_menu WHERE TRIM(view_templateid)=?", String.class, templateId);
|
||||
"SELECT sys_menu_id FROM sys_menu WHERE TRIM(view_templateid)=? AND isactive=1", String.class, tpl);
|
||||
int roleMenu = 0;
|
||||
for (String mid : menuIds) {
|
||||
roleMenu += jdbcTemplate.update("DELETE FROM sys_role_menu WHERE TRIM(menuid)=?", mid.trim());
|
||||
}
|
||||
long now = System.currentTimeMillis();
|
||||
int menus = jdbcTemplate.update(
|
||||
"UPDATE sys_menu SET isactive=0, updatetime=?, updateby=? WHERE TRIM(view_templateid)=?",
|
||||
now, operator, templateId);
|
||||
"UPDATE sys_menu SET isactive=0, updatetime=?, updateby=? WHERE TRIM(view_templateid)=? AND isactive=1",
|
||||
now, operator, tpl);
|
||||
// 2. 删标准层(收口 PageSchemaWriter,不裸 JDBC) + overlay
|
||||
int standard = pageSchemaWriter.deleteStandard(templateId, operator);
|
||||
int standard = pageSchemaWriter.deleteStandard(tpl, operator);
|
||||
int overlay = 0;
|
||||
try {
|
||||
overlay = jdbcTemplate.update("DELETE FROM sys_page_schema_overlay WHERE template_id = ?", templateId);
|
||||
overlay = jdbcTemplate.update("DELETE FROM sys_page_schema_overlay WHERE template_id = ?", tpl);
|
||||
} catch (DataAccessException ex) {
|
||||
log.debug("[deleteStandard] overlay 表不可用(忽略): {}", ex.getMessage());
|
||||
}
|
||||
|
||||
@@ -60,19 +60,32 @@ class MenuRegistrarTest {
|
||||
eq("演示功能改名"), eq("TPL-1"), any(), eq("admin"), eq("MENU-EXIST"));
|
||||
}
|
||||
|
||||
// 幂等 INSERT...SELECT...WHERE NOT EXISTS(sys_role_menu 无唯一约束,ON CONFLICT 不去重)
|
||||
private static final String GRANT_SQL =
|
||||
"INSERT INTO sys_role_menu(roleid, menuid) SELECT ?, ?"
|
||||
+ " WHERE NOT EXISTS (SELECT 1 FROM sys_role_menu WHERE TRIM(roleid)=? AND TRIM(menuid)=?)";
|
||||
|
||||
@Test
|
||||
void grantToRolesInsertsPerRole() {
|
||||
void grantToRolesInsertsPerRoleIdempotent() {
|
||||
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||
String insert = "INSERT INTO sys_role_menu(roleid, menuid) VALUES(?,?) ON CONFLICT DO NOTHING";
|
||||
when(jdbc.update(eq(insert), eq("R1"), eq("M9"))).thenReturn(1);
|
||||
when(jdbc.update(eq(insert), eq("R2"), eq("M9"))).thenReturn(1);
|
||||
when(jdbc.update(eq(GRANT_SQL), eq("R1"), eq("M9"), eq("R1"), eq("M9"))).thenReturn(1);
|
||||
when(jdbc.update(eq(GRANT_SQL), eq("R2"), eq("M9"), eq("R2"), eq("M9"))).thenReturn(1);
|
||||
|
||||
MenuRegistrar reg = new MenuRegistrar(jdbc);
|
||||
int granted = reg.grantToRoles("M9", List.of("R1", "R2"), "admin");
|
||||
|
||||
assertThat(granted).isEqualTo(2);
|
||||
verify(jdbc, times(1)).update(eq(insert), eq("R1"), eq("M9"));
|
||||
verify(jdbc, times(1)).update(eq(insert), eq("R2"), eq("M9"));
|
||||
verify(jdbc, times(1)).update(eq(GRANT_SQL), eq("R1"), eq("M9"), eq("R1"), eq("M9"));
|
||||
verify(jdbc, times(1)).update(eq(GRANT_SQL), eq("R2"), eq("M9"), eq("R2"), eq("M9"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void grantToRolesAlreadyGrantedCountsZero() {
|
||||
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||
// WHERE NOT EXISTS 命中 → 插 0 行(幂等)
|
||||
when(jdbc.update(eq(GRANT_SQL), any(), any(), any(), any())).thenReturn(0);
|
||||
MenuRegistrar reg = new MenuRegistrar(jdbc);
|
||||
assertThat(reg.grantToRoles("M9", List.of("R1"), "admin")).isZero();
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -83,6 +96,6 @@ class MenuRegistrarTest {
|
||||
assertThat(reg.grantToRoles("M9", List.of(), "admin")).isZero();
|
||||
assertThat(reg.grantToRoles(" ", List.of("R1"), "admin")).isZero();
|
||||
assertThat(reg.grantToRoles("M9", List.of(" "), "admin")).isZero();
|
||||
verify(jdbc, times(0)).update(anyString(), anyString(), anyString());
|
||||
verify(jdbc, times(0)).update(anyString(), any(), any(), any(), any());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user