Unverified Commit f2c5eb84 authored by Jimmy Lai's avatar Jimmy Lai Committed by GitHub

actions: fix revalidate after redirect (#53368)

This PR reverts a change that removed the `content-length` header filtering from the req made by the actions when redirecting. This change made some tests flaky and presumably also broke server actions in subtle ways.

There's still one other bug when redirecting after revalidating that will happen in you revalidate a page that was already rendered before where we will still show stale content. @timneutkens is fixing that one.

NEXT-1483
parent a0d1d728
...@@ -23,7 +23,10 @@ import { StaticGenerationStore } from '../../client/components/static-generation ...@@ -23,7 +23,10 @@ import { StaticGenerationStore } from '../../client/components/static-generation
import { FlightRenderResult } from './flight-render-result' import { FlightRenderResult } from './flight-render-result'
import { ActionResult } from './types' import { ActionResult } from './types'
import { ActionAsyncStorage } from '../../client/components/action-async-storage' import { ActionAsyncStorage } from '../../client/components/action-async-storage'
import { filterReqHeaders, forbiddenHeaders } from '../lib/server-ipc/utils' import {
filterReqHeaders,
actionsForbiddenHeaders,
} from '../lib/server-ipc/utils'
import { import {
appendMutableCookies, appendMutableCookies,
getModifiedCookieValues, getModifiedCookieValues,
...@@ -98,10 +101,13 @@ function getForwardedHeaders( ...@@ -98,10 +101,13 @@ function getForwardedHeaders(
}) })
// Merge request and response headers // Merge request and response headers
const mergedHeaders = filterReqHeaders({ const mergedHeaders = filterReqHeaders(
{
...nodeHeadersToRecord(requestHeaders), ...nodeHeadersToRecord(requestHeaders),
...nodeHeadersToRecord(responseHeaders), ...nodeHeadersToRecord(responseHeaders),
}) as Record<string, string> },
actionsForbiddenHeaders
) as Record<string, string>
// Merge cookies // Merge cookies
const mergedCookies = requestCookies.split('; ').concat(setCookies).join('; ') const mergedCookies = requestCookies.split('; ').concat(setCookies).join('; ')
...@@ -223,7 +229,7 @@ async function createRedirectRenderResult( ...@@ -223,7 +229,7 @@ async function createRedirectRenderResult(
}) })
// copy the headers from the redirect response to the response we're sending // copy the headers from the redirect response to the response we're sending
for (const [key, value] of response.headers) { for (const [key, value] of response.headers) {
if (!forbiddenHeaders.includes(key)) { if (!actionsForbiddenHeaders.includes(key)) {
res.setHeader(key, value) res.setHeader(key, value)
} }
} }
......
...@@ -11,7 +11,7 @@ import setupDebug from 'next/dist/compiled/debug' ...@@ -11,7 +11,7 @@ import setupDebug from 'next/dist/compiled/debug'
import { splitCookiesString, toNodeOutgoingHttpHeaders } from '../web/utils' import { splitCookiesString, toNodeOutgoingHttpHeaders } from '../web/utils'
import { Telemetry } from '../../telemetry/storage' import { Telemetry } from '../../telemetry/storage'
import { DecodeError } from '../../shared/lib/utils' import { DecodeError } from '../../shared/lib/utils'
import { filterReqHeaders } from './server-ipc/utils' import { filterReqHeaders, ipcForbiddenHeaders } from './server-ipc/utils'
import { findPagesDir } from '../../lib/find-pages-dir' import { findPagesDir } from '../../lib/find-pages-dir'
import { setupFsCheck } from './router-utils/filesystem' import { setupFsCheck } from './router-utils/filesystem'
import { proxyRequest } from './router-utils/proxy-request' import { proxyRequest } from './router-utils/proxy-request'
...@@ -365,7 +365,10 @@ export async function initialize(opts: { ...@@ -365,7 +365,10 @@ export async function initialize(opts: {
} }
for (const [key, value] of Object.entries( for (const [key, value] of Object.entries(
filterReqHeaders(toNodeOutgoingHttpHeaders(invokeRes.headers)) filterReqHeaders(
toNodeOutgoingHttpHeaders(invokeRes.headers),
ipcForbiddenHeaders
)
)) { )) {
if (value !== undefined) { if (value !== undefined) {
if (key === 'set-cookie') { if (key === 'set-cookie') {
......
...@@ -8,7 +8,7 @@ import { Redirect } from '../../../../types' ...@@ -8,7 +8,7 @@ import { Redirect } from '../../../../types'
import { RenderWorker } from '../router-server' import { RenderWorker } from '../router-server'
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 } from '../server-ipc/utils' import { filterReqHeaders, ipcForbiddenHeaders } from '../server-ipc/utils'
import { Header } from '../../../lib/load-custom-routes' import { Header } from '../../../lib/load-custom-routes'
import { stringifyQuery } from '../../server-route-utils' import { stringifyQuery } from '../../server-route-utils'
import { toNodeOutgoingHttpHeaders } from '../../web/utils' import { toNodeOutgoingHttpHeaders } from '../../web/utils'
...@@ -530,7 +530,7 @@ export function getResolveRoutes( ...@@ -530,7 +530,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({
...filterReqHeaders(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 } from './utils' import { filterReqHeaders, ipcForbiddenHeaders } from './utils'
export const invokeRequest = async ( export const invokeRequest = async (
targetUrl: string, targetUrl: string,
...@@ -16,10 +16,13 @@ export const invokeRequest = async ( ...@@ -16,10 +16,13 @@ export const invokeRequest = async (
const parsedTargetUrl = new URL(targetUrl) const parsedTargetUrl = new URL(targetUrl)
parsedTargetUrl.hostname = '127.0.0.1' parsedTargetUrl.hostname = '127.0.0.1'
const invokeHeaders = filterReqHeaders({ const invokeHeaders = filterReqHeaders(
{
'cache-control': '', 'cache-control': '',
...requestInit.headers, ...requestInit.headers,
}) as IncomingMessage['headers'] },
ipcForbiddenHeaders
) as IncomingMessage['headers']
return await fetch(parsedTargetUrl.toString(), { return await fetch(parsedTargetUrl.toString(), {
headers: invokeHeaders as any as Headers, headers: invokeHeaders as any as Headers,
......
export const forbiddenHeaders = [ export const ipcForbiddenHeaders = [
'accept-encoding', 'accept-encoding',
'keepalive', 'keepalive',
'keep-alive', 'keep-alive',
...@@ -8,8 +8,14 @@ export const forbiddenHeaders = [ ...@@ -8,8 +8,14 @@ export const forbiddenHeaders = [
'connection', 'connection',
] ]
export const actionsForbiddenHeaders = [
...ipcForbiddenHeaders,
'content-length',
]
export const filterReqHeaders = ( export const filterReqHeaders = (
headers: Record<string, undefined | string | number | string[]> headers: Record<string, undefined | string | number | string[]>,
forbiddenHeaders: string[]
) => { ) => {
for (const [key, value] of Object.entries(headers)) { for (const [key, value] of Object.entries(headers)) {
if ( if (
......
...@@ -12,7 +12,7 @@ import * as Log from '../../build/output/log' ...@@ -12,7 +12,7 @@ import * as Log from '../../build/output/log'
import setupDebug from 'next/dist/compiled/debug' import setupDebug from 'next/dist/compiled/debug'
import { splitCookiesString, toNodeOutgoingHttpHeaders } from '../web/utils' import { splitCookiesString, toNodeOutgoingHttpHeaders } from '../web/utils'
import { getCloneableBody } from '../body-streams' import { getCloneableBody } from '../body-streams'
import { filterReqHeaders } from './server-ipc/utils' import { filterReqHeaders, ipcForbiddenHeaders } from './server-ipc/utils'
import setupCompression from 'next/dist/compiled/compression' import setupCompression from 'next/dist/compiled/compression'
import { normalizeRepeatedSlashes } from '../../shared/lib/utils' import { normalizeRepeatedSlashes } from '../../shared/lib/utils'
import { invokeRequest } from './server-ipc/invoke-request' import { invokeRequest } from './server-ipc/invoke-request'
...@@ -418,7 +418,10 @@ export async function startServer({ ...@@ -418,7 +418,10 @@ export async function startServer({
res.statusMessage = invokeRes.statusText res.statusMessage = invokeRes.statusText
for (const [key, value] of Object.entries( for (const [key, value] of Object.entries(
filterReqHeaders(toNodeOutgoingHttpHeaders(invokeRes.headers)) filterReqHeaders(
toNodeOutgoingHttpHeaders(invokeRes.headers),
ipcForbiddenHeaders
)
)) { )) {
if (value !== undefined) { if (value !== undefined) {
if (key === 'set-cookie') { if (key === 'set-cookie') {
......
...@@ -93,7 +93,7 @@ import { nodeFs } from './lib/node-fs-methods' ...@@ -93,7 +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 } from './lib/server-ipc/utils' import { filterReqHeaders, ipcForbiddenHeaders } from './lib/server-ipc/utils'
import { createRequestResponseMocks } from './lib/mock-request' import { createRequestResponseMocks } from './lib/mock-request'
import chalk from 'next/dist/compiled/chalk' import chalk from 'next/dist/compiled/chalk'
import { NEXT_RSC_UNION_QUERY } from '../client/components/app-router-headers' import { NEXT_RSC_UNION_QUERY } from '../client/components/app-router-headers'
...@@ -525,7 +525,8 @@ export default class NextNodeServer extends BaseServer { ...@@ -525,7 +525,8 @@ export default class NextNodeServer extends BaseServer {
} }
) )
const filteredResHeaders = filterReqHeaders( const filteredResHeaders = filterReqHeaders(
toNodeOutgoingHttpHeaders(invokeRes.headers) toNodeOutgoingHttpHeaders(invokeRes.headers),
ipcForbiddenHeaders
) )
for (const key of Object.keys(filteredResHeaders)) { for (const key of Object.keys(filteredResHeaders)) {
......
...@@ -426,7 +426,7 @@ createNextDescribe( ...@@ -426,7 +426,7 @@ createNextDescribe(
}) })
// TODO: investigate flakey behavior with revalidate // TODO: investigate flakey behavior with revalidate
it.skip('should handle revalidatePath', async () => { it('should handle revalidatePath', async () => {
const browser = await next.browser('/revalidate') const browser = await next.browser('/revalidate')
const randomNumber = await browser.elementByCss('#random-number').text() const randomNumber = await browser.elementByCss('#random-number').text()
const justPutIt = await browser.elementByCss('#justputit').text() const justPutIt = await browser.elementByCss('#justputit').text()
...@@ -452,7 +452,7 @@ createNextDescribe( ...@@ -452,7 +452,7 @@ createNextDescribe(
}) })
// TODO: investigate flakey behavior with revalidate // TODO: investigate flakey behavior with revalidate
it.skip('should handle revalidateTag', async () => { it('should handle revalidateTag', async () => {
const browser = await next.browser('/revalidate') const browser = await next.browser('/revalidate')
const randomNumber = await browser.elementByCss('#random-number').text() const randomNumber = await browser.elementByCss('#random-number').text()
const justPutIt = await browser.elementByCss('#justputit').text() const justPutIt = await browser.elementByCss('#justputit').text()
...@@ -503,7 +503,7 @@ createNextDescribe( ...@@ -503,7 +503,7 @@ createNextDescribe(
}, 'success') }, 'success')
}) })
it.skip('should store revalidation data in the prefetch cache', async () => { it('should store revalidation data in the prefetch cache', async () => {
const browser = await next.browser('/revalidate') const browser = await next.browser('/revalidate')
const justPutIt = await browser.elementByCss('#justputit').text() const justPutIt = await browser.elementByCss('#justputit').text()
await browser.elementByCss('#revalidate-justputit').click() await browser.elementByCss('#revalidate-justputit').click()
...@@ -534,7 +534,7 @@ createNextDescribe( ...@@ -534,7 +534,7 @@ createNextDescribe(
}) })
// TODO: investigate flakey behavior with revalidate // TODO: investigate flakey behavior with revalidate
it.skip('should revalidate when cookies.set is called', async () => { it('should revalidate when cookies.set is called', async () => {
const browser = await next.browser('/revalidate') const browser = await next.browser('/revalidate')
const randomNumber = await browser.elementByCss('#random-cookie').text() const randomNumber = await browser.elementByCss('#random-cookie').text()
...@@ -550,7 +550,7 @@ createNextDescribe( ...@@ -550,7 +550,7 @@ createNextDescribe(
}) })
// TODO: investigate flakey behavior with revalidate // TODO: investigate flakey behavior with revalidate
it.skip('should revalidate when cookies.set is called in a client action', async () => { it('should revalidate when cookies.set is called in a client action', async () => {
const browser = await next.browser('/revalidate') const browser = await next.browser('/revalidate')
await browser.refresh() await browser.refresh()
...@@ -607,7 +607,7 @@ createNextDescribe( ...@@ -607,7 +607,7 @@ createNextDescribe(
}, 'success') }, 'success')
}) })
it.skip.each(['tag', 'path'])( it.each(['tag', 'path'])(
'should invalidate client cache when %s is revalidated', 'should invalidate client cache when %s is revalidated',
async (type) => { async (type) => {
const browser = await next.browser('/revalidate') const browser = await next.browser('/revalidate')
......
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