From c5b7b682109a073a338488353eadec872ca3fbe5 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 08:57:59 +0800 Subject: [PATCH] fix: harden AI tool access check --- .../eip4/platform/ai/service/AiToolRegistry.java | 10 ++++++---- .../platform/ai/service/AiToolRegistryTest.java | 9 +++++++++ .../platform/ai/web/AiAgentControllerTest.java | 14 ++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) 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 d15e4fd..eb83e01 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 @@ -100,8 +100,9 @@ public final class AiToolRegistry { if (!employee.toolNames().contains(tool.name())) { blockers.add("Employee " + employee.id() + " is not allowed to use tool " + tool.name()); } - Set granted = new LinkedHashSet<>(request.grantedScopes() == null - ? List.of() : request.grantedScopes()); + List requestScopes = request == null || request.grantedScopes() == null + ? List.of() : request.grantedScopes(); + Set granted = new LinkedHashSet<>(requestScopes); List missingScopes = new ArrayList<>(); for (String scope : tool.requiredScopes()) { if (!granted.contains(scope)) { @@ -116,11 +117,12 @@ public final class AiToolRegistry { if (!missingScopes.isEmpty()) { blockers.add("Missing scopes: " + String.join(",", missingScopes)); } - String targetEnv = text(request.targetEnv()).toLowerCase(Locale.ROOT); + String targetEnv = text(request == null ? null : request.targetEnv()).toLowerCase(Locale.ROOT); if (tool.localOnly() && !isLocalEnv(targetEnv)) { blockers.add("Tool " + tool.name() + " is local-only, targetEnv=" + targetEnv); } - if (request.productionWrite() || isProductionEnv(targetEnv)) { + boolean productionWrite = request != null && request.productionWrite(); + if (productionWrite || isProductionEnv(targetEnv)) { if (!tool.productionWriteAllowed()) { blockers.add("Tool " + tool.name() + " is not allowed to perform production writes"); } diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiToolRegistryTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiToolRegistryTest.java index 2cf0ac3..5f7d3b6 100644 --- a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiToolRegistryTest.java +++ b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiToolRegistryTest.java @@ -65,4 +65,13 @@ class AiToolRegistryTest { assertFalse(decision.allowed()); assertTrue(decision.blockers().stream().anyMatch(b -> b.contains("not allowed"))); } + + @Test + void nullRequestIsRejectedWithoutException() { + var decision = registry.check(null); + + assertFalse(decision.allowed()); + assertTrue(decision.blockers().stream().anyMatch(b -> b.contains("Unknown AI employee"))); + assertTrue(decision.blockers().stream().anyMatch(b -> b.contains("Unknown AI tool"))); + } } diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentControllerTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentControllerTest.java index 80023e4..d83fe6a 100644 --- a/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentControllerTest.java +++ b/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentControllerTest.java @@ -209,6 +209,20 @@ class AiAgentControllerTest { assertTrue(captor.getValue().productionWrite()); } + @Test + void 工具访问检查允许空body由service返回拒绝判定() throws Exception { + when(service.checkToolAccess(null)).thenReturn(new AiToolAccessDecision( + false, List.of(), List.of("Unknown AI employee: ", "Unknown AI tool: "), + null, null)); + + mvc.perform(post("/api/ai/tools/access-check")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.allowed").value(false)) + .andExpect(jsonPath("$.blockers[0]").value("Unknown AI employee: ")); + + verify(service).checkToolAccess(null); + } + private AiAutoDevelopmentRun autoDevelopmentRun() { AiFeatureDevelopment development = new AiFeatureDevelopment(task(), List.of(draft()), changeSet()); AiReleasePlan releasePlan = new AiReleasePlan("ait-1", "aics-1", "READY",