whistle 2.9.12 → 2.9.15-beta

package/biz/webui/lib/index.js

@@ -251,7 +251,7 @@ function cgiHandler(req, res) {
     try {
       require(filepath)(req, res);
     } catch(err) {
-      var msg = config.debugMode ? '<pre>' + util.getErrorStack(err) + '</pre>' : 'Internal Server Error';
+      var msg = config.debugMode ? '<pre>' + util.encodeHtml(util.getErrorStack(err)) + '</pre>' : 'Internal Server Error';
       res.status(500).send(msg);
     }
   };
@@ -263,7 +263,7 @@ function cgiHandler(req, res) {
       var notFound = err ? err.code === 'ENOENT' : !stat.isFile();
       var msg;
       if (config.debugMode) {
-        msg =  '<pre>' + (err ? util.getErrorStack(err) : 'Not File') + '</pre>';
+        msg =  '<pre>' + (err ? util.encodeHtml(util.getErrorStack(err)) : 'Not File') + '</pre>';
       } else {
         msg = notFound ? 'Not Found' : 'Internal Server Error';
       }
@@ -326,7 +326,7 @@ app.all(PLUGIN_PATH_RE, function(req, res) {
   pluginMgr.loadPlugin(plugin, function(err, ports) {
     if (err || !ports.uiPort) {
       if (err) {
-        res.status(500).send('<pre>' + err + '</pre>');
+        res.status(500).send('<pre>' + util.encodeHtml(err) + '</pre>');
       } else {
         res.status(404).send('Not Found');
       }

package/lib/config.js

@@ -587,7 +587,10 @@ function getPluginList(list) {
 exports.extend = function (newConf) {
   config.pluginHostMap = {};
   config.uiport = config.port;
-
+  if (process.env.WHISTLE_MODE) {
+    newConf = newConf || {};
+    newConf.mode = process.env.WHISTLE_MODE + '|' + (newConf.mode || '');
+  }
   if (newConf) {
     config.uiMiddleware = newConf.uiMiddlewares || newConf.uiMiddleware;
     if (newConf.cmdName && CMD_RE.test(newConf.cmdName)) {
@@ -829,20 +832,14 @@ exports.extend = function (newConf) {
           process.env.PFORK_EXEC_PATH = process.execPath;
         } else if (m === 'safe' || m === 'rejectUnauthorized') {
           config.rejectUnauthorized = true;
-        } else if (
-          ['capture', 'intercept', 'enable-capture', 'enableCapture'].indexOf(
-            m
-          ) !== -1
-        ) {
+        } else if (['capture', 'intercept', 'enable-capture', 'enableCapture'].indexOf(m) !== -1) {
           config.isEnableCapture = true;
         } else if (['disable-capture', 'disableCapture'].indexOf(m) !== -1) {
           config.isEnableCapture = false;
         } else if (['http2',  'enable-http2', 'enableHttp2', 'enable-h2', 'enableH2'].indexOf(m) !== -1) {
           config.isEnableHttp2 = true;
         } else if (
-          ['disable-http2', 'disableHttp2', 'disable-h2', 'disableH2'].indexOf(
-            m
-          ) !== -1
+          ['disable-http2', 'disableHttp2', 'disable-h2', 'disableH2'].indexOf(m) !== -1
         ) {
           config.isEnableHttp2 = false;
         } else if (m === 'hideLeftBar' || m === 'hideLeftMenu') {

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

@@ -103,6 +103,7 @@ module.exports = function () {
           account: account,
           isSys: isSys,
           isProj: isProj,
+          noOpt: !!(conf.noOption || conf.notOption),
           notUn: notUn,
           moduleName: pkg.name,
           enableAuthUI: !!conf.enableAuthUI,

package/lib/plugins/index.js

@@ -361,6 +361,7 @@ function readPackages(obj, callback) {
           var hintList = util.getHintList(conf);
           var simpleName = name.slice(0, -1);
           newPkg.enableAuthUI = !!conf.enableAuthUI;
+          newPkg.noOpt = !!(conf.noOption || conf.notOption);
           newPkg.updateUrl = util.getUpdateUrl(conf);
           newPkg.inheritAuth = !!conf.inheritAuth;
           newPkg.tunnelKey = util.getTunnelKey(conf);
@@ -698,6 +699,7 @@ function loadPlugin(plugin, callback) {
     conf.host = host || LOCALHOST;
     var moduleName = plugin.moduleName;
     var name = moduleName.substring(moduleName.indexOf('/') + 1);
+    var isInline = config.inspectMode || process.env.PFORK_MODE === 'inline';
     p.fork(
       {
         data: config.getPluginData(moduleName),
@@ -741,7 +743,7 @@ function loadPlugin(plugin, callback) {
         CERT_CACHE_INFO: CERT_CACHE_INFO,
         HOST_IP_HEADER: HOST_IP_HEADER,
         debugMode: debugMode,
-        config: conf
+        config: isInline ? extend(true, {}, conf) : conf // 防止 inline 时，子进程删除 conf
       },
       function (err, ports, child, first) {
         callback(err, ports);

package/lib/plugins/load-plugin.js

@@ -18,6 +18,7 @@ var transproto = require('../util/transproto');
 var common = require('../util/common');
 var getProxy = require('./proxy');
 var rootRequire = require('../../require');
+var os = require('os');
 
 var getEncodeTransform = transproto.getEncodeTransform;
 var getDecodeTransform = transproto.getDecodeTransform;
@@ -92,6 +93,7 @@ process._handlePforkUncaughtException = function (msg, e) {
   msg = [
     'From: ' + pluginName + pluginVersion,
     'Node: ' + process.version,
+    'Host: ' + os.hostname(),
     'Date: ' + new Date().toLocaleString(),
     msg
   ].join('\n');

package/lib/upgrade.js

@@ -61,7 +61,7 @@ function getPluginNameByReq(req, callback) {
         err ? 500 : 404,
         err ? 'Internal Server Error' : 'Not Found'
       ].join(' ');
-      err = err ? '<pre>' + err + '</pre>' : 'Not Found';
+      err = err ? '<pre>' + util.encodeHtml(err) + '</pre>' : 'Not Found';
       var length = Buffer.byteLength(err);
       err = [
         msg,

package/lib/util/common.js

@@ -271,3 +271,24 @@ exports.writeLogSync = function(msg) {
     }
   }
 };
+
+var SPEC_TAGS = {
+  '&': '&',
+  '<': '&lt;',
+  '>': '&gt;',
+  '"': '&quot;',
+  '\'': '&#39;',
+  '`': '&#96;'
+};
+var SPEC_TAG_RE = /[&<>"'`]/g;
+
+function transformTag(tag) {
+  return SPEC_TAGS[tag] || tag;
+}
+
+exports.encodeHtml = function(str) {
+  if (typeof str !== 'string') {
+    return str;
+  }
+  return str.replace(SPEC_TAG_RE, transformTag);
+};

package/lib/util/index.js

@@ -117,6 +117,7 @@ var CIPHER_OPTIONS = [
 ];
 var TLSV2_CIPHERS = 'ECDHE-ECDSA-AES256-GCM-SHA384';
 var EMPTY_BUFFER = toBuffer('');
+var encodeHtml = common.encodeHtml;
 var lowerCaseify = common.lowerCaseify;
 var removeIPV6Prefix = common.removeIPV6Prefix;
 var hasBody = common.hasBody;
@@ -128,6 +129,7 @@ var pluginMgr;
 
 workerIndex = workerIndex >= 0 ? padReqId(config.workerIndex) : '';
 
+exports.encodeHtml = encodeHtml;
 exports.hasProtocol = hasProtocol;
 exports.removeProtocol = removeProtocol;
 exports.setProtocol = common.setProtocol;
@@ -472,6 +474,7 @@ function getErrorStack(err) {
   var result = [
     'From: ' + config.name + '@' + config.version,
     'Node: ' + process.version,
+    'Host: ' + hostname,
     'Date: ' + formatDate(),
     stack
   ];
@@ -970,7 +973,7 @@ function wrapGatewayError(body) {
     },
     body: body
       ? '<pre>\n' +
-        body +
+        encodeHtml(body) +
         '\n\n\n<a href="javascript:;" onclick="location.reload()"' +
         '>Reload this page</a>\n</pre>'
       : ''
@@ -1005,7 +1008,7 @@ function parseInlineJSON(text, isValue) {
     data[RegExp.$1] = RegExp.$2;
     return data;
   }
-  return parseQuery(text, null, null, text[0] === '&');
+  return parseQuery(text, null, null, true);
 }
 
 function replaceCrLf(char) {
@@ -1251,7 +1254,7 @@ exports.parseRuleJson = function(rules, callback, req) {
   ).spread(callback);
 };
 
-function readRuleValue(rule, callback, checkUrl, needRawData, req) {
+function readRuleValue(rule, callback, checkUrl, needRawData, req, isJson) {
   if (!rule) {
     return callback();
   }
@@ -1267,6 +1270,7 @@ function readRuleValue(rule, callback, checkUrl, needRawData, req) {
   if (opts) {
     readFile = pluginMgr[needRawData ? 'requestBin' : 'requestText'];
     filePath = opts;
+    isJson = false;
   } else {
     readFile = fileMgr[needRawData ? 'readFile' : 'readFileText'];
     filePath = decodePath(filePath);
@@ -1274,6 +1278,24 @@ function readRuleValue(rule, callback, checkUrl, needRawData, req) {
       filePath = join(rule.root, filePath);
     }
   }
+  if (isJson && filePath.indexOf('=') !== -1) {
+    try {
+      var handleStat = function(err, stat) {
+        if (err || !stat || !stat.isFile()) {
+          callback(filePath);
+        } else {
+          readFile(filePath, callback);
+        }
+      };
+      return fs.stat(filePath, function(err, stat) {
+        if (err && err.code !== 'ENOENT') {
+          return fs.stat(filePath, handleStat);
+        } else  {
+          handleStat(err, stat);
+        }
+      });
+    } catch (e) { }
+  }
   readFile(filePath, callback);
 }
 
@@ -1323,7 +1345,8 @@ function readRuleList(rule, callback, isJson, charset, isHtml, req) {
         : callback,
         false,
         needRawData,
-        req
+        req,
+        isJson
     );
   }
   var result = [];
@@ -1383,7 +1406,8 @@ function readRuleList(rule, callback, isJson, charset, isHtml, req) {
       },
       checkUrl,
       needRawData,
-      req
+      req,
+      isJson
     );
   });
 }

package/lib/util/is-utf8.js

@@ -8,7 +8,7 @@ function isUtf8(buf, i) {
       byte == 0x09 ||
       byte == 0x0a ||
       byte == 0x0d ||
-      (0x20 <= byte && byte <= 0x7e)
+      (0x20 <= byte && byte <= 0x7f)
     ) {
       continue;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "whistle",
   "description": "HTTP, HTTP2, HTTPS, Websocket debugging proxy",
-  "version": "2.9.12",
+  "version": "2.9.15-beta",
   "dataDirname": ".whistle",
   "localUIHost": "local.whistlejs.com",
   "port": 8899,
@@ -40,7 +40,7 @@
     "colors": "1.1.2",
     "cookie": "^0.3.1",
     "express": "^4.17.1",
-    "extend": "^3.0.1",
+    "extend": "^3.0.2",
     "fs-extra2": "^1.0.0",
     "hagent": "^0.9.0",
     "hparser": "^0.4.0",