Version: 2.5.9 Update

.github/ISSUE_TEMPLATE/问题反馈.md

@@ -0,0 +1,28 @@
+---
+name: 问题反馈
+about: 尽可能详细的描述问题并反馈
+title: "[BUG] "
+labels: bug
+assignees: ''
+
+---
+
+## 使用环境
+
+```
+HaE版本：
+是否有自定义的HaE规则：
+BurpSuite版本：
+JDK版本：
+操作系统版本：
+```
+
+## 问题详情
+
+问题描述：
+
+出现的场景：
+
+## 解决建议
+
+无。

README.md

@@ -23,6 +23,22 @@
 
 除此之外，您也可以选择将配置文件存放在`HaE Jar包`的同级目录下的`/.config/HaE/`中，**以便于离线携带**。
 
+### 规则释义
+
+HaE目前的规则一共有6个字段，分别是规则名称、规则正则、规则作用域、正则引擎、规则匹配颜色、规则敏感性。
+
+详细的含义如下所示：
+
+| 字段      | 含义                                                                                                                                                                                                   |
+|-----------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Name      | 规则名称，主要用于简短概括当前规则的作用。                                                                                                                                                               |
+| Regex     | 规则正则，主要用于填写正则表达式。在HaE中所需提取匹配的内容需要用`(`、`)`将正则表达式进行包裹。                                                                                                            |
+| Scope     | 规则作用域，主要用于表示当前规则作用与HTTP报文的哪个部分。                                                                                                                                               |
+| Engine    | 正则引擎，主要用于表示当前规则的正则表达式所使用的引擎。**DFA引擎**：对于文本串里的每一个字符只需扫描一次，速度快、特性少；**NFA引擎**：要翻来覆去标注字符、取消标注字符，速度慢，但是特性（如:分组、替换、分割）丰富。 |
+| Color     | 规则匹配颜色，主要用于表示当前规则匹配到对应HTTP报文时所需标记的高亮颜色。                                                                                                                               |
+| Sensitive | 规则敏感性，主要用于表示当前规则对于大小写字母是否敏感，敏感（`True`）则严格按照大小写要求匹配，不敏感（`False`）则反之。                                                                                      |
+
+
 ## 优势特点
 
 1. 精细配置：高度自由的配置选项，以满足各类精细化场景需求。
@@ -40,16 +56,6 @@
 | Config（配置信息管理）    | <img src="images/config.png" style="width: 80%" />    |
 | Databoard（数据集合面板） | <img src="images/databoard.png" style="width: 80%" /> |
 
-## 实际使用
-
-使用 RGPerson 生成测试数据，放入网站根目录文件中: 
-
-![-w467](images/rgperson.jpg)
-
-访问该地址，在`Proxy - HTTP History`中可以看见高亮请求，响应标签页中含有`MarkInfo`标签，其中将匹配到的信息提取了出来。
-
-![-w1047](images/markinfo.png)
-
 ## 文末随笔
 
 正义感是一个不可丢失的东西。

src/main/java/burp/BurpExtender.java

@@ -3,13 +3,10 @@ package burp;
 import burp.config.ConfigLoader;
 import burp.core.processor.ColorProcessor;
 import burp.core.processor.MessageProcessor;
+import burp.core.utils.StringHelper;
 import burp.ui.MainUI;
 import burp.ui.board.DatatablePanel;
 import burp.ui.board.MessagePanel;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.net.URL;
-import java.security.NoSuchAlgorithmException;
 import java.util.*;
 import javax.swing.*;
 import java.awt.*;
@@ -39,7 +36,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 
         new ConfigLoader();
 
-        String version = "2.5.7";
+        String version = "2.5.9";
         callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
 
         // 定义输出
