Skip to content

fix: address edge can read request body failures #2890

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
May 6, 2025
Merged

fix: address edge can read request body failures #2890

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f02b90
fix: address edge can read request body failures
mrstork May 1, 2025
7ca2f22
fix: apply multiple body reads patch to rewrite case
mrstork May 6, 2025
1e67e13
Merge branch 'main' into fix/prevent-multiple-body-reads
mrstork May 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 17 additions & 19 deletions edge-runtime/lib/response.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,25 +163,13 @@ export const buildResponse = async ({

if (rewriteUrl.origin !== baseUrl.origin) {
logger.withFields({ rewrite_url: rewrite }).debug('Rewriting to external url')
let proxyRequest: Request
const proxyRequest = await cloneRequest(rewriteUrl, request)

// Remove Netlify internal headers
const headers = new Headers(
[...request.headers.entries()].filter(([key]) => !key.startsWith('x-nf-')),
)
if (request.body && !request.bodyUsed) {
// This is not ideal, but streaming to an external URL doesn't work
const body = await request.arrayBuffer()
proxyRequest = new Request(rewriteUrl, {
headers,
method: request.method,
body,
})
} else {
proxyRequest = new Request(rewriteUrl, {
headers,
method: request.method,
})
for (const key of request.headers.keys()) {
if (key.startsWith('x-nf-')) {
proxyRequest.headers.delete(key)
}
}

return addMiddlewareHeaders(fetch(proxyRequest, { redirect: 'manual' }), edgeResponse)
Expand All @@ -207,7 +195,7 @@ export const buildResponse = async ({
request.headers.set('x-middleware-rewrite', target)

// coookies set in middleware need to be available during the lambda request
const newRequest = new Request(target, request)
const newRequest = await cloneRequest(target, request)
const newRequestCookies = mergeMiddlewareCookies(edgeResponse, newRequest)
if (newRequestCookies) {
newRequest.headers.set('Cookie', newRequestCookies)
Expand Down Expand Up @@ -241,7 +229,7 @@ export const buildResponse = async ({
edgeResponse.headers.delete('x-middleware-next')

// coookies set in middleware need to be available during the lambda request
const newRequest = new Request(request)
const newRequest = await cloneRequest(request.url, request)
const newRequestCookies = mergeMiddlewareCookies(edgeResponse, newRequest)
if (newRequestCookies) {
newRequest.headers.set('Cookie', newRequestCookies)
Expand Down Expand Up @@ -284,3 +272,13 @@ function normalizeLocalizedTarget({
}
return targetUrl.toString()
}

async function cloneRequest(url, request: Request) {
// This is not ideal, but streaming to an external URL doesn't work
const body = request.body && !request.bodyUsed ? await request.arrayBuffer() : undefined
return new Request(url, {
headers: request.headers,
method: request.method,
body,
})
}
Loading