whistle 2.10.1 → 2.10.3

package/lib/util/index.js

@@ -15,20 +15,21 @@ var dns = require('dns');
 var mime = require('mime');
 var PipeStream = require('pipestream');
 var protoMgr = require('../rules/protocols');
-var protocols = protoMgr.protocols;
 var logger = require('./logger');
 var config = require('../config');
 var isUtf8 = require('./is-utf8');
 var fileMgr = require('./file-mgr');
 var httpMgr = require('./http-mgr');
 var ReplacePatternTransform = require('./replace-pattern-transform');
-var parseQuery = require('./parse-query');
 var common = require('./common');
 var proc = require('./process');
 var parseUrl = require('./parse-url');
 var h2Consts = config.enableH2 ? require('http2').constants : {};
 
+var protocols = protoMgr.protocols;
+var resProtocols = protoMgr.resProtocols;
 var uid = config.uid;
+var parseQuery = common.parseQuery;
 var supportsBr = common.supportsBr;
 var isLocalIp = common.isLocalIp;
 var getStat = common.getStat;
@@ -1163,7 +1164,7 @@ function getTempFilePath(filePath, rule) {
   var root = rule.root;
   if (!root && common.TEMP_PATH_RE.test(filePath)) {
     rule._suffix = RegExp.$2;
-    return path.join(config.TEMP_FILES_PATH, RegExp.$1);
+    return path.join(common.TEMP_FILES_PATH, RegExp.$1);
   }
   return joinPath(root, decodePath(filePath));
 }
