修复 HaE 安装状态检测不严谨，导致路径失效后无法重新选择 HaE 路径的问题

vaycore · Jan 2, 2024 · e308711 · e308711
1 parent b5a71d3
commit e308711
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/burp/vaycore/hae/HaE.java b/src/main/java/burp/vaycore/hae/HaE.java
@@ -112,8 +112,8 @@ public static void loadPlugin(String pluginPath, LoadPluginCallback callback) {
      * @return true=卸载成功；false=卸载失败
      */
     public static boolean unloadPlugin() {
-        // 是否初始化
-        if (sExtender == null || sCallbacks == null || sAdapter == null) {
+        // 是否已安装插件
+        if (!hasInstall()) {
             return false;
         }
         try {
@@ -135,6 +135,15 @@ public static boolean unloadPlugin() {
         }
     }
 
+    /**
+     * 是否安装插件
+     *
+     * @return true=已安装；false=未安装
+     */
+    public static boolean hasInstall() {
+        return sExtender != null && sCallbacks != null && sAdapter != null;
+    }
+
     public static void processHttpMessage(IHttpRequestResponse messageInfo) {
         if (sHttpListener != null) {
             byte[] response = messageInfo.getResponse();

diff --git a/src/main/java/burp/vaycore/onescan/ui/tab/config/OtherTab.java b/src/main/java/burp/vaycore/onescan/ui/tab/config/OtherTab.java
@@ -69,7 +69,7 @@ public void actionPerformed(ActionEvent e) {
         switch (action) {
             case "hae-plugin-select-file":
                 oldPath = getHaEPluginPath();
-                if (StringUtils.isNotEmpty(oldPath)) {
+                if (HaE.hasInstall()) {
                     UIHelper.showTipsDialog("HaE plugin already loaded.");
                     return;
                 }