whistle 2.10.2 → 2.10.4

package/lib/util/index.js

@@ -29,6 +29,7 @@ var h2Consts = config.enableH2 ? require('http2').constants : {};
 var protocols = protoMgr.protocols;
 var resProtocols = protoMgr.resProtocols;
 var uid = config.uid;
+var trimStr = common.trimStr;
 var parseQuery = common.parseQuery;
 var supportsBr = common.supportsBr;
 var isLocalIp = common.isLocalIp;
@@ -126,6 +127,7 @@ workerIndex = workerIndex >= 0 ? common.padLeft(config.workerIndex, 3) : '';
 
 
 exports.sendRes = common.sendRes;
+exports.trimStr = trimStr;
 exports.THEME_STYLE = THEME_STYLE;
 exports.encodeNonLatin1Char = encodeNonLatin1Char;
 exports.isJson = common.isJson;
@@ -1164,7 +1166,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));
 }
@@ -2359,15 +2361,6 @@ exports.transformReq = function(req, res, port, host, html) {
   return client;
 };
 
-function trimStr(str) {
-  if (typeof str !== 'string') {
-    return '';
-  }
-  return str.trim();
-}
-
-exports.trimStr = trimStr;
-
 function hasHeaderRules(headers) {
   return (
     headers['x-whistle-rule-key'] ||
@@ -3102,10 +3095,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));
@@ -3389,19 +3382,25 @@ exports.parseRange = function (req, size) {
 };
 
 exports.parseClientInfo = function (req) {
-  if (req.headers[config.FROM_COM_HEADER] === '1') {
+  var headers = req.headers;
+  var testId = headers[config.TEST_HEADER];
+  if (testId) {
+    delete headers[config.TEST_HEADER];
+    req._testId = testId;
+  }
+  if (headers[config.FROM_COM_HEADER] === '1') {
     req.fromComposer = true;
-    req._disabledProxyRules = !!req.headers[config.DISABLE_RULES_HEADER];
-    delete req.headers[config.FROM_COM_HEADER];
-    delete req.headers[config.DISABLE_RULES_HEADER];
+    req._disabledProxyRules = !!headers[config.DISABLE_RULES_HEADER];
+    delete headers[config.FROM_COM_HEADER];
+    delete headers[config.DISABLE_RULES_HEADER];
   }
   var socket = req.socket || '';
   if (socket.fromTunnel) {
     req.fromTunnel = true;
   }
-  var clientInfo = req.headers[clientInfoKey];
+  var clientInfo = headers[clientInfoKey];
   if (clientInfo) {
-    delete req.headers[clientInfoKey];
+    delete headers[clientInfoKey];
     clientInfo = String(clientInfo).split(',');
     if (!net.isIP(clientInfo[0]) || !(clientInfo[1] > 0)) {
       return '';
@@ -3638,7 +3637,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
   };
 }
 
@@ -3997,3 +3997,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.2",
+  "version": "2.10.4",
   "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.2",
     "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'});
-  }
-};