From 3828ebea3cd8317236b258b1c886fe1dca24e30b Mon Sep 17 00:00:00 2001
From: Steven <steven@ceriously.com>
Date: Mon, 25 Oct 2021 23:26:28 -0400
Subject: [PATCH] Fix middleware header propagation (#30288)

---
 packages/next/server/next-server.ts           | 16 ++++++++++--
 packages/next/server/web/utils.ts             | 25 +++++++++++--------
 .../pages/responses/_middleware.js            | 10 ++++++++
 .../pages/responses/deep/_middleware.js       |  9 +++++++
 .../pages/responses/deep/index.js             | 10 ++++++++
 .../middleware-core/test/index.test.js        | 11 ++++++++
 6 files changed, 68 insertions(+), 13 deletions(-)
 create mode 100644 test/integration/middleware-core/pages/responses/deep/_middleware.js
 create mode 100644 test/integration/middleware-core/pages/responses/deep/index.js

diff --git a/packages/next/server/next-server.ts b/packages/next/server/next-server.ts
index 0d9149777e..d9b6b7fb48 100644
--- a/packages/next/server/next-server.ts
+++ b/packages/next/server/next-server.ts
@@ -624,7 +624,7 @@ export default class Server {
 
     const subreq = params.request.headers[`x-middleware-subrequest`]
     const subrequests = typeof subreq === 'string' ? subreq.split(':') : []
-
+    const allHeaders = new Headers()
     let result: FetchEventResult | null = null
 
     for (const middleware of this.middleware || []) {
@@ -667,6 +667,10 @@ export default class Server {
           },
         })
 
+        for (let [key, value] of result.response.headers) {
+          allHeaders.append(key, value)
+        }
+
         if (!this.renderOpts.dev) {
           result.waitUntil.catch((error) => {
             console.error(`Uncaught: middleware waitUntil errored`, error)
@@ -681,6 +685,10 @@ export default class Server {
 
     if (!result) {
       this.render404(params.request, params.response, params.parsed)
+    } else {
+      for (let [key, value] of allHeaders) {
+        result.response.headers.set(key, value)
+      }
     }
 
     return result
@@ -1156,7 +1164,11 @@ export default class Server {
 
           for (const [key, value] of result.response.headers.entries()) {
             if (key !== 'content-encoding') {
-              res.setHeader(key, value)
+              if (key.toLowerCase() === 'set-cookie') {
+                res.setHeader(key, value.split(', '))
+              } else {
+                res.setHeader(key, value)
+              }
             }
           }
 
diff --git a/packages/next/server/web/utils.ts b/packages/next/server/web/utils.ts
index 3f2b8cb989..1f789163d6 100644
--- a/packages/next/server/web/utils.ts
+++ b/packages/next/server/web/utils.ts
@@ -20,25 +20,28 @@ export function notImplemented(name: string, method: string): any {
   )
 }
 
-export function fromNodeHeaders(object: NodeHeaders) {
-  const headers: { [k: string]: string } = {}
-  for (let headerKey in object) {
-    const headerValue = object[headerKey]
-    if (Array.isArray(headerValue)) {
-      headers[headerKey] = headerValue.join('; ')
-    } else if (headerValue) {
-      headers[headerKey] = String(headerValue)
+export function fromNodeHeaders(object: NodeHeaders): Headers {
+  const headers = new Headers()
+  for (let [key, value] of Object.entries(object)) {
+    const values = Array.isArray(value) ? value : [value]
+    for (let v of values) {
+      if (v !== undefined) {
+        headers.append(key, v)
+      }
     }
   }
   return headers
 }
 
 export function toNodeHeaders(headers?: Headers): NodeHeaders {
-  const object: NodeHeaders = {}
+  const result: NodeHeaders = {}
   if (headers) {
     for (const [key, value] of headers.entries()) {
-      object[key] = value.includes(';') ? value.split(';') : value
+      result[key] = value
+      if (key.toLowerCase() === 'set-cookie') {
+        result[key] = value.split(', ')
+      }
     }
   }
-  return object
+  return result
 }
diff --git a/test/integration/middleware-core/pages/responses/_middleware.js b/test/integration/middleware-core/pages/responses/_middleware.js
index 246ab0a18d..6329017ec0 100644
--- a/test/integration/middleware-core/pages/responses/_middleware.js
+++ b/test/integration/middleware-core/pages/responses/_middleware.js
@@ -15,6 +15,16 @@ export async function middleware(request, ev) {
     next.headers.set('x-nested-header', 'valid')
   }
 
+  // Ensure deep can append to this value
+  if (url.searchParams.get('append-me') === 'true') {
+    next.headers.append('x-append-me', 'top')
+  }
+
+  // Ensure deep can append to this value
+  if (url.searchParams.get('cookie-me') === 'true') {
+    next.headers.append('set-cookie', 'chocochip')
+  }
+
   // Sends a header
   if (url.pathname === '/responses/header') {
     next.headers.set('x-first-header', 'valid')
diff --git a/test/integration/middleware-core/pages/responses/deep/_middleware.js b/test/integration/middleware-core/pages/responses/deep/_middleware.js
new file mode 100644
index 0000000000..28974fdeb1
--- /dev/null
+++ b/test/integration/middleware-core/pages/responses/deep/_middleware.js
@@ -0,0 +1,9 @@
+import { NextResponse } from 'next/server'
+
+export async function middleware(request, _event) {
+  const next = NextResponse.next()
+  next.headers.set('x-deep-header', 'valid')
+  next.headers.append('x-append-me', 'deep')
+  next.headers.append('set-cookie', 'oatmeal')
+  return next
+}
diff --git a/test/integration/middleware-core/pages/responses/deep/index.js b/test/integration/middleware-core/pages/responses/deep/index.js
new file mode 100644
index 0000000000..5d2341782b
--- /dev/null
+++ b/test/integration/middleware-core/pages/responses/deep/index.js
@@ -0,0 +1,10 @@
+function Deep() {
+  return (
+    <div>
+      <h1>Deep</h1>
+      <p>This is a deep page with deep middleware, check the headers</p>
+    </div>
+  )
+}
+
+export default Deep
diff --git a/test/integration/middleware-core/test/index.test.js b/test/integration/middleware-core/test/index.test.js
index 121375f254..d359dfa15f 100644
--- a/test/integration/middleware-core/test/index.test.js
+++ b/test/integration/middleware-core/test/index.test.js
@@ -325,6 +325,17 @@ function responseTests(locale = '') {
     )
     expect(res.headers.get('x-first-header')).toBe('valid')
   })
+
+  it(`${locale} should respond with top level headers and append deep headers`, async () => {
+    const res = await fetchViaHTTP(
+      context.appPort,
+      `${locale}/responses/deep?nested-header=true&append-me=true&cookie-me=true`
+    )
+    expect(res.headers.get('x-nested-header')).toBe('valid')
+    expect(res.headers.get('x-deep-header')).toBe('valid')
+    expect(res.headers.get('x-append-me')).toBe('top, deep')
+    expect(res.headers.raw()['set-cookie']).toEqual(['chocochip', 'oatmeal'])
+  })
 }
 
 function interfaceTests(locale = '') {