From 3b946653ac193f736f4deb77cd113dbd9a38edcc Mon Sep 17 00:00:00 2001
From: avwo <avwu@qq.com>
Date: Thu, 8 Mar 2018 21:47:06 +0800
Subject: [PATCH] refactor: remove x-forwarded-for by default

---
 lib/https/index.js    | 2 ++
 lib/inspectors/res.js | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/lib/https/index.js b/lib/https/index.js
index f77922d4b..72cfa3aac 100644
--- a/lib/https/index.js
+++ b/lib/https/index.js
@@ -337,6 +337,8 @@ function _handleWebsocket(socket, clientIp, clientPort, callback, wss) {
           var forwardedFor = util.getMatcherValue(_rules.forwardedFor);
           if (forwardedFor) {
             headers[config.CLIENT_IP_HEAD] = forwardedFor;
+          } else if (!_rules.forwardedFor) {
+            delete headers[config.CLIENT_IP_HEAD];
           }
         }
         if (_rules.referer) {
diff --git a/lib/inspectors/res.js b/lib/inspectors/res.js
index 6da383e9e..041bfaf00 100644
--- a/lib/inspectors/res.js
+++ b/lib/inspectors/res.js
@@ -259,6 +259,8 @@ module.exports = function(req, res, next) {
             var forwardedFor = util.getMatcherValue(resRules.forwardedFor);
             if (forwardedFor) {
               headers[config.CLIENT_IP_HEAD] = forwardedFor;
+            } else if (!resRules.forwardedFor && ((!isHttps && !proxyUrl) || proxyUrl)) {
+              delete headers[config.CLIENT_IP_HEAD];
             }
           }