whistle 2.10.1 → 2.10.3

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

@@ -29,7 +29,11 @@ module.exports = function (req, res) {
   if (log) {
     util.disableReqCache(req.headers);
     var host = req.headers.host;
+    delete req.rules.log;
     res.on('src', function (_res) {
+      if (!(log = req.rules.log) || !util.hasBody(_res)) {
+        return;
+      }
       var topScript, isHtml;
       if (util.supportHtmlTransform(_res, req)) {
         isHtml = true;

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/inspectors/weinre.js

@@ -21,17 +21,22 @@ function getScript(host, name, isHtml, req) {
 }
 
 module.exports = function (req, res) {
-  if (req.rules.weinre) {
+  var weinre = req.rules.weinre;
+  if (weinre) {
     util.disableReqCache(req.headers);
+    delete req.rules.weinre;
     var host = req.headers.host;
     res.on('src', function (_res) {
+      if (!(weinre = req.rules.weinre) || !util.hasBody(_res)) {
+        return;
+      }
       var isHtml = util.supportHtmlTransform(_res, req);
       if (!isHtml && util.getContentType(_res.headers) !== 'JS') {
         return;
       }
       !util.isEnable(req, 'keepAllCSP') && util.disableCSP(_res.headers);
       !req._customCache && util.disableResStore(_res.headers);
-      var name = util.getPath(util.rule.getMatcher(req.rules.weinre));
+      var name = util.getPath(util.rule.getMatcher(weinre));
       var transform = new Transform();
       transform._transform = function (chunk, _, callback) {
         if (!chunk) {

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

@@ -63,7 +63,6 @@ exports.hasReqScript = rules.hasReqScript.bind(rules);
 exports.resolveDisable = rules.resolveDisable.bind(rules);
 exports.resolvePipe = rules.resolvePipe.bind(rules);
 exports.resolveRule = rules.resolveRule.bind(rules);
-exports.resolveRules = resolveReqRules;
 exports.resolveResRules = rules.resolveResRules.bind(rules);
 exports.resolveBodyFilter = rules.resolveBodyFilter.bind(rules);
 exports.lookupHost = rules.lookupHost.bind(rules);

package/lib/rules/protocols.js

@@ -73,6 +73,7 @@ var protocols = [
   'cipher',
   'sniCallback'
 ];
+var toolProtocols = ['log', 'weinre'];
 
 var RULE_RE = /^(?:|x|xs)(?:file|rawfile|dust|tpl|jsonp):/;
 var LOC_RE = /^locationHref:/;
@@ -86,7 +87,6 @@ var pureResProtocols = [
   'resDelay',
   'resSpeed',
   'resType',
-  'resType',
   'resCharset',
   'resCookies',
   'resCors',
@@ -108,7 +108,7 @@ var pureResProtocols = [
   'htmlPrepend',
   'jsPrepend',
   'responseFor'
-];
+].concat(toolProtocols);
 var resProtocols = [
   'filter',
   'enable',
@@ -155,7 +155,7 @@ var aliasProtocols = {
 var protocolsWithoutG = protocols.slice(1);
 var reqProtocols = protocols.filter(function (name) {
   return pureResProtocols.indexOf(name) === -1;
-});
+}).concat(toolProtocols);
 var reqProtosWithoutG = reqProtocols.filter(function (name) {
   return name !== 'G';
 });
@@ -266,12 +266,6 @@ function resetRules(rules) {
 
 exports.resetRules = resetRules;
 
-function isResRule(protocol) {
-  return resProtocols.indexOf(protocol) != -1;
-}
-
-exports.isResRule = isResRule;
-
 function isWebProtocol(protocol) {
   return protocol == 'http:' || protocol == 'https:';
 }

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/;
@@ -98,6 +97,7 @@ var FILE_PROTO_RE = /^x?((raw)?file|tpl|jsonp|dust):\/\//;
 var NO_PROTO_RE = /[^\w!*|.-]/;
 var SKIP_RE = /^skip:\/\//;
 var SUB_VAR_RE = /\$\{RegExp\.\$([&\d])\}/g;
+var TOOL_RE = /^(?:log|weinre):\/\//;
 var mIndex = 0;
 var mNow = Date.now();
 var IS_JSON = Symbol('isJson');
@@ -370,7 +370,7 @@ function joinUrl(a, b) {
 }
 
 function toLine(_, line) {
-  return line.replace(SPACE_RE, ' ');
+  return line.replace(/\s+/g, ' ');
 }
 
 function mergeLines(text) {
@@ -799,18 +799,12 @@ function getValueFor(key, vals, file) {
   return val;
 }
 
-function getRule(req, list, vals, index, isFilter, host) {
-  var rule = resolveRuleList(req, list, vals, index || 0, isFilter, null, host);
+function getRule(req, list, vals, index, isFilter, host, isReq) {
+  var rule = resolveRuleList(req, list, vals, index || 0, isFilter, null, host, isReq);
   resolveValue(rule, vals, req);
   return rule;
 }
 
-function getRuleList(req, list, vals, isEnableProxy) {
-  return resolveRuleList(req, list, vals, isEnableProxy).map(function (rule) {
-    return resolveValue(rule, vals, req);
-  });
-}
-
 function resolveValue(rule, vals, req) {
   if (!rule) {
     return;
@@ -924,7 +918,7 @@ function checkInternal(req, rule) {
   return props.internalOnly;
 }
 
-function resolveRuleList(req, list, vals, index, isFilter, isEnableProxy, host) {
+function resolveRuleList(req, list, vals, index, isFilter, isEnableProxy, host, isReq) {
   var curUrl = util.formatUrl(req.curUrl);
   var notHttp = list.isRuleProto && curUrl[0] !== 'h';
   //支持域名匹配
@@ -986,6 +980,9 @@ function resolveRuleList(req, list, vals, index, isFilter, isEnableProxy, host)
     if (notHttp && protoMgr.isFileProxy(rule.matcher)) {
       return false;
     }
+    if (isReq && TOOL_RE.test(rule.matcher)) {
+      return true;
+    }
     return (isFilter || !matchExcludeFilters(curUrl, rule, req)) && (host == null || util.checkProxyHost(rule, host));
   };
 
@@ -1155,7 +1152,7 @@ function resolveProps(req, rules, vals, isIgnore) {
       return result;
     }
   }
-  return util.resolveProperties(list, result);
+  return util.parseRuleProps(list, result);
 }
 
 function parseWildcard(pattern, not) {
@@ -1868,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);
@@ -1967,7 +1964,7 @@ function matchFilter(url, filter, req) {
   return false;
 }
 
-function matchExcludeFilters(url, rule, options) {
+function matchExcludeFilters(url, rule, req) {
   var filters = rule.filters;
   if (!filters) {
     return;
@@ -1980,7 +1977,7 @@ function matchExcludeFilters(url, rule, options) {
     hasIncludeFilter = hasIncludeFilter || filter.isInclude;
     if (
       (filter.isInclude ? !include : !exclude) &&
-      matchFilter(url, filter, options)
+      matchFilter(url, filter, req)
     ) {
       if (filter.isInclude) {
         include = true;
@@ -2249,7 +2246,7 @@ function resolveRules(req, isReq, isRes) {
         name === 'rule' ||
         name === 'plugin' ||
         !filter[name]) &&
-      (rule = self.getRule(req, rules[name], vals))
+      (rule = self.getRule(req, rules[name], vals, null, null, null, isReq))
     ) {
       _rules[name] = rule;
     }
@@ -2283,15 +2280,17 @@ function resolveRules(req, isReq, isRes) {
   return _rules;
 }
 
-proto.getRule = function(req, list, vals, index, isFilter, host) {
+proto.getRule = function(req, list, vals, index, isFilter, host, isReq) {
   if (!this._isGlobal || !req._disabledProxyRules) {
-    return getRule(req, list, vals, index, isFilter, host);
+    return getRule(req, list, vals, index, isFilter, host, isReq);
   }
 };
 
 proto.getRuleList = function(req, list, vals, isEnableProxy) {
   if (!this._isGlobal || !req._disabledProxyRules) {
-    return getRuleList(req, list, vals, isEnableProxy);
+    return resolveRuleList(req, list, vals, null, false, isEnableProxy).map(function (rule) {
+      return resolveValue(rule, vals, req);
+    });
   }
   return [];
 };
@@ -2341,8 +2340,8 @@ proto.resolveProxyProps = function (req) {
   }
   mergeRule(req.rules, enable, 'enable');
   mergeRule(req.rules, disable, 'disable');
-  enable = util.resolveProperties(enable);
-  disable = util.resolveProperties(disable);
+  enable = util.parseRuleProps(enable);
+  disable = util.parseRuleProps(disable);
   if (disable.clientId || disable.clientID || disable.clientid) {
     req.disable.clientId = true;
   }
@@ -2417,7 +2416,7 @@ proto.hasReqScript = function (req) {
     : this.getRule(req, this._rules.rulesFile, this._values);
 };
 
-proto.resolveProxy = function resolveProxy(req, host) {
+proto.resolveProxy = function (req, host) {
   var proxy = this.getRule(req, this._rules.proxy, this._values, null, null, host);
   var matcher = proxy && proxy.matcher;
   var name = matcher && matcher.substring(0, matcher.indexOf(':'));