diff --git a/docs/项目进度与路线-总览-2026-06-21.md b/docs/项目进度与路线-总览-2026-06-21.md index cfaf1d3..5e1f1e4 100644 --- a/docs/项目进度与路线-总览-2026-06-21.md +++ b/docs/项目进度与路线-总览-2026-06-21.md @@ -207,7 +207,7 @@ EIP3(Vaadin / 老引擎)→ EIP4(amis 前端 + 保真层 + 转换器)迁 ### 10.3 P2 — 整洁度 / 一致性收敛(多为采纳自原文档的真问题,但属低优先) -- **【D5】抽共享 `LocalHostPolicy`**:`AiToolRegistry:155`/`AiSmokeRunner:105`/`AiLocalReleaseExecutor:298` 三处本机白名单写法不一致(`[::1]` vs `0:0:…`),统一以防新增绕过点。 +- **✅【已完成 2026-06-24】【D5】抽共享 `LocalHostPolicy`**:原状=`AiToolRegistry`/`AiSmokeRunner`/`AiLocalReleaseExecutor` 三处本机白名单互异(ToolRegistry 认展开式 `0:0:0:0:0:0:0:1` 漏 `[::1]`,另两处反之)。**已做**:新增 `LocalHostPolicy.isLocalHost`(去 IPv6 方括号归一 + 精确比对回环集 `{localhost,127.0.0.1,::1,0:0:0:0:0:0:0:1}`,杜绝 `127.0.0.1.evil.com` 伪本地绕过),三处删本地副本统一委托。**验证**:新增 `LocalHostPolicyTest`(接受全部回环形态 + 拒绝伪本地/非本机)3/3 + 三处既有测试(AiToolRegistry 6/AiSmokeRunner 3/AiLocalReleaseExecutor 3)无回归,整套 platform-ai 69/69 绿。 - **【B4】抽 `isAdmin(profile)` 单函数**:`profile?.account==='admin'||profile?.userId==='ADMIN'` 在 Topbar/ModelerPage/NewFeatureShell/AiFeatureForm/DesignCenterPage 5 处逐字硬编码。 - **【B2】删 `api/schema.ts:65-102` overlay 死代码**(零调用,真相在 `editor/overlayApi.ts`);**【B1/B5】**拆 AmisRenderer SDK 注册逻辑、合并 todo.ts/done.ts 503 降级——均**低优先整洁度**,非架构风险。 - **【D2/D3】AI 多入口来源审计**:REST/CLI/MCP 三通道 actor 恒「agent」无区分,加 `X-EIP4-Agent-Channel` 头 + 审计;`runLocalSmoke` 过 `smoke.run` 工具门对齐 `applyLocalRelease`(localhost 硬门已兜底,非可利用洞)。 diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java index a4ff409..4a1d43e 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java @@ -181,7 +181,7 @@ public class AiLocalReleaseExecutor { if (!"http".equalsIgnoreCase(scheme) && !"https".equalsIgnoreCase(scheme)) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "baseUrl 只允许 http/https"); } - if (!isLocalHost(host)) { + if (!LocalHostPolicy.isLocalHost(host)) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "本地发布仅允许访问本机地址"); } String normalized = uri.toString(); @@ -191,14 +191,6 @@ public class AiLocalReleaseExecutor { return URI.create(normalized); } - private static boolean isLocalHost(String host) { - if (host == null) { - return false; - } - String h = host.toLowerCase(Locale.ROOT); - return "localhost".equals(h) || "127.0.0.1".equals(h) || "::1".equals(h) || "[::1]".equals(h); - } - private static String textOrBlank(JsonNode node) { if (node == null || node.isNull()) { return ""; diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiSmokeRunner.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiSmokeRunner.java index fdd37d4..b96be1a 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiSmokeRunner.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiSmokeRunner.java @@ -92,7 +92,7 @@ public class AiSmokeRunner { if (!"http".equalsIgnoreCase(scheme) && !"https".equalsIgnoreCase(scheme)) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "baseUrl 只允许 http/https"); } - if (!isLocalHost(host)) { + if (!LocalHostPolicy.isLocalHost(host)) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "smoke 仅允许访问本机地址"); } String normalized = uri.toString(); @@ -102,14 +102,6 @@ public class AiSmokeRunner { return URI.create(normalized); } - private static boolean isLocalHost(String host) { - if (host == null) { - return false; - } - String h = host.toLowerCase(Locale.ROOT); - return "localhost".equals(h) || "127.0.0.1".equals(h) || "::1".equals(h) || "[::1]".equals(h); - } - private static String text(JsonNode node, String field, String fallback) { JsonNode value = node == null ? null : node.get(field); if (value == null || value.isNull()) { diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiToolRegistry.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiToolRegistry.java index 1138eb3..f5bc06c 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiToolRegistry.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiToolRegistry.java @@ -156,11 +156,9 @@ public final class AiToolRegistry { if (targetEnv.isBlank() || targetEnv.equals("local") || targetEnv.equals("dev")) { return true; } - // 解析 host 精确比对,而非 startsWith 前缀:防 http://127.0.0.1.evil.com / http://localhost.evil.com - // 这类「伪本地」域名绕过(对抗审查 major)。与下游 AiLocalReleaseExecutor.safeLocalBase 同口径。 - String host = hostOf(targetEnv); - return host.equals("localhost") || host.equals("127.0.0.1") - || host.equals("::1") || host.equals("0:0:0:0:0:0:0:1"); + // 解析 host 后交统一的 LocalHostPolicy 精确比对(非前缀),防 http://127.0.0.1.evil.com / + // http://localhost.evil.com 伪本地绕过(对抗审查 major);三处本机判定同口径(总览 §10 D5)。 + return LocalHostPolicy.isLocalHost(hostOf(targetEnv)); } private static boolean isProductionEnv(String targetEnv) { diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/LocalHostPolicy.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/LocalHostPolicy.java new file mode 100644 index 0000000..ec2f5c1 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/LocalHostPolicy.java @@ -0,0 +1,38 @@ +package com.eip4.platform.ai.service; + +import java.util.Locale; +import java.util.Set; + +/** + * AI「仅限本机」红线的单一本机判定(总览 §10 D5)。 + * + *

