whistle 2.10.10 → 2.10.11

package/lib/tunnel.js

@@ -206,10 +206,9 @@ function tunnelProxy(server, proxy, type) {
         if (!isIPHost || !hasCustomCerts()) {
           return false;
         }
-        reqSocket.useProxifier =
-          (config.proxifier2 || (config.proxifier && isWebPort)) &&
-          !disable.proxifier;
-        return reqSocket.useProxifier;
+        var useProxifier = (config.proxifier2 || (config.proxifier && isWebPort)) && !disable.proxifier;
+        reqSocket.useProxifier = useProxifier;
+        return useProxifier;
       };
       var resolvedPlugin;
       if (isIntercept()) {
@@ -248,14 +247,19 @@ function tunnelProxy(server, proxy, type) {
       pluginMgr.getTunnelRules(req, function (_rulesMgr) {
         handlePluginRules(_rulesMgr);
         policy = headers[config.WHISTLE_POLICY_HEADER];
+        var useSniAsTunnelDomain = util.isEnable(req, 'useSniAsTunnelDomain');
+        var noCapture;
         if (!reqSocket._hasError && !req._authForbidden &&
-          !req.fromComposer && (req._forceCapture || isIntercept())) {
+          !req.fromComposer && (req._forceCapture || isIntercept() || (noCapture = useSniAsTunnelDomain))) {
           reqSocket.rulesHeaders = req.rulesHeaders;
           reqSocket.enable = req.enable;
           reqSocket.disable = req.disable;
           reqSocket.tunnelHostname = hostname;
+          reqSocket.tunnelPort = options.port;
           reqSocket.rules = _rules;
           reqSocket._pluginVars = req._pluginVars;
+          reqSocket._noCaptureW2 = noCapture;
+          reqSocket._useSniAsTunnelDomain = useSniAsTunnelDomain;
           dispatch(
             reqSocket,
             function (chunk) {

package/lib/util/common.js

@@ -74,6 +74,13 @@ var PROP_SEP_RE = /(\\*)([|&]|\\[stnrfv])/g;
 var TEMP_FILE_RE = /^(?:\/?temp\/)?([\da-f]{64})(?:\.[\w.-]+)?$/;
 var TEMP_FILES_PATH = path.join(getWhistlePath(), 'temp_files');
 var SAVED_SESSIONS_FILE_RE = /_([1-9]\d*)_(\d+)$/;
+var REG_EXP_RE = /^\/(.+)\/(i?u?|ui)$/;
+
+function isRegExp(regExp) {
+  return REG_EXP_RE.test(regExp);
+}
+
+exports.isRegExp = isRegExp;
 
 exports.getSavedFileItem = function(filename) {
   var result = SAVED_SESSIONS_FILE_RE.exec(filename);
@@ -1905,16 +1912,14 @@ exports.connectInner = function (options, cb, config) {
     auth = 'Basic ' + auth.toString('base64');
     setRawHeader(headers, 'proxy-authorization', auth);
   }
+  var req;
   var timer = setTimeout(function () {
-    if (req) {
-      req.emit('error', TIMEOUT_ERR);
-      req.destroy();
-    }
+    req.emit('error', TIMEOUT_ERR);
+    req.destroy();
   }, CONN_TIMEOUT);
-  var req;
   var clearTimer = function (err) {
     if (timer) {
-      err && req && req.destroy();
+      err && req.destroy();
       clearTimeout(timer);
       timer = null;
     }
@@ -1929,14 +1934,15 @@ exports.connectInner = function (options, cb, config) {
     socket.on('error', function() {
       socket.destroy();
     });
-    if (res.statusCode !== 200) {
-      var err = new Error(
-          'Tunneling socket could not be established, statusCode=' +
-            res.statusCode
-        );
-      err.statusCode = res.statusCode;
+    var status = res.statusCode;
+    if (status !== 200) {
       socket.destroy();
       process.nextTick(function () {
+        var err = new Error(
+          'Tunneling socket could not be established, statusCode=' +
+            status
+        );
+        err.statusCode = status;
         req.emit('error', err);
       });
       return;
@@ -2135,3 +2141,127 @@ function getHttpMeta(f1, f2, f3, headers, rawHeaders) {
 }
 
 exports.getHttpMeta = getHttpMeta;
+
+
+var PATTERN_FIELDS = ['url', 'm', 'method', 'reqH', 'reqHeader', 'reqHeaders',
+  'b', 'body', 'reqBody', 's', 'statusCode', 'status', 'resH', 'resHeader', 'resHeaders'];
+
+function getHeaderKey(key) {
+  return !key || typeof key !== 'string' || /[^\w!#$%&'*+.^`|~-]/.test(key) ? '' : key.toLowerCase();
+}
+
+function createFilter(item, name, key) {
+  var protocol = (item.exclude ? 'ex' : 'in') + 'cludeFilter://';
+  name = name ? name + (key ? '.' : ':') : '';
+  key = key ? key + ':' : '';
+  return protocol + name + key + item.value;
+}
+
+function wrapRegexp(value, item) {
+  var flags = item.ignoreCase || item.matchCase === false ? 'i' : '';
+  return { value: '/' + value.replace(/\//g, '\\$&') + '/' + flags, exclude: item.exclude};
+}
+
+function formatPath(url) {
+  if (/^\^?\/\//.test(url)) {
+    return url;
+  }
+  return url.replace(/^(\^?(?:https?:\/\/|wss?:\/\/)?)([/?.])/, function(all, prefix, flag) {
+    return flag === '/' ? prefix + '**/' : (prefix[0] === '^' ? prefix : '^' + prefix) + '**/**' + flag;
+  });
+}
+
+function formatUrlPattern(item) {
+  var value = item.value;
+  var type = item.type;
+  var prefix;
+  if (/^\s*(keyword|contains?)\s*$/i.test(type)) {
+    return wrapRegexp(item.value.replace(/[|/\\{}()[\]^$+?*.]/g, '\\$&'), item);
+  }
+  if (/^\s*regexp?\s*$/i.test(type)) {
+    return wrapRegexp(item.value.replace(/\//g, '\\$&'), item);
+  }
+  if (/^\s*(wildcard|star)\s*$/i.test(type)) {
+    return { value: formatPath(item.value.replace(/^\^*/, '^')), exclude: item.exclude };
+  }
+  if (value[0] === '?') {
+    prefix = '^**/**';
+  } else if (value[0] !== '/' || value[1] === '/' || isRegExp(value)) {
+    return { value: formatPath(value) };
+  }
+  return { value: (prefix || '**') + value };
+}
+
+function createPattern(list) {
+  if (!list) {
+    return '';
+  }
+  if (!Array.isArray(list)) {
+    list = [list];
+  }
+  var len = list.length;
+  if (!len) {
+    return '';
+  }
+  var result = [];
+  var urlPattern;
+  var key;
+  var add = function(item, name, key) {
+    var p = createFilter(item, name, key);
+    if (result.indexOf(p) === -1) {
+      result.push(p);
+    }
+  };
+  list.forEach(function(item) {
+    if (!item || !item.value) {
+      return;
+    }
+    var name = item.name || 'url';
+    if (PATTERN_FIELDS.indexOf(name) === -1) {
+      return;
+    }
+    if (typeof item.value !== 'string') {
+      item.value = String(item.value);
+    }
+    if (/\s/.test(item.value)) {
+      return;
+    }
+    switch(name) {
+    case 'url':
+      item = formatUrlPattern(item);
+      if (urlPattern || item.exclude) {
+        add(item);
+      } else {
+        urlPattern = item.value;
+      }
+      return;
+    case 'm':
+    case 'method':
+      return add(item, 'm');
+    case 'reqH':
+    case 'reqHeader':
+    case 'reqHeaders':
+      key = getHeaderKey(item.key);
+      return key && add(item, 'reqH', key);
+    case 'b':
+    case 'body':
+    case 'reqBody':
+      return add(item, 'b');
+    case 's':
+    case 'statusCode':
+    case 'status':
+      return add(item, 's');
+    case 'resH':
+    case 'resHeader':
+    case 'resHeaders':
+      key = getHeaderKey(item.key);
+      return key && add(item, 'resH', key);
+    }
+  });
+  if (urlPattern || result.length) {
+    result.unshift(urlPattern || '*');
+  }
+  return result.join(' ');
+}
+
+exports.createPattern = createPattern;

package/lib/util/index.js

@@ -24,7 +24,7 @@ var ReplacePatternTransform = require('./replace-pattern-transform');
 var common = require('./common');
 var proc = require('./process');
 var parseUrl = require('./parse-url');
-var h2Consts = config.enableH2 ? require('http2').constants : {};
+var h2Consts = require('http2').constants;
 
 var protocols = protoMgr.protocols;
 var resProtocols = protoMgr.resProtocols;
@@ -39,7 +39,6 @@ var pendingFiles = {};
 var localIpCache = new LRU({ max: 120 });
 var LOCALHOST = '127.0.0.1';
 var aliasProtocols = protoMgr.aliasProtocols;
-var CONTEXT = vm.createContext();
 var END_SLASH_RE = /[/\\]$/;
 var GEN_URL_RE = /^\s*(?:https?:)?\/\/\w[^\s]*\s*$/i;
 var CORS_KEY_RE = /^(?:enable|use-credentials|useCredentials|credentials)$/i;
@@ -50,17 +49,12 @@ var STYLE_START = toBuffer('<style>');
 var STYLE_END = toBuffer('</style>');
 var PROXY_RE = /^x?(?:socks|https?-proxy|proxy|internal(?:-https)?-proxy)$/;
 var SEP_RE = /[|&]/;
-var ctxTimer;
 var END_RE = /[/\\]$/;
 var EXPIRED_SEC = -123456;
 var EXP_COOKIE = { maxAge: EXPIRED_SEC, path: '/' };
 var EXP_SECURE_COOKIE = { maxAge: EXPIRED_SEC, path: '/', secure: true };
 var EXP_COOKIE_D = { maxAge: EXPIRED_SEC, path: '/' };
 var EXP_SECURE_COOKIE_D = { maxAge: EXPIRED_SEC, path: '/', secure: true };
-var resetContext = function () {
-  ctxTimer = null;
-  CONTEXT = vm.createContext();
-};
 var TIMEOUT_ERR = common.TIMEOUT_ERR;
 var SUB_MATCH_RE = /\$[&\d]/;
 var PROTO_NAME_RE = /^([\w.-]+):\/\//;
@@ -89,6 +83,7 @@ var getMatcher = common.getMatcher;
 var getMatcherValue = common.getMatcherValue;
 var getRemoteAddr = common.getRemoteAddr;
 var getRemotePort = common.getRemotePort;
+var isRegExp = common.isRegExp;
 var workerIndex = process.env && process.env.workerIndex;
 var INTERNAL_ID = Date.now().toString(16) +  Math.floor(Math.random() * 10000000).toString(16);
 var pluginMgr;
@@ -175,6 +170,7 @@ exports.PLUGIN_INSPECTOR_CONFIG = Symbol('inspectorConfig');
 exports.drain = require('./drain');
 exports.isWin = process.platform === 'win32';
 exports.isUtf8 = isUtf8;
+exports.isRegExp = isRegExp;
 exports.WhistleTransform = require('./whistle-transform');
 exports.ReplacePatternTransform = ReplacePatternTransform;
 exports.replacePattern = replacePattern;
@@ -425,7 +421,7 @@ exports.compare = compare;
 var scriptCache = {};
 var VM_OPTIONS = {
   displayErrors: false,
-  timeout: 60
+  timeout: 72
 };
 var MAX_SCRIPT_SIZE = 1024 * 256;
 var MAX_SCRIPT_CACHE_COUNT = 64;
@@ -471,34 +467,20 @@ function getScript(content) {
   return script.script;
 }
 
-function clearContext() {
-  Object.keys(CONTEXT).forEach(function (key) {
-    delete CONTEXT[key];
-  });
-  if (!ctxTimer) {
-    ctxTimer = setTimeout(resetContext, 30000);
-  }
-}
+var customConsole = {};
+['fatal', 'error', 'warn', 'info', 'log', 'debug'].forEach(function (level) {
+  customConsole[level] = logger[level];
+});
 
-exports.execScriptSync = function(script, context) {
+exports.runInContext = function(script, context) {
   try {
-    if ((script = getScript(script))) {
-      CONTEXT.console = {};
-      ['fatal', 'error', 'warn', 'info', 'log', 'debug'].forEach(function (
-        level
-      ) {
-        CONTEXT.console[level] = logger[level];
-      });
-      Object.keys(context).forEach(function (key) {
-        CONTEXT[key] = context[key];
-      });
-      script.runInContext(CONTEXT, VM_OPTIONS);
+    if (script = getScript(script)) {
+      context = Object.assign({ console: Object.create(customConsole) }, context);
+      script.runInNewContext(context, VM_OPTIONS);
     }
     return true;
   } catch (e) {
     logger.error(e);
-  } finally {
-    clearContext();
   }
 };
 
@@ -603,14 +585,6 @@ function formatDate(now) {
 
 exports.formatDate = formatDate;
 
-var REG_EXP_RE = /^\/(.+)\/(i?u?|ui)$/;
-
-function isRegExp(regExp) {
-  return REG_EXP_RE.test(regExp);
-}
-
-exports.isRegExp = isRegExp;
-
 var ORIG_REG_EXP = /^\/(.+)\/([igmu]{0,4})$/;
 var FLAGS_RE = /[igmu]{2}/;
 
@@ -723,14 +697,13 @@ function isAuthCapture(req) {
 
 exports.isAuthCapture = isAuthCapture;
 
-exports.toRegExp = function toRegExp(regExp, ignoreCase) {
-  regExp = REG_EXP_RE.test(regExp);
-  try {
-    regExp = regExp && new RegExp(RegExp.$1, ignoreCase ? 'i' : RegExp.$2);
-  } catch (e) {
-    regExp = null;
+exports.toRegExp = function(regExp, ignoreCase) {
+  if (isRegExp(regExp)) {
+    try {
+      return new RegExp(RegExp.$1, ignoreCase ? 'i' : RegExp.$2);
+    } catch (e) {}
   }
-  return regExp;
+  return null;
 };
 
 var isString = common.isString;
@@ -2983,7 +2956,7 @@ exports.disableReqProps = function (req) {
     delete headers['user-agent'];
   }
 
-  if (disable.gzip || isEnable(req, 'captureStream')) {
+  if (disable.gzip || disable.zip || isEnable(req, 'captureStream')) {
     delete headers['accept-encoding'];
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "whistle",
   "description": "HTTP, HTTP2, HTTPS, Websocket debugging proxy",
-  "version": "2.10.10",
+  "version": "2.10.11",
   "dataDirname": ".whistle",
   "localUIHost": "local.whistlejs.com",
   "port": 8899,
@@ -37,7 +37,7 @@
     "url": "https://github.com/avwo/whistle.git"
   },
   "dependencies": {
-    "adm-zip": "^0.6.0",
+    "adm-zip": "^0.6.1",
     "async-limiter": "2.0.0",
     "body-parser": "^1.20.6",
     "colors": "1.1.2",
@@ -75,7 +75,7 @@
     "docs": "vitepress build docs"
   },
   "engines": {
-    "node": ">= 14.0.0"
+    "node": ">= 16.0.0"
   },
   "devDependencies": {
     "babel-core": "^6.7.6",