fixu

Author: ronag

examples/proxy/proxy.js

@@ -55,7 +55,7 @@ class HTTPHandler {
 
     this.resume = resume
     this.res.on('drain', resume)
-    writeHead(this.res, statusCode, getResponseHeaders(headers))
+    writeHead(this.res, statusCode, copyHeaders(headers, null))
   }
 
   onData (chunk) {
@@ -102,7 +102,7 @@ class WSHandler {
       socket.unshift(this.head)
     }
 
-    headers = getResponseHeaders(headers)
+    headers = copyHeaders(headers, null)
 
     setupSocket(socket)
 
@@ -133,24 +133,16 @@ class WSHandler {
   }
 }
 
-// This expression matched hop-by-hop headers.
-// These headers are meaningful only for a single transport-level connection,
-// and must not be retransmitted by proxies or cached.
-// Note that only hop-by-hop headers may be set using the Connection general header.
-const HOP_EXPR = /^(te|host|upgrade|trailers|connection|keep-alive|http2-settings|transfer-encoding|proxy-connection|proxy-authenticate|proxy-authorization)$/i
-
-// Removes hop-by-hop headers and updates the via and forwarded headers.
-// Also removes http2 pseudo headers.
+// Update or set forwarded and via headers.
 function getRequestHeaders (ctx) {
   const { req, proxyName } = ctx
   const { rawHeaders: headers, socket } = req
 
-  const result = []
-
   let via = ''
   let forwarded = ''
   let host = ''
   let authority = ''
+  let connection = ''
 
   for (let n = 0; n < headers.length; n += 2) {
     const key = headers[n + 0]
@@ -164,11 +156,13 @@ function getRequestHeaders (ctx) {
       forwarded = val
     } else if (!authority && key.length === 10 && /^:authority$/i.test(key)) {
       authority = val
-    } else if (key.charAt(0) !== ':' && !HOP_EXPR.test(key)) {
-      result.push(key, val)
+    } else if (!connection && key.length === 10 && /^connection$/i.test(key)) {
+      connection = val
     }
   }
 
+  const result = copyHeaders(headers)
+
   // TODO(fix): <host> [ ":" <port> ] vs <pseudonym>
   // See, https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Via.
   if (proxyName) {
@@ -195,25 +189,39 @@ function getRequestHeaders (ctx) {
   return result
 }
 
-function getResponseHeaders (headers) {
-  let remove
-  for (let n = 0; n < headers.length; n += 2) {
-    const key = headers[n + 0]
-    if (key.length === 10 && /^connection$/i.test(key)) {
-      const val = headers[n + 1]
-      if (!HOP_EXPR.test(val)) {
-        remove = val.split(',')
+// This expression matched hop-by-hop headers.
+// These headers are meaningful only for a single transport-level connection,
+// and must not be retransmitted by proxies or cached.
+// Note that only hop-by-hop headers may be set using the Connection general header.
+const HOP_EXPR = /^(te|host|upgrade|trailers|connection|keep-alive|http2-settings|transfer-encoding|proxy-connection|proxy-authenticate|proxy-authorization)$/i
+
+// Removes hop-by-hop and pseudo headers.
+function copyHeaders (headers, connection) {
+  if (!connection) {
+    for (let n = 0; n < headers.length; n += 2) {
+      const key = headers[n + 0]
+      if (key.length === 10 && /^connection$/i.test(key)) {
+        connection = headers[n + 1]
+        break
       }
-      break
     }
   }
 
+  let remove
+  if (connection && !HOP_EXPR.test(connection)) {
+    remove = connection.split(/,\s*/)
+  }
+
   const result = []
   for (let n = 0; n < headers.length; n += 2) {
     const key = headers[n + 0]
     const val = headers[n + 1]
 
-    if (!HOP_EXPR.test(key) && (!remove || !remove.includes(key))) {
+    if (
+      key.charAt(0) !== ':' &&
+      !HOP_EXPR.test(key) &&
+      (!remove || !remove.includes(key))
+    ) {
       result.push(key, val)
     }
   }