Skip to content
Closed
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
16 changes: 16 additions & 0 deletions server/mcp-oauth.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,22 @@ describe("the sign-in", () => {
});
});

it("names a registration the authorization server refuses with any other answer", async () => {
// The real case (Harness's Keycloak): a 403 whose policy rejects the
// registration, which the member must answer with a pasted client ID.
const context = setup({ dcrError: "insufficient_scope", dcrStatus: 403 });
register(context.oauth);
expect(await context.oauth.startSignIn(member, "mail", "u1")).toEqual({
ok: false,
reason: "registration_refused",
});
// Nothing of a client is stored: the sign-in left the server as it was.
expect(context.sources.servers.list(member)[0].oauth).toEqual({
clientId: null,
signedIn: false,
});
});

it("refuses metadata whose resource is not the registered URL", async () => {
const context = setup({ resource: "https://other.example.test/mcp" });
register(context.oauth);
Expand Down
5 changes: 4 additions & 1 deletion server/test-support/mcp-oauth-stub.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ export interface StubOptions {
tokenEndpoint?: string;
registration?: boolean;
dcrError?: string;
// The status the registration refusal answers with (400 by default).
dcrStatus?: number;
}

export function stubRig(options: StubOptions = {}) {
Expand Down Expand Up @@ -105,7 +107,8 @@ export function stubRig(options: StubOptions = {}) {
if (url === `${ISSUER}/register`) {
const body = JSON.parse(typeof init.body === "string" ? init.body : "");
rig.registeredRedirects.push(...body.redirect_uris);
if (options.dcrError) return json({ error: options.dcrError }, 400);
if (options.dcrError)
return json({ error: options.dcrError }, options.dcrStatus ?? 400);
return json({ client_id: "client-dcr-1" }, 201);
}
if (url === `${ISSUER}/token`) {
Expand Down
2 changes: 2 additions & 0 deletions shared/i18n/ca.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1328,6 +1328,8 @@ Coses que pots fer per ell:
"No s'ha pogut iniciar la sessió. Torna-ho a provar.",
"settings.mcpServers.signInError.clientNeeded":
"Aquest servidor no registra clients. Introdueix un ID de client.",
"settings.mcpServers.signInError.registrationRefused":
"El servei ha rebutjat registrar un client automàticament. Introdueix l'ID de client de la documentació del servei a la configuració del servidor, a Integracions → MCP.",
"settings.mcpServers.signInError.redirectRefused":
"El servidor d'autorització ha rebutjat l'adreça d'aquesta oficina. Alguns servidors només accepten adreces https o localhost.",
"settings.mcpServers.signInError.metadata":
Expand Down
2 changes: 2 additions & 0 deletions shared/i18n/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1304,6 +1304,8 @@ Never ask for or repeat secrets (API keys, tokens, passwords). Point people to t
"settings.mcpServers.signInFailed": "The sign-in failed. Try again.",
"settings.mcpServers.signInError.clientNeeded":
"This server does not register clients. Enter a client ID.",
"settings.mcpServers.signInError.registrationRefused":
"The service refused to register a client automatically. Enter the client ID from the service's documentation in the server's settings, in Integrations → MCP.",
"settings.mcpServers.signInError.redirectRefused":
"The authorization server refused this office's address. Some servers accept only https or localhost addresses.",
"settings.mcpServers.signInError.metadata":
Expand Down
2 changes: 2 additions & 0 deletions shared/i18n/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1332,6 +1332,8 @@ Cosas que puedes hacer por él:
"No se pudo iniciar sesión. Inténtalo de nuevo.",
"settings.mcpServers.signInError.clientNeeded":
"Este servidor no registra clientes. Introduce un ID de cliente.",
"settings.mcpServers.signInError.registrationRefused":
"El servicio rechazó registrar un cliente automáticamente. Introduce el ID de cliente de la documentación del servicio en los ajustes del servidor, en Integraciones → MCP.",
"settings.mcpServers.signInError.redirectRefused":
"El servidor de autorización rechazó la dirección de esta oficina. Algunos servidores solo aceptan direcciones https o localhost.",
"settings.mcpServers.signInError.metadata":
Expand Down
2 changes: 2 additions & 0 deletions shared/i18n/zh.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1183,6 +1183,8 @@ export const zh: Catalog = {
"settings.mcpServers.signInFailed": "登录失败。请重试。",
"settings.mcpServers.signInError.clientNeeded":
"此服务器不注册客户端。请输入客户端 ID。",
"settings.mcpServers.signInError.registrationRefused":
"此服务拒绝了自动注册客户端。请在“集成 → MCP”中该服务器的设置里输入服务文档提供的客户端 ID。",
"settings.mcpServers.signInError.redirectRefused":
"授权服务器拒绝了此办公室的地址。有些服务器只接受 https 或 localhost 地址。",
"settings.mcpServers.signInError.metadata":
Expand Down
34 changes: 34 additions & 0 deletions ui/integrations/McpSection.dom.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,40 @@ it("explains a refused sign-in redirect by its code", async () => {
);
});

// A service that refuses the automatic client registration (a 403 from its
// registration endpoint) gets its own message, not the bare failure - it
// tells the member to paste the client ID the service's docs name. The
// notice of a code that came back to the page says the same.
it("explains a registration the service refused, in the form and in the returned notice", async () => {
setApiShim(async (method, path) => {
if (path === "/api/me/connections") return EMPTY_CONNECTIONS;
if (path.endsWith("/secrets")) return { secrets: [] };
if (method === "GET")
return {
servers: [
server("mail", { oauth: { clientId: "c1", signedIn: true } }),
],
};
throw new ApiError(502, "sign_in_failed", "x", {
reason: "registration_refused",
});
});
const view = await mount();
await click(view.container.querySelector("[data-mcp-edit]"));
await click(view.container.querySelector("[data-mcp-sign-in-again]"));
const text = t("settings.mcpServers.signInError.registrationRefused");
expect(view.getByRole("alert").textContent).toBe(text);
expect(text).not.toBe(t("settings.mcpServers.signInFailed"));
view.unmount();
const notice = render(
createElement(SignInNotice, {
code: "registration_refused",
server: "mail",
}),
);
expect(notice.getByRole("alert").textContent).toBe(text);
});

// AGENTS.md "UI rules" (task ea76bd44): the secret a sign-in would make,
// named in its refusal, is Data.
it("names the secret in the way of a sign-in as data", async () => {
Expand Down
2 changes: 2 additions & 0 deletions ui/integrations/McpSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ export function signInErrorText(
switch (reason) {
case "client_needed":
return t("settings.mcpServers.signInError.clientNeeded");
case "registration_refused":
return t("settings.mcpServers.signInError.registrationRefused");
case "redirect_refused":
return t("settings.mcpServers.signInError.redirectRefused");
case "discovery_failed":
Expand Down
23 changes: 22 additions & 1 deletion ui/integrations/sign-in-return.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// sessionStorage, is read once, and goes stale after 15 minutes.

import type { McpServerSignInRes } from "../../shared/contract-shapes.ts";
import { apiFetch } from "../api.ts";
import { apiFetch, ApiError } from "../api.ts";
import { basePath, type Target } from "./target.ts";

const KEY = "isomux:mcpSignIn";
Expand Down Expand Up @@ -69,3 +69,24 @@ export async function startMcpSignIn(
if (!askId) rememberSignIn({ server, target });
window.location.assign(authorizationUrl);
}

// A sign-in the office refused to start, for a caller whose card the save
// already closed (an ask card): there is no card left to show the reason on,
// so the browser goes where the callback would have gone. The Integrations
// page shows the reason on the server's row, which offers the sign-in again.
// The code is the office's own fixed reason, never the authorization
// server's text.
export function failMcpSignIn(
target: Target,
server: string,
caught: unknown,
): void {
const reason =
caught instanceof ApiError && typeof caught.detail?.reason === "string"
? caught.detail.reason
: "unexpected";
rememberSignIn({ server, target });
window.location.assign(
`/integrations?mcpSignIn=${encodeURIComponent(reason)}`,
);
}
34 changes: 34 additions & 0 deletions ui/log-view/SecretAskCard.dom.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,40 @@ it("an office OAuth request signs in to the office server", async () => {
}
});

// A sign-in the office refuses to start (a service that refuses the
// automatic client registration): the save closed the ask, so no card is
// left to say why. The browser goes to the Integrations page with the
// reason instead, where the server's row shows it and offers the sign-in.
it("a refused sign-in start sends the browser to the Integrations page with the reason", async () => {
answer = async (path) => {
if (path.endsWith("/sign-in"))
throw new ApiError(502, "sign_in_failed", "refused", {
reason: "registration_refused",
});
return { name: "docs" };
};
const assign = spyOn(window.location, "assign").mockImplementation(() => {});
try {
const view = await mount(false, OAUTH_ASK("personal"));
await act(async () => {
fireEvent.click(saveAndSignIn(view));
});
await waitFor(() =>
expect(assign).toHaveBeenCalledWith(
"/integrations?mcpSignIn=registration_refused",
),
);
// The note names the server and its owner, as after a started sign-in.
expect(takeSignIn()).toEqual({
server: "docs",
target: { kind: "self", username: "alice" },
});
view.unmount();
} finally {
assign.mockRestore();
}
});

it("the request's OAuth is only the starting choice: with None the save makes a plain server and no sign-in starts", async () => {
signInAnswers();
const assign = spyOn(window.location, "assign").mockImplementation(() => {});
Expand Down
14 changes: 10 additions & 4 deletions ui/log-view/SecretAskCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ import {
} from "../integrations/DiscordSection.tsx";
import { DISCORD_BOTS_MAX } from "../../shared/discord.ts";
import { Choice } from "../integrations/kit.tsx";
import { startMcpSignIn } from "../integrations/sign-in-return.ts";
import {
startMcpSignIn,
failMcpSignIn,
} from "../integrations/sign-in-return.ts";
import type { Target } from "../integrations/target.ts";
import { timeSince } from "../../shared/i18n/time.ts";
import {
Expand Down Expand Up @@ -250,10 +253,13 @@ export function SecretAskCard({
setValue("");
dispatch({ type: "ask_removed", id: entry.id });
// The save closed the ask, so the card can be gone by now: nothing
// here waits on it. A sign-in that does not start leaves the server
// signed out, and its Integrations row offers the sign-in.
// here waits on it. A sign-in that does not start sends the browser
// to the Integrations page with the reason, where the server's row
// shows it and offers the sign-in again.
if (kind === "save" && isMcp && auth === "oauth" && target)
startMcpSignIn(target, secret.name).catch(() => {});
startMcpSignIn(target, secret.name).catch((caught) => {
failMcpSignIn(target, secret.name, caught);
});
} catch (caught) {
// 404: the request closed elsewhere (another owner, the agent's
// withdraw); the push removes it too.
Expand Down
Loading