0.1.4 (fix a error inside forwarded logic)

Author: JoaoOtavioS

lib/http-proxy/passes/web-incoming.js

@@ -69,15 +69,19 @@ module.exports = {
 
     const encrypted = req.isSpdy || common.hasEncryptedConnection(req);
     const values = {
-      For: req.connection.remoteAddress || req.socket.remoteAddress,
+      For: req.headers["CF-Connecting-IP"] || req.connection.remoteAddress || req.socket.remoteAddress,
       Port: common.getPort(req),
       Proto: encrypted ? "https" : "http",
     };
 
-    ["For", "Port", "Proto"].forEach(function (header) {
-      req.headers["X-Forwarded-" + header] =
-        (req.headers["X-Forwarded-" + header] || "") + (req.headers["X-Forwarded-" + header] ? "," : "") + values[header];
-    });
+    for (const header of ["For", "Port", "Proto"]) {
+      const headerName = `X-Forwarded-${header}`;
+      if (req.headers?.[headerName]) {
+        req.headers[headerName] += `, ${values[header]}`;
+      } else {
+        req.headers[headerName] = values[header];
+      }
+    }
 
     req.headers["X-Forwarded-Host"] = req.headers["X-Forwarded-Host"] || req.headers.host || "";
   },

lib/http-proxy/passes/web-outgoing.js

@@ -112,7 +112,8 @@ module.exports = {
       rawHeaderKeyMap = {};
 
       for (let i = 0; i < proxyRes.rawHeaders.length; i += 2) {
-        rawHeaderKeyMap[proxyRes.rawHeaders[i].toLowerCase()] = proxyRes.rawHeaders[i];
+        const lowerKey = proxyRes.rawHeaders[i].toLowerCase();
+        rawHeaderKeyMap[lowerKey] = proxyRes.rawHeaders[i];
       }
     }
 

lib/http-proxy/passes/ws-incoming.js

@@ -47,15 +47,19 @@ module.exports = {
     if (!options.xfwd) return;
 
     const values = {
-      For: req.connection.remoteAddress || req.socket.remoteAddress,
+      For: req.headers["CF-Connecting-IP"] || req.connection.remoteAddress || req.socket.remoteAddress,
       Port: common.getPort(req),
       Proto: common.hasEncryptedConnection(req) ? "wss" : "ws",
     };
 
-    ["For", "Port", "Proto"].forEach(function (header) {
-      req.headers["X-Forwarded-" + header] =
-        (req.headers["X-Forwarded-" + header] || "") + (req.headers["X-Forwarded-" + header] ? "," : "") + values[header];
-    });
+    for (const header of ["For", "Port", "Proto"]) {
+      const headerName = `X-Forwarded-${header}`;
+      if (req.headers?.[headerName]) {
+        req.headers[headerName] += `, ${values[header]}`;
+      } else {
+        req.headers[headerName] = values[header];
+      }
+    }
   },
 
   /**