Commit5fd3ae8

authored

[backport] Update middleware request header (#77202)

Backports#77201 to v14 releasebranch

1 parent756be15 commit5fd3ae8Copy full SHA for 5fd3ae8

File tree

+34

-0

lines changed

+34

-0

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,12 @@ export async function initialize(opts: {`
`149`	`149`	`renderServer.instance=`
`150`	`150`	`require('./render-server')astypeofimport('./render-server')`
`151`	`151`
	`152`	`+constrandomBytes=newUint8Array(8)`
	`153`	`+crypto.getRandomValues(randomBytes)`
	`154`	`+constmiddlewareSubrequestId=Buffer.from(randomBytes).toString('hex')`
	`155`	`+;(globalThisasany)[Symbol.for('@next/middleware-subrequest-id')]=`
	`156`	`+middlewareSubrequestId`
	`157`	`+`
`152`	`158`	`constrequestHandlerImpl:WorkerRequestHandler=async(req,res)=>{`
`153`	`159`	`// internal headers should not be honored by the request handler`
`154`	`160`	`if(!process.env.NEXT_PRIVATE_TEST_HEADERS){`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,5 +57,16 @@ export const filterInternalHeaders = (`
`57`	`57`	`if(INTERNAL_HEADERS.includes(header)){`
`58`	`58`	`deleteheaders[header]`
`59`	`59`	`}`
	`60`	`+`
	`61`	`+// If this request didn't origin from this session we filter`
	`62`	`+// out the "x-middleware-subrequest" header so we don't skip`
	`63`	`+// middleware incorrectly`
	`64`	`+if(`
	`65`	`+header==='x-middleware-subrequest'&&`
	`66`	`+headers['x-middleware-subrequest-id']!==`
	`67`	`+(globalThisasany)[Symbol.for('@next/middleware-subrequest-id')]`
	`68`	`+){`
	`69`	`+deleteheaders['x-middleware-subrequest']`
	`70`	`+}`
`60`	`71`	`}`
`61`	`72`	`}`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -365,6 +365,10 @@ Learn More: https://nextjs.org/docs/messages/edge-dynamic-code-evaluation`),
`365`	`365`	`store.headers.get('x-middleware-subrequest')??''`
`366`	`366`	`)`
`367`	`367`	`}`
	`368`	`+init.headers.set(`
	`369`	`+'x-middleware-subrequest-id',`
	`370`	`+(globalThisasany)[Symbol.for('@next/middleware-subrequest-id')]`
	`371`	`+)`
`368`	`372`
`369`	`373`	`constprevs=`
`370`	`374`	init.headers.get(`x-middleware-subrequest`)?.split(':')\|\|[]

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,19 @@ describe('Middleware Runtime', () => {`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`functionrunTests({ i18n}:{i18n?:boolean}){`
	`105`	`+it('should filter request header properly',async()=>{`
	`106`	`+constres=awaitnext.fetch('/redirect-to-somewhere',{`
	`107`	`+headers:{`
	`108`	`+'x-middleware-subrequest':`
	`109`	`+'middleware:middleware:middleware:middleware:middleware',`
	`110`	`+},`
	`111`	`+redirect:'manual',`
	`112`	`+})`
	`113`	`+`
	`114`	`+expect(res.status).toBe(307)`
	`115`	`+expect(res.headers.get('location')).toContain('/somewhere')`
	`116`	`+})`
	`117`	`+`
`105`	`118`	`it('should handle 404 on fallback: false route correctly',async()=>{`
`106`	`119`	`constres=awaitnext.fetch('/ssg-fallback-false/first')`
`107`	`120`	`expect(res.status).toBe(200)`

Comments

(0)