Skip to content

Commit f0f8762

Browse files
authored
Drop ipc server headers filters (#56226)
It's merged into single process after #54813 , we don't need to filter ipc server headers anymore. Still need to keep header filters for server actions
1 parent 489f7fd commit f0f8762

File tree

4 files changed

+12
-22
lines changed

4 files changed

+12
-22
lines changed

packages/next/src/server/lib/router-utils/resolve-routes.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import url from 'url'
99
import { Redirect } from '../../../../types'
1010
import setupDebug from 'next/dist/compiled/debug'
1111
import { getCloneableBody } from '../../body-streams'
12-
import { filterReqHeaders, ipcForbiddenHeaders } from '../server-ipc/utils'
1312
import { Header } from '../../../lib/load-custom-routes'
1413
import { stringifyQuery } from '../../server-route-utils'
1514
import { formatHostname } from '../format-hostname'
@@ -457,7 +456,7 @@ export function getResolveRoutes(
457456
const { res: mockedRes } = await createRequestResponseMocks({
458457
url: req.url || '/',
459458
method: req.method || 'GET',
460-
headers: filterReqHeaders(invokeHeaders, ipcForbiddenHeaders),
459+
headers: invokeHeaders,
461460
resWriter(chunk) {
462461
readableController.enqueue(Buffer.from(chunk))
463462
return true
@@ -560,7 +559,7 @@ export function getResolveRoutes(
560559
delete middlewareHeaders['x-middleware-next']
561560

562561
for (const [key, value] of Object.entries({
563-
...filterReqHeaders(middlewareHeaders, ipcForbiddenHeaders),
562+
...middlewareHeaders,
564563
})) {
565564
if (
566565
[

packages/next/src/server/lib/server-ipc/invoke-request.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import type { IncomingMessage } from 'http'
22
import type { Readable } from 'stream'
3-
import { filterReqHeaders, ipcForbiddenHeaders } from './utils'
43

54
export const invokeRequest = async (
65
targetUrl: string,
@@ -11,13 +10,10 @@ export const invokeRequest = async (
1110
},
1211
readableBody?: Readable | ReadableStream
1312
) => {
14-
const invokeHeaders = filterReqHeaders(
15-
{
16-
'cache-control': '',
17-
...requestInit.headers,
18-
},
19-
ipcForbiddenHeaders
20-
) as IncomingMessage['headers']
13+
const invokeHeaders = {
14+
'cache-control': '',
15+
...requestInit.headers,
16+
}
2117

2218
return await fetch(targetUrl, {
2319
headers: invokeHeaders as any as Headers,

packages/next/src/server/lib/server-ipc/utils.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export const ipcForbiddenHeaders = [
1+
export const actionsForbiddenHeaders = [
22
'accept-encoding',
33
'keepalive',
44
'keep-alive',
@@ -8,10 +8,7 @@ export const ipcForbiddenHeaders = [
88
'connection',
99
// marked as unsupported by undici: https://github.com/nodejs/undici/blob/c83b084879fa0bb8e0469d31ec61428ac68160d5/lib/core/request.js#L354
1010
'expect',
11-
]
12-
13-
export const actionsForbiddenHeaders = [
14-
...ipcForbiddenHeaders,
11+
// action specific
1512
'content-length',
1613
]
1714

packages/next/src/server/next-server.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ import { nodeFs } from './lib/node-fs-methods'
9393
import { getRouteRegex } from '../shared/lib/router/utils/route-regex'
9494
import { invokeRequest } from './lib/server-ipc/invoke-request'
9595
import { pipeReadable } from './pipe-readable'
96-
import { filterReqHeaders, ipcForbiddenHeaders } from './lib/server-ipc/utils'
9796
import { createRequestResponseMocks } from './lib/mock-request'
9897
import { NEXT_RSC_UNION_QUERY } from '../client/components/app-router-headers'
9998
import { signalFromNodeResponse } from './web/spec-extension/adapters/next-request'
@@ -539,13 +538,12 @@ export default class NextNodeServer extends BaseServer {
539538
signal: signalFromNodeResponse(res.originalResponse),
540539
}
541540
)
542-
const filteredResHeaders = filterReqHeaders(
543-
toNodeOutgoingHttpHeaders(invokeRes.headers),
544-
ipcForbiddenHeaders
541+
const nodeOutgoingHttpHeaders = toNodeOutgoingHttpHeaders(
542+
invokeRes.headers
545543
)
546544

547-
for (const key of Object.keys(filteredResHeaders)) {
548-
newRes.setHeader(key, filteredResHeaders[key] || '')
545+
for (const key of Object.keys(nodeOutgoingHttpHeaders)) {
546+
newRes.setHeader(key, nodeOutgoingHttpHeaders[key] || '')
549547
}
550548
newRes.statusCode = invokeRes.status || 200
551549

0 commit comments

Comments
 (0)