Commit b02ac1bd authored by Jiachi Liu's avatar Jiachi Liu

try consistent encode/decode

parent 6f028440
...@@ -943,23 +943,17 @@ export default abstract class Server< ...@@ -943,23 +943,17 @@ 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 // In minimal mode (Vercel), decode percent-encoded header values.
// to preserve non-ASCII characters during transport // Middleware encodes non-ASCII characters for safe HTTP transport,
// and we decode them here to restore the original values.
if (this.minimalMode) { if (this.minimalMode) {
const encodedHeadersList = req.headers['x-middleware-request-encoded'] for (const key of Object.keys(req.headers)) {
if (typeof encodedHeadersList === 'string') { const value = req.headers[key]
const encodedHeaders = encodedHeadersList.split(',') if (typeof value === 'string') {
for (const headerName of encodedHeaders) { req.headers[key] = decodeHeaderValue(value)
const trimmedName = headerName.trim() } else if (Array.isArray(value)) {
const headerValue = req.headers[trimmedName] req.headers[key] = value.map(decodeHeaderValue)
if (typeof headerValue === 'string') {
req.headers[trimmedName] = decodeHeaderValue(headerValue)
} else if (Array.isArray(headerValue)) {
req.headers[trimmedName] = headerValue.map(decodeHeaderValue)
}
} }
// Clean up the marker header
delete req.headers['x-middleware-request-encoded']
} }
} }
......
...@@ -45,7 +45,6 @@ const INTERNAL_HEADERS = [ ...@@ -45,7 +45,6 @@ const INTERNAL_HEADERS = [
'x-middleware-set-cookie', 'x-middleware-set-cookie',
'x-middleware-skip', 'x-middleware-skip',
'x-middleware-override-headers', 'x-middleware-override-headers',
'x-middleware-request-encoded',
'x-middleware-next', 'x-middleware-next',
'x-now-route-matches', 'x-now-route-matches',
'x-matched-path', 'x-matched-path',
......
...@@ -5,8 +5,6 @@ import { ...@@ -5,8 +5,6 @@ import {
toNodeOutgoingHttpHeaders, toNodeOutgoingHttpHeaders,
validateURL, validateURL,
encodeHeaderValue, encodeHeaderValue,
decodeHeaderValue,
containsNonAscii,
} from '../utils' } from '../utils'
import { ReflectAdapter } from './adapters/reflect' import { ReflectAdapter } from './adapters/reflect'
...@@ -25,30 +23,14 @@ function handleMiddlewareField( ...@@ -25,30 +23,14 @@ function handleMiddlewareField(
} }
const keys = [] const keys = []
const encodedKeys = []
for (const [key, value] of init.request.headers) { for (const [key, value] of init.request.headers) {
let finalValue = value // Encode non-ASCII characters for safe HTTP header transmission.
// If value is already percent-encoded (all ASCII), it passes through unchanged.
// Decode to check if there are non-ASCII characters that need encoding. headers.set('x-middleware-request-' + key, encodeHeaderValue(value))
// Only apply the decode-encode transformation if the decoded value actually
// contains non-ASCII characters. This avoids changing headers that intentionally
// contain percent-encoded ASCII characters (e.g., %20 for space).
const decodedValue = decodeHeaderValue(value)
if (containsNonAscii(decodedValue)) {
finalValue = encodeHeaderValue(decodedValue)
encodedKeys.push(key)
}
headers.set('x-middleware-request-' + key, finalValue)
keys.push(key) keys.push(key)
} }
headers.set('x-middleware-override-headers', keys.join(',')) headers.set('x-middleware-override-headers', keys.join(','))
// Add a marker header listing which headers have percent-encoded values
// This allows the server to decode them in minimal mode (Vercel)
if (encodedKeys.length > 0) {
headers.set('x-middleware-request-encoded', encodedKeys.join(','))
}
} }
} }
......
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