Commit 92fd4b35 authored by Jiachi Liu's avatar Jiachi Liu

decode in one place for two modes

parent a09167cb
...@@ -111,7 +111,7 @@ import { ...@@ -111,7 +111,7 @@ import {
import { BaseServerSpan } from './lib/trace/constants' import { BaseServerSpan } from './lib/trace/constants'
import { I18NProvider } from './lib/i18n-provider' import { I18NProvider } from './lib/i18n-provider'
import { sendResponse } from './send-response' import { sendResponse } from './send-response'
import { normalizeNextQueryParam } from './web/utils' import { normalizeNextQueryParam, decodeMiddlewareHeaders } from './web/utils'
import { import {
HTML_CONTENT_TYPE_HEADER, HTML_CONTENT_TYPE_HEADER,
JSON_CONTENT_TYPE_HEADER, JSON_CONTENT_TYPE_HEADER,
...@@ -943,23 +943,9 @@ export default abstract class Server< ...@@ -943,23 +943,9 @@ export default abstract class Server<
isNodeNextResponse(res) ? res.originalResponse : res isNodeNextResponse(res) ? res.originalResponse : res
) )
// In minimal mode (Vercel), decode headers that were percent-encoded by middleware // Decode headers that were percent-encoded by middleware
// to preserve non-ASCII characters during transport. // to preserve non-ASCII characters during transport.
if (this.minimalMode) { decodeMiddlewareHeaders(req.headers)
const encodedHeaders = req.headers['x-middleware-request-encoded']
if (typeof encodedHeaders === 'string') {
for (const key of encodedHeaders.split(',')) {
const headerKey = key.trim()
const value = req.headers[headerKey]
if (typeof value === 'string' && /%[0-9A-Fa-f]{2}/.test(value)) {
try {
req.headers[headerKey] = decodeURIComponent(value)
} catch {}
}
}
}
delete req.headers['x-middleware-request-encoded']
}
const urlParts = (req.url || '').split('?', 1) const urlParts = (req.url || '').split('?', 1)
const urlNoQuery = urlParts[0] const urlNoQuery = urlParts[0]
......
...@@ -620,25 +620,13 @@ export function getResolveRoutes( ...@@ -620,25 +620,13 @@ export function getResolveRoutes(
delete middlewareHeaders[valueKey] delete middlewareHeaders[valueKey]
} }
// Decode only headers that were explicitly marked as encoded. // Copy the encoded headers marker to req.headers so base-server.ts
// This preserves intentional percent-encoding (like %2F, %20) in other headers. // can decode them later (unified handling for local and minimal modes).
const encodedHeaders = if (middlewareHeaders['x-middleware-request-encoded']) {
middlewareHeaders['x-middleware-request-encoded'] req.headers['x-middleware-request-encoded'] =
if (typeof encodedHeaders === 'string') { middlewareHeaders['x-middleware-request-encoded']
for (const key of encodedHeaders.split(',')) { delete middlewareHeaders['x-middleware-request-encoded']
const headerKey = key.trim()
const value = req.headers[headerKey]
if (
typeof value === 'string' &&
/%[0-9A-Fa-f]{2}/.test(value)
) {
try {
req.headers[headerKey] = decodeURIComponent(value)
} catch {}
}
}
} }
delete middlewareHeaders['x-middleware-request-encoded']
} }
if ( if (
......
...@@ -218,3 +218,31 @@ export function decodeHeaderValue(value: string): string { ...@@ -218,3 +218,31 @@ export function decodeHeaderValue(value: string): string {
} }
return value return value
} }
/**
* Decodes middleware headers that were percent-encoded for safe HTTP transmission.
* Only decodes headers listed in 'x-middleware-request-encoded' marker.
* Deletes the marker after processing.
*
* @param headers - The headers object to decode (mutated in place)
*/
export function decodeMiddlewareHeaders(
headers: Record<string, string | string[] | undefined>
): void {
const encodedHeadersList = headers['x-middleware-request-encoded']
if (typeof encodedHeadersList !== 'string') {
return
}
for (const key of encodedHeadersList.split(',')) {
const headerKey = key.trim()
const value = headers[headerKey]
if (typeof value === 'string' && /%[0-9A-Fa-f]{2}/.test(value)) {
try {
headers[headerKey] = decodeURIComponent(value)
} catch {}
}
}
delete headers['x-middleware-request-encoded']
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment