Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions shared/glean/mcp/src/remote-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,16 +153,11 @@ function buildTransport(
chatSessionId?: string,
): StreamableHTTPClientTransport {
const parsedUrl = new URL(serverUrl);
// External clients must not send Glean internal-service headers; the edge WAF rejects them.
const headers: Record<string, string> = {
"X-Glean-Internal-Service": "true",
"X-Glean-Gateway-Request-Metadata": buildGatewayMetadataHeader(chatSessionId),
};

const scParam = parsedUrl.searchParams.get("sc");
if (scParam) {
headers["X-Glean-Request-ScParams"] = scParam;
}

const transportOpts: ConstructorParameters<typeof StreamableHTTPClientTransport>[1] = {
requestInit: { headers },
fetch: opts.fetch ?? loggingFetch,
Expand Down
33 changes: 33 additions & 0 deletions shared/glean/mcp/tests/remote-client.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -211,3 +211,36 @@ describe("remote elicitation bridge", () => {
}
});
});

describe("remote transport headers", () => {
it("keeps gateway metadata without forwarding internal headers or removing sc", async () => {
const handler = createMcpHandler(
() => new McpServer({ name: "test", version: "1.0.0" }),
);
const requests: Request[] = [];
const client = await createRemoteClient(
"http://test.local/mcp?sc=request-scope",
{
fetch: (url, init) => {
const request = new Request(url, init);
requests.push(request);
return handler.fetch(request);
},
},
);

try {
expect(requests.length).toBeGreaterThan(0);
for (const request of requests) {
expect(new URL(request.url).searchParams.get("sc")).toBe("request-scope");
expect(request.headers.has("X-Glean-Internal-Service")).toBe(false);
expect(request.headers.has("X-Glean-Request-ScParams")).toBe(false);
expect(request.headers.has("X-Glean-Forced-ScParams")).toBe(false);
expect(request.headers.has("X-Glean-Gateway-Request-Metadata")).toBe(true);
}
} finally {
await client.close();
await handler.close();
}
});
});
Loading