Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix actions redirect handling #49483

Merged
merged 2 commits into from May 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions packages/next/src/server/app-render/action-handler.ts
Expand Up @@ -21,6 +21,7 @@ import { StaticGenerationStore } from '../../client/components/static-generation
import { FlightRenderResult } from './flight-render-result'
import { ActionResult } from './types'
import { ActionAsyncStorage } from '../../client/components/action-async-storage'
import { filterReqHeaders, forbiddenHeaders } from '../lib/server-ipc/utils'

function nodeToWebReadableStream(nodeReadable: import('stream').Readable) {
if (process.env.NEXT_RUNTIME !== 'edge') {
Expand Down Expand Up @@ -90,10 +91,10 @@ function getForwardedHeaders(
})

// Merge request and response headers
const mergedHeaders = {
const mergedHeaders = filterReqHeaders({
...nodeHeadersToRecord(requestHeaders),
...nodeHeadersToRecord(responseHeaders),
}
}) as Record<string, string>

// Merge cookies
const mergedCookies = requestCookies.split('; ').concat(setCookies).join('; ')
Expand Down Expand Up @@ -177,13 +178,16 @@ async function createRedirectRenderResult(
})
// copy the headers from the redirect response to the response we're sending
for (const [key, value] of response.headers) {
res.setHeader(key, value)
if (!forbiddenHeaders.includes(key)) {
res.setHeader(key, value)
}
}

return new FlightRenderResult(response.body!)
}
} catch (err) {
// we couldn't stream the redirect response, so we'll just do a normal redirect
console.error(`failed to get redirect response`, err)
}
}
return new RenderResult(JSON.stringify({}))
Expand Down
2 changes: 1 addition & 1 deletion packages/next/src/server/lib/server-ipc/utils.ts
@@ -1,4 +1,4 @@
const forbiddenHeaders = [
export const forbiddenHeaders = [
'accept-encoding',
'content-length',
'keepalive',
Expand Down