From f5888ad992e6e3e90f4af296196f18cabdf49d0b Mon Sep 17 00:00:00 2001
From: Ghost_chu <ghostchu@111.com>
Date: Wed, 6 Nov 2024 20:00:17 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E6=B2=A1=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1d0736cf95..3a54508162 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.ghostchu.peerbanhelper</groupId>
     <artifactId>peerbanhelper</artifactId>
-    <version>7.1.0-beta1</version>
+    <version>7.1.0</version>
     <packaging>jar</packaging>
 
     <name>PeerBanHelper</name>

From f836699ab250afadaa678d1df034e52ced6e6533 Mon Sep 17 00:00:00 2001
From: Ghost_chu <ghostchu@111.com>
Date: Wed, 6 Nov 2024 20:07:43 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=85=89=E9=80=9F=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=84=9A=E6=9C=AC=E6=89=A7=E8=A1=8C=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../peerbanhelper/config/ProfileUpdateScript.java      |  6 ++++++
 .../module/impl/rule/BtnNetworkOnline.java             | 10 +++++++---
 src/main/resources/profile.yml                         |  4 +++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ghostchu/peerbanhelper/config/ProfileUpdateScript.java b/src/main/java/com/ghostchu/peerbanhelper/config/ProfileUpdateScript.java
index 597aab070c..fb175981c1 100644
--- a/src/main/java/com/ghostchu/peerbanhelper/config/ProfileUpdateScript.java
+++ b/src/main/java/com/ghostchu/peerbanhelper/config/ProfileUpdateScript.java
@@ -25,6 +25,12 @@ public ProfileUpdateScript(YamlConfiguration conf) {
         this.conf = conf;
     }
 
