@@ -23,6 +23,7 @@ import * as Clock from "effect/Clock";
2323import * as Context from "effect/Context" ;
2424import * as Digest from "effect/crypto/Digest" ;
2525import * as SecureRandom from "effect/crypto/SecureRandom" ;
26+ import * as Mac from "effect/crypto/Mac" ;
2627import * as Effect from "effect/Effect" ;
2728import * as Layer from "effect/Layer" ;
2829import * as Option from "effect/Option" ;
@@ -44,6 +45,7 @@ import {
4445 deriveAuthClientMetadata ,
4546 signPayload ,
4647 timingSafeEqualBase64Url ,
48+ verifyPayloadSignature ,
4749} from "./utils.ts" ;
4850import { requestUrl } from "../requestUrl.ts" ;
4951
@@ -266,27 +268,33 @@ const make = Effect.gen(function* () {
266268 . pipe ( Effect . orDie ) ;
267269 const codes = yield * Ref . make < ReadonlyMap < string , PendingCode > > ( new Map ( ) ) ;
268270
269- const sign = ( domain : string , payload : string ) => signPayload ( `${ domain } .${ payload } ` , signingKey ) ;
271+ const mac = yield * Mac . Mac ;
272+ const sign = ( domain : string , payload : string ) =>
273+ signPayload ( `${ domain } .${ payload } ` , signingKey ) . pipe ( Effect . provideService ( Mac . Mac , mac ) ) ;
270274
271275 const signClientId = ( name : string , redirectUris : ReadonlyArray < string > , peerLink : boolean ) => {
272276 const body = base64UrlEncode (
273277 JSON . stringify ( { v : 1 , n : name , r : redirectUris , ...( peerLink ? { p : 1 } : { } ) } ) ,
274278 ) ;
275- return ` ${ body } . ${ sign ( "mcp-client-id" , body ) } ` ;
279+ return sign ( "mcp-client-id" , body ) . pipe ( Effect . map ( ( signature ) => ` ${ body } . ${ signature } ` ) ) ;
276280 } ;
277281
278- const parseClientId = ( clientId : string ) : McpOAuthClient | undefined => {
282+ // Untraced: only called inside the traced McpOAuth methods below.
283+ const parseClientId = Effect . fnUntraced ( function * (
284+ clientId : string ,
285+ ) : Effect . fn . Return < McpOAuthClient | undefined > {
279286 const [ body , signature , extra ] = clientId . split ( "." ) ;
280287 if ( ! body || ! signature || extra !== undefined ) return undefined ;
281- if ( ! timingSafeEqualBase64Url ( signature , sign ( "mcp-client-id" , body ) ) ) return undefined ;
282- let json : string ;
283- try {
284- json = base64UrlDecodeUtf8 ( body ) ;
285- } catch {
286- return undefined ;
287- }
288+ const verified = yield * verifyPayloadSignature (
289+ `mcp-client-id.${ body } ` ,
290+ signature ,
291+ signingKey ,
292+ ) . pipe ( Effect . provideService ( Mac . Mac , mac ) ) ;
293+ if ( ! verified ) return undefined ;
294+ const json = yield * Effect . try ( ( ) => base64UrlDecodeUtf8 ( body ) ) . pipe ( Effect . option ) ;
295+ if ( Option . isNone ( json ) ) return undefined ;
288296 return Option . getOrUndefined (
289- decodeClientIdPayload ( json ) . pipe (
297+ decodeClientIdPayload ( json . value ) . pipe (
290298 Option . map ( ( payload ) => ( {
291299 clientId,
292300 name : payload . n ,
@@ -295,7 +303,7 @@ const make = Effect.gen(function* () {
295303 } ) ) ,
296304 ) ,
297305 ) ;
298- } ;
306+ } ) ;
299307
300308 const pkceVerifies = ( verifier : string , challenge : string ) =>
301309 CODE_VERIFIER_PATTERN . test ( verifier )
@@ -347,7 +355,7 @@ const make = Effect.gen(function* () {
347355 } ) ;
348356 }
349357 return {
350- clientId : signClientId ( name , redirectUris , peerLink ) ,
358+ clientId : yield * signClientId ( name , redirectUris , peerLink ) ,
351359 name,
352360 redirectUris,
353361 peerLink,
@@ -358,7 +366,7 @@ const make = Effect.gen(function* () {
358366 const validateAuthorization : McpOAuth [ "Service" ] [ "validateAuthorization" ] = Effect . fn (
359367 "McpOAuth.validateAuthorization" ,
360368 ) ( function * ( { urls, request } ) {
361- const client = parseClientId ( request . client_id ?? "" ) ;
369+ const client = yield * parseClientId ( request . client_id ?? "" ) ;
362370 if ( client === undefined ) {
363371 return yield * new McpOAuthPageError ( {
364372 description : "This sign-in link names an unknown app. Start the sign-in again from it." ,
@@ -410,12 +418,14 @@ const make = Effect.gen(function* () {
410418 authorization ,
411419 ) =>
412420 environmentAuth . authenticateBrowserSession ( request ) . pipe (
413- Effect . map ( ( session ) =>
421+ Effect . flatMap ( ( session ) =>
414422 // Approving manages access, and a session may only hand out scopes it holds.
415423 session . scopes . includes ( AuthAccessWriteScope ) &&
416424 session . scopes . includes ( AuthOrchestrationReadScope )
417- ? { csrfToken : csrfToken ( session . sessionId , authorization ) , scopes : session . scopes }
418- : undefined ,
425+ ? csrfToken ( session . sessionId , authorization ) . pipe (
426+ Effect . map ( ( token ) => ( { csrfToken : token , scopes : session . scopes } ) ) ,
427+ )
428+ : Effect . undefined ,
419429 ) ,
420430 Effect . orElseSucceed ( ( ) => undefined ) ,
421431 ) ;
@@ -507,7 +517,7 @@ const make = Effect.gen(function* () {
507517 "code, redirect_uri, client_id and code_verifier are required." ,
508518 ) ;
509519 }
510- if ( parseClientId ( clientId ) === undefined ) {
520+ if ( ( yield * parseClientId ( clientId ) ) === undefined ) {
511521 return yield * fail ( "invalid_client" , "The client is unknown." ) ;
512522 }
513523 // A presented code is spent even when a later check fails (RFC 6749 §4.1.2).
0 commit comments