From 38f68926607e60f666f51565f29315693998d5c8 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 27 Aug 2021 15:54:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=99=BD=E5=90=8D=E5=8D=95=E4=BC=9A?=
 =?UTF-8?q?=E8=A2=ABow=E6=8B=A6=E6=88=AA=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/linux.md                                         |  1 -
 packages/core/src/config/index.js                    |  4 ++++
 packages/gui/extra/config_remote.json5               | 12 ++++++++++++
 packages/gui/src/view/pages/setting.vue              | 11 +++++++++++
 .../src/lib/proxy/mitmproxy/createConnectHandler.js  |  8 ++++++--
 .../src/lib/proxy/mitmproxy/createRequestHandler.js  |  1 +
 packages/mitmproxy/src/options.js                    |  8 ++++++--
 7 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 packages/gui/extra/config_remote.json5

diff --git a/doc/linux.md b/doc/linux.md
index b915991..89f0ad1 100644
--- a/doc/linux.md
+++ b/doc/linux.md
@@ -13,7 +13,6 @@
 * 设置可执行权限 `sudo chmod +X DevSidecar-x.x.x.AppImage`
 * 双击运行
 
-
 ## 证书安装
 默认模式和增强模式需要系统信任CA证书。   
 由于linux上火狐和chrome都不走系统证书，所以除了安装系统证书之外，还需要给浏览器安装证书
diff --git a/packages/core/src/config/index.js b/packages/core/src/config/index.js
index 2c736f1..0734581 100644
--- a/packages/core/src/config/index.js
+++ b/packages/core/src/config/index.js
@@ -14,6 +14,10 @@ module.exports = {
     mode: 'default',
     autoStart: {
       enabled: false
+    },
+    remoteConfig: {
+      enabled: true,
+      url: 'https://gitee.com/docmirror/dev-sidecar/raw/master/packages/gui/extra/config_remote.json5'
     }
   },
   server: {
diff --git a/packages/gui/extra/config_remote.json5 b/packages/gui/extra/config_remote.json5
new file mode 100644
index 0000000..80d7a25
--- /dev/null
+++ b/packages/gui/extra/config_remote.json5
@@ -0,0 +1,12 @@
+{
+  server: {
+    intercepts: {
+      'github.githubassets.com': {
+        '.*': {
+          proxy: 'assets.fastgit.org',
+          sni11: 'baidu.com'
+        }
+      }
+    },
+  }
+}
diff --git a/packages/gui/src/view/pages/setting.vue b/packages/gui/src/view/pages/setting.vue
index 7f8acb6..3d9124e 100644
--- a/packages/gui/src/view/pages/setting.vue
+++ b/packages/gui/src/view/pages/setting.vue
@@ -12,6 +12,14 @@
           开机自启
         </a-checkbox>
       </a-form-item>
+      <a-form-item label="远程配置" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-checkbox v-model="config.app.remoteConfig.enabled" @change="onRemoteConfigEnabledChange">
+          启用远程配置
+        </a-checkbox>
+      </a-form-item>
+      <a-form-item label="远程配置地址" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-input v-model="config.app.remoteConfig.url"></a-input>
+      </a-form-item>
     </div>
     <template slot="footer">
       <div class="footer-bar">
@@ -42,6 +50,9 @@ export default {
     onAutoStartChange () {
       this.$api.autoStart.enabled(this.config.app.autoStart.enabled)
       this.saveConfig()
+    },
+    onRemoteConfigEnabledChange () {
+      this.saveConfig()
     }
   }
 }
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js
index f062e28..ba6e0e3 100644
--- a/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js
+++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js
@@ -11,7 +11,10 @@ const sniExtract = require('../tls/sniUtil.js')
 function isSslConnect (sslConnectInterceptors, req, cltSocket, head) {
   for (const intercept of sslConnectInterceptors) {
     const ret = intercept(req, cltSocket, head)
-    if (ret) {
+    if (ret === false) {
+      return false
+    }
+    if (ret === true) {
       return true
     }
   }
@@ -43,6 +46,7 @@ module.exports = function createConnectHandler (sslConnectInterceptor, middlewar
         log.error('getServerPromise', e)
       })
     } else {
+      log.info('不拦截请求：', hostname)
       connect(req, cltSocket, head, hostname, srvUrl.port, dnsConfig, sniRegexpMap)
     }
   }
@@ -53,7 +57,7 @@ function connect (req, cltSocket, head, hostname, port, dnsConfig, sniRegexpMap)
   // log.info('connect:', hostname, port)
   const start = new Date().getTime()
   let isDnsIntercept = null
-  const replaceSni = matchUtil.matchHostname(sniRegexpMap, hostname)
+  // const replaceSni = matchUtil.matchHostname(sniRegexpMap, hostname)
   try {
     const options = {
       port,
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js
index 9b07869..7d8b499 100644
--- a/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js
+++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js
@@ -128,6 +128,7 @@ module.exports = function createRequestHandler (createIntercepts, middlewares, e
             }
           }
 
+          // log.info('开始请求:', process.env.NODE_TLS_REJECT_UNAUTHORIZED, rOptions.rejectUnauthorized, rOptions.agent)
           proxyReq = (rOptions.protocol === 'https:' ? https : http).request(rOptions, (proxyRes) => {
             const end = new Date().getTime()
             const cost = end - start
diff --git a/packages/mitmproxy/src/options.js b/packages/mitmproxy/src/options.js
index 7dcfd17..59e8ceb 100644
--- a/packages/mitmproxy/src/options.js
+++ b/packages/mitmproxy/src/options.js
@@ -41,10 +41,14 @@ module.exports = (config) => {
       const inWhiteList = matchUtil.matchHostname(whiteList, hostname) != null
       if (inWhiteList) {
         log.info('白名单域名，不拦截', hostname)
-        return false
+        return false // 所有都不拦截
       }
       // 配置了拦截的域名，将会被代理
-      return !!matchUtil.matchHostname(intercepts, hostname)
+      const matched = !!matchUtil.matchHostname(intercepts, hostname)
+      if (matched === true) {
+        return matched // 拦截
+      }
+      return null // 由下一个拦截器判断
     },
     createIntercepts: (context) => {
       const rOptions = context.rOptions