whistle 2.10.2 → 2.10.4

package/lib/rules/rules.js

@@ -7,6 +7,7 @@ var rulesUtil = require('./util');
 var lookup = require('./dns');
 var protoMgr = require('./protocols');
 var config = require('../config');
+var common = require('../util/common');
 
 var rules = rulesUtil.rules;
 var values = rulesUtil.values;
@@ -14,7 +15,6 @@ var env = process.env || {};
 var allowDnsCache = true;
 var SUB_MATCH_RE = /\$[&\d]/;
 var BODY_MATCH_RE = /\$b[&\d]/;
-var SPACE_RE = /\s+/g;
 var EXACT_RE = /^\$/;
 var NON_RE = /^!/;
 var HAS_SPACE_RE = /\s/;
@@ -69,7 +69,6 @@ var NON_STAR_RE = /[^*]/;
 var DOMAIN_STAR_RE = /([*~]+)(\\.)?/g;
 var STAR_RE = /\*+/g;
 var PORT_PATTERN_RE = /^!?:\d{1,5}$/;
-var COMMENT_RE = /#[^\r\n]*/g;
 var TPL_RE = /^((?:[\w.-]+:)?\/\/)?(`.*`)$/;
 // url:  protocol, host, port, hostname, search, query, pathname, path, href, query.key
 // req|res: ip, method, statusCode, headers?.key, cookies?.key
@@ -102,6 +101,7 @@ var TOOL_RE = /^(?:log|weinre):\/\//;
 var mIndex = 0;
 var mNow = Date.now();
 var IS_JSON = Symbol('isJson');
