Version: 2.4.6 Update

README.md

@@ -21,7 +21,7 @@
 
 ![-w477](images/show_config.png)
 
-除了初始化的配置文件外，还有`Setting.yml`，该文件用于存储配置文件路径与排除后缀名；`HaE`支持自定义配置文件路径，你可以通过点击`Select File`按钮进行选择自定义配置文件。
+除了初始化的配置文件外，还有`Setting.yml`，该文件用于存储配置文件路径与排除后缀名；`HaE`支持在线更新配置文件，你可以通过点击`Online Update`按钮进行更新（部分网络需要挂代理）。
 
 ## 优势特点
 

src/main/java/burp/BurpExtender.java

@@ -3,8 +3,8 @@ package burp;
 import burp.action.*;
 import burp.ui.MainUI;
 
-import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import javax.swing.*;
 import java.awt.*;
 import java.nio.charset.StandardCharsets;
@@ -34,7 +34,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
         this.callbacks = callbacks;
         BurpExtender.helpers = callbacks.getHelpers();
 
-        String version = "2.4.2";
+        String version = "2.4.6";
         callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
         // 定义输出
         stdout = new PrintWriter(callbacks.getStdout(), true);
@@ -102,8 +102,9 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
                 String color = uc.getEndColor(gck.getColorKeys(colorList));
 
                 messageInfo.setHighlight(color);
+
                 String addComment = String.join(", ", result.get(1).get("comment"));
-                String resComment = originalComment != null ? String.format("%s, %s", originalComment, addComment) : addComment;
+                String resComment = !Objects.equals(originalComment, "") ? String.format("%s, %s", originalComment, addComment) : addComment;
 
                 messageInfo.setComment(resComment);
             }
