From b910ec49098069d4274150e142cac71ea854f56d Mon Sep 17 00:00:00 2001 From: Dinh Le Date: Wed, 18 Nov 2026 14:19:55 +0700 Subject: [PATCH 1/3] fix(server): ignore invalid headers in RequestHeadersPlugin --- .../src/plugins/request-headers.test.ts | 59 +++++++++++++++++++ .../server/src/plugins/request-headers.ts | 38 +++++++++++- 2 files changed, 96 insertions(+), 1 deletion(-) diff --git a/packages/server/src/plugins/request-headers.test.ts b/packages/server/src/plugins/request-headers.test.ts index d427349837..35e64bde03 100644 --- a/packages/server/src/plugins/request-headers.test.ts +++ b/packages/server/src/plugins/request-headers.test.ts @@ -1,6 +1,7 @@ import type { RequestHeadersPluginContext } from './request-headers' import { OpenAPIHandler } from '../../../openapi/src/adapters/fetch/openapi-handler' import { os } from '../builder' +import { BatchHandlerPlugin } from './batch' import { RequestHeadersPlugin } from './request-headers' describe('requestHeadersPlugin', () => { @@ -111,4 +112,62 @@ describe('requestHeadersPlugin', () => { // The existing reqHeaders should be preserved expect(interceptor.mock.calls[0]![0].context.reqHeaders).toBe(existingHeaders) }) + + it('leaves out invalid batch subrequest headers instead of throwing', async () => { + let capturedHeaders: Headers | undefined + + const router = os + .$context() + .use(({ context, next }) => { + capturedHeaders = context.reqHeaders + return next() + }) + .route({ + method: 'GET', + path: '/ping', + }) + .handler(() => 'pong') + + const handler = new OpenAPIHandler(router, { + plugins: [ + new RequestHeadersPlugin(), + new BatchHandlerPlugin(), + ], + }) + + const { response } = await handler.handle(new Request('https://example.com/ping', { + method: 'POST', + headers: { + 'content-type': 'application/json', + 'x-orpc-batch': 'buffered', + }, + body: JSON.stringify([ + { + url: 'https://example.com/ping', + method: 'GET', + headers: { + 'a b': '1', + '': '2', + 'x-newline': 'a\nb', + 'x-non-latin1': 'δΈ­', + 'x-object': { toString: 1 }, + 'x-mixed': ['valid', 'a\nb'], + 'x-valid': 'value', + }, + }, + ]), + })) + + expect(response?.status).toBe(207) + await expect(response?.json()).resolves.toEqual([ + expect.objectContaining({ index: 0, status: 200, body: 'pong' }), + ]) + + expect(Object.fromEntries(capturedHeaders!)).toEqual({ + 'content-type': 'application/json', + 'x-mixed': 'valid', + 'x-orpc-batch': 'buffered', + 'x-valid': 'value', + }) + }) }) diff --git a/packages/server/src/plugins/request-headers.ts b/packages/server/src/plugins/request-headers.ts index 2017d73b12..9f370ac7a5 100644 --- a/packages/server/src/plugins/request-headers.ts +++ b/packages/server/src/plugins/request-headers.ts @@ -1,3 +1,4 @@ +import type { StandardHeaders } from '@orpc/standard-server' import type { StandardHandlerOptions, StandardHandlerPlugin } from '../adapters/standard' import { toFetchHeaders } from '@orpc/standard-server-fetch' @@ -5,6 +6,41 @@ export interface RequestHeadersPluginContext { reqHeaders?: Headers } +function appendValidHeader(headers: Headers, name: string, value: string): void { + try { + headers.append(name, value) + } + catch {} +} + +/** + * Not every request passes through an HTTP parser: batch subrequests carry their headers + * in the request body, so a client can send any header name or value. + */ +function toSafeFetchHeaders(standardHeaders: StandardHeaders): Headers { + try { + return toFetchHeaders(standardHeaders) + } + catch { + const headers = new Headers() + + for (const name of Object.keys(standardHeaders)) { + const value = standardHeaders[name] + + if (Array.isArray(value)) { + for (const item of value) { + appendValidHeader(headers, name, item) + } + } + else if (value !== undefined) { + appendValidHeader(headers, name, value) + } + } + + return headers + } +} + /** * The Request Headers Plugin injects a `reqHeaders` instance into the context, * allowing access to request headers in oRPC. @@ -16,7 +52,7 @@ export class RequestHeadersPlugin impleme options.rootInterceptors ??= [] options.rootInterceptors.push((interceptorOptions) => { - const reqHeaders = interceptorOptions.context.reqHeaders ?? toFetchHeaders(interceptorOptions.request.headers) + const reqHeaders = interceptorOptions.context.reqHeaders ?? toSafeFetchHeaders(interceptorOptions.request.headers) return interceptorOptions.next({ ...interceptorOptions, From f9c6f43855aa55fa11c74d05684c66a7c767aab4 Mon Sep 17 00:00:00 2001 From: Dinh Le Date: Wed, 18 Nov 2026 14:34:26 +0700 Subject: [PATCH 2/3] ci: set Node runtime before installing dependencies --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d9cdf31045..4dc6085552 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -41,10 +41,10 @@ jobs: - uses: pnpm/action-setup@v6 - - run: pnpm i - - run: pnpm runtime set node 22 + - run: pnpm i + - run: pnpm run test:coverage env: REDIS_URL: redis://localhost:6379 From 71f54d7847df8486701b34082bd2e86b937aa1b0 Mon Sep 17 00:00:00 2001 From: Dinh Le Date: Wed, 18 Nov 2026 14:40:24 +0700 Subject: [PATCH 3/3] ci: run the test job on Node 22 from the start --- .github/workflows/ci.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4dc6085552..161b9dad24 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,9 +39,11 @@ jobs: steps: - uses: actions/checkout@v7 - - uses: pnpm/action-setup@v6 + - uses: actions/setup-node@v7 + with: + node-version: 22 - - run: pnpm runtime set node 22 + - uses: pnpm/action-setup@v6 - run: pnpm i