add MCP tool contracts and authenticated local HTTP transport

This commit is contained in:
2026-09-29 07:55:29 +01:00
parent e3c3b2cbb7
commit 9f61f9c07d
18 changed files with 2730 additions and 1 deletions
@@ -21,13 +21,17 @@ class StudioApplicationConfigurationTest {
.headless(true)
.run();
final ExecutorService executor = context.getBean(ExecutorService.class);
final var mcp = context.getBean(p.studio.app.mcp.LocalMcpServer.class);
try (context) {
assertNotNull(context.getBean(StudioUiFactory.class));
assertNotNull(context.getBean(PackerWorkspaceService.class));
assertNotNull(context.getBean(OperationExecutor.class));
assertFalse(context.getClass().getName().contains("WebServer"));
assertFalse(executor.isShutdown());
assertTrue(mcp.isRunning());
assertTrue(context.getBean(p.studio.app.mcp.McpToolRegistry.class).descriptors().isEmpty());
}
assertTrue(executor.isShutdown());
assertFalse(mcp.isRunning());
}
}
@@ -0,0 +1,133 @@
package p.studio.app.mcp;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.jupiter.api.*;
import java.net.URI;
import java.net.http.*;
import java.time.Duration;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import p.studio.api.automation.*;
import static org.junit.jupiter.api.Assertions.*;
class LocalMcpServerTest {
final ObjectMapper mapper = new ObjectMapper();
final HttpClient client = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(3)).build();
LocalMcpServer server;
String session;
AtomicInteger calls;
@BeforeEach void start() throws Exception {
calls = new AtomicInteger();
server = new LocalMcpServer(mapper, new McpToolRegistry(new McpToolCatalog(mapper), mapper, Map.of(
"studio_project_context", args -> { calls.incrementAndGet(); return McpToolResult.success(mapper, mapper.createObjectNode().put("projectRoot", args.get("projectRoot").asText())); },
"studio_control_acquire", args -> McpToolResult.failure(mapper, new AutomationFailure(AutomationFailure.Code.NOT_GRANTED, "Human grant required")))));
server.start();
}
@AfterEach void close() { server.close(); client.close(); }
HttpResponse<String> request(String method, URI uri, String body, String token, String origin, String protocol, String sessionId) throws Exception {
var request = HttpRequest.newBuilder(uri).timeout(Duration.ofSeconds(5))
.header("Accept", "application/json, text/event-stream").header("Content-Type", "application/json");
if (token != null) request.header("Authorization", token);
if (origin != null) request.header("Origin", origin);
if (protocol != null) request.header("MCP-Protocol-Version", protocol);
if (sessionId != null) request.header("Mcp-Session-Id", sessionId);
return client.send(request.method(method, body == null ? HttpRequest.BodyPublishers.noBody() : HttpRequest.BodyPublishers.ofString(body)).build(), HttpResponse.BodyHandlers.ofString());
}
HttpResponse<String> post(String body) throws Exception {
return request("POST", server.connection().endpoint(), body, server.connection().authorizationHeader(), null, LocalMcpServer.PROTOCOL_VERSION, session);
}
static String init() { return "{\"jsonrpc\":\"2.0\",\"id\":1,\"method\":\"initialize\",\"params\":{\"protocolVersion\":\"2025-06-18\",\"clientInfo\":{\"name\":\"test-client\",\"version\":\"1\"},\"capabilities\":{}}}"; }
void initialize() throws Exception {
var response = post(init()); assertEquals(200, response.statusCode());
session = response.headers().firstValue("Mcp-Session-Id").orElseThrow();
assertEquals(LocalMcpServer.PROTOCOL_VERSION, mapper.readTree(response.body()).path("result").path("protocolVersion").asText());
assertEquals(202, post("{\"jsonrpc\":\"2.0\",\"method\":\"notifications/initialized\"}").statusCode());
}
@Test void lifecycleNegotiatesListsAndCallsOnlyActualHandlers() throws Exception {
initialize();
var listed = mapper.readTree(post("{\"jsonrpc\":\"2.0\",\"id\":2,\"method\":\"tools/list\"}").body());
assertEquals(2, listed.path("result").path("tools").size());
var response = post("{\"jsonrpc\":\"2.0\",\"id\":3,\"method\":\"tools/call\",\"params\":{\"name\":\"studio_project_context\",\"arguments\":{\"projectRoot\":\"/project\"}}}");
assertEquals(200, response.statusCode()); assertEquals(1, calls.get());
assertEquals("ok", mapper.readTree(response.body()).path("result").path("structuredContent").path("status").asText());
assertEquals(200, request("DELETE", server.connection().endpoint(), null, server.connection().authorizationHeader(), null, null, session).statusCode());
assertEquals(404, post("{\"jsonrpc\":\"2.0\",\"id\":4,\"method\":\"ping\"}").statusCode());
}
@Test void authAndOriginAreCheckedBeforeProtocolOrTools() throws Exception {
var endpoint = server.connection().endpoint(); var token = server.connection().authorizationHeader();
assertEquals("127.0.0.1", endpoint.getHost()); assertTrue(endpoint.getPort() > 0);
assertEquals(401, request("POST", endpoint, init(), null, null, null, null).statusCode());
assertEquals(401, request("POST", endpoint, init(), "Bearer wrong", null, null, null).statusCode());
for (var origin : List.of("null", "https://evil.example", "http://127.0.0.1:1", "http://localhost:" + endpoint.getPort()))
assertEquals(403, request("POST", endpoint, init(), token, origin, null, null).statusCode());
assertEquals(200, request("POST", endpoint, init(), token, "http://" + endpoint.getRawAuthority(), null, null).statusCode());
assertEquals(0, calls.get());
assertFalse(server.connection().toString().contains(token.substring(7)));
}
@Test void restartChangesCredentialsInvalidatesConnectionsAndDoesNotPersistThem() throws Exception {
initialize(); var old = server.connection(); server.close();
assertFalse(server.isRunning()); assertThrows(IllegalStateException.class, server::connection);
server.start(); assertFalse(old.authorizationHeader().equals(server.connection().authorizationHeader()));
assertEquals(401, request("POST", server.connection().endpoint(), init(), old.authorizationHeader(), null, null, null).statusCode());
assertEquals(404, post(init()).statusCode());
session = null; initialize();
}
@Test void malformedBodiesVersionsAndToolsCannotReachProviders() throws Exception {
initialize();
assertEquals(400, post("{not json}").statusCode());
assertEquals(400, post("[]").statusCode());
assertEquals(400, post("{\"jsonrpc\":2.0,\"id\":1,\"method\":\"ping\"}").statusCode());
assertEquals(400, post("{\"jsonrpc\":\"2.0\",\"method\":123}").statusCode());
assertEquals(400, post("{\"jsonrpc\":\"2.0\",\"id\":1,\"id\":2,\"method\":\"ping\"}").statusCode());
assertEquals(400, post("{\"jsonrpc\":\"2.0\",\"id\":1,\"method\":\"ping\"} {}").statusCode());
assertEquals(400, request("POST", server.connection().endpoint(), init(), server.connection().authorizationHeader(), null, "unknown", session).statusCode());
var bad = post("{\"jsonrpc\":\"2.0\",\"id\":3,\"method\":\"tools/call\",\"params\":{\"name\":\"studio_project_context\",\"arguments\":{\"projectRoot\":\"relative\"}}}");
assertEquals(-32602, mapper.readTree(bad.body()).path("error").path("code").intValue()); assertEquals(0, calls.get());
assertEquals(413, post(" ".repeat(1024 * 1024 + 1)).statusCode());
}
@Test void exactEndpointNoSseAndInitializationAreEnforced() throws Exception {
var endpoint = server.connection().endpoint(); var token = server.connection().authorizationHeader();
assertEquals(400, post("{\"jsonrpc\":\"2.0\",\"id\":3,\"method\":\"tools/list\"}").statusCode());
var initialized = post(init()); session = initialized.headers().firstValue("Mcp-Session-Id").orElseThrow();
assertEquals(-32600, mapper.readTree(post("{\"jsonrpc\":\"2.0\",\"id\":3,\"method\":\"tools/list\"}").body()).path("error").path("code").asInt());
assertEquals(405, request("GET", endpoint, null, token, null, null, session).statusCode());
assertEquals(404, request("POST", URI.create(endpoint + "/nested"), init(), token, null, null, null).statusCode());
assertEquals(404, request("POST", URI.create(endpoint + "?token=forbidden"), init(), token, null, null, null).statusCode());
assertEquals(0, calls.get());
}
@Test void authenticatedConnectionDoesNotGrantControl() throws Exception {
initialize();
var denied = post("{\"jsonrpc\":\"2.0\",\"id\":3,\"method\":\"tools/call\",\"params\":{\"name\":\"studio_control_acquire\",\"arguments\":{\"projectRoot\":\"/project\"}}}");
var result = mapper.readTree(denied.body()).path("result");
assertTrue(result.path("isError").asBoolean()); assertEquals("NOT_GRANTED", result.path("structuredContent").path("error").path("code").asText());
}
@Test void hostileHostAndDuplicateOriginAreRejectedEvenWithValidCredentials() throws Exception {
var connection = server.connection();
try (var socket = new java.net.Socket("127.0.0.1", connection.endpoint().getPort())) {
socket.setSoTimeout(3000);
String request = "POST /mcp HTTP/1.1\r\nHost: evil.example\r\nAuthorization: " + connection.authorizationHeader()
+ "\r\nContent-Length: 0\r\nConnection: close\r\n\r\n";
socket.getOutputStream().write(request.getBytes(java.nio.charset.StandardCharsets.UTF_8));
var status = new java.io.BufferedReader(new java.io.InputStreamReader(socket.getInputStream())).readLine();
assertTrue(status.contains("403"));
}
var request = HttpRequest.newBuilder(connection.endpoint()).header("Authorization", connection.authorizationHeader())
.header("Origin", "http://" + connection.endpoint().getRawAuthority()).header("Origin", "https://evil.example")
.POST(HttpRequest.BodyPublishers.ofString(init())).build();
assertEquals(403, client.send(request, HttpResponse.BodyHandlers.discarding()).statusCode());
}
@Test void contentNegotiationAcceptsWeightedTypesAndRejectsInvalidUtf8() throws Exception {
var connection = server.connection();
var request = HttpRequest.newBuilder(connection.endpoint()).header("Authorization", connection.authorizationHeader())
.header("Accept", "application/json;q=1, text/event-stream;q=0.5").header("Content-Type", "application/json")
.POST(HttpRequest.BodyPublishers.ofString(init())).build();
assertEquals(200, client.send(request, HttpResponse.BodyHandlers.discarding()).statusCode());
var invalid = HttpRequest.newBuilder(connection.endpoint()).header("Authorization", connection.authorizationHeader())
.header("Accept", "application/json, text/event-stream").header("Content-Type", "application/json")
.POST(HttpRequest.BodyPublishers.ofByteArray(new byte[]{(byte) 0xc3, (byte) 0x28})).build();
assertEquals(400, client.send(invalid, HttpResponse.BodyHandlers.discarding()).statusCode());
}
}
@@ -0,0 +1,81 @@
package p.studio.app.mcp;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.junit.jupiter.api.Test;
import p.studio.api.automation.*;
import java.util.*;
import static org.junit.jupiter.api.Assertions.*;
class McpContractTest {
final ObjectMapper mapper = new ObjectMapper();
final McpToolCatalog catalog = new McpToolCatalog(mapper);
@Test void everyToolHasValidExampleAuthorityAndResultEnvelope() {
assertEquals(17, catalog.names().size());
for (var name : catalog.names()) {
var definition = catalog.definition(name);
catalog.validateArguments(name, definition.get("exampleArguments"));
var result = McpToolResult.success(mapper, (ObjectNode) definition.get("exampleValue"));
ContractSchema.validate(definition.get("outputSchema"), result.wire().get("structuredContent"));
var failure = McpToolResult.failure(mapper, new AutomationFailure(AutomationFailure.Code.INVALID_TASK, "Revoked"));
ContractSchema.validate(definition.get("outputSchema"), failure.wire().get("structuredContent"));
assertTrue(Set.of("authenticated", "granted", "task").contains(definition.get("authority").asText()));
assertEquals(definition.get("authority").asText().equals("task"), definition.get("inputSchema").get("properties").has("taskId"));
assertFalse(catalog.descriptor(name).has("exampleArguments"));
}
}
@Test void missingRootTaskUnexpectedFieldsAndWrongTypesAreRejected() {
for (var name : catalog.names()) {
ObjectNode sample = catalog.definition(name).get("exampleArguments").deepCopy();
sample.remove("projectRoot"); assertThrows(IllegalArgumentException.class, () -> catalog.validateArguments(name, sample));
sample.put("projectRoot", "relative/root"); assertThrows(IllegalArgumentException.class, () -> catalog.validateArguments(name, sample));
sample.put("projectRoot", "/project").put("shell", "forbidden"); assertThrows(IllegalArgumentException.class, () -> catalog.validateArguments(name, sample));
sample.remove("shell"); sample.put("projectRoot", 12); assertThrows(IllegalArgumentException.class, () -> catalog.validateArguments(name, sample));
if (sample.has("taskId")) {
sample.put("projectRoot", "/project").remove("taskId");
assertThrows(IllegalArgumentException.class, () -> catalog.validateArguments(name, sample));
}
}
}
@Test void lookupIsExclusiveAndFrameInputAndPaginationAreBounded() {
ObjectNode lookup = catalog.definition("studio_operation_get").get("exampleArguments").deepCopy();
lookup.put("clientRequestId", "request"); assertThrows(IllegalArgumentException.class, () -> catalog.validateArguments("studio_operation_get", lookup));
lookup.remove(List.of("clientRequestId", "operationId")); assertThrows(IllegalArgumentException.class, () -> catalog.validateArguments("studio_operation_get", lookup));
lookup.put("clientRequestId", "request"); catalog.validateArguments("studio_operation_get", lookup);
ObjectNode advance = catalog.definition("studio_headless_advance").get("exampleArguments").deepCopy();
advance.put("frames", -1); assertThrows(IllegalArgumentException.class, () -> catalog.validateArguments("studio_headless_advance", advance));
advance.put("frames", 1.5); assertThrows(IllegalArgumentException.class, () -> catalog.validateArguments("studio_headless_advance", advance));
ObjectNode reference = catalog.definition("studio_reference_read").get("exampleArguments").deepCopy();
reference.put("limit", 0); assertThrows(IllegalArgumentException.class, () -> catalog.validateArguments("studio_reference_read", reference));
ObjectNode input = catalog.definition("studio_headless_set_input").get("exampleArguments").deepCopy();
((ObjectNode) input.get("input")).put("touchX", Long.MAX_VALUE);
assertThrows(IllegalArgumentException.class, () -> catalog.validateArguments("studio_headless_set_input", input));
}
@Test void imageBytesAndMetadataArePreservedWithoutFileTransport() throws Exception {
byte[] png = Base64.getDecoder().decode("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+a9l0AAAAASUVORK5CYII=");
var capture = new CanonicalCapture("session", "build", 123, 7, 1, 1, 1, png);
var wire = McpToolResult.capture(mapper, capture, true).wire();
assertArrayEquals(png, Base64.getDecoder().decode(wire.get("content").get(1).get("data").asText()));
assertEquals("image/png", wire.get("content").get(1).get("mimeType").asText());
assertEquals(wire.get("structuredContent").toString(), wire.get("content").get(0).get("text").asText());
var value = wire.get("structuredContent").get("value");
assertEquals(123, value.get("logicalFrameIndex").asLong()); assertEquals(7, value.get("frameId").asLong());
assertTrue(value.get("stale").asBoolean()); assertEquals("RGBA8888", value.get("pixelFormat").asText());
}
@Test void unavailableHandlersAreNotAdvertisedOrInvoked() {
var registry = new McpToolRegistry(catalog, mapper, Map.of());
assertTrue(registry.descriptors().isEmpty());
assertThrows(IllegalArgumentException.class, () -> registry.call("studio_project_context", catalog.definition("studio_project_context").get("exampleArguments")));
}
@Test void neutralLookupProgressAndReferencesDoNotInventUnknownValues() {
assertThrows(IllegalArgumentException.class, () -> new OperationLookup(null, null));
assertThrows(IllegalArgumentException.class, () -> new OperationLookup("id", "request"));
assertThrows(IllegalArgumentException.class, () -> new TrackedOperation.Progress(4L, 5L));
assertNull(new TrackedOperation.Progress(null, null).completedFrames());
assertFalse(ProjectKnowledge.Version.unknown().known());
assertNull(ProjectKnowledge.Version.unknown().value());
assertEquals(1, new ProjectKnowledge.ReferencePage("unicode", 0, 2, 1, "🎮").nextOffset());
assertThrows(IllegalArgumentException.class, () -> new ProjectKnowledge.ReferencePage("invalid", 0, 1, 1, "ab"));
}
}