@@ -142,6 +143,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
         public boolean isEnabled(byte[] content, boolean isRequest) {
             String c = new String(content, StandardCharsets.UTF_8).intern();
             List<Map<String, String>> result = pm.processMessageByContent(helpers, content, isRequest, false, "");
+
             if (result != null && !result.isEmpty()) {
                 Map<String, String> dataMap = result.get(0);
                 if (isRequest) {

src/main/java/burp/Config.java

@@ -13,6 +13,8 @@ public class Config {
 
     public static String[] scopeArray = new String[] {
             "any",
+            "any header",
+            "any body",
             "response",
             "response header",
             "response body",

src/main/java/burp/action/ExtractContent.java

@@ -1,5 +1,6 @@
 package burp.action;
 
+import burp.BurpExtender;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import burp.Config;
@@ -19,8 +20,10 @@ public class ExtractContent {
     public Map<String, Map<String, Object>> matchRegex(byte[] content, String headers, byte[] body, String scopeString, String host) {
         Map<String, Map<String, Object>> map = new HashMap<>(); // 最终返回的结果
         Config.ruleConfig.keySet().forEach(i -> {
-            String matchContent = "";
             for (Object[] objects : Config.ruleConfig.get(i)) {
+                // 多线程执行，一定程度上减少阻塞现象
+                Thread t = new Thread(() -> {
+                    String matchContent = "";
                     // 遍历获取规则
                     List<String> result = new ArrayList<>();
                     Map<String, Object> tmpMap = new HashMap<>();
@@ -33,17 +36,19 @@ public class ExtractContent {
                     String engine = objects[5].toString();
                     boolean sensitive = (Boolean) objects[6];
                     // 判断规则是否开启与作用域
-                if (loaded && (scope.contains(scopeString) || "any".equals(scope))) {
+                    if (loaded && (scope.contains(scopeString) || scope.contains("any"))) {
                         switch (scope) {
                             case "any":
                             case "request":
                             case "response":
                                 matchContent = new String(content, StandardCharsets.UTF_8).intern();
                                 break;
+                            case "any header":
                             case "request header":
                             case "response header":
                                 matchContent = headers;
                                 break;
+                            case "any body":
                             case "request body":
                             case "response body":
                                 matchContent = new String(body, StandardCharsets.UTF_8).intern();
@@ -86,46 +91,56 @@ public class ExtractContent {
 
                         if (!result.isEmpty()) {
                             tmpMap.put("color", color);
-                        tmpMap.put("data", String.join("\n", result));
+                            String dataStr = String.join("\n", result);
-                        // 初始化格式
+                            tmpMap.put("data", dataStr);
-                        map.put(name, tmpMap);
-                    }
-                }
-            }
-        });
 
-        // 将提取的数据存放到全局变量中
+                            // 添加到全局变量中，便于Databoard检索
                             if (!host.isEmpty()) {
-            map.keySet().forEach(i -> {
+                                String anyHost = host.replace(host.split("\\.")[0], "*");
-                Map<String, Object> tmpMap = map.get(i);
+                                List<String> dataList = Arrays.asList(dataStr.split("\n"));
-                List<String> dataList = Arrays.asList(tmpMap.get("data").toString().split("\n"));
-                // 判断Host是否存在，如存在则进行数据更新，反之则新增数据
                                 if (Config.globalDataMap.containsKey(host)) {
                                     Map<String, List<String>> gRuleMap = Config.globalDataMap.get(host);
                                     // 判断匹配规则是否存在（逻辑同Host判断）
-                    if (gRuleMap.containsKey(i)) {
+                                    if (gRuleMap.containsKey(name)) {
-                        List<String> gDataList = gRuleMap.get(i);
+                                        List<String> gDataList = gRuleMap.get(name);
-                        List<String> mergeDataList = new ArrayList<>();
+                                        List<String> mergeDataList = new ArrayList<>(gDataList);
                                         // 合并两个List
-                        mergeDataList.addAll(gDataList);
                                         mergeDataList.addAll(dataList);
                                         // 去重操作
-                        HashSet tmpList = new HashSet(mergeDataList);
+                                        tmpList = new HashSet(mergeDataList);
                                         mergeDataList.clear();
                                         mergeDataList.addAll(tmpList);
                                         // 替换操作
-                        gRuleMap.replace(i, gDataList, mergeDataList);
+                                        gRuleMap.replace(name, gDataList, mergeDataList);
                                     } else {
-                        gRuleMap.put(i, dataList);
+                                        gRuleMap.put(name, dataList);
                                     }
+                                } else if (!Config.globalDataMap.containsKey(anyHost)) {
+                                    // 添加通配符Host
+                                    Config.globalDataMap.put(anyHost, new HashMap<>());
                                 } else {
                                     Map<String, List<String>> ruleMap = new HashMap<>();
-                    ruleMap.put(i, dataList);
+                                    ruleMap.put(name, dataList);
+                                    // 添加单一Host
                                     Config.globalDataMap.put(host, ruleMap);
                                 }
-            });
                             }
 
+                            map.put(name, tmpMap);
+
+                        }
+                    }
+                });
+                t.start();
+                try {
+                    t.join();
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+
+
+            }
+        });
         return map;
     }
 }

src/main/java/burp/action/ProcessMessage.java

@@ -1,5 +1,6 @@
 package burp.action;
 
+import burp.BurpExtender;
 import burp.IExtensionHelpers;
 import java.util.ArrayList;
 import java.util.Arrays;

src/main/java/burp/ui/Databoard.java

@@ -1,6 +1,8 @@
 package burp.ui;
 
 import burp.Config;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import javax.swing.table.DefaultTableModel;
 import org.jetbrains.annotations.NotNull;
@@ -14,7 +16,7 @@ import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
 /**
- * @author LinChen
+ * @author LinChen && EvilChen
  */
 
 public class Databoard extends JPanel {
@@ -22,11 +24,33 @@ public class Databoard extends JPanel {
         initComponents();
     }
 
+    /**
+     * 清空数据
+     */
+    private void clearActionPerformed(ActionEvent e) {
+        // 清空页面
+        dataTabbedPane.removeAll();
+        // 判断通配符Host/单一Host
+        String host = hostTextField.getText();
+        if(host.contains("*")){
+            Map<String, Map<String, List<String>>> ruleMap = Config.globalDataMap;
+            Map<String, List<String>> selectHost = new HashMap<>();
+            ruleMap.keySet().forEach(i -> {
+                if (i.contains(host.replace("*.", ""))) {
+                    Config.globalDataMap.remove(i);
+                }
+            });
+        } else {
+            Config.globalDataMap.remove(host);
+        }
+    }
+
     private void initComponents() {
         // JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
         hostLabel = new JLabel();
         hostTextField = new JTextField();
         dataTabbedPane = new JTabbedPane();
+        clearButton = new JButton();
 
         //======== this ========
         setLayout(new GridBagLayout());
@@ -43,7 +67,11 @@ public class Databoard extends JPanel {
         add(hostTextField, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(8, 0, 5, 5), 0, 0));
-
+        clearButton.setText("Clear");
+        clearButton.addActionListener(this::clearActionPerformed);
+        add(clearButton,  new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0,
+                GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+                new Insets(8, 0, 5, 5), 0, 0));
         add(dataTabbedPane, new GridBagConstraints(1, 1, 3, 2, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(8, 0, 0, 5), 0, 0));
@@ -56,9 +84,7 @@ public class Databoard extends JPanel {
      */
     private static List<String> getHostByList(){
         List<String> hostList = new ArrayList<>();
-        Config.globalDataMap.keySet().forEach(i -> {
+        hostList.addAll(Config.globalDataMap.keySet());
-            hostList.add(i);
-        });
         return hostList;
     }
 
@@ -143,10 +169,15 @@ public class Databoard extends JPanel {
                 if (!input.isEmpty()){
                     for (String host : getHostByList()) {
                         if (host.toLowerCase().contains(input.toLowerCase())) {
+                            if (host.length() == input.length()){
+                                comboBoxModel.insertElementAt(host,0);
+                                comboBoxModel.setSelectedItem(host);
+                            }else{
                                 comboBoxModel.addElement(host);
                             }
                         }
                     }
+                }
                 hostComboBox.setPopupVisible(comboBoxModel.getSize() > 0);
                 isMatchHost = false;
             }
@@ -159,9 +190,36 @@ public class Databoard extends JPanel {
     private static void getInfoByHost(@NotNull JComboBox hostComboBox, JTabbedPane tabbedPane, JTextField textField) {
         if (hostComboBox.getSelectedItem() != null) {
             Map<String, Map<String, List<String>>> ruleMap = Config.globalDataMap;
-            Map<String, List<String>> selectUrl = ruleMap.get(hostComboBox.getSelectedItem());
+            Map<String, List<String>> selectHost = new HashMap<>();
+            String host = hostComboBox.getSelectedItem().toString();
+            if (host.contains("*")) {
+                // 通配符数据
+                Map<String, List<String>> finalSelectHost = selectHost;
+                ruleMap.keySet().forEach(i -> {
+                    if (i.contains(host.replace("*.", ""))) {
+                        ruleMap.get(i).keySet().forEach(e -> {
+                            if (finalSelectHost.containsKey(e)) {
+                                // 合并操作
+                                List<String> newList = new ArrayList<>(finalSelectHost.get(e));
+                                newList.addAll(ruleMap.get(i).get(e));
+                                // 去重操作
+                                HashSet tmpList = new HashSet(newList);
+                                newList.clear();
+                                newList.addAll(tmpList);
+                                // 添加操作
+                                finalSelectHost.put(e, newList);
+                            } else {
+                                finalSelectHost.put(e, ruleMap.get(i).get(e));
+                            }
+                        });
+                    }
+                });
+            } else {
+                selectHost = ruleMap.get(host);
+            }
+
             tabbedPane.removeAll();
-            for(Map.Entry<String, List<String>> entry: selectUrl.entrySet()){
+            for(Map.Entry<String, List<String>> entry: selectHost.entrySet()){
                 tabbedPane.addTab(entry.getKey(), new JScrollPane(new HitRuleDataList(entry.getValue())));
             }
             textField.setText(hostComboBox.getSelectedItem().toString());
@@ -172,6 +230,7 @@ public class Databoard extends JPanel {
     private JLabel hostLabel;
     private JTextField hostTextField;
     private JTabbedPane dataTabbedPane;
+    private JButton clearButton;
     // JFormDesigner - End of variables declaration  //GEN-END:variables
 
     // 是否自动匹配Host

src/main/java/burp/ui/MainUI.java

@@ -18,7 +18,7 @@ import java.awt.event.*;
 import java.util.Map;
 
 /**
- * @author LinChen
+ * @author LinChen && EvilChen
  */
 
 public class MainUI extends JPanel{
@@ -45,7 +45,11 @@ public class MainUI extends JPanel{
     }
 
     private void onlineUpdateActionPerformed(ActionEvent e) {
-        String url = "https://raw.githubusercontent.com/gh0stkey/HaE/gh-pages/Config.yml";
+        // 添加提示框防止用户误触导致配置更新
+        int retCode = JOptionPane.showConfirmDialog(null, "Do you want to update config?", "Info",
+                JOptionPane.YES_NO_CANCEL_OPTION);
+        if (retCode == JOptionPane.YES_OPTION) {
+            String url = "https://cdn.jsdelivr.net/gh/gh0stkey/HaE@gh-pages/Config.yml";
             OkHttpClient httpClient = new OkHttpClient();
             Request httpRequest = new Request.Builder().url(url).get().build();
             try {
@@ -64,6 +68,7 @@ public class MainUI extends JPanel{
             new LoadConfig();
             reloadRule();
         }
+    }
 
     private void reloadRule(){
         ruleTabbedPane.removeAll();