@@ -1855,23 +1856,21 @@ function joinPath(root, dir) {
 
 exports.joinPath = joinPath;
 
-function resolveProperties(list, result) {
+function parseRuleProps(list, result) {
   result = result || {};
   if (list) {
-    list
-      .map(getMatcherValue)
-      .join('|')
-      .split(SEP_RE)
-      .forEach(function (action) {
-        if (action) {
+    list.forEach(function(rule) {
+      if (rule = getMatcherValue(rule)) {
+        common.parseProps(rule).forEach(function (action) {
           result[action] = true;
-        }
-      });
+        });
+      }
+    });
   }
   return result;
 }
 
-exports.resolveProperties = resolveProperties;
+exports.parseRuleProps = parseRuleProps;
 
 exports.parseLineProps = function (str) {
   str = str && removeProtocol(str, true);
@@ -1998,17 +1997,7 @@ exports.checkSkip = function(skip, rule, curUrl) {
 };
 
 function resolveRuleProps(rule, result) {
-  result = result || {};
-  if (rule) {
-    rule.list.forEach(function (rule) {
-      getMatcherValue(rule)
-        .split(SEP_RE)
-        .forEach(function (action) {
-          result[action] = true;
-        });
-    });
-  }
-  return result;
+  return parseRuleProps(rule && rule.list, result);
 }
 
 var PLUGIN_RE = /^(?:plugin|whistle)\.[a-z\d_\-]+$/;
@@ -2089,7 +2078,7 @@ function ignoreRules(rules, ignore, isResRules) {
     if (name === 'filter' || name === 'ignore' || exclude[name]) {
       return;
     }
-    if (!isResRules || protoMgr.resProtocols.indexOf(name) !== -1) {
+    if (!isResRules || resProtocols.indexOf(name) !== -1) {
       if (
         ignorePlugins(rules, name, exclude) ||
         ignoreProxy(rules, name, exclude) ||
@@ -2191,7 +2180,7 @@ function mergeRules(req, add, isResRules) {
   };
   if (origAdd) {
     if (isResRules) {
-      protoMgr.resProtocols.forEach(merge);
+      resProtocols.forEach(merge);
     } else {
       Object.keys(origAdd).forEach(merge);
     }
@@ -2680,12 +2669,12 @@ var REQ_HEADER_RE = /^req\.?H(?:eaders?)?\.(.+)$/i;
 var RES_HEADER_RE = /^res\.?H(?:eaders?)?\.(.+)$/i;
 var TRAILER_RE = /trailer\.(.+)$/;
 var HEADER_RE = /^headers\.(.+)$/;
-var REQ_COOKIE_RE = /^req\.?C(?:ookies?)?\.(.+)$/i;
-var RES_COOKIE_RE = /^res\.?C(?:ookies?)?\.(.+)$/i;
-var REQ_BODY_RE = /^req\.?B(?:ody?)?\.(.+)$/i;
-var RES_BODY_RE = /^res\.?B(?:ody?)?\.(.+)$/i;
-var COOKIE_RE = /^cookies?\.(.+)$/i;
-var QUERY_RE = /^(?:query|params|url\.?Params?)\.(.+)$/i;
+var REQ_COOKIE_RE = /^req\.?C(?:ookies?)?\.([\s\S]+)$/i;
+var RES_COOKIE_RE = /^res\.?C(?:ookies?)?\.([\s\S]+)$/i;
+var REQ_BODY_RE = /^req\.?B(?:ody?)?\.([\s\S]+)$/i;
+var RES_BODY_RE = /^res\.?B(?:ody?)?\.([\s\S]+)$/i;
+var COOKIE_RE = /^cookies?\.([\s\S]+)$/i;
+var QUERY_RE = /^(?:query|params|url\.?Params?)\.([\s\S]+)$/i;
 var QUERY_STRING_RE = /^(?:query|params|url\.?Params?)$/i;
 var PATH_INDEX_RE = /^pathname(?:\.?(-?\d+|first|last))?$/i;
 
@@ -2766,12 +2755,11 @@ exports.parseDelResBody = function(req) {
 
 exports.deleteProps = function(obj, keys) {
   keys = obj && keys && Object.keys(keys);
-  if (!keys || !keys.length) {
-    return;
+  if (keys && keys.length) {
+    keys.forEach(function(key) {
+      common.deleteProps(obj, key);
+    });
   }
-  keys.forEach(function(key) {
-    common.deleteProps(obj, key);
-  });
 };
 
 function getDomain(req) {
@@ -3114,10 +3102,10 @@ function getCookieItem(name, cookie) {
   if (!cookie || typeof cookie != 'object') {
     return name + '=' + (cookie == null ? '' : cookie);
   }
-  var attrs = [name + '=' + escapeValue(cookie.value)];
+  var attrs = [name + '=' + escapeValue(cookie.value || cookie.Value)];
   var maxAge = cookie.maxAge ||  cookie.maxage ||
       cookie.MaxAge || cookie['Max-Age'] || cookie['max-age'];
-  maxAge = parseInt(cookie.maxAge, 10);
+  maxAge = parseInt(maxAge, 10);
   if (!Number.isNaN(maxAge)) {
     attrs.push('Expires=' + new Date(Date.now() + maxAge * 1000).toGMTString());
     attrs.push('Max-Age=' + (maxAge === EXPIRED_SEC ? 0 : maxAge));
@@ -3650,7 +3638,8 @@ function formatAuth(obj) {
   var password = obj.password;
   return {
     username: username == null ? null : String(username),
-    password: password == null ? null : String(password)
+    password: password == null ? null : String(password),
+    proxy: !!obj.proxy
   };
 }
 
@@ -4009,3 +3998,22 @@ exports.isHide = function(req) {
   var d = req.disable || '';
   return req.fromComposer ? checkHideProp(e, d, 'Composer') : checkHideProp(e, d, '', req._filters && req._filters.hide);
 };
+
+
+var frameIndex = 0;
+
+exports.MAX_FRAME_PAYLOAD = 1024 * 1024;
+
+exports.getFrameId = function() {
+  ++frameIndex;
+  if (frameIndex > 999) {
+    frameIndex = 0;
+  }
+  if (frameIndex > 99) {
+    return Date.now() + '-' + frameIndex;
+  }
+  if (frameIndex > 9) {
+    return Date.now() + '-0' + frameIndex;
+  }
+  return Date.now() + '-00' + frameIndex;
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "whistle",
   "description": "HTTP, HTTP2, HTTPS, Websocket debugging proxy",
-  "version": "2.10.1",
+  "version": "2.10.3",
   "dataDirname": ".whistle",
   "localUIHost": "local.whistlejs.com",
   "port": 8899,
@@ -53,7 +53,7 @@
     "parseurl": "^1.3.1",
     "pfork": "^0.6.3",
     "pipestream": "^0.7.5",
-    "set-global-proxy": "^0.3.0",
+    "set-global-proxy": "^0.4.0",
     "sni": "1.0.0",
     "sockx": "^0.2.3",
     "starting": "^8.0.3",

package/biz/webui/cgi-bin/import-remote.js

@@ -1,37 +0,0 @@
-var util = require('../../../lib/util');
-var loadService = require('../lib/proxy').loadService;
-
-var MAX_LEN = 1024 * 1024 * 6;
-var HTTP_RE = /https?:\/\/\S/i;
-
-module.exports = function(req, res) {
-  var url = req.query.url;
-  if (HTTP_RE.test(url)) {
-    util.request({
-      url: url,
-      maxLength: MAX_LEN
-    }, function(err, body, r) {
-      if (err) {
-        var msg = err.code === 'EEXCEED'  ? 'The size of response body exceeds 6MB' : err.message;
-        return res.json({ec: 2, em: msg});
-      }
-      var status = r.statusCode;
-      if (status !== 200) {
-        var em = status > 200 && status < 400 ? 'No data' : 'Request failed';
-        return res.json({ec: 2, em: em + ' (statusCode: ' + status + ')'});
-      }
-      return res.json({ec: 0, body: body});
-    });
-  } else if (util.isString(url)) {
-    loadService(function(err, options) {
-      if (err) {
-        util.sendRes(res, 500, err.stack || err);
-      } else {
-        req.url = '/cgi-bin/temp/get?filename=' + encodeURIComponent(url);
-        util.transformReq(req, res, options.port);
-      }
-    });
-  } else {
-    res.json({ec: 400, em: 'Bad url'});
-  }
-};

package/biz/webui/cgi-bin/log/set.js

@@ -1,7 +0,0 @@
-var proxy = require('../../lib/proxy');
-
-module.exports = function(req, res) {
-  proxy.addLog(req.query);
-  res.setHeader('content-type', 'image/png');
-  res.end();
-};

package/lib/util/parse-query.js

@@ -1,35 +0,0 @@
-var qs = require('querystring');
-
-var TOKEN_RE = /\r\u0000\n\u0003\r/g;
-var PLUS_RE = /\+/g;
-var TOKEN = '\r\u0000\n\u0003\r';
-
-var decoder = {
-  decodeURIComponent: function (s) {
-    s = s.replace(TOKEN_RE, '+');
-    return qs.unescape(s);
-  }
-};
-var rawDecoder = {
-  decodeURIComponent: function (s) {
-    return s.replace(TOKEN_RE, '+');
-  }
-};
-var rawDecoder2 = {
-  decodeURIComponent: function (s) {
-    return s;
-  }
-};
-
-function parse(str, sep, eq, escape) {
-  try {
-    if (str.indexOf('+') === -1 || str.indexOf(TOKEN) !== -1) {
-      return qs.parse(str, sep, eq, escape ? rawDecoder2 : undefined);
-    }
-    str = str.replace(PLUS_RE, TOKEN);
-    return qs.parse(str, sep, eq, escape ? rawDecoder : decoder);
-  } catch (e) {}
-  return '';
-}
-
-module.exports = parse;