a028d76144
* feat(mcp-oauth): add oauth field to ClaudeCodeMcpServer schema Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode) Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai> * feat(mcp-oauth): add RFC 7591 Dynamic Client Registration * feat(mcp-oauth): add RFC 9728 PRM + RFC 8414 AS discovery * feat(mcp-oauth): add secure token storage with {host}/{resource} key format * feat(mcp-oauth): add dynamic port OAuth callback server * feat(mcp-oauth): add RFC 8707 Resource Indicators * feat(mcp-oauth): implement full-spec McpOAuthProvider * feat(mcp-oauth): add step-up authorization handler * feat(mcp-oauth): integrate authProvider into SkillMcpManager * feat(doctor): add MCP OAuth token status check * feat(cli): add mcp oauth subcommand structure * feat(cli): implement mcp oauth login command * fix(mcp-oauth): address cubic review — security, correctness, and test issues - Remove @ts-nocheck from provider.ts, storage.ts, provider.test.ts - Fix server resource leak on missing code/state (close + reject) - Fix command injection in openBrowser (spawn array args, cross-platform) - Mock McpOAuthProvider in login.test.ts for deterministic CI - Recreate auth provider with merged scopes in step-up flow - Add listAllTokens() for global status listing - Fix logout to accept --server-url for correct token deletion - Support both quoted and unquoted WWW-Authenticate params (RFC 2617) - Save/restore OPENCODE_CONFIG_DIR in storage.test.ts - Fix index.test.ts: vitest → bun:test * fix(mcp-oauth): use explorer instead of cmd /c start on Windows to prevent shell injection * fix(mcp-oauth): address remaining cubic review issues - Add 5-minute timeout to provider callback server to prevent indefinite hangs - Persist client registration from token storage across process restarts - Require --server-url for logout to match token storage key format - Use listTokensByHost for server-specific status lookups - Fix callback-server test to handle promise rejection ordering - Fix provider test port expectations (8912 → 19877) - Fix cli-guide.md duplicate Section 7 numbering - Fix manager test for login-on-missing-tokens behavior * fix(mcp-oauth): address final review issues - P1: Redact token values in status.ts output to prevent credential leakage - P2: Read OAuth error response body before throwing in token exchange - Test: Fix mcp-oauth doctor test to use epoch seconds (not milliseconds) --------- Co-authored-by: justsisyphus <justsisyphus@users.noreply.github.com> Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
165 lines
4.7 KiB
TypeScript
165 lines
4.7 KiB
TypeScript
import { describe, expect, it } from "bun:test"
|
|
import {
|
|
getOrRegisterClient,
|
|
type ClientCredentials,
|
|
type ClientRegistrationStorage,
|
|
type DcrFetch,
|
|
} from "./dcr"
|
|
|
|
function createStorage(initial: ClientCredentials | null):
|
|
& ClientRegistrationStorage
|
|
& { getLastKey: () => string | null; getLastSet: () => ClientCredentials | null } {
|
|
let stored = initial
|
|
let lastKey: string | null = null
|
|
let lastSet: ClientCredentials | null = null
|
|
|
|
return {
|
|
getClientRegistration: () => stored,
|
|
setClientRegistration: (serverIdentifier: string, credentials: ClientCredentials) => {
|
|
lastKey = serverIdentifier
|
|
lastSet = credentials
|
|
stored = credentials
|
|
},
|
|
getLastKey: () => lastKey,
|
|
getLastSet: () => lastSet,
|
|
}
|
|
}
|
|
|
|
describe("getOrRegisterClient", () => {
|
|
it("returns cached registration when available", async () => {
|
|
// #given
|
|
const storage = createStorage({
|
|
clientId: "cached-client",
|
|
clientSecret: "cached-secret",
|
|
})
|
|
const fetchMock: DcrFetch = async () => {
|
|
throw new Error("fetch should not be called")
|
|
}
|
|
|
|
// #when
|
|
const result = await getOrRegisterClient({
|
|
registrationEndpoint: "https://server.example.com/register",
|
|
serverIdentifier: "server-1",
|
|
clientName: "Test Client",
|
|
redirectUris: ["https://app.example.com/callback"],
|
|
tokenEndpointAuthMethod: "client_secret_post",
|
|
storage,
|
|
fetch: fetchMock,
|
|
})
|
|
|
|
// #then
|
|
expect(result).toEqual({
|
|
clientId: "cached-client",
|
|
clientSecret: "cached-secret",
|
|
})
|
|
})
|
|
|
|
it("registers client and stores credentials when endpoint available", async () => {
|
|
// #given
|
|
const storage = createStorage(null)
|
|
let fetchCalled = false
|
|
const fetchMock: DcrFetch = async (
|
|
input: string,
|
|
init?: { method?: string; headers?: Record<string, string>; body?: string }
|
|
) => {
|
|
fetchCalled = true
|
|
expect(input).toBe("https://server.example.com/register")
|
|
if (typeof init?.body !== "string") {
|
|
throw new Error("Expected request body string")
|
|
}
|
|
const payload = JSON.parse(init.body)
|
|
expect(payload).toEqual({
|
|
redirect_uris: ["https://app.example.com/callback"],
|
|
client_name: "Test Client",
|
|
grant_types: ["authorization_code", "refresh_token"],
|
|
response_types: ["code"],
|
|
token_endpoint_auth_method: "client_secret_post",
|
|
})
|
|
|
|
return {
|
|
ok: true,
|
|
json: async () => ({
|
|
client_id: "registered-client",
|
|
client_secret: "registered-secret",
|
|
}),
|
|
}
|
|
}
|
|
|
|
// #when
|
|
const result = await getOrRegisterClient({
|
|
registrationEndpoint: "https://server.example.com/register",
|
|
serverIdentifier: "server-2",
|
|
clientName: "Test Client",
|
|
redirectUris: ["https://app.example.com/callback"],
|
|
tokenEndpointAuthMethod: "client_secret_post",
|
|
storage,
|
|
fetch: fetchMock,
|
|
})
|
|
|
|
// #then
|
|
expect(fetchCalled).toBe(true)
|
|
expect(result).toEqual({
|
|
clientId: "registered-client",
|
|
clientSecret: "registered-secret",
|
|
})
|
|
expect(storage.getLastKey()).toBe("server-2")
|
|
expect(storage.getLastSet()).toEqual({
|
|
clientId: "registered-client",
|
|
clientSecret: "registered-secret",
|
|
})
|
|
})
|
|
|
|
it("uses config client id when registration endpoint missing", async () => {
|
|
// #given
|
|
const storage = createStorage(null)
|
|
let fetchCalled = false
|
|
const fetchMock: DcrFetch = async () => {
|
|
fetchCalled = true
|
|
return {
|
|
ok: false,
|
|
json: async () => ({}),
|
|
}
|
|
}
|
|
|
|
// #when
|
|
const result = await getOrRegisterClient({
|
|
registrationEndpoint: undefined,
|
|
serverIdentifier: "server-3",
|
|
clientName: "Test Client",
|
|
redirectUris: ["https://app.example.com/callback"],
|
|
tokenEndpointAuthMethod: "client_secret_post",
|
|
clientId: "config-client",
|
|
storage,
|
|
fetch: fetchMock,
|
|
})
|
|
|
|
// #then
|
|
expect(fetchCalled).toBe(false)
|
|
expect(result).toEqual({ clientId: "config-client" })
|
|
})
|
|
|
|
it("falls back to config client id when registration fails", async () => {
|
|
// #given
|
|
const storage = createStorage(null)
|
|
const fetchMock: DcrFetch = async () => {
|
|
throw new Error("network error")
|
|
}
|
|
|
|
// #when
|
|
const result = await getOrRegisterClient({
|
|
registrationEndpoint: "https://server.example.com/register",
|
|
serverIdentifier: "server-4",
|
|
clientName: "Test Client",
|
|
redirectUris: ["https://app.example.com/callback"],
|
|
tokenEndpointAuthMethod: "client_secret_post",
|
|
clientId: "fallback-client",
|
|
storage,
|
|
fetch: fetchMock,
|
|
})
|
|
|
|
// #then
|
|
expect(result).toEqual({ clientId: "fallback-client" })
|
|
expect(storage.getLastSet()).toBeNull()
|
|
})
|
|
})
|