原先 {@code AiToolRegistry} / {@code AiSmokeRunner} / {@code AiLocalReleaseExecutor} 三处各写一份 + * 白名单且互异——一处认展开式 {@code 0:0:0:0:0:0:0:1} 却漏方括号式 {@code [::1]},另两处反之, + * 同一回环地址一处放行一处拒绝。本类统一为去括号归一 + 精确比对的回环集,消除漂移。 + * + *

精确比对(非前缀):杜绝 {@code http://127.0.0.1.evil.com} / + * {@code http://localhost.evil.com} 这类「伪本地」域名绕过(对抗审查曾揪出的 major)。 + */ +final class LocalHostPolicy { + + private static final Set LOOPBACK = Set.of( + "localhost", "127.0.0.1", "::1", "0:0:0:0:0:0:0:1"); + + private LocalHostPolicy() { + } + + /** + * host 是否为本机回环地址。接受 {@link java.net.URI#getHost()} 的形态: + * 自动小写化并剥去 IPv6 字面量方括号(getHost 对 {@code [::1]} 返回带括号串)。 + */ + static boolean isLocalHost(String host) { + if (host == null) { + return false; + } + String h = host.trim().toLowerCase(Locale.ROOT); + if (h.startsWith("[") && h.endsWith("]")) { + h = h.substring(1, h.length() - 1); + } + return LOOPBACK.contains(h); + } +} diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/service/LocalHostPolicyTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/service/LocalHostPolicyTest.java new file mode 100644 index 0000000..20d093e --- /dev/null +++ b/platform-ai/src/test/java/com/eip4/platform/ai/service/LocalHostPolicyTest.java @@ -0,0 +1,46 @@ +package com.eip4.platform.ai.service; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +/** + * 本机判定红线测试(总览 §10 D5):统一后须接受全部 loopback 形态、拒绝一切伪本地/非本机。 + */ +class LocalHostPolicyTest { + + @Test + @DisplayName("接受全部回环形态(含原三处各漏的 [::1] / 0:0:0:0:0:0:0:1 + 括号/大小写/空白)") + void acceptsAllLoopbackForms() { + assertTrue(LocalHostPolicy.isLocalHost("localhost")); + assertTrue(LocalHostPolicy.isLocalHost("127.0.0.1")); + assertTrue(LocalHostPolicy.isLocalHost("::1")); + assertTrue(LocalHostPolicy.isLocalHost("[::1]")); // 方括号式(原 ToolRegistry 漏) + assertTrue(LocalHostPolicy.isLocalHost("0:0:0:0:0:0:0:1")); // 展开式(原 Smoke/Executor 漏) + assertTrue(LocalHostPolicy.isLocalHost("[0:0:0:0:0:0:0:1]")); + assertTrue(LocalHostPolicy.isLocalHost("LOCALHOST")); // 大小写无关 + assertTrue(LocalHostPolicy.isLocalHost(" localhost ")); // 去空白 + } + + @Test + @DisplayName("拒绝伪本地域名(精确比对防 127.0.0.1.evil.com / localhost.evil.com 绕过)") + void rejectsSpoofedLocalHosts() { + assertFalse(LocalHostPolicy.isLocalHost("127.0.0.1.evil.com")); + assertFalse(LocalHostPolicy.isLocalHost("localhost.evil.com")); + assertFalse(LocalHostPolicy.isLocalHost("evil.com")); + assertFalse(LocalHostPolicy.isLocalHost("notlocalhost")); + } + + @Test + @DisplayName("拒绝非本机地址(含非 .1 回环段与通配地址,保持精确匹配)") + void rejectsNonLocalHosts() { + assertFalse(LocalHostPolicy.isLocalHost("10.0.0.5")); + assertFalse(LocalHostPolicy.isLocalHost("192.168.1.1")); + assertFalse(LocalHostPolicy.isLocalHost("127.0.0.2")); // 127/8 但非精确 127.0.0.1,保守拒绝 + assertFalse(LocalHostPolicy.isLocalHost("0.0.0.0")); + assertFalse(LocalHostPolicy.isLocalHost(null)); + assertFalse(LocalHostPolicy.isLocalHost("")); + } +}