TypeScript
fix(server): accept a case-insensitive DPoP authorization scheme (#30337)
spoukyiic12fd6c03525
diff --git a/apps/server/src/auth/EnvironmentAuth.test.ts b/apps/server/src/auth/EnvironmentAuth.test.tsindex 78a90401f29..3c05047e4a4 100644--- a/apps/server/src/auth/EnvironmentAuth.test.ts+++ b/apps/server/src/auth/EnvironmentAuth.test.ts@@ -785,6 +785,45 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodePlatformCrypto.layer))(),);+ it.effect.each(["DPoP", "dpop", "dPoP"])(+ "accepts %s for a proof-bound HTTP request",+ (scheme) =>+ Effect.gen(function* () {+ const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;+ const key = makeDpopKey();+ const { access_token: token } =+ yield* serverAuth.exchangeBootstrapCredentialForAccessToken(+ "desktop-bootstrap-token",+ ["orchestration:read"],+ requestMetadata,+ { proofKeyThumbprint: key.thumbprint },+ );+ const iat = Math.floor((yield* DateTime.now).epochMilliseconds / 1_000);+ const request = {+ method: "GET",+ url: "/api/auth/session",+ cookies: {},+ headers: {+ host: "192.168.1.50:3773",+ authorization: `${scheme} ${token}`,+ dpop: key.sign({+ method: "GET",+ url: "http://192.168.1.50:3773/api/auth/session",+ token,+ iat,+ }),+ },+ } as never;+ expect((yield* serverAuth.authenticateHttpRequest(request)).sessionId).toBeTypeOf(+ "string",+ );+ }).pipe(+ Effect.provide(+ layerEnvironmentAuth({ desktopBootstrapToken: "desktop-bootstrap-token" }),+ ),+ ),+ );+it.effect("rejects a replayed proof on a bound RPC socket ticket", () =>Effect.gen(function* () {const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;diff --git a/apps/server/src/auth/EnvironmentAuth.ts b/apps/server/src/auth/EnvironmentAuth.tsindex 39a333d6116..b6bf63792bf 100644--- a/apps/server/src/auth/EnvironmentAuth.ts+++ b/apps/server/src/auth/EnvironmentAuth.ts@@ -640,7 +640,7 @@ export function parseBearerToken(request: HttpServerRequest.HttpServerRequest):function parseDpopToken(request: HttpServerRequest.HttpServerRequest): string | null {const header = request.headers["authorization"];- if (typeof header !== "string" || !header.startsWith(DPOP_AUTHORIZATION_PREFIX)) {+ if (typeof header !== "string" || !/^DPoP /i.test(header)) {return null;}const token = header.slice(DPOP_AUTHORIZATION_PREFIX.length).trim();diff --git a/apps/server/src/auth/http.test.ts b/apps/server/src/auth/http.test.tsindex 45bf8b3baa2..14003a36b64 100644--- a/apps/server/src/auth/http.test.ts+++ b/apps/server/src/auth/http.test.ts@@ -158,3 +158,36 @@ it.effect("sets the selected browser session cookies through the HTTP route", ());}).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),);++it.effect.each(["DPoP", "dpop"])("challenges a refused %s request with DPoP", (scheme) =>+ Effect.gen(function* () {+ const random = yield* SecureRandom.SecureRandom;+ const unusedSecretStore = ServerSecretStore.ServerSecretStore.of({+ get: () => Effect.succeedNone,+ set: () => Effect.void,+ create: () => Effect.void,+ getOrCreateRandom: () => Effect.die("Not used by these routes."),+ remove: () => Effect.void,+ });+ const requestContext = Context.make(SecureRandom.SecureRandom, random).pipe(+ Context.add(ServerSecretStore.ServerSecretStore, unusedSecretStore),+ );+ return yield* Effect.acquireUseRelease(+ Effect.sync(() => HttpRouter.toWebHandler(layerRoutes, { disableLogger: true })),+ (environment) =>+ Effect.promise(async () => {+ const refused = await environment.handler(+ postJson(+ "/api/auth/pairing-token",+ { scopes: ["orchestration:read"] },+ { authorization: `${scheme} not-a-valid-token` },+ ),+ requestContext,+ );+ expect(refused.status).toBe(401);+ expect(refused.headers.get("www-authenticate")).toBe("DPoP");+ }),+ (environment) => Effect.promise(() => environment.dispose()),+ );+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),+);diff --git a/apps/server/src/auth/http.ts b/apps/server/src/auth/http.tsindex c02da89d7d4..1dd273dbe64 100644--- a/apps/server/src/auth/http.ts+++ b/apps/server/src/auth/http.ts@@ -57,7 +57,7 @@ const appendDpopChallengeOnUnauthorized =const request = yield* HttpServerRequest.HttpServerRequest;const usesDpop =(request.originalUrl.startsWith("/oauth/token") && request.headers.dpop !== undefined) ||- request.headers.authorization?.startsWith("DPoP ") === true;+ /^DPoP /i.test(request.headers.authorization ?? "");if (usesDpop) {yield* appendDpopChallengeHeader;}