Unverified Commit 5d9f4193 authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Revert "Drop ipc server headers filters (#56226)" (#56836)

x-ref: https://github.com/vercel/next.js/issues/56038#issuecomment-1762855556
x-ref: https://github.com/vercel/next.js/issues/56038#issuecomment-1746864558

http header `connection` could still fail the image requests while running next build
parent 83d88674
...@@ -12,6 +12,7 @@ import type { NextUrlWithParsedQuery } from '../../request-meta' ...@@ -12,6 +12,7 @@ import type { NextUrlWithParsedQuery } from '../../request-meta'
import url from 'url' import url from 'url'
import setupDebug from 'next/dist/compiled/debug' import setupDebug from 'next/dist/compiled/debug'
import { getCloneableBody } from '../../body-streams' import { getCloneableBody } from '../../body-streams'
import { filterReqHeaders, ipcForbiddenHeaders } from '../server-ipc/utils'
import { stringifyQuery } from '../../server-route-utils' import { stringifyQuery } from '../../server-route-utils'
import { formatHostname } from '../format-hostname' import { formatHostname } from '../format-hostname'
import { toNodeOutgoingHttpHeaders } from '../../web/utils' import { toNodeOutgoingHttpHeaders } from '../../web/utils'
...@@ -457,7 +458,7 @@ export function getResolveRoutes( ...@@ -457,7 +458,7 @@ export function getResolveRoutes(
const { res: mockedRes } = await createRequestResponseMocks({ const { res: mockedRes } = await createRequestResponseMocks({
url: req.url || '/', url: req.url || '/',
method: req.method || 'GET', method: req.method || 'GET',
headers: invokeHeaders, headers: filterReqHeaders(invokeHeaders, ipcForbiddenHeaders),
resWriter(chunk) { resWriter(chunk) {
readableController.enqueue(Buffer.from(chunk)) readableController.enqueue(Buffer.from(chunk))
return true return true
...@@ -560,7 +561,7 @@ export function getResolveRoutes( ...@@ -560,7 +561,7 @@ export function getResolveRoutes(
delete middlewareHeaders['x-middleware-next'] delete middlewareHeaders['x-middleware-next']
for (const [key, value] of Object.entries({ for (const [key, value] of Object.entries({
...middlewareHeaders, ...filterReqHeaders(middlewareHeaders, ipcForbiddenHeaders),
})) { })) {
if ( if (
[ [
......
import type { IncomingMessage } from 'http' import type { IncomingMessage } from 'http'
import type { Readable } from 'stream' import type { Readable } from 'stream'
import { filterReqHeaders, ipcForbiddenHeaders } from './utils'
export const invokeRequest = async ( export const invokeRequest = async (
targetUrl: string, targetUrl: string,
...@@ -10,10 +11,13 @@ export const invokeRequest = async ( ...@@ -10,10 +11,13 @@ export const invokeRequest = async (
}, },
readableBody?: Readable | ReadableStream readableBody?: Readable | ReadableStream
) => { ) => {
const invokeHeaders = { const invokeHeaders = filterReqHeaders(
'cache-control': '', {
...requestInit.headers, 'cache-control': '',
} ...requestInit.headers,
},
ipcForbiddenHeaders
) as IncomingMessage['headers']
return await fetch(targetUrl, { return await fetch(targetUrl, {
headers: invokeHeaders as any as Headers, headers: invokeHeaders as any as Headers,
......
export const actionsForbiddenHeaders = [ export const ipcForbiddenHeaders = [
'accept-encoding', 'accept-encoding',
'keepalive', 'keepalive',
'keep-alive', 'keep-alive',
...@@ -8,7 +8,10 @@ export const actionsForbiddenHeaders = [ ...@@ -8,7 +8,10 @@ export const actionsForbiddenHeaders = [
'connection', 'connection',
// marked as unsupported by undici: https://github.com/nodejs/undici/blob/c83b084879fa0bb8e0469d31ec61428ac68160d5/lib/core/request.js#L354 // marked as unsupported by undici: https://github.com/nodejs/undici/blob/c83b084879fa0bb8e0469d31ec61428ac68160d5/lib/core/request.js#L354
'expect', 'expect',
// action specific ]
export const actionsForbiddenHeaders = [
...ipcForbiddenHeaders,
'content-length', 'content-length',
] ]
......
...@@ -93,6 +93,7 @@ import { nodeFs } from './lib/node-fs-methods' ...@@ -93,6 +93,7 @@ import { nodeFs } from './lib/node-fs-methods'
import { getRouteRegex } from '../shared/lib/router/utils/route-regex' import { getRouteRegex } from '../shared/lib/router/utils/route-regex'
import { invokeRequest } from './lib/server-ipc/invoke-request' import { invokeRequest } from './lib/server-ipc/invoke-request'
import { pipeReadable } from './pipe-readable' import { pipeReadable } from './pipe-readable'
import { filterReqHeaders, ipcForbiddenHeaders } from './lib/server-ipc/utils'
import { createRequestResponseMocks } from './lib/mock-request' import { createRequestResponseMocks } from './lib/mock-request'
import { NEXT_RSC_UNION_QUERY } from '../client/components/app-router-headers' import { NEXT_RSC_UNION_QUERY } from '../client/components/app-router-headers'
import { signalFromNodeResponse } from './web/spec-extension/adapters/next-request' import { signalFromNodeResponse } from './web/spec-extension/adapters/next-request'
...@@ -549,12 +550,13 @@ export default class NextNodeServer extends BaseServer { ...@@ -549,12 +550,13 @@ export default class NextNodeServer extends BaseServer {
signal: signalFromNodeResponse(res.originalResponse), signal: signalFromNodeResponse(res.originalResponse),
} }
) )
const nodeOutgoingHttpHeaders = toNodeOutgoingHttpHeaders( const filteredResHeaders = filterReqHeaders(
invokeRes.headers toNodeOutgoingHttpHeaders(invokeRes.headers),
ipcForbiddenHeaders
) )
for (const key of Object.keys(nodeOutgoingHttpHeaders)) { for (const key of Object.keys(filteredResHeaders)) {
newRes.setHeader(key, nodeOutgoingHttpHeaders[key] || '') newRes.setHeader(key, filteredResHeaders[key] || '')
} }
newRes.statusCode = invokeRes.status || 200 newRes.statusCode = invokeRes.status || 200
......
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