fleet/fleetd
3
0
Fork 0
Code Issues 73 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

#281: cover registered authorization actions
CI / contract (pull_request) Successful in 1m14s
Details
CI / build (pull_request) Successful in 1m33s
Details

Browse Source
This commit is contained in:
Dai Ha
2026-09-04 10:46:26 +07:00
parent 719b79f892
commit 30e21adec7
4 changed files with 76 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fleetd/src/main/java/dev/ltms/fleet/mcp/FleetMcp.java
-6
View File
@@ -68,12 +68,6 @@ import org.slf4j.LoggerFactory;
*/
public final class FleetMcp {
/** The tool names registered below, paired with the action their handler passes to {@link #deny}. */
static Set<String> registeredToolNames() {
return Set.of("fleet_send", "fleet_reply", "fleet_ask", "fleet_status", "fleet_poll",
"fleet_ack", "fleet_spawn", "fleet_list", "fleet_stop", "fleet_profiles", "fleet_whoami");
}
private static final Logger log = LoggerFactory.getLogger(FleetMcp.class);
private static final long DEFAULT_TIMEOUT_MS = 25_000;
fleetd/src/main/java/dev/ltms/fleet/rest/FleetApp.java
-9
View File
@@ -31,7 +31,6 @@ import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.function.Supplier;
@@ -48,14 +47,6 @@ import java.util.stream.Collectors;
*/
public final class FleetApp {
/** Route paths registered by {@link #build()}, including the deliberately open liveness probe. */
static Set<String> registeredRoutePaths() {
return Set.of("GET /healthz", "GET /metrics", "GET /sessions", "GET /agents", "GET /members",
"GET /profiles", "GET /member-credentials", "POST /members", "DELETE /members/{paneId}",
"POST /sessions/{id}/message", "POST /sessions/{id}/reply", "GET /sessions/{id}/replies",
"POST /sessions/{id}/ask", "GET /sessions/{id}/status", "GET /tasks/{ticket}");
}
/** The authorization action the matching route handler hands to {@link #allow}. */
static Authz.Action routeAction(String route) {
return switch (route) {
fleetd/src/test/java/dev/ltms/fleet/mcp/FleetMcpAuthzTest.java
+37 -17
View File
@@ -24,8 +24,13 @@ import io.modelcontextprotocol.spec.McpSchema;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static org.junit.jupiter.api.Assertions.*;
@@ -44,6 +49,9 @@ import static org.junit.jupiter.api.Assertions.*;
*/
class FleetMcpAuthzTest {
private static final Path MCP_SOURCE = Path.of("src/main/java/dev/ltms/fleet/mcp/FleetMcp.java");
private static final Pattern TOOL_REGISTRATION = Pattern.compile("tool\\(\\\"(fleet_[a-z_]+)\\\"");
private final FakeHerdr herdr = new FakeHerdr();
private final AgentControl agents = new AgentControl(herdr);
private Metrics metrics;
@@ -203,28 +211,40 @@ class FleetMcpAuthzTest {
@Test
void everyRegisteredToolHasItsHandlerActionPinned() {
Map<String, Authz.Action> expected = Map.ofEntries(
Map.entry("fleet_send", Authz.Action.SEND),
Map.entry("fleet_reply", Authz.Action.REPLY),
Map.entry("fleet_ask", Authz.Action.ASK),
Map.entry("fleet_status", Authz.Action.READ),
Map.entry("fleet_ack", Authz.Action.DRAIN),
Map.entry("fleet_spawn", Authz.Action.SPAWN),
Map.entry("fleet_list", Authz.Action.READ),
Map.entry("fleet_stop", Authz.Action.STOP),
Map.entry("fleet_profiles", Authz.Action.READ),
Map.entry("fleet_whoami", Authz.Action.READ));
Set<String> registered = toolsTheServerRegisters();
assertTrue(registered.size() >= 10,
"scraped only " + registered.size() + " tool registrations from FleetMcp (" + registered
+ "); the server registers eleven, so the tool(\"…\") scrape has stopped matching");
registered.forEach(tool -> assertDoesNotThrow(() -> FleetMcp.toolAction(tool, Map.of()),
() -> tool + " is registered but has no pinned authorization action"));
Set<String> expectedNames = Set.of("fleet_send", "fleet_reply", "fleet_ask", "fleet_status",
"fleet_poll", "fleet_ack", "fleet_spawn", "fleet_list", "fleet_stop", "fleet_profiles",
"fleet_whoami");
assertEquals(expectedNames, FleetMcp.registeredToolNames(),
"a registered tool needs an action expectation before this test can pass");
expected.forEach((tool, action) -> assertEquals(action, FleetMcp.toolAction(tool, Map.of()), tool));
assertEquals(Authz.Action.SEND, FleetMcp.toolAction("fleet_send", Map.of()));
assertEquals(Authz.Action.REPLY, FleetMcp.toolAction("fleet_reply", Map.of()));
assertEquals(Authz.Action.ASK, FleetMcp.toolAction("fleet_ask", Map.of()));
assertEquals(Authz.Action.READ, FleetMcp.toolAction("fleet_status", Map.of()));
assertEquals(Authz.Action.DRAIN, FleetMcp.toolAction("fleet_ack", Map.of()));
assertEquals(Authz.Action.SPAWN, FleetMcp.toolAction("fleet_spawn", Map.of()));
assertEquals(Authz.Action.READ, FleetMcp.toolAction("fleet_list", Map.of()));
assertEquals(Authz.Action.STOP, FleetMcp.toolAction("fleet_stop", Map.of()));
assertEquals(Authz.Action.READ, FleetMcp.toolAction("fleet_profiles", Map.of()));
assertEquals(Authz.Action.READ, FleetMcp.toolAction("fleet_whoami", Map.of()));
assertEquals(Authz.Action.READ, FleetMcp.toolAction("fleet_poll", Map.of("ticket", "task")));
assertEquals(Authz.Action.DRAIN, FleetMcp.toolAction("fleet_poll", Map.of("target", "term_b")));
}
private static Set<String> toolsTheServerRegisters() {
try {
Matcher matcher = TOOL_REGISTRATION.matcher(Files.readString(MCP_SOURCE));
Set<String> tools = new LinkedHashSet<>();
while (matcher.find()) {
tools.add(matcher.group(1));
}
return tools;
} catch (Exception e) {
throw new AssertionError("could not scrape FleetMcp tool registrations", e);
}
}
@Test
void aWorkerMayNotDrainAnotherSessionsInboxByPolling() {
FleetMcp m = mcp(true);
fleetd/src/test/java/dev/ltms/fleet/rest/FleetAppAuthTest.java
+39 -9
View File
@@ -26,8 +26,15 @@ import java.net.URI;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.LinkedHashSet;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import static org.junit.jupiter.api.Assertions.*;
@@ -37,6 +44,10 @@ import static org.junit.jupiter.api.Assertions.*;
*/
class FleetAppAuthTest {
private static final Path REST_SOURCE = Path.of("src/main/java/dev/ltms/fleet/rest/FleetApp.java");
private static final Pattern ROUTE_REGISTRATION =
Pattern.compile("app\\.(get|post|delete|put|patch)\\(\\s*\"([^\"]+)\"");
private final HttpClient http = HttpClient.newHttpClient();
private Javalin app;
private Metrics metrics;
@@ -95,13 +106,14 @@ class FleetAppAuthTest {
@Test
void everyRegisteredRouteHasItsHandlerActionPinned() {
Set<String> expected = Set.of("GET /healthz", "GET /metrics", "GET /sessions", "GET /agents",
"GET /members", "GET /profiles", "GET /member-credentials", "POST /members",
"DELETE /members/{paneId}", "POST /sessions/{id}/message", "POST /sessions/{id}/reply",
"GET /sessions/{id}/replies", "POST /sessions/{id}/ask", "GET /sessions/{id}/status",
"GET /tasks/{ticket}");
assertEquals(expected, FleetApp.registeredRoutePaths(),
"a registered route needs an action expectation before this test can pass");
Set<String> registered = routesTheServerRegisters();
assertTrue(registered.size() >= 15,
"scraped only " + registered.size() + " route registrations from FleetApp (" + registered
+ "); the app.<verb>(\"…\") scrape has stopped matching");
// Liveness must work before credentials can be checked, so this route is deliberately open.
assertTrue(registered.remove("GET /healthz"), "GET /healthz must stay an explicit ungated exception");
registered.forEach(route -> assertDoesNotThrow(() -> FleetApp.routeAction(route),
() -> route + " is registered but has no pinned authorization action"));
assertEquals(Authz.Action.METRICS, FleetApp.routeAction("GET /metrics"));
assertEquals(Authz.Action.SPAWN, FleetApp.routeAction("POST /members"));
assertEquals(Authz.Action.STOP, FleetApp.routeAction("DELETE /members/{paneId}"));
@@ -113,8 +125,26 @@ class FleetAppAuthTest {
"GET /member-credentials", "GET /sessions/{id}/status", "GET /tasks/{ticket}")) {
assertEquals(Authz.Action.READ, FleetApp.routeAction(route), route);
}
assertThrows(IllegalArgumentException.class, () -> FleetApp.routeAction("GET /healthz"),
"healthz is deliberately open");
assertThrows(IllegalArgumentException.class, () -> FleetApp.routeAction("GET /healthz"));
}
private static Set<String> routesTheServerRegisters() {
try {
String source = Files.readString(REST_SOURCE).lines()
.filter(line -> {
String stripped = line.stripLeading();
return !(stripped.startsWith("//") || stripped.startsWith("*") || stripped.startsWith("/*"));
})
.collect(Collectors.joining("\n"));
Matcher matcher = ROUTE_REGISTRATION.matcher(source);
Set<String> routes = new LinkedHashSet<>();
while (matcher.find()) {
routes.add(matcher.group(1).toUpperCase(Locale.ROOT) + " " + matcher.group(2));
}
return routes;
} catch (Exception e) {
throw new AssertionError("could not scrape FleetApp route registrations", e);
}
}
// --- loopback-trust: the caller is the primary -------------------------------------------