whistle.script 1.2.1 → 1.2.5

package/lib/index.js

@@ -1,6 +1,7 @@
 const handlePipe = require('./pipe');
 
 exports.auth = require('./auth');
+exports.sniCallback = require('./sniCallback');
 exports.uiServer = require('./uiServer');
 exports.rulesServer = require('./rulesServer');
 exports.resRulesServer = require('./resRulesServer');

package/lib/pipe.js

@@ -16,7 +16,7 @@ module.exports = (name) => {
     }, options);
     server.on(eventName, async (req, res) => {
       const oReq = req.originalReq;
-      oReq.ruleValue = oReq.ruleValue || oReq.pipeValue;
+      oReq.ruleValue = oReq.pipeValue || oReq.ruleValue;
       const handleRequest = scripts.getHandler({ req })[getHandlerName(name)];
       if (!util.isFunction(handleRequest)) {
         return req.pipe(res);

package/lib/sniCallback.js

@@ -0,0 +1,24 @@
+const scripts = require('./scripts');
+const { getRemoteUrl, getContext, getFn, request, SNI_URL, isSni } = require('./util');
+
+module.exports = async (req, options) => {
+  if (!isSni(req)) {
+    const oReq = req.originalReq;
+    oReq.ruleValue = oReq.sniValue || oReq.ruleValue;
+    const ctx = getContext(req);
+    const { sniCallback, SNICallback } = scripts.getHandler(ctx);
+    const sniCb = getFn(sniCallback, SNICallback);
+    return sniCb && sniCb(req, options);
+  }
+  const sniUrl = getRemoteUrl(req, SNI_URL);
+  if (sniUrl) {
+    const result = await request(sniUrl, req.headers);
+    if (result === false || result.cert === false) {
+      return false;
+    }
+    if (result === true || result.cert === true) {
+      return true;
+    }
+    return result;
+  }
+};

package/lib/util.js

@@ -2,9 +2,11 @@ const zlib = require('zlib');
 const { EventEmitter } = require('events');
 const { parse: parseUrl } = require('url');
 const http = require('http');
+const https = require('https');
 const dataSource = require('./dataSource');
 
 exports.AUTH_URL = 'x-whistle-.script-auth-url';
+exports.SNI_URL = 'x-whistle-.script-sni-url';
 exports.REQ_RULES_URL = 'x-whistle-.script-req-rules-url';
 exports.RES_RULES_URL = 'x-whistle-.script-res-rules-url';
 exports.STATS_URL = 'x-whistle-.script-stats-url';
@@ -13,7 +15,7 @@ exports.noop = () => {};
 
 const POLICY = 'x-whistle-.script-policy';
 const isFunction = fn => typeof fn === 'function';
-const URL_RE = /^http:(?:\/\/|%3A%2F%2F)[\w.-]/;
+const URL_RE = /^https?:(?:\/\/|%3A%2F%2F)[\w.-]/;
 
 exports.isFunction = isFunction;
 exports.noop = () => {};
@@ -140,7 +142,9 @@ const request = (url, headers, data) => {
     options.method = 'POST';
   }
   return new Promise((resolve, reject) => {
-    const client = http.request(options, (res) => {
+    const httpModule = options.protocol === 'https:' ? https : http;
+    options.rejectUnauthorized = false;
+    const client = httpModule.request(options, (res) => {
       res.on('error', handleError);  // eslint-disable-line
       let body;
       res.on('data', (chunk) => {
@@ -177,10 +181,23 @@ exports.request = async (url, headers, data) => {
   }
 };
 
-const isRemote = ({ headers }) => (headers[POLICY] === 'remote');
+const hasPolicy = ({ headers }, name) => {
+  const policy = headers[POLICY];
+  if (typeof policy === 'string') {
+    return policy.toLowerCase().indexOf(name) !== -1;
+  }
+};
+
+const isRemote = (req) => {
+  return hasPolicy(req, 'remote');
+};
 
 exports.isRemote = isRemote;
 
+exports.isSni = (req) => {
+  return hasPolicy(req, 'sni');
+};
+
 exports.getRemoteUrl = (req, name) => {
   let url = req.headers[name];
   if (typeof url === 'string') {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "whistle.script",
   "description": "The plugin for the extension script for whistle",
-  "version": "1.2.1",
+  "version": "1.2.5",
   "author": "avenwu <avenwu@vip.qq.com>",
   "contributors": [],
   "license": "MIT",
@@ -15,6 +15,9 @@
     "ssi"
   ],
   "registry": "https://github.com/whistle-plugins/whistle.script",
+  "whistleConfig": {
+    "pluginVars": true
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/whistle-plugins/whistle.script.git"

package/rules.txt

@@ -1 +1,2 @@
-* whistle.script:// includeFilter://reqH.x-whistle-.script-policy=remote
+* whistle.script:// delete://reqH.x-whistle-.script-policy|reqH.x-whistle-.script-auth-url|reqH.x-whistle-.script-req-rules-url|reqH.x-whistle-.script-res-rules-url|reqH.x-whistle-.script-stats-url|reqH.x-whistle-.script-data-url includeFilter://reqH.x-whistle-.script-policy=remote
+* sniCallback://script delete://reqH.x-whistle-.script-policy|reqH.x-whistle-.script-sni-url includeFilter://reqH.x-whistle-.script-policy=sni