Unverified Commit 6a974adc authored by Zack Tanner's avatar Zack Tanner Committed by GitHub

[backport v14]: fix router handling when setting a location response header (#82588) (#82754)

Backports:
- #82588
Co-authored-by: 's avatarJJ Kasper <jj@jjsweb.site>
parent 55f76620
...@@ -18,7 +18,10 @@ import { formatHostname } from '../format-hostname' ...@@ -18,7 +18,10 @@ import { formatHostname } from '../format-hostname'
import { toNodeOutgoingHttpHeaders } from '../../web/utils' import { toNodeOutgoingHttpHeaders } from '../../web/utils'
import { isAbortError } from '../../pipe-readable' import { isAbortError } from '../../pipe-readable'
import { getHostname } from '../../../shared/lib/get-hostname' import { getHostname } from '../../../shared/lib/get-hostname'
import { getRedirectStatus } from '../../../lib/redirect-status' import {
allowedStatusCodes,
getRedirectStatus,
} from '../../../lib/redirect-status'
import { normalizeRepeatedSlashes } from '../../../shared/lib/utils' import { normalizeRepeatedSlashes } from '../../../shared/lib/utils'
import { relativizeURL } from '../../../shared/lib/router/utils/relativize-url' import { relativizeURL } from '../../../shared/lib/router/utils/relativize-url'
import { addPathPrefix } from '../../../shared/lib/router/utils/add-path-prefix' import { addPathPrefix } from '../../../shared/lib/router/utils/add-path-prefix'
...@@ -640,15 +643,35 @@ export function getResolveRoutes( ...@@ -640,15 +643,35 @@ export function getResolveRoutes(
if (middlewareHeaders['location']) { if (middlewareHeaders['location']) {
const value = middlewareHeaders['location'] as string const value = middlewareHeaders['location'] as string
const rel = relativizeURL(value, initUrl) // Only process Location header as a redirect if it has a proper redirect status
resHeaders['location'] = rel // This prevents a Location header with non-redirect status from being treated as a redirect
parsedUrl = url.parse(rel, true) const isRedirectStatus = allowedStatusCodes.has(
middlewareRes.status
)
return { if (isRedirectStatus) {
parsedUrl, // Process as redirect: update parsedUrl and convert to relative URL
resHeaders, const rel = relativizeURL(value, initUrl)
finished: true, resHeaders['location'] = rel
statusCode: middlewareRes.status, parsedUrl = url.parse(rel, true)
return {
parsedUrl,
resHeaders,
finished: true,
statusCode: middlewareRes.status,
}
} else {
// Not a redirect: just pass through the Location header
resHeaders['location'] = value
return {
parsedUrl,
resHeaders,
finished: true,
bodyStream,
statusCode: middlewareRes.status,
}
} }
} }
......
...@@ -11,7 +11,7 @@ createNextDescribe( ...@@ -11,7 +11,7 @@ createNextDescribe(
files: __dirname, files: __dirname,
skipDeployment: true, skipDeployment: true,
}, },
({ next }) => { ({ next, isNextDeploy }) => {
it('should filter correctly after middleware rewrite', async () => { it('should filter correctly after middleware rewrite', async () => {
const browser = await next.browser('/start') const browser = await next.browser('/start')
...@@ -240,6 +240,29 @@ createNextDescribe( ...@@ -240,6 +240,29 @@ createNextDescribe(
await browser.deleteCookies() await browser.deleteCookies()
}) })
// TODO: This consistently 404s on Vercel deployments. It technically
// doesn't repro the bug we're trying to fix but we need to figure out
// why the handling is different.
if (!isNextDeploy) {
it('should not incorrectly treat a Location header as a rewrite', async () => {
const res = await next.fetch('/test-location-header')
// Should get status 200 (not a redirect status)
expect(res.status).toBe(200)
// Should get the JSON response associated with the route,
// and not follow the redirect
const json = await res.json()
expect(json).toEqual({ foo: 'bar' })
// Ensure the provided location is still on the response
const locationHeader = res.headers.get('location')
expect(locationHeader).toBe(
'https://next-data-api-endpoint.vercel.app/api/random'
)
})
}
} }
) )
......
...@@ -69,6 +69,17 @@ export async function middleware(request) { ...@@ -69,6 +69,17 @@ export async function middleware(request) {
return res return res
} }
if (request.nextUrl.pathname === '/test-location-header') {
return NextResponse.json(
{ foo: 'bar' },
{
headers: {
location: 'https://next-data-api-endpoint.vercel.app/api/random',
},
}
)
}
return NextResponse.next({ return NextResponse.next({
request: { request: {
headers: headersFromRequest, headers: headersFromRequest,
......
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