whistle 2.10.2 → 2.10.3

package/lib/service/service.js

@@ -32,7 +32,7 @@ var TEMP_PLUGINS_PATH = path.join(common.getWhistlePath(), '.temp_plugins');
 var SESSIONS_FILE_RE = /\.(txt|json|saz)$/i;
 var limiter = new Limiter({ concurrency: 10 });
 var MAX_PLUGINS = 10;
-var TEMP_FILES_PATH;
+var TEMP_FILES_PATH = common.TEMP_FILES_PATH;
 var SAVED_SESSIONS_PATH;
 var LIMIT_SIZE = 1024 * 1024 * 128;
 var MAX_TEMP_SIZE = 1024 * 1024 * 12;
@@ -47,7 +47,6 @@ var hasWhistleToken;
 var whistleIdFile;
 var storage = multer.memoryStorage();
 var INVALID_NAME_RE = /[\u001e\u001f\u200e\u200f\u200d\u200c\u202a\u202d\u202e\u202c\u206e\u206f\u206b\u206a\u206d\u206c'<>:"\\/|?*]+/g;
-var SPACE_RE = /\s+/g;
 var upload = multer({
   storage: storage,
   fieldSize: LIMIT_SIZE
@@ -91,7 +90,7 @@ process.on('data', function(data) {
 });
 
 function getFilename(filename, time, count) {
-  filename = common.isString(filename) ? filename.replace(INVALID_NAME_RE, '').replace(SPACE_RE, ' ').substring(0, 64).trim() : '';
+  filename = common.isString(filename) ? filename.replace(INVALID_NAME_RE, '').replace(/\s+/g, ' ').substring(0, 64).trim() : '';
   time = time || Date.now();
   return common.getMonth(time) + '/' + filename + '_' + count + '_' + time;
 }
@@ -108,7 +107,7 @@ function saveSessions(data, cb) {
         return cb(err);
       }
       var filename = getFilename(data.filename, 0, count);
-      util.writeFile(path.join(SAVED_SESSIONS_PATH, filename), buf, function(e) {
+      common.writeFile(path.join(SAVED_SESSIONS_PATH, filename), buf, function(e) {
         !e && saveData({ type: 'savedData', filename: filename, buffer: buf } );
         cb(e);
       });
@@ -167,7 +166,8 @@ function getTempFiles(list, cb) {
     }
   };
   list = list.forEach(function(filename) {
-    if (!common.isTempFile(filename)) {
+    filename = common.getTempFile(filename);
+    if (!filename) {
       return execCb();
     }
     filename = path.join(TEMP_FILES_PATH, filename);
@@ -194,7 +194,7 @@ function writeTempPlugin(plugin, data, cb) {
   plugin = plugin.split('/').pop();
   var tempPath = path.join(TEMP_PLUGINS_PATH, plugin);
   ensureTempPluginsDir();
-  util.writeFile(tempPath, data, function(e) {
+  common.writeFile(tempPath, data, function(e) {
     cb(e, e ? null : tempPath);
   });
 }
@@ -308,6 +308,10 @@ function sessionsHandler() {
     function abort() {
       res.destroy();
     }
+    if (req.headers[common.WHISTLE_UID_HEADER] !== config.uid) {
+      return res.status(403).end('Forbidden');
+    }
+    delete req.headers[common.WHISTLE_UID_HEADER];
     next();
   });
   app.get('/service/*', forwardRequest);
@@ -456,8 +460,9 @@ function sessionsHandler() {
       });
     }
     var filename = req.query.filename;
-    if (common.isTempFile(filename)) {
-      filename = path.join(TEMP_FILES_PATH, filename);
+    var tempFile = common.getTempFile(filename);
+    if (tempFile) {
+      filename = path.join(TEMP_FILES_PATH, tempFile);
     }
     getFile(filename, function(em, data) {
       if (em) {
@@ -470,7 +475,7 @@ function sessionsHandler() {
   app.use('/cgi-bin/temp/create',
     jsonParser,
     function(req, res) {
-      util.writeTempFile(TEMP_FILES_PATH, getContent(req.body), function(e, filename) {
+      common.writeTempFile(getContent(req.body), function(e, filename) {
         if (e) {
           return res.json({ ec: 2, em: e.message });
         }
@@ -609,7 +614,6 @@ function checkWhistleId(cb) {
 module.exports = function (options, callback) {
   config = options;
   whistleIdFile = path.join(options.baseDir, options.storage || '', '.whistle_id');
-  TEMP_FILES_PATH = options.TEMP_FILES_PATH;
   SAVED_SESSIONS_PATH = options.SAVED_SESSIONS_PATH;
   dataCenter.setup(options);
   composer.setup(options);

package/lib/service/util.js

@@ -1,7 +1,5 @@
-var crypto = require('crypto');
 var path = require('path');
 var fs = require('fs');
-var fse = require('fs-extra2');
 var zlib = require('../util/zlib');
 var common = require('../util/common');
 
@@ -426,16 +424,6 @@ function parseFrames(res, content, callback) {
 
 exports.parseFrames = parseFrames;
 
-function getHexHash(ctn, key) {
-  return crypto
-    .createHmac('sha256', key || 'whistle_temp_files')
-    .update(ctn || '').digest('hex').toLowerCase();
-}
-
-function descSorter(a, b) {
-  return a > b ? -1 : 1;
-}
-
 var MAX_SESSIONS_FILES = 2000;
 var SAVED_SESSIONS_FILE_RE = /_([1-9]\d*)_(\d+)$/;
 var DIR_RE = /^\d{6}$/;
@@ -492,7 +480,9 @@ exports.getSavedList = function(savedDir, cb) {
         list.push(dir);
       }
     });
-    list = list.sort(descSorter).slice(0, 12).map(function(dir) {
+    list = list.sort(function (a, b) {
+      return a > b ? -1 : 1;
+    }).slice(0, 12).map(function(dir) {
       return path.join(savedDir, dir);
     });
     readSessionsFiles(list, cb);
@@ -504,32 +494,3 @@ var SHARE_TYPE_RE = /Share$/;
 exports.isShareType = function(type) {
   return SHARE_TYPE_RE.test(type);
 };
-
-function writeRetry(filepath, data, callback, retry) {
-  fse.outputFile(filepath, data, function(e) {
-    if (!e || retry) {
-      return callback(e);
-    }
-    writeRetry(filepath, data, callback, true);
-  });
-}
-
-function writeFile(filepath, data, callback) {
-  common.getStat(filepath, function(_, stat) {
-    if (!stat || !stat.isFile()) {
-      return writeRetry(filepath, data, callback);
-    }
-    callback();
-  });
-}
-
-exports.writeFile = writeFile;
-
-function writeTempFile(dir, value, callback) {
-  var filename = getHexHash(value);
-  writeFile(path.join(dir, filename), value, function(err) {
-    callback(err, filename);
-  });
-}
-
-exports.writeTempFile = writeTempFile;

package/lib/socket-mgr.js

@@ -7,28 +7,14 @@ var extend = require('extend');
 var pendingReqList = [];
 var INTERVAL = 22 * 1000;
 var proxy;
-var index = 0;
-var MAX_PAYLOAD = 1024 * 1024;
 var conns = {};
 var PING = Buffer.from('iQA=', 'base64');
 var PONG = Buffer.from('ioAn6ubf', 'base64');
 var PAUSE_STATUS = 1;
 var IGNORE_STATUS = 2;
 var MAX_COMPOSE_FRAME_COUNT = 5;
-
-function getFrameId() {
-  ++index;
-  if (index > 999) {
-    index = 0;
-  }
-  if (index > 99) {
-    return Date.now() + '-' + index;
-  }
-  if (index > 9) {
-    return Date.now() + '-0' + index;
-  }
-  return Date.now() + '-00' + index;
-}
+var getFrameId = util.getFrameId;
+var MAX_PAYLOAD = util.MAX_FRAME_PAYLOAD;
 
 exports = module.exports = function (p) {
   proxy = p;

package/lib/util/common.js

@@ -70,10 +70,16 @@ var ALLOW_ACK = 'x-whistle-allow-tunnel-ack';
 var PLUS_RE = /\+/g;
 var TOKEN = '\r\u0000\n\u0003\r';
 var PROP_SEP_RE = /(\\*)([|&]|\\[stnrfv])/g;
-var TEMP_FILE_RE = /^[\da-f]{64}$/;
+var TEMP_FILE_RE = /^(?:\/?temp\/)?([\da-f]{64})(?:\.[\w.-]+)?$/;
+var TEMP_FILES_PATH = path.join(getWhistlePath(), 'temp_files');
+
+
+exports.WHISTLE_UID_HEADER = '_x-whistle-uid_';
+
+exports.getTempFile = function(str) {
+  var match = TEMP_FILE_RE.exec(str);
+  return match && match[1];
 
-exports.isTempFile = function(str) {
-  return TEMP_FILE_RE.test(str);
 };
 
 var PROPS_CHAR = {
@@ -135,6 +141,7 @@ exports.parseQuery = function (str, sep, eq, escape) {
   return '';
 };
 
+exports.TEMP_FILES_PATH = TEMP_FILES_PATH;
 exports.ALLOW_ACK = ALLOW_ACK;
 exports.CONN_TIMEOUT = CONN_TIMEOUT;
 exports.TGZ_FILE_NAME_RE = /^(?:[\w.~-]+-)?whistle\.[a-z\d_-]+-\d+\.\d+\.\d+[\w.-]*\.(?:tgz|tar(?:\.gz)?)$/;
@@ -481,14 +488,8 @@ exports.isConnect = function(options) {
   );
 };
 
-var NO_PROTO_RE = /[^a-zA-Z0-9.-]/;
-
 function hasProtocol(url) {
-  var index = isString(url) ? url.indexOf('://') : -1;
-  if (index <= 0) {
-    return false;
-  }
-  return !NO_PROTO_RE.test(url.substring(0, index));
+  return /^[a-zA-Z0-9.-]+:\/\//.test(url);
 }
 
 function setProtocol(url, isHttps) {
@@ -2001,3 +2002,36 @@ exports.getSessionInfo = function(headers) {
   result._ = rawResult;
   return result;
 };
+
+function writeRetry(filepath, data, callback, retry) {
+  fse.outputFile(filepath, data, function(e) {
+    if (!e || retry) {
+      return callback(e);
+    }
+    writeRetry(filepath, data, callback, true);
+  });
+}
+
+function writeFile(filepath, data, callback) {
+  getStat(filepath, function(_, stat) {
+    if (!stat || !stat.isFile()) {
+      return writeRetry(filepath, data, callback);
+    }
+    callback();
+  });
+}
+
+exports.writeFile = writeFile;
+
+function getHexHash(ctn, key) {
+  return crypto
+    .createHmac('sha256', key || 'whistle_temp_files')
+    .update(ctn || '').digest('hex').toLowerCase();
+}
+
+exports.writeTempFile = function (value, callback) {
+  var filename = getHexHash(value);
+  writeFile(path.join(TEMP_FILES_PATH, filename), value, function(err) {
+    callback(err, filename);
+  });
+};

package/lib/util/index.js

@@ -1164,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));
 }
@@ -3102,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));
@@ -3638,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
   };
 }
 
@@ -3997,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.2",
+  "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'});
-  }
-};