dcda8769cc
* 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>
80 lines
1.9 KiB
TypeScript
80 lines
1.9 KiB
TypeScript
export interface StepUpInfo {
|
|
requiredScopes: string[]
|
|
error?: string
|
|
errorDescription?: string
|
|
}
|
|
|
|
export function parseWwwAuthenticate(header: string): StepUpInfo | null {
|
|
const trimmed = header.trim()
|
|
const lowerHeader = trimmed.toLowerCase()
|
|
const bearerIndex = lowerHeader.indexOf("bearer")
|
|
if (bearerIndex === -1) {
|
|
return null
|
|
}
|
|
|
|
const params = trimmed.slice(bearerIndex + "bearer".length).trim()
|
|
if (params.length === 0) {
|
|
return null
|
|
}
|
|
|
|
const scope = extractParam(params, "scope")
|
|
if (scope === null) {
|
|
return null
|
|
}
|
|
|
|
const requiredScopes = scope
|
|
.split(/\s+/)
|
|
.filter((s) => s.length > 0)
|
|
|
|
if (requiredScopes.length === 0) {
|
|
return null
|
|
}
|
|
|
|
const info: StepUpInfo = { requiredScopes }
|
|
|
|
const error = extractParam(params, "error")
|
|
if (error !== null) {
|
|
info.error = error
|
|
}
|
|
|
|
const errorDescription = extractParam(params, "error_description")
|
|
if (errorDescription !== null) {
|
|
info.errorDescription = errorDescription
|
|
}
|
|
|
|
return info
|
|
}
|
|
|
|
function extractParam(params: string, name: string): string | null {
|
|
const quotedPattern = new RegExp(`${name}="([^"]*)"`)
|
|
const quotedMatch = quotedPattern.exec(params)
|
|
if (quotedMatch) {
|
|
return quotedMatch[1]
|
|
}
|
|
|
|
const unquotedPattern = new RegExp(`${name}=([^\\s,]+)`)
|
|
const unquotedMatch = unquotedPattern.exec(params)
|
|
return unquotedMatch?.[1] ?? null
|
|
}
|
|
|
|
export function mergeScopes(existing: string[], required: string[]): string[] {
|
|
const set = new Set(existing)
|
|
for (const scope of required) {
|
|
set.add(scope)
|
|
}
|
|
return [...set]
|
|
}
|
|
|
|
export function isStepUpRequired(statusCode: number, headers: Record<string, string>): StepUpInfo | null {
|
|
if (statusCode !== 403) {
|
|
return null
|
|
}
|
|
|
|
const wwwAuth = headers["www-authenticate"] ?? headers["WWW-Authenticate"]
|
|
if (!wwwAuth) {
|
|
return null
|
|
}
|
|
|
|
return parseWwwAuthenticate(wwwAuth)
|
|
}
|