+    @UpdateScript(version = 23)
+    public void scriptExecuteSwitch() {
+        conf.set("module.btn.allow-script-execute", true);
+    }
+
+
     @UpdateScript(version = 22)
     public void workaroundForBadWebUI() {
         if(conf.getInt("module.auto-range-ban.ipv6") == 32) { // WebUI bug
diff --git a/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/BtnNetworkOnline.java b/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/BtnNetworkOnline.java
index 7caca10c0f..1eb5a9f238 100644
--- a/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/BtnNetworkOnline.java
+++ b/src/main/java/com/ghostchu/peerbanhelper/module/impl/rule/BtnNetworkOnline.java
@@ -66,6 +66,7 @@ public class BtnNetworkOnline extends AbstractRuleFeatureModule implements Reloa
     private ScriptEngine scriptEngine;
     @Autowired
     private ScriptStorageDao scriptStorageDao;
+    private boolean allowScript;
 
 
     @Override
@@ -156,6 +157,7 @@ public ReloadResult reloadModule() throws Exception {
 
     public void reloadConfig() {
         this.banDuration = getConfig().getLong("ban-duration", 0);
+        this.allowScript = getConfig().getBoolean("allow-script-execute");
         getCache().invalidateAll();
     }
 
@@ -174,9 +176,11 @@ public boolean isThreadSafe() {
         if (checkExceptionResult.action() == PeerAction.SKIP) {
             return checkExceptionResult;
         }
-        var scriptResult = checkScript(torrent, peer, downloader, ruleExecuteExecutor);
-        if (scriptResult.action() != PeerAction.NO_ACTION) {
-            return scriptResult;
+        if(allowScript) {
+            var scriptResult = checkScript(torrent, peer, downloader, ruleExecuteExecutor);
+            if (scriptResult.action() != PeerAction.NO_ACTION) {
+                return scriptResult;
+            }
         }
         return checkShouldBan(torrent, peer, downloader, ruleExecuteExecutor);
     }
diff --git a/src/main/resources/profile.yml b/src/main/resources/profile.yml
index 5151f7685e..da20b84afb 100644
--- a/src/main/resources/profile.yml
+++ b/src/main/resources/profile.yml
@@ -1,4 +1,4 @@
-config-version: 22
+config-version: 23
 # Check interval (Timeunit: ms)
 # 检查频率（单位：毫秒）
 check-interval: 5000
@@ -271,6 +271,8 @@ module:
     enabled: true
     # 封禁时间，单位：毫秒，使用 default 则跟随全局设置
     ban-duration: 259200000
+    # 是否允许执行从 BTN 服务器下发的 Aviator Script
+    allow-script-execute: true
   # 多拨封禁
   # Multi-dialing blocker
   multi-dialing-blocker:

From aeb1d27e5aa15f9ab08eed8da8295d967ba2eaca Mon Sep 17 00:00:00 2001
From: Gaojianli <admin@gaojianli.me>
Date: Wed, 6 Nov 2024 20:23:46 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=85=89=E9=80=9F=E8=BF=BD=E5=8A=A0?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AFUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webui/src/api/model/profile.ts                        |  1 +
 .../settings/components/profile/components/btn.vue    | 11 +++++++++++
 .../views/settings/components/profile/locale/en-US.ts |  6 +++++-
 .../views/settings/components/profile/locale/zh-CN.ts |  7 ++++++-
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/webui/src/api/model/profile.ts b/webui/src/api/model/profile.ts
index c43a0cc936..1b1bee561a 100644
--- a/webui/src/api/model/profile.ts
+++ b/webui/src/api/model/profile.ts
@@ -91,6 +91,7 @@ export interface AutoRangeBan {
 export interface Btn {
   enabled: boolean
   ban_duration: BanDuration
+  allow_script_execute: boolean
 }
 
 export interface MultiDialingBlocker {
diff --git a/webui/src/views/settings/components/profile/components/btn.vue b/webui/src/views/settings/components/profile/components/btn.vue
index 159dd14ad1..f6f88efe4b 100644
--- a/webui/src/views/settings/components/profile/components/btn.vue
+++ b/webui/src/views/settings/components/profile/components/btn.vue
@@ -21,6 +21,17 @@
         ={{ formatMilliseconds(model.ban_duration) }}
       </template>
     </a-form-item>
+    <a-form-item
+      :label="t('page.settings.tab.profile.module.btn.allowScript')"
+      field="model.enabled"
+    >
+      <a-switch v-model="model.allow_script_execute" />
+      <template v-if="model.allow_script_execute" #extra>
+        <a-typography-text type="danger">
+          {{ t('page.settings.tab.profile.module.btn.allowScript.tips') }}
+        </a-typography-text></template
+      >
+    </a-form-item>
   </a-space>
 </template>
 <script setup lang="ts">
diff --git a/webui/src/views/settings/components/profile/locale/en-US.ts b/webui/src/views/settings/components/profile/locale/en-US.ts
index f2abb6c480..27213af7b6 100644
--- a/webui/src/views/settings/components/profile/locale/en-US.ts
+++ b/webui/src/views/settings/components/profile/locale/en-US.ts
@@ -137,5 +137,9 @@ export default {
   'page.settings.tab.profile.module.activeMonitor.trafficMonitoring.daily.tips':
     'Set the traffic alert threshold, when the threshold is exceeded, an alert message will be sent to remind you to check the status of the downloader.',
   'page.settings.tab.profile.module.activeMonitor.trafficMonitoring.daily.value':
-    'Daily traffic alert threshold'
+    'Daily traffic alert threshold',
+
+  'page.settings.tab.profile.module.btn.allowScript': 'Allow BTN server push scripts',
+  'page.settings.tab.profile.module.btn.allowScript.tips':
+    'Warning, this means that the remote server can execute any code on your computer, please enable with caution!'
 }
diff --git a/webui/src/views/settings/components/profile/locale/zh-CN.ts b/webui/src/views/settings/components/profile/locale/zh-CN.ts
index b52255de27..fc0a32c439 100644
--- a/webui/src/views/settings/components/profile/locale/zh-CN.ts
+++ b/webui/src/views/settings/components/profile/locale/zh-CN.ts
@@ -124,5 +124,10 @@ export default {
   'page.settings.tab.profile.module.activeMonitor.trafficMonitoring.daily.enable': '开启流量告警',
   'page.settings.tab.profile.module.activeMonitor.trafficMonitoring.daily.tips':
     '设置流量告警阈值，当超出阈值后将发送告警信息提醒您检查下载器状态',
-  'page.settings.tab.profile.module.activeMonitor.trafficMonitoring.daily.value': '每日流量告警阈值'
+  'page.settings.tab.profile.module.activeMonitor.trafficMonitoring.daily.value':
+    '每日流量告警阈值',
+
+  'page.settings.tab.profile.module.btn.allowScript': '允许 BTN 服务器下发脚本',
+  'page.settings.tab.profile.module.btn.allowScript.tips':
+    '警告，这意味着远程服务器可以在你的计算机上执行任意代码，请谨慎开启'
 }

From 3f15131cb38e399e34e27dc4e75357f61f859dbe Mon Sep 17 00:00:00 2001
From: Ghost_chu <ghostchu@111.com>
Date: Wed, 6 Nov 2024 20:25:48 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ghostchu/peerbanhelper/config/ProfileUpdateScript.java  | 2 +-
 src/main/resources/profile.yml                                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ghostchu/peerbanhelper/config/ProfileUpdateScript.java b/src/main/java/com/ghostchu/peerbanhelper/config/ProfileUpdateScript.java
index fb175981c1..f6fd61c685 100644
--- a/src/main/java/com/ghostchu/peerbanhelper/config/ProfileUpdateScript.java
+++ b/src/main/java/com/ghostchu/peerbanhelper/config/ProfileUpdateScript.java
@@ -27,7 +27,7 @@ public ProfileUpdateScript(YamlConfiguration conf) {
 
     @UpdateScript(version = 23)
     public void scriptExecuteSwitch() {
-        conf.set("module.btn.allow-script-execute", true);
+        conf.set("module.btn.allow-script-execute", false);
     }
 
 
diff --git a/src/main/resources/profile.yml b/src/main/resources/profile.yml
index da20b84afb..b917c4fd5c 100644
--- a/src/main/resources/profile.yml
+++ b/src/main/resources/profile.yml
@@ -272,7 +272,7 @@ module:
     # 封禁时间，单位：毫秒，使用 default 则跟随全局设置
     ban-duration: 259200000
     # 是否允许执行从 BTN 服务器下发的 Aviator Script
-    allow-script-execute: true
+    allow-script-execute: false
   # 多拨封禁
   # Multi-dialing blocker
   multi-dialing-blocker:

From 4e4f7c99e7cd16a2c13207de86bbfa2d2e91671a Mon Sep 17 00:00:00 2001
From: Gaojianli <admin@gaojianli.me>
Date: Wed, 6 Nov 2024 20:26:16 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ghostchu/peerbanhelper/config/ProfileUpdateScript.java    | 2 +-
 src/main/resources/profile.yml                                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ghostchu/peerbanhelper/config/ProfileUpdateScript.java b/src/main/java/com/ghostchu/peerbanhelper/config/ProfileUpdateScript.java
index fb175981c1..f6fd61c685 100644
--- a/src/main/java/com/ghostchu/peerbanhelper/config/ProfileUpdateScript.java
+++ b/src/main/java/com/ghostchu/peerbanhelper/config/ProfileUpdateScript.java
@@ -27,7 +27,7 @@ public ProfileUpdateScript(YamlConfiguration conf) {
 
     @UpdateScript(version = 23)
     public void scriptExecuteSwitch() {
-        conf.set("module.btn.allow-script-execute", true);
+        conf.set("module.btn.allow-script-execute", false);
     }
 
 
diff --git a/src/main/resources/profile.yml b/src/main/resources/profile.yml
index da20b84afb..90a026e0fc 100644
--- a/src/main/resources/profile.yml
+++ b/src/main/resources/profile.yml
@@ -271,8 +271,8 @@ module:
     enabled: true
     # 封禁时间，单位：毫秒，使用 default 则跟随全局设置
     ban-duration: 259200000
-    # 是否允许执行从 BTN 服务器下发的 Aviator Script
-    allow-script-execute: true
+    # 是否允许执行从 BTN 服务器下发的 Aviator Script，如果您不信任 BTN 服务器，请勿开启！
+    allow-script-execute: false
   # 多拨封禁
   # Multi-dialing blocker
   multi-dialing-blocker:

From 4f6bcd827d660e052427585087d999c925790d05 Mon Sep 17 00:00:00 2001
From: Gaojianli <admin@gaojianli.me>
Date: Wed, 6 Nov 2024 20:41:29 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/settings/components/profile/components/btn.vue  | 3 ++-
 webui/src/views/settings/components/profile/locale/en-US.ts   | 4 +++-
 webui/src/views/settings/components/profile/locale/zh-CN.ts   | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/webui/src/views/settings/components/profile/components/btn.vue b/webui/src/views/settings/components/profile/components/btn.vue
index f6f88efe4b..d3841773f5 100644
--- a/webui/src/views/settings/components/profile/components/btn.vue
+++ b/webui/src/views/settings/components/profile/components/btn.vue
@@ -23,12 +23,13 @@
     </a-form-item>
     <a-form-item
       :label="t('page.settings.tab.profile.module.btn.allowScript')"
+      :tooltip="t('page.settings.tab.profile.module.btn.allowScript.tips')"
       field="model.enabled"
     >
       <a-switch v-model="model.allow_script_execute" />
       <template v-if="model.allow_script_execute" #extra>
         <a-typography-text type="danger">
-          {{ t('page.settings.tab.profile.module.btn.allowScript.tips') }}
+          {{ t('page.settings.tab.profile.module.btn.allowScript.warning') }}
         </a-typography-text></template
       >
     </a-form-item>
diff --git a/webui/src/views/settings/components/profile/locale/en-US.ts b/webui/src/views/settings/components/profile/locale/en-US.ts
index 27213af7b6..daa159f0c9 100644
--- a/webui/src/views/settings/components/profile/locale/en-US.ts
+++ b/webui/src/views/settings/components/profile/locale/en-US.ts
@@ -140,6 +140,8 @@ export default {
     'Daily traffic alert threshold',
 
   'page.settings.tab.profile.module.btn.allowScript': 'Allow BTN server push scripts',
+  'page.settings.tab.profile.module.btn.allowScript.warning':
+    'Warning, this means that the remote server can execute any code on your device, please enable with caution!',
   'page.settings.tab.profile.module.btn.allowScript.tips':
-    'Warning, this means that the remote server can execute any code on your computer, please enable with caution!'
+    'This option will allow BTN server push scripts to your device, this may increase the accuracy of the ban'
 }
diff --git a/webui/src/views/settings/components/profile/locale/zh-CN.ts b/webui/src/views/settings/components/profile/locale/zh-CN.ts
index fc0a32c439..9e5b782b07 100644
--- a/webui/src/views/settings/components/profile/locale/zh-CN.ts
+++ b/webui/src/views/settings/components/profile/locale/zh-CN.ts
@@ -128,6 +128,8 @@ export default {
     '每日流量告警阈值',
 
   'page.settings.tab.profile.module.btn.allowScript': '允许 BTN 服务器下发脚本',
+  'page.settings.tab.profile.module.btn.allowScript.warning':
+    '警告，这意味着远程服务器可以在你的设备上执行任意代码，请谨慎开启',
   'page.settings.tab.profile.module.btn.allowScript.tips':
-    '警告，这意味着远程服务器可以在你的计算机上执行任意代码，请谨慎开启'
+    '打开此选项后将允许 PeerBanHelper 接收并执行来自 BTN 服务器的动态脚本，这有助于提高反吸血精确度和反吸血效果。'
 }

From c09f817b4c028a0f3c7a163e6ab4fa1cd0edcd51 Mon Sep 17 00:00:00 2001
From: Ghost_chu <ghostchu@111.com>
Date: Wed, 6 Nov 2024 20:48:13 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ghostchu/peerbanhelper/btn/BtnConfig.java    | 3 ++-
 .../java/com/ghostchu/peerbanhelper/btn/BtnNetwork.java   | 6 ++++--
 .../com/ghostchu/peerbanhelper/btn/BtnRuleParsed.java     | 4 ++--
 .../peerbanhelper/btn/ability/BtnAbilityRules.java        | 8 +++++---
 .../peerbanhelper/config/MainConfigUpdateScript.java      | 6 ++++++
 .../peerbanhelper/config/ProfileUpdateScript.java         | 4 ----
 src/main/resources/config.yml                             | 7 ++++++-
 src/main/resources/profile.yml                            | 4 +---
 8 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/ghostchu/peerbanhelper/btn/BtnConfig.java b/src/main/java/com/ghostchu/peerbanhelper/btn/BtnConfig.java
index f3a9af208f..1f8bc7fd3b 100644
--- a/src/main/java/com/ghostchu/peerbanhelper/btn/BtnConfig.java
+++ b/src/main/java/com/ghostchu/peerbanhelper/btn/BtnConfig.java
@@ -34,7 +34,8 @@ public BtnNetwork btnNetwork() {
             var submit = server.getMainConfig().getBoolean("btn.submit");
             var appId = server.getMainConfig().getString("btn.app-id");
             var appSecret = server.getMainConfig().getString("btn.app-secret");
-            BtnNetwork btnNetwork = new BtnNetwork(server, scriptEngine, userAgent, configUrl, submit, appId, appSecret, matchCache);
+            var scriptExecute = server.getMainConfig().getBoolean("btn.allow-script-execute");
+            BtnNetwork btnNetwork = new BtnNetwork(server, scriptEngine, userAgent, configUrl, submit, appId, appSecret, matchCache, scriptExecute);
             log.info(tlUI(Lang.BTN_NETWORK_ENABLED));
             return btnNetwork;
         } else {
diff --git a/src/main/java/com/ghostchu/peerbanhelper/btn/BtnNetwork.java b/src/main/java/com/ghostchu/peerbanhelper/btn/BtnNetwork.java
index 0d1ade59c3..4d6794d7a1 100644
--- a/src/main/java/com/ghostchu/peerbanhelper/btn/BtnNetwork.java
+++ b/src/main/java/com/ghostchu/peerbanhelper/btn/BtnNetwork.java
@@ -37,6 +37,7 @@ public class BtnNetwork {
     @Getter
     private final Map<Class<? extends BtnAbility>, BtnAbility> abilities = new HashMap<>();
     private final ScriptEngine scriptEngine;
+    private final boolean scriptExecute;
     @Getter
     private ScheduledExecutorService executeService = null;
     private String configUrl;
@@ -54,7 +55,7 @@ public class BtnNetwork {
     private PeerRecordDao peerRecordDao;
     private ModuleMatchCache moduleMatchCache;
 
-    public BtnNetwork(PeerBanHelperServer server, ScriptEngine scriptEngine, String userAgent, String configUrl, boolean submit, String appId, String appSecret, ModuleMatchCache moduleMatchCache) {
+    public BtnNetwork(PeerBanHelperServer server, ScriptEngine scriptEngine, String userAgent, String configUrl, boolean submit, String appId, String appSecret, ModuleMatchCache moduleMatchCache, boolean scriptExecute) {
         this.server = server;
         this.scriptEngine = scriptEngine;
         this.userAgent = userAgent;
@@ -63,6 +64,7 @@ public BtnNetwork(PeerBanHelperServer server, ScriptEngine scriptEngine, String
         this.appId = appId.trim();
         this.appSecret = appSecret.trim();
         this.moduleMatchCache = moduleMatchCache;
+        this.scriptExecute = scriptExecute;
         setupHttpClient();
         resetScheduler();
         checkIfNeedRetryConfig();
@@ -112,7 +114,7 @@ public void configBtnNetwork() {
 //                abilities.put(BtnAbilitySubmitRulesHitRate.class, new BtnAbilitySubmitRulesHitRate(this, ability.get("submit_hitrate").getAsJsonObject()));
 //            }
             if (ability.has("rules")) {
-                abilities.put(BtnAbilityRules.class, new BtnAbilityRules(this, scriptEngine, ability.get("rules").getAsJsonObject()));
+                abilities.put(BtnAbilityRules.class, new BtnAbilityRules(this, scriptEngine, ability.get("rules").getAsJsonObject(), scriptExecute));
             }
             if (ability.has("reconfigure")) {
                 abilities.put(BtnAbilityReconfigure.class, new BtnAbilityReconfigure(this, ability.get("reconfigure").getAsJsonObject()));
diff --git a/src/main/java/com/ghostchu/peerbanhelper/btn/BtnRuleParsed.java b/src/main/java/com/ghostchu/peerbanhelper/btn/BtnRuleParsed.java
index 0c9cefc20c..9d5e158596 100644
--- a/src/main/java/com/ghostchu/peerbanhelper/btn/BtnRuleParsed.java
+++ b/src/main/java/com/ghostchu/peerbanhelper/btn/BtnRuleParsed.java
@@ -33,14 +33,14 @@ public class BtnRuleParsed {
     private Map<String, List<Rule>> portRules;
     private Map<String, CompiledScript> scriptRules;
 
-    public BtnRuleParsed(ScriptEngine scriptEngine, BtnRule btnRule) {
+    public BtnRuleParsed(ScriptEngine scriptEngine, BtnRule btnRule, boolean scriptExecute) {
         this.scriptEngine = scriptEngine;
         this.version = btnRule.getVersion();
         this.ipRules = parseIPRule(btnRule.getIpRules());
         this.portRules = parsePortRule(btnRule.getPortRules());
         this.peerIdRules = parseRule(btnRule.getPeerIdRules());
         this.clientNameRules = parseRule(btnRule.getClientNameRules());
-        this.scriptRules = compileScripts(btnRule.getScriptRules());
+        this.scriptRules = scriptExecute ? compileScripts(btnRule.getScriptRules()) : new HashMap<>();
     }
 
     private Map<String, CompiledScript> compileScripts(Map<String, String> scriptRules) {
diff --git a/src/main/java/com/ghostchu/peerbanhelper/btn/ability/BtnAbilityRules.java b/src/main/java/com/ghostchu/peerbanhelper/btn/ability/BtnAbilityRules.java
index b297c39f94..43ce0321e1 100644
--- a/src/main/java/com/ghostchu/peerbanhelper/btn/ability/BtnAbilityRules.java
+++ b/src/main/java/com/ghostchu/peerbanhelper/btn/ability/BtnAbilityRules.java
@@ -38,16 +38,18 @@ public class BtnAbilityRules extends AbstractBtnAbility {
     private final long randomInitialDelay;
     private final File btnCacheFile = new File(Main.getDataDirectory(), "btn.cache");
     private final ScriptEngine scriptEngine;
+    private final boolean scriptExecute;
     @Getter
     private BtnRuleParsed btnRule;
 
 
-    public BtnAbilityRules(BtnNetwork btnNetwork, ScriptEngine scriptEngine, JsonObject ability) {
+    public BtnAbilityRules(BtnNetwork btnNetwork, ScriptEngine scriptEngine, JsonObject ability, boolean scriptExecute) {
         this.btnNetwork = btnNetwork;
         this.scriptEngine = scriptEngine;
         this.interval = ability.get("interval").getAsLong();
         this.endpoint = ability.get("endpoint").getAsString();
         this.randomInitialDelay = ability.get("random_initial_delay").getAsLong();
+        this.scriptExecute = scriptExecute;
         setLastStatus(true, new TranslationComponent(Lang.BTN_STAND_BY));
     }
 
@@ -60,7 +62,7 @@ private void loadCacheFile() throws IOException {
         } else {
             try {
                 BtnRule btnRule = JsonUtil.getGson().fromJson(Files.readString(btnCacheFile.toPath()), BtnRule.class);
-                this.btnRule = new BtnRuleParsed(scriptEngine, btnRule);
+                this.btnRule = new BtnRuleParsed(scriptEngine, btnRule, scriptExecute);
             } catch (Throwable ignored) {
             }
         }
@@ -122,7 +124,7 @@ private void updateRule() {
                     } else {
                         try {
                             BtnRule btr = JsonUtil.getGson().fromJson(r.body(), BtnRule.class);
-                            this.btnRule = new BtnRuleParsed(scriptEngine, btr);
+                            this.btnRule = new BtnRuleParsed(scriptEngine, btr, scriptExecute);
                             Main.getEventBus().post(new BtnRuleUpdateEvent());
                             try {
                                 Files.writeString(btnCacheFile.toPath(), r.body(), StandardCharsets.UTF_8);
diff --git a/src/main/java/com/ghostchu/peerbanhelper/config/MainConfigUpdateScript.java b/src/main/java/com/ghostchu/peerbanhelper/config/MainConfigUpdateScript.java
index 1e63f29a61..348853e2fa 100644
--- a/src/main/java/com/ghostchu/peerbanhelper/config/MainConfigUpdateScript.java
+++ b/src/main/java/com/ghostchu/peerbanhelper/config/MainConfigUpdateScript.java
@@ -29,6 +29,12 @@ private void validate() {
 //        }
     }
 
+    @UpdateScript(version = 23)
+    public void btnScriptExecuteSwitch() {
+        conf.set("btn.allow-script-execute", false);
+    }
+
+
     @UpdateScript(version = 22)
     public void miscChanges() {
         conf.set("privacy", null);
diff --git a/src/main/java/com/ghostchu/peerbanhelper/config/ProfileUpdateScript.java b/src/main/java/com/ghostchu/peerbanhelper/config/ProfileUpdateScript.java
index f6fd61c685..dcb476f2d7 100644
--- a/src/main/java/com/ghostchu/peerbanhelper/config/ProfileUpdateScript.java
+++ b/src/main/java/com/ghostchu/peerbanhelper/config/ProfileUpdateScript.java
@@ -25,10 +25,6 @@ public ProfileUpdateScript(YamlConfiguration conf) {
         this.conf = conf;
     }
 
-    @UpdateScript(version = 23)
-    public void scriptExecuteSwitch() {
-        conf.set("module.btn.allow-script-execute", false);
-    }
 
 
     @UpdateScript(version = 22)
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index a5df61ac9e..22fd2613dd 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,4 +1,4 @@
-config-version: 22
+config-version: 23
 # 设置程序语言
 # Set the program language
 # default 跟随操作系统 (Follow the operating system)
@@ -77,6 +77,11 @@ btn:
   # The BTN instance URL, you need find a BTN instance
   # By default, PBH-BTN official BTN instance will be used
   config-url: "https://sparkle.ghostchu.com/ping/config"
+  # 是否允许执行从 BTN 服务器下发的 Aviator Script （如果有）
+  # 请仅在受信任的 BTN 服务器上启用此功能
+  # Allow execute Aviator Script (fully programmable) from BTN server (if have),
+  # Enable this option only on trusted BTN server
+  allow-script-execute: false
 # 封禁列表处理
 # PBH 能够除了调用 BT 客户端的封禁 API 外，还能够进行如下操作，以便适配更多其它客户端
 # Banlist invoker
diff --git a/src/main/resources/profile.yml b/src/main/resources/profile.yml
index b917c4fd5c..5151f7685e 100644
--- a/src/main/resources/profile.yml
+++ b/src/main/resources/profile.yml
@@ -1,4 +1,4 @@
-config-version: 23
+config-version: 22
 # Check interval (Timeunit: ms)
 # 检查频率（单位：毫秒）
 check-interval: 5000
@@ -271,8 +271,6 @@ module:
     enabled: true
     # 封禁时间，单位：毫秒，使用 default 则跟随全局设置
     ban-duration: 259200000
-    # 是否允许执行从 BTN 服务器下发的 Aviator Script
-    allow-script-execute: false
   # 多拨封禁
   # Multi-dialing blocker
   multi-dialing-blocker:

From 41452f92691fd2fa66aa317e7e143a1145b599ce Mon Sep 17 00:00:00 2001
From: Gaojianli <admin@gaojianli.me>
Date: Wed, 6 Nov 2024 20:50:18 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webui/src/api/model/config.ts                        |  1 +
 webui/src/api/model/profile.ts                       |  1 -
 .../settings/components/config/components/btn.vue    | 12 ++++++++++++
 .../views/settings/components/config/locale/en-US.ts |  5 +++++
 .../views/settings/components/config/locale/zh-CN.ts |  5 +++++
 .../settings/components/profile/components/btn.vue   | 12 ------------
 .../settings/components/profile/locale/en-US.ts      |  8 +-------
 .../settings/components/profile/locale/zh-CN.ts      |  9 +--------
 8 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/webui/src/api/model/config.ts b/webui/src/api/model/config.ts
index 06d94f0313..87ea662797 100644
--- a/webui/src/api/model/config.ts
+++ b/webui/src/api/model/config.ts
@@ -41,6 +41,7 @@ export interface Btn {
   app_id: string
   app_secret: string
   config_url: string
+  allow_script_execute: boolean
 }
 
 export interface BanlistInvoker {
diff --git a/webui/src/api/model/profile.ts b/webui/src/api/model/profile.ts
index 1b1bee561a..c43a0cc936 100644
--- a/webui/src/api/model/profile.ts
+++ b/webui/src/api/model/profile.ts
@@ -91,7 +91,6 @@ export interface AutoRangeBan {
 export interface Btn {
   enabled: boolean
   ban_duration: BanDuration
-  allow_script_execute: boolean
 }
 
 export interface MultiDialingBlocker {
diff --git a/webui/src/views/settings/components/config/components/btn.vue b/webui/src/views/settings/components/config/components/btn.vue
index bf374b30e1..31f6790923 100644
--- a/webui/src/views/settings/components/config/components/btn.vue
+++ b/webui/src/views/settings/components/config/components/btn.vue
@@ -28,6 +28,18 @@
       <a-form-item label="App Secret" field="btn.app_secret">
         <a-input-password v-model="model.app_secret" style="width: 400px" />
       </a-form-item>
+      <a-form-item
+        :label="t('page.settings.tab.config.btn.allowScript')"
+        :tooltip="t('page.settings.tab.config.btn.allowScript.tips')"
+        field="model.enabled"
+      >
+        <a-switch v-model="model.allow_script_execute" />
+        <template v-if="model.allow_script_execute" #extra>
+          <a-typography-text type="danger">
+            {{ t('page.settings.tab.config.btn.allowScript.warning') }}
+          </a-typography-text></template
+        >
+      </a-form-item>
     </div>
   </a-space>
 </template>
diff --git a/webui/src/views/settings/components/config/locale/en-US.ts b/webui/src/views/settings/components/config/locale/en-US.ts
index 9850abee81..002a05e536 100644
--- a/webui/src/views/settings/components/config/locale/en-US.ts
+++ b/webui/src/views/settings/components/config/locale/en-US.ts
@@ -49,6 +49,11 @@ export default {
     'All peers connected to torrents (Including: IP, Port, PeerID, UserAgent, Peer Protocol, Flags, Uploaded, Downloaded, UploadRate, DownloadRate, PeerProgress, YourProgress and Downloader Name)',
   'page.settings.tab.config.btn.enableSubmit.modal.content3':
     'Are you sure you want to enable submit?',
+  'page.settings.tab.config.btn.allowScript': 'Allow BTN server push scripts',
+  'page.settings.tab.config.btn.allowScript.warning':
+    'Warning, this means that the remote server can execute any code on your device, please enable with caution!',
+  'page.settings.tab.config.btn.allowScript.tips':
+    'This option will allow BTN server push scripts to your device, this may increase the accuracy of the ban',
 
   'page.settings.tab.config.ipDatabase.title': 'IP Database',
   'page.settings.tab.config.ipDatabase.autoUpdate': 'Enable auto update',
diff --git a/webui/src/views/settings/components/config/locale/zh-CN.ts b/webui/src/views/settings/components/config/locale/zh-CN.ts
index 22d6fd4b1a..e2847b050c 100644
--- a/webui/src/views/settings/components/config/locale/zh-CN.ts
+++ b/webui/src/views/settings/components/config/locale/zh-CN.ts
@@ -48,6 +48,11 @@ export default {
   'page.settings.tab.config.btn.enableSubmit.modal.content2':
     '您的 Torrent 列表（包括：Torrent 种子摘要的二次不可逆哈希和 Torrent 大小），连接到您的 Torrent 的所有 Peers （包括：IP地址、端口号、PeerID、UserAgent（ClientName），Peer协议，Peer总下载量，Peer总上传量，Peer瞬时上传速度，Peer瞬时下载速度，Peer下载进度，以及您的下载器名称）',
   'page.settings.tab.config.btn.enableSubmit.modal.content3': '确定要开启提交吗？',
+  'page.settings.tab.config.btn.allowScript': '允许 BTN 服务器下发脚本',
+  'page.settings.tab.config.btn.allowScript.warning':
+    '警告，这意味着远程服务器可以在你的设备上执行任意代码，请谨慎开启',
+  'page.settings.tab.config.btn.allowScript.tips':
+    '打开此选项后将允许 PeerBanHelper 接收并执行来自 BTN 服务器的动态脚本，这有助于提高反吸血精确度和反吸血效果。',
 
   'page.settings.tab.config.ipDatabase.title': 'IP 数据库',
   'page.settings.tab.config.ipDatabase.autoUpdate': '启用自动更新',
diff --git a/webui/src/views/settings/components/profile/components/btn.vue b/webui/src/views/settings/components/profile/components/btn.vue
index d3841773f5..159dd14ad1 100644
--- a/webui/src/views/settings/components/profile/components/btn.vue
+++ b/webui/src/views/settings/components/profile/components/btn.vue
@@ -21,18 +21,6 @@
         ={{ formatMilliseconds(model.ban_duration) }}
       </template>
     </a-form-item>
-    <a-form-item
-      :label="t('page.settings.tab.profile.module.btn.allowScript')"
-      :tooltip="t('page.settings.tab.profile.module.btn.allowScript.tips')"
-      field="model.enabled"
-    >
-      <a-switch v-model="model.allow_script_execute" />
-      <template v-if="model.allow_script_execute" #extra>
-        <a-typography-text type="danger">
-          {{ t('page.settings.tab.profile.module.btn.allowScript.warning') }}
-        </a-typography-text></template
-      >
-    </a-form-item>
   </a-space>
 </template>
 <script setup lang="ts">
diff --git a/webui/src/views/settings/components/profile/locale/en-US.ts b/webui/src/views/settings/components/profile/locale/en-US.ts
index daa159f0c9..f2abb6c480 100644
--- a/webui/src/views/settings/components/profile/locale/en-US.ts
+++ b/webui/src/views/settings/components/profile/locale/en-US.ts
@@ -137,11 +137,5 @@ export default {
   'page.settings.tab.profile.module.activeMonitor.trafficMonitoring.daily.tips':
     'Set the traffic alert threshold, when the threshold is exceeded, an alert message will be sent to remind you to check the status of the downloader.',
   'page.settings.tab.profile.module.activeMonitor.trafficMonitoring.daily.value':
-    'Daily traffic alert threshold',
-
-  'page.settings.tab.profile.module.btn.allowScript': 'Allow BTN server push scripts',
-  'page.settings.tab.profile.module.btn.allowScript.warning':
-    'Warning, this means that the remote server can execute any code on your device, please enable with caution!',
-  'page.settings.tab.profile.module.btn.allowScript.tips':
-    'This option will allow BTN server push scripts to your device, this may increase the accuracy of the ban'
+    'Daily traffic alert threshold'
 }
diff --git a/webui/src/views/settings/components/profile/locale/zh-CN.ts b/webui/src/views/settings/components/profile/locale/zh-CN.ts
index 9e5b782b07..b52255de27 100644
--- a/webui/src/views/settings/components/profile/locale/zh-CN.ts
+++ b/webui/src/views/settings/components/profile/locale/zh-CN.ts
@@ -124,12 +124,5 @@ export default {
   'page.settings.tab.profile.module.activeMonitor.trafficMonitoring.daily.enable': '开启流量告警',
   'page.settings.tab.profile.module.activeMonitor.trafficMonitoring.daily.tips':
     '设置流量告警阈值，当超出阈值后将发送告警信息提醒您检查下载器状态',
-  'page.settings.tab.profile.module.activeMonitor.trafficMonitoring.daily.value':
-    '每日流量告警阈值',
-
-  'page.settings.tab.profile.module.btn.allowScript': '允许 BTN 服务器下发脚本',
-  'page.settings.tab.profile.module.btn.allowScript.warning':
-    '警告，这意味着远程服务器可以在你的设备上执行任意代码，请谨慎开启',
-  'page.settings.tab.profile.module.btn.allowScript.tips':
-    '打开此选项后将允许 PeerBanHelper 接收并执行来自 BTN 服务器的动态脚本，这有助于提高反吸血精确度和反吸血效果。'
+  'page.settings.tab.profile.module.activeMonitor.trafficMonitoring.daily.value': '每日流量告警阈值'
 }