whistle 2.10.2 → 2.10.3

package/biz/webui/lib/index.js

@@ -20,6 +20,7 @@ var common = require('../../../lib/util/common');
 var getWorker = require('../../../lib/plugins/util').getWorker;
 var loadAuthPlugins = require('../../../lib/plugins').loadAuthPlugins;
 var parseUrl = require('../../../lib/util/parse-url-safe');
+var loadService = require('../../../lib/service');
 
 var sendError = cgiUtil.sendError;
 var sendGzipText = cgiUtil.sendGzipText;
@@ -55,6 +56,8 @@ var MENU_URL = '???_WHISTLE_PLUGIN_EXT_CONTEXT_MENU_' + config.port + '???';
 var INSPECTOR_URL = '???_WHISTLE_PLUGIN_INSPECTOR_TAB_' + config.port + '???';
 var KEY_RE_G = /\${[^{}\s]+}|{\S+}/g;
 var COMMENT_RE = /#[^\r\n]*$/mg;
+var MAX_LEN = 1024 * 1024 * 6;
+var HTTP_RE = /https?:\/\/\S/i;
 
 function hasLogin() {
   return config.username && config.password;
@@ -65,7 +68,7 @@ function isTempFile(query) {
   if (files && typeof files === 'string') {
     return false;
   }
-  return common.isTempFile(query.filename);
+  return common.getTempFile(query.filename);
 }
 
 function sendToService(req, res) {
@@ -74,10 +77,11 @@ function sendToService(req, res) {
     res.end('{"ec":0,"value":"","forbidden":true}');
     return;
   }
-  proxyEvent.loadService(function(err, options) {
+  loadService(function(err, options) {
     if (err) {
       common.sendRes(res, 500, err.stack || err);
     } else {
+      req.headers[common.WHISTLE_UID_HEADER] = config.uid;
       util.transformReq(req, res, options.port);
     }
   });
@@ -407,6 +411,32 @@ function cgiHandler(req, res) {
     handleResponse();
   });
 }
+app.get('/cgi-bin/import-remote', 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)) {
+    req.url = '/cgi-bin/temp/get?filename=' + encodeURIComponent(url);
+    req.query.filename = url;
+    sendToService(req, res);
+  } else {
+    res.json({ec: 400, em: 'Bad url'});
+  }
+});
 app.all('/service/*', sendToService);
 app.all('/cgi-bin/service/*', sendToService);
 app.all('/cgi-bin/sessions/*', sendToService);

package/lib/config.js

@@ -148,7 +148,6 @@ function getDataDir(dirname) {
 }
 
 config.baseDir = getDataDir();
-config.TEMP_FILES_PATH = path.join(getWhistlePath(), 'temp_files');
 config.CUSTOM_PLUGIN_PATH = path.join(getWhistlePath(), 'custom_plugins');
 config.CUSTOM_CERTS_DIR = path.resolve(getWhistlePath(), 'custom_certs');
 config.SAVED_SESSIONS_PATH = path.resolve(getWhistlePath(), 'saved_sessions');
