* 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>
124 lines
4.2 KiB
TypeScript
124 lines
4.2 KiB
TypeScript
export interface OAuthServerMetadata {
|
|
authorizationEndpoint: string
|
|
tokenEndpoint: string
|
|
registrationEndpoint?: string
|
|
resource: string
|
|
}
|
|
|
|
const discoveryCache = new Map<string, OAuthServerMetadata>()
|
|
const pendingDiscovery = new Map<string, Promise<OAuthServerMetadata>>()
|
|
|
|
function parseHttpsUrl(value: string, label: string): URL {
|
|
const parsed = new URL(value)
|
|
if (parsed.protocol !== "https:") {
|
|
throw new Error(`${label} must use https`)
|
|
}
|
|
return parsed
|
|
}
|
|
|
|
function readStringField(source: Record<string, unknown>, field: string): string {
|
|
const value = source[field]
|
|
if (typeof value !== "string" || value.length === 0) {
|
|
throw new Error(`OAuth metadata missing ${field}`)
|
|
}
|
|
return value
|
|
}
|
|
|
|
async function fetchMetadata(url: string): Promise<{ ok: true; json: Record<string, unknown> } | { ok: false; status: number }> {
|
|
const response = await fetch(url, { headers: { accept: "application/json" } })
|
|
if (!response.ok) {
|
|
return { ok: false, status: response.status }
|
|
}
|
|
const json = (await response.json().catch(() => null)) as Record<string, unknown> | null
|
|
if (!json || typeof json !== "object") {
|
|
throw new Error("OAuth metadata response is not valid JSON")
|
|
}
|
|
return { ok: true, json }
|
|
}
|
|
|
|
async function fetchAuthorizationServerMetadata(issuer: string, resource: string): Promise<OAuthServerMetadata> {
|
|
const issuerUrl = parseHttpsUrl(issuer, "Authorization server URL")
|
|
const issuerPath = issuerUrl.pathname.replace(/\/+$/, "")
|
|
const metadataUrl = new URL(`/.well-known/oauth-authorization-server${issuerPath}`, issuerUrl).toString()
|
|
const metadata = await fetchMetadata(metadataUrl)
|
|
|
|
if (!metadata.ok) {
|
|
if (metadata.status === 404) {
|
|
throw new Error("OAuth authorization server metadata not found")
|
|
}
|
|
throw new Error(`OAuth authorization server metadata fetch failed (${metadata.status})`)
|
|
}
|
|
|
|
const authorizationEndpoint = parseHttpsUrl(
|
|
readStringField(metadata.json, "authorization_endpoint"),
|
|
"authorization_endpoint"
|
|
).toString()
|
|
const tokenEndpoint = parseHttpsUrl(
|
|
readStringField(metadata.json, "token_endpoint"),
|
|
"token_endpoint"
|
|
).toString()
|
|
const registrationEndpointValue = metadata.json.registration_endpoint
|
|
const registrationEndpoint =
|
|
typeof registrationEndpointValue === "string" && registrationEndpointValue.length > 0
|
|
? parseHttpsUrl(registrationEndpointValue, "registration_endpoint").toString()
|
|
: undefined
|
|
|
|
return {
|
|
authorizationEndpoint,
|
|
tokenEndpoint,
|
|
registrationEndpoint,
|
|
resource,
|
|
}
|
|
}
|
|
|
|
function parseAuthorizationServers(metadata: Record<string, unknown>): string[] {
|
|
const servers = metadata.authorization_servers
|
|
if (!Array.isArray(servers)) return []
|
|
return servers.filter((server): server is string => typeof server === "string" && server.length > 0)
|
|
}
|
|
|
|
export async function discoverOAuthServerMetadata(resource: string): Promise<OAuthServerMetadata> {
|
|
const resourceUrl = parseHttpsUrl(resource, "Resource server URL")
|
|
const resourceKey = resourceUrl.toString()
|
|
|
|
const cached = discoveryCache.get(resourceKey)
|
|
if (cached) return cached
|
|
|
|
const pending = pendingDiscovery.get(resourceKey)
|
|
if (pending) return pending
|
|
|
|
const discoveryPromise = (async () => {
|
|
const prmUrl = new URL("/.well-known/oauth-protected-resource", resourceUrl).toString()
|
|
const prmResponse = await fetchMetadata(prmUrl)
|
|
|
|
if (prmResponse.ok) {
|
|
const authServers = parseAuthorizationServers(prmResponse.json)
|
|
if (authServers.length === 0) {
|
|
throw new Error("OAuth protected resource metadata missing authorization_servers")
|
|
}
|
|
return fetchAuthorizationServerMetadata(authServers[0], resource)
|
|
}
|
|
|
|
if (prmResponse.status !== 404) {
|
|
throw new Error(`OAuth protected resource metadata fetch failed (${prmResponse.status})`)
|
|
}
|
|
|
|
return fetchAuthorizationServerMetadata(resourceKey, resource)
|
|
})()
|
|
|
|
pendingDiscovery.set(resourceKey, discoveryPromise)
|
|
|
|
try {
|
|
const result = await discoveryPromise
|
|
discoveryCache.set(resourceKey, result)
|
|
return result
|
|
} finally {
|
|
pendingDiscovery.delete(resourceKey)
|
|
}
|
|
}
|
|
|
|
export function resetDiscoveryCache(): void {
|
|
discoveryCache.clear()
|
|
pendingDiscovery.clear()
|
|
}
|