Unverified Commit 3828ebea authored by Steven's avatar Steven Committed by GitHub

Fix middleware header propagation (#30288)

parent 2f329d2f
...@@ -624,7 +624,7 @@ export default class Server { ...@@ -624,7 +624,7 @@ export default class Server {
const subreq = params.request.headers[`x-middleware-subrequest`] const subreq = params.request.headers[`x-middleware-subrequest`]
const subrequests = typeof subreq === 'string' ? subreq.split(':') : [] const subrequests = typeof subreq === 'string' ? subreq.split(':') : []
const allHeaders = new Headers()
let result: FetchEventResult | null = null let result: FetchEventResult | null = null
for (const middleware of this.middleware || []) { for (const middleware of this.middleware || []) {
...@@ -667,6 +667,10 @@ export default class Server { ...@@ -667,6 +667,10 @@ export default class Server {
}, },
}) })
for (let [key, value] of result.response.headers) {
allHeaders.append(key, value)
}
if (!this.renderOpts.dev) { if (!this.renderOpts.dev) {
result.waitUntil.catch((error) => { result.waitUntil.catch((error) => {
console.error(`Uncaught: middleware waitUntil errored`, error) console.error(`Uncaught: middleware waitUntil errored`, error)
...@@ -681,6 +685,10 @@ export default class Server { ...@@ -681,6 +685,10 @@ export default class Server {
if (!result) { if (!result) {
this.render404(params.request, params.response, params.parsed) this.render404(params.request, params.response, params.parsed)
} else {
for (let [key, value] of allHeaders) {
result.response.headers.set(key, value)
}
} }
return result return result
...@@ -1156,7 +1164,11 @@ export default class Server { ...@@ -1156,7 +1164,11 @@ export default class Server {
for (const [key, value] of result.response.headers.entries()) { for (const [key, value] of result.response.headers.entries()) {
if (key !== 'content-encoding') { if (key !== 'content-encoding') {
res.setHeader(key, value) if (key.toLowerCase() === 'set-cookie') {
res.setHeader(key, value.split(', '))
} else {
res.setHeader(key, value)
}
} }
} }
......
...@@ -20,25 +20,28 @@ export function notImplemented(name: string, method: string): any { ...@@ -20,25 +20,28 @@ export function notImplemented(name: string, method: string): any {
) )
} }
export function fromNodeHeaders(object: NodeHeaders) { export function fromNodeHeaders(object: NodeHeaders): Headers {
const headers: { [k: string]: string } = {} const headers = new Headers()
for (let headerKey in object) { for (let [key, value] of Object.entries(object)) {
const headerValue = object[headerKey] const values = Array.isArray(value) ? value : [value]
if (Array.isArray(headerValue)) { for (let v of values) {
headers[headerKey] = headerValue.join('; ') if (v !== undefined) {
} else if (headerValue) { headers.append(key, v)
headers[headerKey] = String(headerValue) }
} }
} }
return headers return headers
} }
export function toNodeHeaders(headers?: Headers): NodeHeaders { export function toNodeHeaders(headers?: Headers): NodeHeaders {
const object: NodeHeaders = {} const result: NodeHeaders = {}
if (headers) { if (headers) {
for (const [key, value] of headers.entries()) { for (const [key, value] of headers.entries()) {
object[key] = value.includes(';') ? value.split(';') : value result[key] = value
if (key.toLowerCase() === 'set-cookie') {
result[key] = value.split(', ')
}
} }
} }
return object return result
} }
...@@ -15,6 +15,16 @@ export async function middleware(request, ev) { ...@@ -15,6 +15,16 @@ export async function middleware(request, ev) {
next.headers.set('x-nested-header', 'valid') next.headers.set('x-nested-header', 'valid')
} }
// Ensure deep can append to this value
if (url.searchParams.get('append-me') === 'true') {
next.headers.append('x-append-me', 'top')
}
// Ensure deep can append to this value
if (url.searchParams.get('cookie-me') === 'true') {
next.headers.append('set-cookie', 'chocochip')
}
// Sends a header // Sends a header
if (url.pathname === '/responses/header') { if (url.pathname === '/responses/header') {
next.headers.set('x-first-header', 'valid') next.headers.set('x-first-header', 'valid')
......
import { NextResponse } from 'next/server'
export async function middleware(request, _event) {
const next = NextResponse.next()
next.headers.set('x-deep-header', 'valid')
next.headers.append('x-append-me', 'deep')
next.headers.append('set-cookie', 'oatmeal')
return next
}
function Deep() {
return (
<div>
<h1>Deep</h1>
<p>This is a deep page with deep middleware, check the headers</p>
</div>
)
}
export default Deep
...@@ -325,6 +325,17 @@ function responseTests(locale = '') { ...@@ -325,6 +325,17 @@ function responseTests(locale = '') {
) )
expect(res.headers.get('x-first-header')).toBe('valid') expect(res.headers.get('x-first-header')).toBe('valid')
}) })
it(`${locale} should respond with top level headers and append deep headers`, async () => {
const res = await fetchViaHTTP(
context.appPort,
`${locale}/responses/deep?nested-header=true&append-me=true&cookie-me=true`
)
expect(res.headers.get('x-nested-header')).toBe('valid')
expect(res.headers.get('x-deep-header')).toBe('valid')
expect(res.headers.get('x-append-me')).toBe('top, deep')
expect(res.headers.raw()['set-cookie']).toEqual(['chocochip', 'oatmeal'])
})
} }
function interfaceTests(locale = '') { function interfaceTests(locale = '') {
......
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