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.

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

Jump to bottom

fix: allow some recursion for middleware subrequests #60615

Merged
merged 9 commits into from
Feb 6, 2024
Merged

fix: allow some recursion for middleware subrequests #60615

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a116cbd
feat: allow overriding subrequest blocker
juliusmarminge Jan 13, 2024
4c91e02
Merge branch 'canary' into allow-subrequests
juliusmarminge Feb 5, 2024
5c75071
max depth limit
juliusmarminge Feb 5, 2024
d5840a7
Merge branch 'canary' into allow-subrequests
ijjk Feb 5, 2024
60a54c4
store and forward headers from async local storage
juliusmarminge Feb 5, 2024
b180b21
add test
juliusmarminge Feb 5, 2024
b1701e3
skip deploy mode
ijjk Feb 5, 2024
4542f83
rm unnecessary
juliusmarminge Feb 6, 2024
47e7430
Merge branch 'canary' into allow-subrequests
juliusmarminge Feb 6, 2024
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
3 changes: 2 additions & 1 deletion packages/next/src/server/web/sandbox/sandbox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ export const run = withTaggedErrors(async function runWithTaggedErrors(params) {
const runtime = await getRuntimeContext(params)
const subreq = params.request.headers[`x-middleware-subrequest`]
const subrequests = typeof subreq === 'string' ? subreq.split(':') : []
if (subrequests.includes(params.name)) {
const allowSubrequests = params.request.headers[`x-middleware-allow-subrequests`] === "true"
if (subrequests.includes(params.name) && !allowSubrequests) {
ijjk marked this conversation as resolved.
Show resolved Hide resolved
return {
waitUntil: Promise.resolve(),
response: new runtime.context.Response(null, {
Expand Down