fixup

Author: ronag

examples/proxy/proxy.js

@@ -10,7 +10,7 @@ module.exports = async function proxy (ctx, client) {
     client.dispatch({
       method: req.method,
       path: req.url,
-      headers: getRequestHeaders(ctx),
+      headers: getHeaders(ctx),
       upgrade: 'Websocket'
     }, handler)
     return handler.promise
@@ -19,7 +19,7 @@ module.exports = async function proxy (ctx, client) {
     client.dispatch({
       method: req.method,
       path: req.url,
-      headers: getRequestHeaders(ctx),
+      headers: getHeaders(ctx),
       body: req
     }, handler)
     return handler.promise
@@ -55,7 +55,7 @@ class HTTPHandler {
 
     this.resume = resume
     this.res.on('drain', resume)
-    writeHead(this.res, statusCode, copyHeaders(headers, null))
+    writeHead(this.res, statusCode, getHeaders({ headers }))
   }
 
   onData (chunk) {
@@ -106,7 +106,7 @@ class WSHandler {
 
     let head = 'HTTP/1.1 101 Switching Protocols\r\nconnection: upgrade\r\nupgrade: websocket'
 
-    headers = copyHeaders(headers, null)
+    headers = getHeaders({ headers })
     for (let n = 0; n < headers.length; n += 2) {
       const key = headers[n + 0]
       const val = headers[n + 1]
@@ -132,10 +132,16 @@ class WSHandler {
   }
 }
 
-// Update or set forwarded and via headers.
-function getRequestHeaders (ctx) {
-  const { req, proxyName } = ctx
-  const { rawHeaders: headers, socket } = req
+// This expression matches hop-by-hop headers.
+// These headers are meaningful only for a single transport-level connection,
+// and must not be retransmitted by proxies or cached.
+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.
+// Updates via and forwarded headers.
+// Only hop-by-hop headers may be set using the Connection general header.
+function getHeaders (ctx) {
+  const { req, proxyName, headers = req && req.rawHeaders } = ctx
 
   let via = ''
   let forwarded = ''
@@ -160,52 +166,6 @@ function getRequestHeaders (ctx) {
     }
   }
 
-  const result = copyHeaders(headers, connection)
-
-  // TODO(fix): <host> [ ":" <port> ] vs <pseudonym>
-  // See, https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Via.
-  if (proxyName) {
-    if (via) {
-      if (via.split(',').some(name => name.endsWith(proxyName))) {
-        throw new createError.LoopDetected()
-      }
-      via += ', '
-    }
-    via += `${req.httpVersion} ${proxyName}`
-  }
-
-  if (via) {
-    result.push('via', via)
-  }
-
-  result.push('forwarded', (forwarded ? forwarded + ', ' : '') + [
-    `by=${printIp(socket.localAddress, socket.localPort)}`,
-    `for=${printIp(socket.remoteAddress, socket.remotePort)}`,
-    `proto=${socket.encrypted ? 'https' : 'http'}`,
-    `host=${printIp(authority || host || '')}`
-  ].join(';'))
-
-  return result
-}
-
-// This expression matches hop-by-hop headers.
-// These headers are meaningful only for a single transport-level connection,
-// and must not be retransmitted by proxies or cached.
-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.
-// Only hop-by-hop headers may be set using the Connection general header.
-function copyHeaders (headers, connection) {
-  if (!connection) {
-    for (let n = 0; n < headers.length; n += 2) {
-      const key = headers[n + 0]
-      if (key.length === 10 && key.toLowerCase() === 'connection') {
-        connection = headers[n + 1]
-        break
-      }
-    }
-  }
-
   let remove
   if (connection && !HOP_EXPR.test(connection)) {
     remove = connection.split(/,\s*/)
@@ -225,6 +185,33 @@ function copyHeaders (headers, connection) {
     }
   }
 
+  if (req) {
+    const { socket, httpVersion } = req
+
+    result.push('forwarded', (forwarded ? forwarded + ', ' : '') + [
+      `by=${printIp(socket.localAddress, socket.localPort)}`,
+      `for=${printIp(socket.remoteAddress, socket.remotePort)}`,
+      `proto=${socket.encrypted ? 'https' : 'http'}`,
+      `host=${printIp(authority || host || '')}`
+    ].join(';'))
+
+    // TODO(fix): <host> [ ":" <port> ] vs <pseudonym>
+    // See, https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Via.
+    if (proxyName) {
+      if (via) {
+        if (via.split(',').some(name => name.endsWith(proxyName))) {
+          throw new createError.LoopDetected()
+        }
+        via += ', '
+      }
+      via += `${httpVersion} ${proxyName}`
+    }
+  }
+
+  if (via) {
+    result.push('via', via)
+  }
+
   return result
 }