From 6ad097a8c8a1aa38095ac1a6f8fa2cdd6325618a Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 26 Mar 2021 09:30:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=89=E5=85=A8=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/src/config/index.js         |  3 +++
 packages/core/src/modules/server/index.js |  7 ++++++-
 packages/gui/src/view/pages/index.vue     | 15 +++++++++++++--
 packages/gui/src/view/pages/server.vue    |  7 +++++++
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/config/index.js b/packages/core/src/config/index.js
index 5d7ef7ae..4e733e84 100644
--- a/packages/core/src/config/index.js
+++ b/packages/core/src/config/index.js
@@ -28,6 +28,9 @@ module.exports = {
         keyPath: getRootCaKeyPath()
       }
     },
+    intercept: {
+      enabled: true
+    },
     intercepts: {
       'github.com': {
         '/.*/.*/releases/download/': {
diff --git a/packages/core/src/modules/server/index.js b/packages/core/src/modules/server/index.js
index 1529555d..8a9c41ae 100644
--- a/packages/core/src/modules/server/index.js
+++ b/packages/core/src/modules/server/index.js
@@ -37,7 +37,7 @@ const serverApi = {
     const allConfig = config.get()
     const serverConfig = lodash.cloneDeep(allConfig.server)
 
-    const intercepts = serverConfig.intercepts
+    let intercepts = serverConfig.intercepts
     const dnsMapping = serverConfig.dns.mapping
 
     if (allConfig.plugin) {
@@ -55,6 +55,11 @@ const serverApi = {
       })
     }
 
+    if (serverConfig.intercept.enabled === false) {
+      // 如果设置为关闭拦截
+      intercepts = {}
+    }
+
     for (const key in plugins) {
       const plugin = plugins[key]
       if (plugin.overrideRunningConfig) {
diff --git a/packages/gui/src/view/pages/index.vue b/packages/gui/src/view/pages/index.vue
index a74d0dfb..743ad309 100644
--- a/packages/gui/src/view/pages/index.vue
+++ b/packages/gui/src/view/pages/index.vue
@@ -20,12 +20,17 @@
     <div class="box">
       <div class="mode-bar" style="margin:20px;" v-if="config && config.app">
         <a-radio-group   v-model="config.app.mode"  button-style="solid" @change="modeChange">
-          <a-tooltip placement="topLeft" title="启用测速，关闭增强功能（此模式不fanqiang，但不是很稳定）">
+          <a-tooltip placement="topLeft" title="启用测速，关闭拦截，关闭增强（功能最弱，不需要信任证书，最安全）">
+            <a-radio-button value="safe">
+              安全模式
+            </a-radio-button>
+          </a-tooltip>
+          <a-tooltip placement="topLeft" title="启用测速，关闭增强（此模式不fanqiang，但不是很稳定）">
             <a-radio-button value="default">
               默认模式
             </a-radio-button>
           </a-tooltip>
-          <a-tooltip placement="topLeft" title="启用增强功能，关闭测速（默认模式访问不了github时，请使用此模式）">
+          <a-tooltip placement="topLeft" title="启用增强，关闭测速（默认模式访问不了github时，请使用此模式）">
             <a-radio-button value="ow">
               增强模式
             </a-radio-button>
@@ -159,9 +164,15 @@ export default {
     async modeChange () {
       const mode = this.config.app.mode
       if (mode === 'ow') {
+        this.config.server.intercept.enabled = true
         this.config.server.dns.speedTest.enabled = false
         this.config.plugin.overwall.enabled = true
       } else if (mode === 'default') {
+        this.config.server.intercept.enabled = true
+        this.config.server.dns.speedTest.enabled = true
+        this.config.plugin.overwall.enabled = false
+      } else if (mode === 'safe') {
+        this.config.server.intercept.enabled = false
         this.config.server.dns.speedTest.enabled = true
         this.config.plugin.overwall.enabled = false
       }
diff --git a/packages/gui/src/view/pages/server.vue b/packages/gui/src/view/pages/server.vue
index 352cdaca..26f976c0 100644
--- a/packages/gui/src/view/pages/server.vue
+++ b/packages/gui/src/view/pages/server.vue
@@ -42,6 +42,13 @@
              <a-input-search addon-before="Cert" enter-button="选择" @search="onCrtSelect"   v-model="config.server.setting.rootCaFile.certPath" />
              <a-input-search addon-before="Key" enter-button="选择" @search="onKeySelect" v-model="config.server.setting.rootCaFile.keyPath" />
           </a-form-item>
+          <a-form-item label="启用拦截" :label-col="labelCol" :wrapper-col="wrapperCol">
+            <a-tooltip title="关闭拦截，且关闭功能增强的话，就不需要安装根证书，本应用退化为dns优选，最安全">
+              <a-checkbox v-model="config.server.intercept.enabled" >
+                启用拦截
+              </a-checkbox>
+            </a-tooltip>
+          </a-form-item>
           <a-form-item label="启用脚本" :label-col="labelCol" :wrapper-col="wrapperCol">
             <a-tooltip title="关闭后，github的clone加速链接复制也将关闭">
               <a-checkbox v-model="config.server.setting.script.enabled" >