@@ -158,8 +157,8 @@ config.valuesDir = path.join(config.baseDir, 'values');
 config.propertiesDir = path.join(config.baseDir, 'properties');
 
 try {
-  fse.ensureDirSync(config.TEMP_FILES_PATH);
-  var blankFile = path.join(config.TEMP_FILES_PATH, 'blank');
+  fse.ensureDirSync(common.TEMP_FILES_PATH);
+  var blankFile = path.join(common.TEMP_FILES_PATH, 'blank');
   if (!fs.existsSync(blankFile)) {
     fs.writeFileSync(blankFile, '');
   }
@@ -796,7 +795,7 @@ exports.extend = function (newConf) {
         setDefaultResultOrder(m.toLowerCase());
       } else if (m === 'proxyOnly') {
         config.pureProxy = true;
-      } else if (m === 'useMultipleRules' || m === 'enableMultipleRules') {
+      } else if (m === 'useMultipleRules' || m === 'enableMultipleRules' || m === 'allowMultipleChoice') {
         config.allowMultipleChoice = true;
       } else if (m === 'disableMultipleRules') {
         config.allowMultipleChoice = false;

package/lib/handlers/file-proxy.js

@@ -66,7 +66,7 @@ function parseRes(str, rawHeaderNames, fromValue) {
     };
   }
   var headers = str.split(CRLF_RE);
-  var statusLine = headers.shift().trim().split(/\s+/g);
+  var statusLine = headers.shift().trim().split(/\s+/);
   headers = util.parseHeaders(headers, rawHeaderNames);
   if (fromValue) {
     delete headers['content-encoding'];

package/lib/https/ca.js

@@ -177,6 +177,19 @@ exports.hasCustomCerts = function () {
   return customCertCount;
 };
 
+var rootSkiBytes;
+
+function getRootSKI() {
+  if (!rootSkiBytes) {
+    try {
+      rootSkiBytes = ROOT_CRT.generateSubjectKeyIdentifier().getBytes();
+    } catch (e) {
+      rootSkiBytes = null;
+    }
+  }
+  return rootSkiBytes;
+}
+
 function getCacheCert(hostname) {
   return (
     customPairs[hostname] ||
@@ -206,6 +219,20 @@ function createSelfCert(hostname) {
   ]);
   cert.setIssuer(ROOT_CRT.subject.attributes);
   cert.setExtensions([
+    {
+      name: 'basicConstraints',
+      cA: false
+    },
+    {
+      name: 'keyUsage',
+      digitalSignature: true,
+      keyEncipherment: true
+    },
+    {
+      name: 'extKeyUsage',
+      serverAuth: true,
+      clientAuth: true
+    },
     {
       name: 'subjectAltName',
       altNames: [
@@ -219,6 +246,10 @@ function createSelfCert(hostname) {
             value: hostname
           }
       ]
+    },
+    {
+      name: 'authorityKeyIdentifier',
+      keyIdentifier: getRootSKI() // Get SKI from ROOT_CRT for authorityKeyIdentifier extension
     }
   ]);
   cert.sign(ROOT_KEY, forge.md.sha256.create());

package/lib/https/index.js

@@ -718,9 +718,10 @@ function resolveWebsocket(socket, wss) {
           extend(headers, reqHeaders);
           headers.host = headers.host || host;
         }
-        auth = util.getAuthBasic(auth || authObj);
+        authObj = auth || authObj;
+        auth = util.getAuthBasic(authObj);
         if (auth) {
-          headers['authorization'] = auth;
+          headers[(authObj.proxy ? 'proxy-' : '') + 'authorization'] = auth;
         }
         var reqRuleData = { headers: headers };
         util.setReqCors(reqRuleData, reqCors);

package/lib/index.js

@@ -13,7 +13,6 @@ var rulesUtil = require('./rules/util');
 var initDataServer = require('./util/data-server');
 var pluginMgr = require('./plugins');
 var config = require('./config');
-var loadService = require('./service');
 var initSocketMgr = require('./socket-mgr');
 var tunnelProxy = require('./tunnel');
 var upgradeProxy = require('./upgrade');
@@ -222,7 +221,6 @@ function exportInterfaces(obj) {
   obj.httpsUtil = httpsUtil;
   obj.pluginMgr = pluginMgr;
   obj.logger = logger;
-  obj.loadService = loadService;
   obj.setAuth = config.setAuth;
   obj.setUIHost = config.setUIHost;
   obj.setPluginUIHost = config.setPluginUIHost;

package/lib/inspectors/data.js

@@ -10,7 +10,9 @@ var MAX_REQ_BODY_SIZE = (config.strict ? 256 : 2048) * 1024;
 var MAX_RES_BODY_SIZE = (config.strict ? 256 : 2048) * 1024;
 var BIG_DATA_SIZE = 1024 * 1024 * 16;
 var LOCALHOST = '127.0.0.1';
-var SSE_RE = /^\s*text\/event-stream/i;
+var MAX_PAYLOAD = util.MAX_FRAME_PAYLOAD;
+var SSE_SEP = Buffer.from('\n\n');
+var FRAME_SEP_KEY = 'x-whistle-custom-frame-separator';
 
 function getZipType(options) {
   return options.headers && options.headers['content-encoding'];
@@ -57,6 +59,80 @@ function emitDataEvents(req, res, proxy) {
   if (!util.showPluginReq(req) || util.isHide(req)) {
     return;
   }
+
+  var reqSepInfo = parseFrameSep(req.headers);
+  var cseSep = reqSepInfo && reqSepInfo.sep;
+  var resSepInfo;
+
+  function emitFrame(chunk, fromServer) {
+    proxy.emit('frame', {
+      reqId: req.reqId,
+      frameId: util.getFrameId(),
+      isClient: !fromServer,
+      length: chunk.length,
+      bin: chunk
+    });
+  }
+
+  function parseFrameSep(headers) {
+    var sep = headers[FRAME_SEP_KEY];
+    if (!util.isString(sep)) {
+      return;
+    }
+    var result = {};
+    delete headers[FRAME_SEP_KEY];
+    try {
+      sep = decodeURIComponent(sep);
+    } catch (e) {}
+    if (sep[0] === '/') {
+      result.keepSep = true;
+      sep = sep.slice(1);
+    }
+    if (sep) {
+      result.sep = Buffer.from(sep);
+      result.sepLen = sep.length;
+    }
+    return result;
+  }
+
+  function parseFrame(buf, isRes, end) {
+    var len = buf && buf.length;
+    if (!len) {
+      return null;
+    }
+    var sep, sepLen, keepSep;
+    var info = isRes ? resSepInfo : reqSepInfo;
+    if (info) {
+      sep = info.sep;
+      sepLen = info.sepLen;
+      keepSep = info.keepSep;
+    } else {
+      sep = SSE_SEP;
+      sepLen = 2;
+    }
+    var index = buf.indexOf(sep);
+    while (index !== -1) {
+      if (keepSep) {
+        index += sepLen;
+      }
+      index && emitFrame(buf.slice(0, index), isRes);
+      buf = buf.slice(keepSep ? index : index + sepLen);
+      index = buf.indexOf(sep);
+    }
+    len = buf.length;
+    if (!len) {
+      return null;
+    }
+    if (end) {
+      emitFrame(buf, isRes);
+      return null;
+    }
+    if (len > MAX_PAYLOAD) {
+      emitFrame(buf.slice(0, -1), isRes);
+      buf = buf.slice(-1);
+    }
+    return buf;
+  }
   var getTTFB = function () {
     if (req._ttfb >= now) {
       return req._ttfb - now;
@@ -167,12 +243,20 @@ function emitDataEvents(req, res, proxy) {
   var captureReqStream;
   var maxReqSize;
   var reqInfo;
+  var setReqBody = function (body, end) {
+    if (captureReqStream && cseSep) {
+      reqBody = parseFrame(reqBody, false, end);
+    } else {
+      reqData.body = reqBody;
+    }
+  };
   var updateReqInfo = function() {
     if (reqInfo && !captureReqStream) {
       captureReqStream = !disable.captureStream && (resDone || enable.captureStream) && !getZipType(reqInfo);
       maxReqSize = useBigData ? BIG_DATA_SIZE : (captureReqStream ? MAX_REQ_BODY_SIZE : MAX_SIZE);
-      if (captureReqStream && reqBody && !reqData.body) {
-        reqData.body = reqBody;
+      if (captureReqStream) {
+        data.isCse = !!cseSep;
+        reqBody && !reqData.body && setReqBody(reqBody);
       }
     }
   };
@@ -198,7 +282,7 @@ function emitDataEvents(req, res, proxy) {
           } else {
             reqBody = reqBody ? Buffer.concat([reqBody, chunk]) : chunk;
             if (captureReqStream) {
-              reqData.body = reqBody;
+              setReqBody(reqBody);
             }
             if (reqBody.length > maxReqSize) {
               reqBody = false;
@@ -225,8 +309,8 @@ function emitDataEvents(req, res, proxy) {
           data.endTime = endTime;
         }
         reqBody = err ? util.getErrorStack(err) : body;
-        reqData.body = reqBody;
-        setUnzipSize(body, reqData);
+        setReqBody(reqBody, true);
+        !data.isCse && setUnzipSize(body, reqData);
         checkBodySize(reqData, useBigData);
       });
       updateEvent && proxy.emit(updateEvent, req.fullUrl, false, true);
@@ -239,9 +323,22 @@ function emitDataEvents(req, res, proxy) {
     }
     resDone = true;
     info = info || (res._needGunzip ? { statusCode: res.statusCode, headers: '' } : res);
-    var captureStream = !disable.captureStream && (requestTime == null || enable.captureStream ||
-      (info.headers && SSE_RE.test(info.headers['content-type']))) && !getZipType(info);
+    var isSse;
+    var captureStream;
+    if (!disable.captureStream && !getZipType(info)) {
+      var headers = info.headers;
+      captureStream = requestTime == null || enable.captureStream;
+      if (headers) {
+        isSse = headers['content-type'] === 'text/event-stream';
+        captureStream = captureStream || isSse;
+        resSepInfo = parseFrameSep(headers);
+        if (resSepInfo && resSepInfo.sep) {
+          isSse = captureStream;
+        }
+      }
+    }
     var maxResSize = useBigData ? BIG_DATA_SIZE : (captureStream ? MAX_RES_BODY_SIZE : MAX_SIZE);
+    data.isSse = isSse;
     captureStream && updateReqInfo();
     if (!cleared && util.hasBody(info, req) && checkType(info)) {
       if (info.headers['content-length'] > maxResSize && !captureStream) {
@@ -261,9 +358,13 @@ function emitDataEvents(req, res, proxy) {
           } else {
             resBody = resBody ? Buffer.concat([resBody, chunk]) : chunk;
             if (captureStream) {
-              resData.body = resBody;
+              if (isSse) {
+                resBody = parseFrame(resBody, true);
+              } else {
+                resData.body = resBody;
+              }
             }
-            if (resBody.length > maxResSize) {
+            if (resBody && resBody.length > maxResSize) {
               resBody = false;
             }
           }
@@ -286,9 +387,13 @@ function emitDataEvents(req, res, proxy) {
       resData.hasGzipError = unzipBody(info, resBody, function (err, body) {
         if (!data.resError) {
           resBody = err ? util.getErrorStack(err) : body;
-          resData.body = resBody;
+          if (isSse) {
+            resBody = parseFrame(resBody, true, true);
+          } else {
+            resData.body = resBody;
+          }
         }
-        setUnzipSize(body, resData);
+        !isSse && setUnzipSize(body, resData);
         checkBodySize(resData, useBigData);
         setEndTime();
         reqEmitter.emit('end', data);
@@ -341,7 +446,8 @@ function emitDataEvents(req, res, proxy) {
     }
     !endTime && setEndTime();
     delete data.abort;
-    if (err && err.message !== 'Aborted') {
+    var msg = err && err.message;
+    if (msg !== 'Aborted') {
       data.resError = true;
       if (resData.body) {
         data.errMsg = util.getErrorStack(err);

package/lib/inspectors/req.js

@@ -147,9 +147,11 @@ function handleReq(req, data, reqRules, delType) {
   }
 }
 
-function handleAuth(data, auth) {
-  auth = util.getAuthBasic(auth);
-  auth && util.setHeader(data, 'authorization', auth);
+function handleAuth(data, authObj) {
+  var auth = util.getAuthBasic(authObj);
+  if (auth) {
+    util.setHeader(data, (authObj.proxy ? 'proxy-' : '') + 'authorization', auth);
+  }
 }
 
 function handleParams(req, params, urlParams, enableBigData) {

package/lib/plugins/get-plugins-sync.js

@@ -12,6 +12,7 @@ var notUninstallPluginPaths = config.notUninstallPluginPaths || [];
 var projectPluginPaths = config.projectPluginPaths || [];
 var accountPluginsPath = config.accountPluginsPath || [];
 var paths = mp.getPaths();
+var PLUGIN_DIR = pluginUtil.PLUGIN_DIR;
 
 function getMTimeSync(filePath) {
   var stats = common.getStatSync(filePath);
@@ -41,8 +42,9 @@ function readPluginModulesSync(dir, plugins) {
               var mtime = getMTimeSync(path.join(root, 'package.json'));
               if (mtime != null) {
                 var old = plugins[name];
-                if (!old || (mtime > old.mtime && root === old.root)) {
+                if (pluginUtil.compparePlugin(dir, mtime, old)) {
                   plugins[name] = {
+                    [PLUGIN_DIR]: dir,
                     mtime: mtime,
                     root: root,
                     account: account,
@@ -65,8 +67,9 @@ function readPluginModulesSync(dir, plugins) {
       var mtime = getMTimeSync(path.join(root, 'package.json'));
       if (mtime != null) {
         var old = plugins[name];
-        if (!old || (mtime > old.mtime && root === old.root)) {
+        if (pluginUtil.compparePlugin(dir, mtime, old)) {
           plugins[name] = {
+            [PLUGIN_DIR]: dir,
             root: root,
             mtime: mtime,
             account: account,
@@ -95,15 +98,15 @@ module.exports = function () {
     if (pluginUtil.excludePlugin(simpleName)) {
       return;
     }
-    var dir = plugins[name];
-    var account = dir.account;
-    var isSys = dir.isSys;
-    var isProj = dir.isProj;
-    var notUn = dir.notUn;
-    var isDev = dir.isDev;
-    var dirName = dir.dir;
-    var mtime = dir.mtime;
-    dir = dir.root;
+    var obj = plugins[name];
+    var account = obj.account;
+    var isSys = obj.isSys;
+    var isProj = obj.isProj;
+    var notUn = obj.notUn;
+    var isDev = obj.isDev;
+    var dirName = obj.dir;
+    var mtime = obj.mtime;
+    var dir = obj.root;
     var pkgPath = path.join(dir, 'package.json');
     var pkg = common.readJsonSync(pkgPath);
     if (!pkg) {
@@ -120,6 +123,7 @@ module.exports = function () {
       var tabs = util.getInspectorTabs(conf);
       var hintList = util.getHintList(conf);
       var plugin = {
+        [PLUGIN_DIR]: obj[PLUGIN_DIR],
         account: account,
         dir: dirName,
         isSys: isSys,

package/lib/plugins/get-plugins.js

@@ -9,6 +9,7 @@ var customPluginPaths = config.customPluginPaths || [];
 var notUninstallPluginPaths = config.notUninstallPluginPaths || [];
 var projectPluginPaths = config.projectPluginPaths || [];
 var accountPluginsPath = config.accountPluginsPath || [];
+var PLUGIN_DIR = pluginUtil.PLUGIN_DIR;
 
 function readPluginRootList(dir, callback) {
   var roots = [];
@@ -31,7 +32,7 @@ function readPluginRootList(dir, callback) {
       if (pluginUtil.isWhistleModule(name)) {
         roots[i] = {
           name: name,
-          dir: dir
+          [PLUGIN_DIR]: dir
         };
       } else if (pluginUtil.isOrgModule(name)) {
         ++count;
@@ -44,7 +45,7 @@ function readPluginRootList(dir, callback) {
                 orgList.push({
                   org: name,
                   name: pluginName,
-                  dir: dir
+                  [PLUGIN_DIR]: dir
                 });
               }
             });
@@ -74,7 +75,7 @@ function readPluginModules(dir, callback, plugins, isSys) {
       return callback(plugins);
     }
     list.forEach(function (obj) {
-      var dir = obj.dir;
+      var dir = obj[PLUGIN_DIR];
       var dirName = obj.org ? obj.org + '/' + obj.name : obj.name;
       pluginUtil.getSysPath(dir, dirName, isSys, function(root) {
         common.getStat(path.join(root, 'package.json'), function (_, stats) {
@@ -83,13 +84,10 @@ function readPluginModules(dir, callback, plugins, isSys) {
             obj.mtime = stats.mtime.getTime();
           }
           if (--len === 0) {
-            list.forEach(function (obj) {
-              var name = pluginUtil.getPluginName(obj.name);
-              if (obj.root) {
-                var old = plugins[name];
-                if (!old || (obj.mtime > old.mtime && obj.root === old.root)) {
-                  plugins[name] = obj;
-                }
+            list.forEach(function (item) {
+              var name = pluginUtil.getPluginName(item.name);
+              if (item.root && pluginUtil.compparePlugin(dir, item.mtime, plugins[name])) {
+                plugins[name] = item;
               }
             });
             callback(plugins);
@@ -121,10 +119,11 @@ module.exports = function (callback) {
           if (pluginUtil.excludePlugin(name)) {
             return;
           }
-          var old = result[name + ':'];
           var obj = plugins[name];
-          if (!old || (obj.mtime > old.mtime && obj.root === old.path)) {
+          var dir = obj[PLUGIN_DIR];
+          if (pluginUtil.compparePlugin(dir, obj.mtime, result[name + ':'])) {
             result[name + ':'] = {
+              [PLUGIN_DIR]: dir,
               account: account,
               dir: config.whistleName,
               isSys: isSys,

package/lib/plugins/load-plugin.js

@@ -1202,7 +1202,7 @@ module.exports = async function (options, callback) {
   PROXY_ID_HEADER = config.PROXY_ID_HEADER;
   options.getTempFilePath = function(filePath) {
     if (common.TEMP_PATH_RE.test(filePath)) {
-      return path.join(config.TEMP_FILES_PATH, RegExp.$1);
+      return path.join(common.TEMP_FILES_PATH, RegExp.$1);
     }
   };
 

package/lib/plugins/module-paths.js

@@ -36,6 +36,7 @@ var pluginPaths = config.pluginPaths;
 if (pluginPaths) {
   pluginPaths = pluginPaths.concat(pluginPaths.map(formatPath).concat(addon));
   pluginPaths = prePlugins.concat(pluginPaths);
+  config.PLUGIN_INSTALL_ROOT = pluginPaths[0];
   addDebugPaths(pluginPaths);
   pluginPaths = uniqueArr(pluginPaths);
   exports.getPaths = function () {
@@ -80,6 +81,9 @@ if (pluginsPath && paths.indexOf(pluginsPath) == -1) {
 }
 if (!config.customPluginPaths || !config.customPluginPaths.length) {
   paths.unshift(config.CUSTOM_PLUGIN_PATH);
+  config.PLUGIN_INSTALL_ROOT = config.CUSTOM_PLUGIN_PATH;
+} else {
+  config.PLUGIN_INSTALL_ROOT = config.customPluginPaths[0];
 }
 paths = addon.concat(paths);
 addDebugPaths(paths);

package/lib/plugins/util.js

@@ -13,11 +13,14 @@ var MAX_EXPIRE = 36000;
 var UTF8_OPTIONS = { encoding: 'utf8' };
 var workerScript = util.readFileSync(path.join(__dirname, '../../assets/js/worker.js'), false);
 var workers = {};
+var PLUGIN_DIR = Symbol('dir');
 
 function replaceScript(ctn, name) {
   return workerScript.replace('$PLUGIN_NAME', name).replace('/*sourcecode*/', ctn);
 }
 
+exports.PLUGIN_DIR = PLUGIN_DIR;
+
 exports.readWorkerSync = function(root, conf, name) {
   var file = util.getWebWorker(conf);
   file = file && util.readFileSync(path.join(root, file));
@@ -140,6 +143,7 @@ function setPlugin(plugins, pkg, root, mtime, sync) {
   if (PLUGIN_NAME_RE.test(pkg.name)) {
     var name = sync ? RegExp.$1 : getPluginName(RegExp.$1);
     plugins[name] = {
+      [PLUGIN_DIR]: DEV_PLUGINS_PATH,
       root: root,
       mtime: mtime,
       notUn: true,
@@ -256,3 +260,7 @@ exports.getSysPath = function(dir, name, isSys, cb) {
     cb(exists ? sysRoot : root);
   });
 };
+
+exports.compparePlugin = function (dir, mtime, old) {
+  return !old || (mtime > old.mtime && dir === old[PLUGIN_DIR]);
+};

package/lib/rules/dns.js

@@ -177,3 +177,7 @@ module.exports = function lookup(hostname, callback, allowDnsCache) {
     err ? lookupDNS(hostname, callback) : callback(err, ip);
   });
 };
+
+module.exports.clearCache = function() {
+  dnsCache = {};
+};

package/lib/rules/rules.js

@@ -14,7 +14,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/;
@@ -371,7 +370,7 @@ function joinUrl(a, b) {
 }
 
 function toLine(_, line) {
-  return line.replace(SPACE_RE, ' ');
+  return line.replace(/\s+/g, ' ');
 }
 
 function mergeLines(text) {
@@ -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

@@ -38,7 +38,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 +55,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)
@@ -335,13 +340,13 @@ function getCharset(headers) {
 exports.handleRequest = function(req, res) {
   var fullUrl = req.body.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) {
@@ -386,7 +391,7 @@ exports.handleRequest = function(req, res) {
     }
   }
   if (!req.body.noStore && req.body.needResponse && common.checkHistory(req.body)) {
-    handleComposerHistory(req.body);
+    handleComposerHistory(req.body, isConn);
     dataCenter.saveData({
       type: 'composer',
       history: composerHistory