whistle 2.9.11 → 2.9.12

package/lib/https/index.js

@@ -409,6 +409,9 @@ function resolveWebsocket(socket, wss) {
                         if (isProxyPort) {
                           proxyHeaders[config.WEBUI_HEAD] = 1;
                         }
+                        if (util.isLocalPHost(socket, wss)) {
+                          headers[config.WEBUI_HEAD] = 1;
+                        }
                         var clientId = headers[config.CLIENT_ID_HEADER];
                         if (clientId) {
                           proxyHeaders[config.CLIENT_ID_HEADER] = clientId;

package/lib/inspectors/res.js

@@ -350,7 +350,8 @@ module.exports = function (req, res, next) {
                       }
                       if (isProxyPort) {
                         proxyHeaders[config.WEBUI_HEAD] = 1;
-                      } else if (util.isProxyPort(curServerPort)) {
+                      }
+                      if (util.isProxyPort(curServerPort) || util.isLocalPHost(req, isHttps)) {
                         headers[config.WEBUI_HEAD] = 1;
                       }
                       var clientId = req.headers[config.CLIENT_ID_HEADER];
@@ -431,7 +432,8 @@ module.exports = function (req, res, next) {
                 } else {
                   if (
                     isProxyPort ||
-                    util.isProxyPort(options.port || (isHttps ? 443 : 80))
+                    util.isProxyPort(options.port || (isHttps ? 443 : 80)) ||
+                    util.isLocalPHost(req, isHttps)
                   ) {
                     headers[config.WEBUI_HEAD] = 1;
                   }

package/lib/rules/index.js

@@ -124,19 +124,20 @@ exports.getProxy = function (url, req, callback) {
   var ignoreProxy;
   var proxy;
   var pacRule;
-  var phost;
+  var host = rules.getHost(req, pRules, fRules, hRules);
+  var hostValue = util.getMatcherValue(host) || '';
   if (config.multiEnv || req._headerRulesFirst) {
     proxy =
-      (pRules && pRules.resolveProxy(req)) ||
-      (hRules && hRules.resolveProxy(req)) ||
-      rules.resolveProxy(req) ||
-      (fRules && fRules.resolveProxy(req));
+      (pRules && pRules.resolveProxy(req, hostValue)) ||
+      (hRules && hRules.resolveProxy(req, hostValue)) ||
+      rules.resolveProxy(req, hostValue) ||
+      (fRules && fRules.resolveProxy(req, hostValue));
   } else {
     proxy =
-      (pRules && pRules.resolveProxy(req)) ||
-      rules.resolveProxy(req) ||
-      (fRules && fRules.resolveProxy(req)) ||
-      (hRules && hRules.resolveProxy(req));
+      (pRules && pRules.resolveProxy(req, hostValue)) ||
+      rules.resolveProxy(req, hostValue) ||
+      (fRules && fRules.resolveProxy(req, hostValue)) ||
+      (hRules && hRules.resolveProxy(req, hostValue));
   }
   var proxyHostOnly = isLineProp(proxy, 'proxyHostOnly');
   var proxyHost =
@@ -154,7 +155,7 @@ exports.getProxy = function (url, req, callback) {
       proxyHost = proxyHost || PROXY_HOSTS_RE.test(proxy.matcher);
     }
   }
-  var host = rules.getHost(req, pRules, fRules, hRules);
+
   if (!ignoreProxy) {
     proxyHost = isProxyHost(req, proxy, host) || proxyHost; // 不能调换顺序
   }
@@ -207,10 +208,7 @@ exports.getProxy = function (url, req, callback) {
       resolvePacRule();
     }
     if (proxyHost) {
-      phost = parseUrl(util.setProtocol(host.matcher + (host.port ? ':' + host.port : '')));
-      if (util.checkProxyHost(proxy, phost)) {
-        req._phost = phost;
-      }
+      req._phost = parseUrl(util.setProtocol(host.matcher + (host.port ? ':' + host.port : '')));
     } else if (
       !isLineProp(proxy, 'proxyFirst') &&
       !isLineProp(host, 'proxyFirst') &&
@@ -229,10 +227,7 @@ exports.getProxy = function (url, req, callback) {
   }
   if (proxy) {
     if (!req._phost && P_HOST_RE.test(proxy.matcher)) {
-      phost = parseUrl(util.setProtocol(RegExp.$1));
-      if (util.checkProxyHost(proxy, phost)) {
-        req._phost = phost;
-      }
+      req._phost = parseUrl(util.setProtocol(RegExp.$1));
     }
     reqRules.proxy = proxy;
     return callback();
@@ -268,7 +263,7 @@ exports.getProxy = function (url, req, callback) {
       if (rule) {
         tempRules.parse(pacRule.rawPattern + ' ' + rule);
         req.curUrl = url;
-        if ((proxy = tempRules.resolveProxy(req))) {
+        if ((proxy = tempRules.resolveProxy(req, hostValue))) {
           proxyHost = isProxyHost(req, proxy) || proxyHost; // 不能调换顺序
           req._proxyTunnel =
             req._proxyTunnel || isLineProp(pacRule, 'proxyTunnel');

package/lib/rules/rules.js

@@ -724,8 +724,8 @@ function getValueFor(key, vals) {
   return values.get(key);
 }
 
-function getRule(req, list, vals, index, isFilter) {
-  var rule = resolveRuleList(req, list, vals, index || 0, isFilter);
+function getRule(req, list, vals, index, isFilter, host) {
+  var rule = resolveRuleList(req, list, vals, index || 0, isFilter, null, host);
   resolveValue(rule, vals, req);
   return rule;
 }
@@ -803,7 +803,7 @@ function replaceSubMatcher(url, regExp) {
   return util.replacePattern(url, regExp);
 }
 
-function resolveRuleList(req, list, vals, index, isFilter, isEnableProxy) {
+function resolveRuleList(req, list, vals, index, isFilter, isEnableProxy, host) {
   var curUrl = formatUrl(req.curUrl);
   var notHttp = list.isRuleProto && curUrl[0] !== 'h';
   //支持域名匹配
@@ -860,7 +860,7 @@ function resolveRuleList(req, list, vals, index, isFilter, isEnableProxy) {
     if (notHttp && protoMgr.isFileProxy(rule.matcher)) {
       return false;
     }
-    return isFilter || !matchExcludeFilters(curUrl, rule, req);
+    return (isFilter || !matchExcludeFilters(curUrl, rule, req)) && (host == null || util.checkProxyHost(rule, host));
   };
 
   for (var i = 0; (rule = list[i]); i++) {
@@ -1954,9 +1954,6 @@ proto.resolveHost = function (
 proto.lookupHost = function (req, callback) {
   req.curUrl = formatUrl(util.setProtocol(req.curUrl));
   var options = url.parse(req.curUrl);
-  if (options.hostname === '::1') {
-    return callback(null, '127.0.0.1');
-  }
   lookup(
     options.hostname,
     callback,
@@ -2226,8 +2223,8 @@ proto.hasReqScript = function (req) {
     : getRule(req, this._rules.rulesFile, this._values);
 };
 
-proto.resolveProxy = function resolveProxy(req) {
-  var proxy = getRule(req, this._rules.proxy, this._values);
+proto.resolveProxy = function resolveProxy(req, host) {
+  var proxy = getRule(req, this._rules.proxy, this._values, null, null, host);
   var matcher = proxy && proxy.matcher;
   var name = matcher && matcher.substring(0, matcher.indexOf(':'));
   var filter = this.resolveFilter(req);

package/lib/tunnel.js

@@ -408,7 +408,7 @@ function tunnelProxy(server, proxy, type) {
                           isSocks ? 1080 : isHttpsProxy ? 443 : 80
                         );
                         options.auth = options.auth || req._pacAuth;
-                        var isProxyPort = options.port == config.port;
+                        var isProxyPort = util.isProxyPort(options.port);
                         if (isProxyPort && util.isLocalAddress(ip)) {
                           return emitError(
                             new Error(
@@ -455,7 +455,7 @@ function tunnelProxy(server, proxy, type) {
                         } else {
                           dstOptions.proxyPort = options.port || 80;
                           dstOptions.proxyAuth = options.auth;
-                          if (isProxyPort) {
+                          if (isProxyPort || util.isLocalPHost(req, true)) {
                             _headers[config.WEBUI_HEAD] = 1;
                           }
                           _headers['x-whistle-request-tunnel-ack'] = 1;

package/lib/util/index.js

@@ -1824,7 +1824,7 @@ function isJSONContent(req) {
 
 exports.isJSONContent = isJSONContent;
 
-exports.isProxyPort = function (proxyPort) {
+function isProxyPort(proxyPort) {
   return (
     proxyPort == config.port ||
     proxyPort == config.httpsPort ||
@@ -1832,6 +1832,17 @@ exports.isProxyPort = function (proxyPort) {
     proxyPort == config.socksPort ||
     proxyPort == config.realPort
   );
+}
+
+exports.isProxyPort = isProxyPort;
+
+exports.isLocalPHost = function(req, isHttps) {
+  var phost = req._phost;
+  var hostname = phost && phost.hostname;
+  if (!hostname || !isProxyPort(phost.port || (isHttps ? 443 : 80))) {
+    return false;
+  }
+  return isLocalHost(hostname);
 };
 
 function isMultipart(req) {
@@ -3650,9 +3661,8 @@ function checkProxyHost(host, filter) {
   return filter.not ? !result : result;
 }
 
-exports.checkProxyHost = function(proxy, phost) {
+exports.checkProxyHost = function(proxy, host) {
   var filters = proxy && proxy.hostFilter;
-  var host = phost.host;
   if (filters) {
     if (!host) {
       return false;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "whistle",
   "description": "HTTP, HTTP2, HTTPS, Websocket debugging proxy",
-  "version": "2.9.11",
+  "version": "2.9.12",
   "dataDirname": ".whistle",
   "localUIHost": "local.whistlejs.com",
   "port": 8899,