@@ -75,43 +72,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 
     @Override
     public Component getUiComponent() {
-        JTabbedPane HaETabbedPane = new JTabbedPane();
-        HaETabbedPane.addTab("", getImageIcon(false), main);
-        HaETabbedPane.addTab(" Highlighter and Extractor - Empower ethical hacker for efficient operations ", null);
-        HaETabbedPane.setEnabledAt(1, false);
-        HaETabbedPane.addPropertyChangeListener("background", new PropertyChangeListener() {
-            @Override
-            public void propertyChange(PropertyChangeEvent e) {
-                boolean isDarkBg = isDarkBg();
-                HaETabbedPane.setIconAt(0, getImageIcon(isDarkBg));
-            }
-
-            private boolean isDarkBg() {
-                Color bg = HaETabbedPane.getBackground();
-                int r = bg.getRed();
-                int g = bg.getGreen();
-                int b = bg.getBlue();
-                int avg = (r + g + b) / 3;
-
-                return avg < 128;
-            }
-        });
-        return HaETabbedPane;
-    }
-
-    private ImageIcon getImageIcon(boolean isDark) {
-        ClassLoader classLoader = getClass().getClassLoader();
-        URL imageURL;
-        if (isDark) {
-            imageURL = classLoader.getResource("logo.png");
-        } else {
-            imageURL = classLoader.getResource("logo_black.png");
-        }
-        ImageIcon originalIcon = new ImageIcon(imageURL);
-        Image originalImage = originalIcon.getImage();
-        Image scaledImage = originalImage.getScaledInstance(30, 20, Image.SCALE_FAST);
-        ImageIcon scaledIcon = new ImageIcon(scaledImage);
-        return scaledIcon;
+        return main;
     }
 
     /**
@@ -121,101 +82,44 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
     public void processHttpMessage(int toolFlag, boolean messageIsRequest, IHttpRequestResponse messageInfo) {
         // 判断是否是响应，且该代码作用域为：REPEATER、INTRUDER、PROXY（分别对应toolFlag 64、32、4）
         if (toolFlag == 64 || toolFlag == 32 || toolFlag == 4) {
-            byte[] content;
+            if (!messageIsRequest) {
+                IHttpService iHttpService = messageInfo.getHttpService();
+                String host = iHttpService.getHost();
 
-            if (messageIsRequest) {
-                content = messageInfo.getRequest();
-            } else {
-                content = messageInfo.getResponse();
-            }
+                List<Map<String, String>> result = null;
 
-            IHttpService iHttpService = null;
+                String originalColor = messageInfo.getHighlight();
+                String originalComment = messageInfo.getComment();
 
-            String host = "";
+                try {
+                    result = messageProcessor.processMessage(helpers, messageInfo, host, true);
 
-            try {
-                iHttpService = messageInfo.getHttpService();
-                host = iHttpService.getHost();
-            } catch (Exception ignored) {
-            }
+                    if (result != null && !result.isEmpty() && result.size() > 0) {
+                        List<String> colorList = new ArrayList<>();
 
-            if (Objects.equals(host, "")) {
-                List<String> requestTmpHeaders = helpers.analyzeRequest(content).getHeaders();
-                host = requestTmpHeaders.get(1).split(":")[1].trim();
-            }
+                        if (originalColor != null) {
+                            colorList.add(originalColor);
+                        }
 
-            List<Map<String, String>> result = null;
+                        colorList.add(result.get(0).get("color"));
+                        String resColor = colorProcessor.retrieveFinalColor(colorProcessor.retrieveColorIndices(colorList));
+                        messageInfo.setHighlight(resColor);
 
-            try {
-                result = messageProcessor.processMessage(helpers, content, messageIsRequest, true, host);
-            } catch (NoSuchAlgorithmException e) {
-                throw new RuntimeException(e);
-            }
+                        String addComment = String.join(", ", result.get(1).get("comment"));
+                        String allComment = !Objects.equals(originalComment, "") ? String.format("%s, %s", originalComment, addComment) : addComment;
+                        String resComment = StringHelper.mergeComment(allComment);
+                        messageInfo.setComment(resComment);
 
-            String resComment = "";
-            String resColor = "";
-            String originalColor = messageInfo.getHighlight();
-            String originalComment = messageInfo.getComment();
-
-            if (result != null && !result.isEmpty() && result.size() > 0) {
-                List<String> colorList = new ArrayList<>();
-
-                if (originalColor != null) {
-                    colorList.add(originalColor);
+                        messagePanel.add(messageInfo, resComment, resColor);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
-
-                colorList.add(result.get(0).get("color"));
-                resColor = colorProcessor.retrieveFinalColor(colorProcessor.retrieveColorIndices(colorList));
-                messageInfo.setHighlight(resColor);
-
-                String addComment = String.join(", ", result.get(1).get("comment"));
-                String allComment = !Objects.equals(originalComment, "") ? String.format("%s, %s", originalComment, addComment) : addComment;
-                resComment = mergeComment(allComment);
-                messageInfo.setComment(resComment);
             }
 
-            String endComment = resComment.isEmpty() ? originalComment : resComment;
-            String endColor = resColor.isEmpty() ? originalColor : resColor;
-
-            if (!messageIsRequest && !Objects.equals(endComment, "") && !Objects.equals(endColor, "")) {
-                messagePanel.add(messageInfo, endComment, String.valueOf(content.length), endColor);
-            }
         }
     }
 
-    private String mergeComment(String comment) {
-        if (!comment.contains(",")) {
-            return comment;
-        }
-
-        Map<String, Integer> itemCounts = new HashMap<>();
-        String[] items = comment.split(", ");
-
-        for (String item : items) {
-            if (item.contains("(") && item.contains(")")) {
-                int openParenIndex = item.lastIndexOf("(");
-                int closeParenIndex = item.lastIndexOf(")");
-                String itemName = item.substring(0, openParenIndex).trim();
-                int count = Integer.parseInt(item.substring(openParenIndex + 1, closeParenIndex).trim());
-                itemCounts.put(itemName, itemCounts.getOrDefault(itemName, 0) + count);
-            } else {
-                itemCounts.put(item, 0);
-            }
-        }
-
-        StringBuilder mergedItems = new StringBuilder();
-
-        for (Map.Entry<String, Integer> entry : itemCounts.entrySet()) {
-            String itemName = entry.getKey();
-            int count = entry.getValue();
-            if (count != 0) {
-                mergedItems.append(itemName).append(" (").append(count).append("), ");
-            }
-        }
-
-        return mergedItems.substring(0, mergedItems.length() - 2);
-    }
-
     class MarkInfoTab implements IMessageEditorTab {
         private final JTabbedPane jTabbedPane = new JTabbedPane();
         private DatatablePanel dataPanel;
@@ -248,21 +152,26 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
         @Override
         public boolean isEnabled(byte[] content, boolean isRequest) {
             List<Map<String, String>> result = null;
-
-            try {
-                result = messageProcessor.processMessage(helpers, content, isRequest, false, "");
-            } catch (NoSuchAlgorithmException e) {
-                throw new RuntimeException(e);
-            }
-
-            if (result != null && !result.isEmpty()) {
-                Map<String, String> dataMap = result.get(0);
-                if (isRequest) {
-                    extractRequestMap = dataMap;
-                } else {
-                    extractResponseMap = dataMap;
+            if (content.length != 0 && !helpers.bytesToString(content).equals("Loading...")) {
+                try {
+                    if (isRequest) {
+                        result = messageProcessor.processRequestMessage(helpers, content, "", false);
+                    } else {
+                        result = messageProcessor.processResponseMessage(helpers, content, "", false);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+                if (result != null && !result.isEmpty()) {
+                    Map<String, String> dataMap = result.get(0);
+                    if (isRequest) {
+                        extractRequestMap = dataMap;
+                    } else {
+                        extractResponseMap = dataMap;
+                    }
+                    return true;
                 }
-                return true;
             }
             return false;
         }

src/main/java/burp/config/ConfigEntry.java

@@ -3,6 +3,7 @@ package burp.config;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class ConfigEntry {
     public static String excludeSuffix = "3g2|3gp|7z|aac|abw|aif|aifc|aiff|apk|arc|au|avi|azw|bat|bin|bmp|bz|bz2|cmd|cmx|cod|com|csh|css|csv|dll|doc|docx|ear|eot|epub|exe|flac|flv|gif|gz|ico|ics|ief|jar|jfif|jpe|jpeg|jpg|less|m3u|mid|midi|mjs|mkv|mov|mp2|mp3|mp4|mpa|mpe|mpeg|mpg|mpkg|mpp|mpv2|odp|ods|odt|oga|ogg|ogv|ogx|otf|pbm|pdf|pgm|png|pnm|ppm|ppt|pptx|ra|ram|rar|ras|rgb|rmi|rtf|scss|sh|snd|svg|swf|tar|tif|tiff|ttf|vsd|war|wav|weba|webm|webp|wmv|woff|woff2|xbm|xls|xlsx|xpm|xul|xwd|zip";
@@ -38,5 +39,5 @@ public class ConfigEntry {
 
     public static Map<String,Object[][]> globalRules = null;
 
-    public static Map<String, Map<String, List<String>>> globalDataMap = new HashMap<>();
+    public static ConcurrentHashMap<String, Map<String, List<String>>> globalDataMap = new ConcurrentHashMap<>();
 }

src/main/java/burp/config/ConfigLoader.java

@@ -143,7 +143,7 @@ public class ConfigLoader {
         Map<String,Object> r = new LinkedHashMap<>();
         r.put("excludeSuffix", excludeSuffix);
         try{
-            Writer ws = new OutputStreamWriter(Files.newOutputStream(Paths.get(RulesFilePath)), StandardCharsets.UTF_8);
+            Writer ws = new OutputStreamWriter(Files.newOutputStream(Paths.get(ConfigFilePath)), StandardCharsets.UTF_8);
             yaml.dump(r, ws);
             ws.close();
         }catch (Exception ex){

src/main/java/burp/core/processor/DataProcessingUnit.java

@@ -1,5 +1,6 @@
 package burp.core.processor;
 
+import burp.BurpExtender;
 import burp.core.GlobalCachePool;
 import burp.core.utils.HashCalculator;
 import burp.core.utils.MatchTool;
@@ -13,6 +14,7 @@ import java.nio.charset.StandardCharsets;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
 
+import java.util.concurrent.ConcurrentHashMap;
 import jregex.Matcher;
 import jregex.Pattern;
 
@@ -93,31 +95,37 @@ public class DataProcessingUnit {
                                 break;
                         }
 
-                        if ("nfa".equals(engine)) {
-                            Pattern pattern;
-                            // 判断规则是否大小写敏感
-                            if (sensitive) {
-                                pattern = new Pattern(regex);
-                            } else {
-                                pattern = new Pattern(regex, Pattern.IGNORE_CASE);
-                            }
+                        try {
+                            if ("nfa".equals(engine)) {
+                                Pattern pattern;
+                                // 判断规则是否大小写敏感
+                                if (sensitive) {
+                                    pattern = new Pattern(regex);
+                                } else {
+                                    pattern = new Pattern(regex, Pattern.IGNORE_CASE);
+                                }
 
-                            Matcher matcher = pattern.matcher(matchContent);
-                            while (matcher.find()) {
-                                // 添加匹配数据至list
-                                // 强制用户使用()包裹正则
-                                result.add(matcher.group(1));
-                            }
-                        } else {
-                            RegExp regexp = new RegExp(regex);
-                            Automaton auto = regexp.toAutomaton();
-                            RunAutomaton runAuto = new RunAutomaton(auto, true);
-                            AutomatonMatcher autoMatcher = runAuto.newMatcher(matchContent);
-                            while (autoMatcher.find()) {
-                                // 添加匹配数据至list
-                                // 强制用户使用()包裹正则
-                                result.add(autoMatcher.group());
+                                Matcher matcher = pattern.matcher(matchContent);
+                                while (matcher.find()) {
+                                    // 添加匹配数据至list
+                                    // 强制用户使用()包裹正则
+                                    result.add(matcher.group(1));
+                                }
+                            } else {
+                                RegExp regexp = new RegExp(regex);
+                                Automaton auto = regexp.toAutomaton();
+                                RunAutomaton runAuto = new RunAutomaton(auto, true);
+                                AutomatonMatcher autoMatcher = runAuto.newMatcher(matchContent);
+                                while (autoMatcher.find()) {
+                                    // 添加匹配数据至list
+                                    // 强制用户使用()包裹正则
+                                    result.add(autoMatcher.group());
+                                }
                             }
+                        } catch (Exception e) {
+                            BurpExtender.stdout.println(String.format("[x] Error Info:\nName: %s\nRegex: %s", name, regex));
+                            e.printStackTrace();
+                            continue;
                         }
 
                         // 去除重复内容
@@ -132,10 +140,10 @@ public class DataProcessingUnit {
                             tmpMap.put("data", dataStr);
                             finalMap.put(nameAndSize, tmpMap);
                             // 添加到全局变量中，便于Databoard检索
-                            if (!Objects.equals(host, "")) {
+                            if (!Objects.equals(host, "") && host != null) {
                                 List<String> dataList = Arrays.asList(dataStr.split("\n"));
                                 if (ConfigEntry.globalDataMap.containsKey(host)) {
-                                    Map<String, List<String>> gRuleMap = new HashMap<>(ConfigEntry.globalDataMap.get(host));
+                                    ConcurrentHashMap<String, List<String>> gRuleMap = new ConcurrentHashMap<>(ConfigEntry.globalDataMap.get(host));
                                     if (gRuleMap.containsKey(name)) {
                                         // gDataList为不可变列表，因此需要重新创建一个列表以便于使用addAll方法
                                         List<String> gDataList = gRuleMap.get(name);

src/main/java/burp/core/processor/MessageProcessor.java

@@ -1,10 +1,10 @@
 package burp.core.processor;
 
 import burp.IExtensionHelpers;
+import burp.IHttpRequestResponse;
 import burp.IRequestInfo;
 import burp.IResponseInfo;
 import burp.core.utils.MatchTool;
-import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -12,53 +12,98 @@ import java.util.List;
 import java.util.Map;
 
 public class MessageProcessor {
-    MatchTool matcher = new MatchTool();
-    DataProcessingUnit dataProcessingUnit = new DataProcessingUnit();
-    ColorProcessor colorProcessor = new ColorProcessor();
+    private MatchTool matcher = new MatchTool();
+    private DataProcessingUnit dataProcessingUnit = new DataProcessingUnit();
+    private ColorProcessor colorProcessor = new ColorProcessor();
 
-    public List<Map<String, String>> processMessage(IExtensionHelpers helpers, byte[] content, boolean isRequest, boolean messageInfo, String host)
-            throws NoSuchAlgorithmException {
-        List<Map<String, String>> result = new ArrayList<>();
-        Map<String, Map<String, Object>> obj;
+    public List<Map<String, String>> processMessage(IExtensionHelpers helpers, IHttpRequestResponse messageInfo, String host, boolean actionFlag) throws Exception {
 
-        if (isRequest) {
-            IRequestInfo requestInfo = helpers.analyzeRequest(content);
-            List<String> requestTmpHeaders = requestInfo.getHeaders();
-            String requestHeaders = String.join("\n", requestTmpHeaders);
+        byte[] requestByte = messageInfo.getRequest();
+        byte[] responseByte = messageInfo.getResponse();
 
-            try {
-                String urlString = requestTmpHeaders.get(0).split(" ")[1];
-                urlString = urlString.indexOf("?") > 0 ? urlString.substring(0, urlString.indexOf("?")) : urlString;
-                if (matcher.matchUrlSuffix(urlString)) {
-                    return result;
-                }
-            } catch (Exception e) {
-                return result;
+        List<Map<String, String>> reqObj = processRequestMessage(helpers, requestByte, host, actionFlag);
+        List<Map<String, String>> resObj = processResponseMessage(helpers, responseByte, host, actionFlag);
+        List<Map<String, String>> mergedList = new ArrayList<>();
+
+        if (reqObj != null && !reqObj.isEmpty()) {
+            if (resObj != null && !resObj.isEmpty()) {
+                List<String> colorList = new ArrayList<>();
+
+                colorList.add(reqObj.get(0).get("color"));
+                colorList.add(resObj.get(0).get("color"));
+                Map<String, String> colorMap = new HashMap<>();
+                colorMap.put("color", colorProcessor.retrieveFinalColor(colorProcessor.retrieveColorIndices(colorList)));
+
+                Map<String, String> commentMap = new HashMap<>();
+                String commentList = String.format("%s, %s", reqObj.get(1).get("comment"), resObj.get(1).get("comment"));
+                commentMap.put("comment", commentList);
+
+                mergedList.add(0, colorMap);
+                mergedList.add(1, commentMap);
+            } else {
+                mergedList = new ArrayList<>(reqObj);
             }
-
-            int requestBodyOffset = requestInfo.getBodyOffset();
-            byte[] requestBody = Arrays.copyOfRange(content, requestBodyOffset, content.length);
-            obj = dataProcessingUnit.matchContentByRegex(content, requestHeaders, requestBody, "request", host);
-        } else {
-            IResponseInfo responseInfo = helpers.analyzeResponse(content);
-            try {
-                String inferredMimeType = String.format("hae.%s", responseInfo.getInferredMimeType().toLowerCase());
-                String statedMimeType = String.format("hae.%s", responseInfo.getStatedMimeType().toLowerCase());
-                if (matcher.matchUrlSuffix(statedMimeType) || matcher.matchUrlSuffix(inferredMimeType)) {
-                    return result;
-                }
-            } catch (Exception e) {
-                return result;
-            }
-            List<String> responseTmpHeaders = responseInfo.getHeaders();
-            String responseHeaders = String.join("\n", responseTmpHeaders);
-            int responseBodyOffset = responseInfo.getBodyOffset();
-            byte[] responseBody = Arrays.copyOfRange(content, responseBodyOffset, content.length);
-            obj = dataProcessingUnit.matchContentByRegex(content, responseHeaders, responseBody, "response", host);
+        } else if (resObj != null && !resObj.isEmpty()){
+            mergedList = new ArrayList<>(resObj);
         }
 
+        return mergedList;
+    }
+
+    public List<Map<String, String>> processRequestMessage(IExtensionHelpers helpers, byte[] content, String host, boolean actionFlag) throws Exception {
+        Map<String, Map<String, Object>> obj;
+
+        IRequestInfo requestInfo = helpers.analyzeRequest(content);
+        List<String> requestTmpHeaders = requestInfo.getHeaders();
+        String requestHeaders = String.join("\n", requestTmpHeaders);
+
+        try {
+            String urlString = requestTmpHeaders.get(0).split(" ")[1];
+            urlString = urlString.indexOf("?") > 0 ? urlString.substring(0, urlString.indexOf("?")) : urlString;
+            if (matcher.matchUrlSuffix(urlString)) {
+                return null;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+
+        int requestBodyOffset = requestInfo.getBodyOffset();
+        byte[] requestBody = Arrays.copyOfRange(content, requestBodyOffset, content.length);
+        obj = dataProcessingUnit.matchContentByRegex(content, requestHeaders, requestBody, "request", host);
+
+        return getDataList(obj, actionFlag);
+    }
+
+    public List<Map<String, String>> processResponseMessage(IExtensionHelpers helpers, byte[] content, String host, boolean actionFlag) throws Exception {
+        Map<String, Map<String, Object>> obj;
+
+        IResponseInfo responseInfo = helpers.analyzeResponse(content);
+        try {
+            String inferredMimeType = String.format("hae.%s", responseInfo.getInferredMimeType().toLowerCase());
+            String statedMimeType = String.format("hae.%s", responseInfo.getStatedMimeType().toLowerCase());
+            if (matcher.matchUrlSuffix(statedMimeType) || matcher.matchUrlSuffix(inferredMimeType)) {
+                return null;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+        List<String> responseTmpHeaders = responseInfo.getHeaders();
+        String responseHeaders = String.join("\n", responseTmpHeaders);
+        int responseBodyOffset = responseInfo.getBodyOffset();
+        byte[] responseBody = Arrays.copyOfRange(content, responseBodyOffset, content.length);
+        obj = dataProcessingUnit.matchContentByRegex(content, responseHeaders, responseBody, "response", host);
+
+        return getDataList(obj, actionFlag);
+    }
+
+    private List<Map<String, String>> getDataList(Map<String, Map<String, Object>> obj, boolean actionFlag) {
+        List<Map<String, String>> highlightList = new ArrayList<>();
+        List<Map<String, String>> extractList = new ArrayList<>();
+
         if (obj.size() > 0) {
-            if (messageInfo) {
+            if (actionFlag) {
                 List<List<String>> resultList = dataProcessingUnit.extractColorsAndComments(obj);
                 List<String> colorList = resultList.get(0);
                 List<String> commentList = resultList.get(1);
@@ -70,13 +115,14 @@ public class MessageProcessor {
                     Map<String, String> commentMap = new HashMap<String, String>() {{
                         put("comment", String.join(", ", commentList));
                     }};
-                    result.add(colorMap);
-                    result.add(commentMap);
+                    highlightList.add(colorMap);
+                    highlightList.add(commentMap);
                 }
             } else {
-                result.add(dataProcessingUnit.extractDataFromMap(obj));
+                extractList.add(dataProcessingUnit.extractDataFromMap(obj));
             }
         }
-        return result;
+
+        return actionFlag ? highlightList : extractList;
     }
 }

src/main/java/burp/core/utils/StringHelper.java

@@ -1,5 +1,8 @@
 package burp.core.utils;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class StringHelper {
     public static String replaceFirstOccurrence(String original, String find, String replace) {
         int index = original.indexOf(find);
@@ -27,4 +30,37 @@ public class StringHelper {
         // 如果patternIndex为-1，表示pattern字符串已经完全匹配
         return patternIndex == -1;
     }
+
+    public static String mergeComment(String comment) {
+        if (!comment.contains(",")) {
+            return comment;
+        }
+
+        Map<String, Integer> itemCounts = new HashMap<>();
+        String[] items = comment.split(", ");
+
+        for (String item : items) {
+            if (item.contains("(") && item.contains(")")) {
+                int openParenIndex = item.lastIndexOf("(");
+                int closeParenIndex = item.lastIndexOf(")");
+                String itemName = item.substring(0, openParenIndex).trim();
+                int count = Integer.parseInt(item.substring(openParenIndex + 1, closeParenIndex).trim());
+                itemCounts.put(itemName, itemCounts.getOrDefault(itemName, 0) + count);
+            } else {
+                itemCounts.put(item, 0);
+            }
+        }
+
+        StringBuilder mergedItems = new StringBuilder();
+
+        for (Map.Entry<String, Integer> entry : itemCounts.entrySet()) {
+            String itemName = entry.getKey();
+            int count = entry.getValue();
+            if (count != 0) {
+                mergedItems.append(itemName).append(" (").append(count).append("), ");
+            }
+        }
+
+        return mergedItems.substring(0, mergedItems.length() - 2);
+    }
 }

src/main/java/burp/rule/utils/RuleTool.java

@@ -1,8 +1,6 @@
 package burp.rule.utils;
 
 import burp.*;
-import burp.config.ConfigEntry;
-import burp.config.ConfigLoader;
 import java.io.FileOutputStream;
 import java.net.URL;
 import java.util.Arrays;

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

@@ -6,6 +6,9 @@ import burp.rule.RuleProcessor;
 import burp.ui.board.Databoard;
 import burp.ui.board.MessagePanel;
 import burp.ui.rule.RulePane;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.net.URL;
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
@@ -134,7 +137,31 @@ public class MainUI extends JPanel {
             mainTabbedPane.addTab("Config", rulePanel);
             mainTabbedPane.addTab("Databoard", this.databoardPanel);
         }
-        add(mainTabbedPane, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
+
+        // 新增Logo
+        JTabbedPane HaETabbedPane = new JTabbedPane();
+        HaETabbedPane.addTab("", getImageIcon(false), mainTabbedPane);
+        HaETabbedPane.addTab(" Highlighter and Extractor - Empower ethical hacker for efficient operations ", null);
+        HaETabbedPane.setEnabledAt(1, false);
+        HaETabbedPane.addPropertyChangeListener("background", new PropertyChangeListener() {
+            @Override
+            public void propertyChange(PropertyChangeEvent e) {
+                boolean isDarkBg = isDarkBg();
+                HaETabbedPane.setIconAt(0, getImageIcon(isDarkBg));
+            }
+
+            private boolean isDarkBg() {
+                Color bg = HaETabbedPane.getBackground();
+                int r = bg.getRed();
+                int g = bg.getGreen();
+                int b = bg.getBlue();
+                int avg = (r + g + b) / 3;
+
+                return avg < 128;
+            }
+        });
+
+        add(HaETabbedPane, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, 0, 0, 0), 0, 0));
 
@@ -153,6 +180,21 @@ public class MainUI extends JPanel {
         tabMenu.add(deleteMenuItem);
     }
 
+    private ImageIcon getImageIcon(boolean isDark) {
+        ClassLoader classLoader = getClass().getClassLoader();
+        URL imageURL;
+        if (isDark) {
+            imageURL = classLoader.getResource("logo.png");
+        } else {
+            imageURL = classLoader.getResource("logo_black.png");
+        }
+        ImageIcon originalIcon = new ImageIcon(imageURL);
+        Image originalImage = originalIcon.getImage();
+        Image scaledImage = originalImage.getScaledInstance(30, 20, Image.SCALE_FAST);
+        ImageIcon scaledIcon = new ImageIcon(scaledImage);
+        return scaledIcon;
+    }
+
     private JTabbedPane ruleTabbedPane;
     private JTextField rulesPathTextField;
     private JTextField excludeSuffixTextField;

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

@@ -5,8 +5,8 @@ import burp.core.utils.StringHelper;
 import burp.ui.board.MessagePanel.Table;
 
 import java.util.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
+import java.util.concurrent.ConcurrentHashMap;
+import javax.swing.event.*;
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableColumnModel;
 import javax.swing.table.TableModel;
@@ -15,8 +15,6 @@ import java.awt.*;
 import java.awt.event.*;
 import java.util.List;
 import javax.swing.*;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
 
 /**
  * @author LinChen && EvilChen
@@ -48,7 +46,6 @@ public class Databoard extends JPanel {
         }
     };
 
-
     public Databoard(MessagePanel messagePanel) {
         this.messagePanel = messagePanel;
         initComponents();
@@ -94,42 +91,25 @@ public class Databoard extends JPanel {
 
         //---- hostLabel ----
         hostLabel.setText("Host:");
-        add(hostLabel, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+        add(hostLabel, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(8, 0, 5, 5), 0, 0));
-        add(hostTextField, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+        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,
+        add(clearButton,  new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+                new Insets(8, 0, 5, 5), 0, 0));
+
+        hostComboBox.setMaximumRowCount(5);
+        add(hostComboBox, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(8, 0, 5, 5), 0, 0));
 
         splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
         splitPane.setVisible(false);
-
-        add(splitPane, new GridBagConstraints(1, 1, 3, 2, 0.0, 0.0,
+        add(splitPane, new GridBagConstraints(1, 1, 3, 3, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(8, 0, 5, 5), 0, 0));
 
-        hostTextField.setLayout(new BorderLayout());
-        hostTextField.add(hostComboBox, BorderLayout.SOUTH);
-        hostComboBox.setMaximumRowCount(5);
-        hostComboBox.setPreferredSize(new Dimension(super.getPreferredSize().width, 0));
-
-        // 由于主题切换造成的UI组件重绘，而自定义组件没有正确地与之同步，因此需要事件监听来进行同步
-        UIManager.addPropertyChangeListener(evt -> {
-            if ("lookAndFeel".equals(evt.getPropertyName())) {
-                SwingUtilities.invokeLater(() -> {
-                    hostTextField.remove(hostComboBox);
-                    hostTextField.add(hostComboBox, BorderLayout.SOUTH);
-                    hostTextField.revalidate();
-                    hostTextField.repaint();
-                });
-            }
-        });
-
         setAutoMatch();
     }
 
@@ -156,22 +136,19 @@ public class Databoard extends JPanel {
         hostTextField.getDocument().addDocumentListener(new DocumentListener() {
             @Override
             public void insertUpdate(DocumentEvent e) {
-                update(e);
+                filterComboBoxList();
             }
 
             @Override
             public void removeUpdate(DocumentEvent e) {
-                update(e);
+                filterComboBoxList();
             }
 
             @Override
             public void changedUpdate(DocumentEvent e) {
-                update(e);
-            }
-
-            public void update(DocumentEvent e) {
                 filterComboBoxList();
             }
+
         });
     }
 
@@ -188,7 +165,6 @@ public class Databoard extends JPanel {
             populateTabbedPaneByHost(selectedHost);
         }
     }
-
     private void handleKeyEvents(KeyEvent e) {
         isMatchHost = true;
         int keyCode = e.getKeyCode();
@@ -197,14 +173,14 @@ public class Databoard extends JPanel {
             e.setKeyCode(KeyEvent.VK_ENTER);
         }
 
-        if (Arrays.asList(KeyEvent.VK_ENTER, KeyEvent.VK_UP, KeyEvent.VK_DOWN).contains(keyCode)) {
-            e.setSource(hostComboBox);
+        if (Arrays.asList(KeyEvent.VK_DOWN, KeyEvent.VK_UP).contains(keyCode)) {
             hostComboBox.dispatchEvent(e);
-            if (keyCode == KeyEvent.VK_ENTER) {
-                updateTextFieldFromComboBox();
-                hostComboBox.setPopupVisible(false);
-                e.consume();
-            }
+        }
+
+        if (keyCode == KeyEvent.VK_ENTER) {
+            isMatchHost = false;
+            handleComboBoxAction(null);
+            hostComboBox.setPopupVisible(false);
         }
 
         if (keyCode == KeyEvent.VK_ESCAPE) {
@@ -214,15 +190,6 @@ public class Databoard extends JPanel {
         isMatchHost = false;
     }
 
-    private void updateTextFieldFromComboBox() {
-        Object selectedItem = hostComboBox.getSelectedItem();
-        if (selectedItem != null) {
-            String selectedHost = selectedItem.toString();
-            hostTextField.setText(selectedHost);
-            populateTabbedPaneByHost(selectedHost);
-        }
-    }
-
     private void filterComboBoxList() {
         isMatchHost = true;
         comboBoxModel.removeAllElements();
@@ -249,24 +216,28 @@ public class Databoard extends JPanel {
     private void applyHostFilter(String filterText) {
         TableRowSorter<TableModel> sorter = (TableRowSorter<TableModel>) table.getRowSorter();
 
-        if (filterText.contains("*.")) {
-            filterText = StringHelper.replaceFirstOccurrence(filterText, "*.", "");
-        } else if (filterText.contains("*")) {
-            filterText = "";
+        String cleanedText = StringHelper.replaceFirstOccurrence(filterText, "*.", "");
+
+        if (cleanedText.contains("*")) {
+            cleanedText = "";
         }
 
-        RowFilter<TableModel, Integer> filter = RowFilter.regexFilter(filterText, 1);
+        RowFilter<TableModel, Integer> filter = RowFilter.regexFilter(cleanedText, 1);
         sorter.setRowFilter(filter);
-        filterText = filterText.isEmpty() ? "*" : filterText;
 
         messagePanel.applyHostFilter(filterText);
     }
 
     private void populateTabbedPaneByHost(String selectedHost) {
         if (!Objects.equals(selectedHost, "")) {
-            Map<String, Map<String, List<String>>> dataMap = ConfigEntry.globalDataMap;
+            ConcurrentHashMap<String, Map<String, List<String>>> dataMap = ConfigEntry.globalDataMap;
             Map<String, List<String>> selectedDataMap;
 
+            dataTabbedPane.removeAll();
+            dataTabbedPane.setPreferredSize(new Dimension(500,0));
+            dataTabbedPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
+            splitPane.setLeftComponent(dataTabbedPane);
+
             if (selectedHost.contains("*")) {
                 // 通配符数据
                 selectedDataMap = new HashMap<>();
@@ -291,19 +262,10 @@ public class Databoard extends JPanel {
                 selectedDataMap = dataMap.get(selectedHost);
             }
 
-            dataTabbedPane.removeAll();
-
-            dataTabbedPane.setPreferredSize(new Dimension(500,0));
-            dataTabbedPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
-            splitPane.setLeftComponent(dataTabbedPane);
-
             if (selectedHost.equals("**")) {
-                for (Map.Entry<String, Map<String, List<String>>> entry : dataMap.entrySet()) {
+                for (ConcurrentHashMap.Entry<String, Map<String, List<String>>> entry : dataMap.entrySet()) {
                     JTabbedPane newTabbedPane = new JTabbedPane();
                     newTabbedPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
-                    if (currentWorker != null && !currentWorker.isDone()) {
-                        currentWorker.cancel(true);
-                    }
 
                     for (Map.Entry<String, List<String>> entrySet : entry.getValue().entrySet()) {
                         currentWorker = new SwingWorker<Object, Void>() {
@@ -322,8 +284,10 @@ public class Databoard extends JPanel {
                                 if (!isCancelled()) {
                                     try {
                                         Object[] result = (Object[]) get();
-                                        newTabbedPane.addTab(result[0].toString(), (DatatablePanel) result[1]);
-                                        dataTabbedPane.addTab(entry.getKey(), newTabbedPane);
+                                        SwingUtilities.invokeLater(() -> {
+                                            newTabbedPane.addTab(result[0].toString(), (DatatablePanel) result[1]);
+                                            dataTabbedPane.addTab(entry.getKey(), newTabbedPane);
+                                        });
                                     } catch (Exception e) {
                                         e.printStackTrace();
                                     }
@@ -385,4 +349,4 @@ public class Databoard extends JPanel {
             dataTabbedPane.addChangeListener(changeListener);
         }
     }
-}
+}

src/main/java/burp/ui/board/MessagePanel.java

@@ -182,9 +182,13 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
     public void applyHostFilter(String filterText) {
         filteredLog.clear();
         fireTableDataChanged();
+        String cleanedText = StringHelper.replaceFirstOccurrence(filterText, "*.", "");
+
         for (LogEntry entry : log) {
             String host = entry.getUrl().getHost();
-            if (StringHelper.matchFromEnd(host, filterText) || filterText.contains("*")) {
+            if (filterText.contains("*.") && StringHelper.matchFromEnd(host, cleanedText)) {
+                filteredLog.add(entry);
+            } else if (host.equals(filterText) || filterText.contains("*")) {
                 filteredLog.add(entry);
             }
         }
@@ -308,13 +312,13 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
         return currentlyDisplayedItem.getHttpService();
     }
 
-    public void add(IHttpRequestResponse messageInfo, String comment, String length, String color) {
+    public void add(IHttpRequestResponse messageInfo, String comment, String color) {
         synchronized(log) {
             IRequestInfo iRequestInfo = helpers.analyzeRequest(messageInfo);
             URL url = iRequestInfo.getUrl();
             String method = iRequestInfo.getMethod();
             String status = String.valueOf(helpers.analyzeResponse(messageInfo.getResponse()).getStatusCode());
-
+            String length = String.valueOf(messageInfo.getResponse().length);
             LogEntry logEntry = new LogEntry(callbacks.saveBuffersToTempFiles(messageInfo), method, url, comment, length, color, status);
 
             try {
@@ -329,8 +333,8 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
                         byte[] reqByteB = reqResMessage.getRequest();
                         byte[] resByteB = reqResMessage.getResponse();
                         try {
-                            // 采用匹配数据结果比对
-                            if (areMapsEqual(getCacheData(reqByteB), getCacheData(reqByteA)) && areMapsEqual(getCacheData(resByteB), getCacheData(resByteA))) {
+                            // 通过URL、请求和响应报文、匹配数据内容，多维度进行对比
+                            if ((entry.getUrl().toString().equals(url.toString()) || (Arrays.equals(reqByteB, reqByteA) || Arrays.equals(resByteB, resByteA))) && (areMapsEqual(getCacheData(reqByteB), getCacheData(reqByteA)) && areMapsEqual(getCacheData(resByteB), getCacheData(resByteA)))) {
                                 isDuplicate = true;
                                 break;
                             }