+var removeComment = common.removeComment;
 
 function getMFlag() {
   if (mIndex === Number.MAX_SAFE_INTEGER) {
@@ -111,10 +111,6 @@ function getMFlag() {
   return mNow + '-' + (mIndex++);
 }
 
-function removeComment(text) {
-  return text.replace(COMMENT_RE, '').trim();
-}
-
 function domainToRegExp(all, star, dot) {
   var len = star.length;
   var result = len > 1 ? '([^/?]*)' : '([^/?.]*)';
@@ -371,7 +367,7 @@ function joinUrl(a, b) {
 }
 
 function toLine(_, line) {
-  return line.replace(SPACE_RE, ' ');
+  return line.replace(/\s+/g, ' ');
 }
 
 function mergeLines(text) {
@@ -1839,6 +1835,9 @@ function matchFilter(url, filter, req) {
     if (filter.from === 'tunnel') {
       return filter.not ? !req.fromTunnel : req.fromTunnel;
     }
+    if (filter.from === 'test') {
+      return filter.not ? !req._testId : req._testId;
+    }
     if (filter.from === 'composer') {
       return filter.not ? !req.fromComposer : req.fromComposer;
     }
@@ -1866,7 +1865,7 @@ function matchFilter(url, filter, req) {
     if (keyLen > 0 && key[keyLen] === '%') {
       key = key.substring(0, keyLen) / 100;
     }
-    return getFilterResult(Math.random() < chance.key, filter);
+    return getFilterResult(Math.random() < key, filter);
   }
   if (filterProp(req.method, filter.method, filter.mPattern)) {
     return getFilterResult(result, filter);

package/lib/service/composer.js

@@ -29,6 +29,7 @@ var MAX_BODY_LEN = 260 * 1024;
 var MAX_BASE64_LEN = 360 * 1024;
 var MAX_METHOD_LEN = 64;
 var LEN_HEADER = 'content-length';
+var testIndex = 0;
 
 var composerTimer;
 function saveComposerHistory() {
@@ -38,7 +39,12 @@ function saveComposerHistory() {
   } catch (e) {}
 }
 
-function handleComposerHistory(data) {
+function getUrl(url, isConn) {
+  url = isConn ? url.replace(/[?#].*$/, '') : url;
+  return url.length > MAX_URL_LEN ? url.substring(0, MAX_URL_LEN) : url;
+}
+
+function handleComposerHistory(data, isConn) {
   var url = data.url;
   var method = data.method;
   var headers = data.headers;
@@ -50,7 +56,7 @@ function handleComposerHistory(data) {
   var result = {
     date: Date.now(),
     useH2: data.useH2,
-    url: url.length > MAX_URL_LEN ? url.substring(0, MAX_URL_LEN) : url,
+    url: getUrl(url, isConn),
     method:
         method.length > MAX_METHOD_LEN
           ? method.substring(0, MAX_METHOD_LEN)
@@ -120,7 +126,24 @@ function getReqCount(count) {
   return count > 0 ? Math.min(count, MAX_REQ_COUNT) : 1;
 }
 
-function handleConnect(options, cb, count) {
+function getResponse(res, testId) {
+  if (testId) {
+    return { testId: testId };
+  }
+  return { statusCode: res.statusCode, headers: res.headers || {} };
+}
+
+function handleCallback(cb, err, res, testId) {
+  if (!cb) {
+    return;
+  }
+  if (testId) {
+    return cb(null, getResponse(null, testId));
+  }
+  cb(err, !err && getResponse(res));
+}
+
+function handleConnect(options, cb, count, testId) {
   count = getReqCount(count);
   options.headers['x-whistle-policy'] = 'tunnel';
   var origOpts = options;
@@ -140,7 +163,7 @@ function handleConnect(options, cb, count) {
       headers: options.headers
     }, function(socket, svrRes, err) {
       if (err) {
-        return execCb && execCb(err);
+        return handleCallback(execCb, err, null, testId);
       }
       if (TLS_PROTOS.indexOf(options.protocol) !== -1) {
         socket = tls.connect({
@@ -155,10 +178,7 @@ function handleConnect(options, cb, count) {
         socket.write(data);
         options.body = data = null;
       }
-      execCb && execCb(null, {
-        statusCode: svrRes.statusCode,
-        headers: svrRes.headers
-      });
+      handleCallback(execCb, err, svrRes, testId);
     }, config).on('error', execCb || noop);
   }
 }
@@ -173,7 +193,7 @@ function getReqRaw(options) {
   return raw + '\r\n\r\n';
 }
 
-function handleWebSocket(options, cb, count) {
+function handleWebSocket(options, cb, count, testId) {
   count = getReqCount(count);
   if (options.protocol === 'https:' || options.protocol === 'wss:') {
     options.headers[common.HTTPS_FIELD] = 1;
@@ -191,7 +211,7 @@ function handleWebSocket(options, cb, count) {
     }
     common.connect(PROXY_OPTS, function(err, socket) {
       if (err) {
-        execCb && execCb(err);
+        handleCallback(execCb, err, null, testId);
       } else {
         socket.write(getReqRaw(options));
         var data = options.body;
@@ -201,7 +221,7 @@ function handleWebSocket(options, cb, count) {
         parseReq(socket, function(e) {
           if (e) {
             socket.destroy();
-            return execCb && execCb(e);
+            return handleCallback(execCb, e, null, testId);
           }
           var statusCode = socket.statusCode;
           if (statusCode == 101) {
@@ -221,17 +241,14 @@ function handleWebSocket(options, cb, count) {
           } else {
             socket.destroy();
           }
-          execCb && execCb(null, {
-            statusCode: statusCode,
-            headers: socket.headers || {}
-          });
+          handleCallback(execCb, err, socket, testId);
         }, true);
       }
     });
   }
 }
 
-function handleHttp(options, cb, count, reqId) {
+function handleHttp(options, cb, count, reqId, testId) {
   count = getReqCount(count);
   if (options.protocol === 'https:') {
     options.headers[common.HTTPS_FIELD] = 1;
@@ -250,7 +267,8 @@ function handleHttp(options, cb, count, reqId) {
       options = extend({}, origOpts);
     }
     var client = http.request(options, function(svrRes) {
-      if (!execCb) {
+      if (!execCb || testId) {
+        handleCallback(execCb, null, svrRes, testId);
         return drain(svrRes);
       }
       svrRes.on('error', execCb);
@@ -333,15 +351,16 @@ function getCharset(headers) {
 }
 
 exports.handleRequest = function(req, res) {
-  var fullUrl = req.body.url;
+  var reqBody = req.body;
+  var fullUrl = reqBody.url;
   if (!fullUrl || typeof fullUrl !== 'string') {
-    return res.json({ec: 0});
+    return res.json({ec: 2, em: 'Invalid URL'});
   }
 
   fullUrl = common.encodeNonLatin1Char(fullUrl.replace(/#.*$/, ''));
   var options = common.parseUrl(common.setProtocol(fullUrl));
   if (!options.host) {
-    return res.json({ec: 0});
+    return res.json({ec: 2, em: 'Invalid URL'});
   }
   var protocol = options.protocol;
   if (protocol) {
@@ -349,13 +368,41 @@ exports.handleRequest = function(req, res) {
   }
   var rawHeaderNames = {};
   var clientId = req.headers[config.CLIENT_ID_HEADER];
-  var headers = parseHeaders(req.body.headers, rawHeaderNames, clientId);
-  var method = common.getMethod(req.body.method);
+  var headers = parseHeaders(reqBody.headers, rawHeaderNames, clientId);
+  var method = common.getMethod(reqBody.method);
   var isWebSocket = method === 'WEBSOCKET';
+  var rules = common.trimStr(reqBody.rules);
+  if (rules) {
+    var curRules = headers['x-whistle-rule-value'];
+    if (Array.isArray(curRules)) {
+      curRules = curRules.join('\n');
+    }
+    curRules = common.trimStr(curRules);
+    if (curRules) {
+      try {
+        curRules = decodeURIComponent(curRules);
+        rules = common.removeComment(rules + '\n' + curRules);
+      } catch (e) {}
+    }
+    headers['x-whistle-rule-value'] = common.safeEncodeURIComponent(rules);
+  }
+  var type = common.trimStr(reqBody.contentType);
+  if (type) {
+    headers['content-type'] = type;
+  }
+  if (reqBody.contentLength >= 0) {
+    headers['content-length'] = reqBody.contentLength;
+  }
   delete headers[config.WEBUI_HEAD];
   headers[config.FROM_COM_HEADER] = '1';
-  if (req.body.enableProxyRules === false) {
+  var isTest = reqBody.isTest;
+  var testId;
+  if (reqBody.enableProxyRules === false || isTest) {
     headers[config.DISABLE_RULES_HEADER] = '1';
+    if (isTest) {
+      testId = ++testIndex + '';
+      headers[config.TEST_HEADER] = testId;
+    }
   }
   headers.host = options.host;
   options.clientId = clientId;
@@ -365,8 +412,8 @@ exports.handleRequest = function(req, res) {
 
   var isConn = common.isConnect(options);
   var isWs = !isConn && (isWebSocket || common.isUpgrade(options, headers));
-  var useH2 = req.body.useH2 || req.body.isH2;
-  req.body.useH2 = false;
+  var useH2 = reqBody.useH2 || reqBody.isH2;
+  reqBody.useH2 = false;
   if (isWs) {
     headers.connection = 'Upgrade';
     headers.upgrade = (!isWebSocket && headers.upgrade) || 'websocket';
@@ -377,7 +424,7 @@ exports.handleRequest = function(req, res) {
   } else {
     delete headers.upgrade;
     if (!isConn && ((useH2 && (protocol === 'https:' || protocol === 'http:')) || protocol === 'h2:' || protocol === 'http2:')) {
-      req.body.useH2 = true;
+      reqBody.useH2 = true;
       var isHttp = protocol === 'http:';
       options.protocol = isHttp ? 'http:' : 'https:';
       if (!headers[config.ALPN_PROTOCOL_HEADER]) {
@@ -385,8 +432,8 @@ exports.handleRequest = function(req, res) {
       }
     }
   }
-  if (!req.body.noStore && req.body.needResponse && common.checkHistory(req.body)) {
-    handleComposerHistory(req.body);
+  if (!reqBody.noStore && !testId && reqBody.needResponse && common.checkHistory(reqBody)) {
+    handleComposerHistory(reqBody, isConn);
     dataCenter.saveData({
       type: 'composer',
       history: composerHistory
@@ -394,15 +441,15 @@ exports.handleRequest = function(req, res) {
   }
 
   var getBody = function(cb) {
-    var base64 = req.body.base64;
-    var body = base64 || req.body.body;
+    var base64 = reqBody.base64;
+    var body = base64 || reqBody.body;
     if (!isWs) {
       delete headers.trailer;
     }
     if (isWs || isConn || common.hasRequestBody(options)) {
       body = body && common.toBuffer(body, base64 ? 'base64' : getCharset(headers));
       options.body = body;
-      if (!isWs && !isConn && body && req.body.isGzip) {
+      if (!isWs && !isConn && body && reqBody.isGzip) {
         gzip(body, function(err, gzipData) {
           if (err) {
             return cb(err);
@@ -434,7 +481,7 @@ exports.handleRequest = function(req, res) {
   getBody(function(err) {
     options.headers = formatHeaders(headers, rawHeaderNames);
     var done;
-    var needResponse = req.query.needResponse || req.body.needResponse;
+    var needResponse = req.query.needResponse || reqBody.needResponse;
     var handleResponse = needResponse ? function(err, data) {
       if (done) {
         return;
@@ -448,23 +495,23 @@ exports.handleRequest = function(req, res) {
         }});
         return;
       }
-      common.sendGzip(req, res, {ec: 0, em: 'success', res: data || ''});
+      common.sendGzip(req, res, {ec: 0, res: data || ''});
     } : null;
     if (err) {
       return handleResponse && handleResponse(err);
     }
-    var count = req.body.repeatCount;
-    count = count > 0 ? count : req.body.repeatTimes;
+    var count = reqBody.repeatCount;
+    count = count > 0 ? count : reqBody.repeatTimes;
     if (isWs) {
       options.method = 'GET';
-      handleWebSocket(options, handleResponse, count);
+      handleWebSocket(options, handleResponse, count, testId);
     } else if (isConn) {
-      handleConnect(options, handleResponse, count);
+      handleConnect(options, handleResponse, count, testId);
     } else  {
-      handleHttp(options, handleResponse, count, req.body.reqId);
+      handleHttp(options, handleResponse, count, reqBody.reqId, testId);
     }
     if (!handleResponse) {
-      res.json({ec: 0, em: 'success'});
+      res.json({ec: 0});
     }
   });
 };

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/tunnel.js

@@ -91,6 +91,7 @@ function tunnelProxy(server, proxy, type) {
     reqSocket.headers = headers;
     reqSocket.fromTunnel = req.fromTunnel;
     reqSocket.fromComposer = req.fromComposer;
+    reqSocket._testId = req._testId;
     req.isPluginReq = reqSocket.isPluginReq = util.checkPluginReqOnce(req, true);
     util.onSocketEnd(reqSocket, function (err) {
       // 处理可能的证书校验出错
@@ -100,6 +101,7 @@ function tunnelProxy(server, proxy, type) {
           id: req.reqId,
           url: options.host,
           fc: req.fromComposer ? 1 : undefined,
+          testId: req._testId,
           startTime: now,
           dnsTime: now,
           captureError: true,
@@ -319,6 +321,7 @@ function tunnelProxy(server, proxy, type) {
             id: req.reqId,
             url: options.host,
             fc: req.fromComposer ? 1 : undefined,
+            testId: req._testId,
             startTime: Date.now(),
             rules: _rules,
             req: reqData,

package/lib/upgrade.js

@@ -167,6 +167,7 @@ function upgradeHandler(req, socket) {
     socket.url = req.url;
     socket.fromTunnel = req.fromTunnel;
     socket.fromComposer = req.fromComposer;
+    socket._testId = req._testId;
     socket.enableXFF = req.enableXFF;
     socket._isInternalReq = req._isInternalReq;
     socket.isInternalUrl = req.isInternalUrl;

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) {
@@ -1126,6 +1127,10 @@ function isNum(n) {
   return typeof n === 'number';
 }
 
+exports.trimStr = function(str) {
+  return typeof str === 'string' ? str.trim() : '';
+};
+
 exports.parsePlainText = function (text, resolveKeys) {
   var result;
   text.split(LINE_END_RE).forEach(function(line) {
@@ -2001,3 +2006,42 @@ 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);
+  });
+};
+
+var COMMENT_RE = /#[^\r\n]*/g;
+
+exports.removeComment = function(text) {
+  return text.replace(COMMENT_RE, '').trim();
+};

package/lib/util/data-server.js

@@ -577,6 +577,16 @@ module.exports = function init(_proxy) {
     }
     return item;
   };
+  proxy.getTestItem = function(id) {
+    var list = Object.values(reqData);
+    for (var i = 0, len = list.length; i < len; i++) {
+      var item = list[i];
+      if (item.testId === id) {
+        return item;
+      }
+    }
+  };
+
   proxy.abortRequest = function (id) {
     var item = id && reqData[id];
     item && item.abort && item.abort();