Version: 2.5.10 Update

.github/ISSUE_TEMPLATE/问题反馈.md

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

README.md

@@ -21,6 +21,24 @@
 1. Linux/Mac用户的配置文件目录：`~/.config/HaE/`
 2. Windows用户的配置文件目录：`%USERPROFILE%/.config/HaE/`
 
+除此之外，您也可以选择将配置文件存放在`HaE Jar包`的同级目录下的`/.config/HaE/`中，**以便于离线携带**。
+
+### 规则释义
+
+HaE目前的规则一共有6个字段，分别是规则名称、规则正则、规则作用域、正则引擎、规则匹配颜色、规则敏感性。
+
+详细的含义如下所示：
+
+| 字段      | 含义                                                                                                                                                                                                   |
+|-----------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Name      | 规则名称，主要用于简短概括当前规则的作用。                                                                                                                                                               |
+| Regex     | 规则正则，主要用于填写正则表达式。在HaE中所需提取匹配的内容需要用`(`、`)`将正则表达式进行包裹。                                                                                                            |
+| Scope     | 规则作用域，主要用于表示当前规则作用于HTTP报文的哪个部分。                                                                                                                                               |
+| Engine    | 正则引擎，主要用于表示当前规则的正则表达式所使用的引擎。**DFA引擎**：对于文本串里的每一个字符只需扫描一次，速度快、特性少；**NFA引擎**：要翻来覆去标注字符、取消标注字符，速度慢，但是特性（如:分组、替换、分割）丰富。 |
+| Color     | 规则匹配颜色，主要用于表示当前规则匹配到对应HTTP报文时所需标记的高亮颜色。                                                                                                                               |
+| Sensitive | 规则敏感性，主要用于表示当前规则对于大小写字母是否敏感，敏感（`True`）则严格按照大小写要求匹配，不敏感（`False`）则反之。                                                                                      |
+
+
 ## 优势特点
 
 1. 精细配置：高度自由的配置选项，以满足各类精细化场景需求。
@@ -38,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)
-
 ## 文末随笔
 
 正义感是一个不可丢失的东西。
@@ -64,4 +72,4 @@
 
 `HaE` 是 404Team [星链计划2.0](https://github.com/knownsec/404StarLink2.0-Galaxy) 中的一环，如果对 `HaE` 有任何疑问又或是想要找小伙伴交流，可以参考星链计划的加群方式。
 
-- [https://github.com/knownsec/404StarLink2.0-Galaxy#community](https://github.com/knownsec/404StarLink2.0-Galaxy#community)
+- [https://github.com/knownsec/404StarLink2.0-Galaxy#community](https://github.com/knownsec/404StarLink2.0-Galaxy#community)

build.gradle

@@ -30,5 +30,4 @@ dependencies {
     compile group: 'org.yaml', name: 'snakeyaml', version: '1.28'
     compile 'net.sourceforge.jregex:jregex:1.2_01'
     compile 'dk.brics.automaton:automaton:1.11-8'
-    compile 'com.squareup.okhttp:okhttp:2.7.5'
+}
-}

src/main/java/burp/BurpExtender.java

@@ -1,17 +1,16 @@
 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.security.NoSuchAlgorithmException;
+import java.util.*;
-import java.util.Map;
-import java.util.Objects;
 import javax.swing.*;
 import java.awt.*;
-import java.nio.charset.StandardCharsets;
 import java.io.PrintWriter;
-import java.util.ArrayList;
 import java.util.List;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
@@ -22,10 +21,9 @@ import javax.swing.event.ChangeListener;
 
 public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEditorTabFactory, ITab {
     private MainUI main;
-    // stdout变成公开属性，便于其他类调用输出调试信息
     public static PrintWriter stdout;
-    private IBurpExtenderCallbacks callbacks;
+    public static IBurpExtenderCallbacks callbacks;
-    private static IExtensionHelpers helpers;
+    public static IExtensionHelpers helpers;
     ColorProcessor colorProcessor = new ColorProcessor();
     MessageProcessor messageProcessor = new MessageProcessor();
     private MessagePanel messagePanel;
@@ -33,10 +31,12 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
     @Override
     public void registerExtenderCallbacks(final IBurpExtenderCallbacks callbacks)
     {
-        this.callbacks = callbacks;
+        BurpExtender.callbacks = callbacks;
         BurpExtender.helpers = callbacks.getHelpers();
 
-        String version = "2.5";
+        new ConfigLoader();
+
+        String version = "2.5.10";
         callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
 
         // 定义输出
@@ -58,7 +58,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 
     }
 
-    private void initialize(){
+    private void initialize() {
         messagePanel = new MessagePanel(callbacks, helpers);
         main = new MainUI(messagePanel);
         callbacks.customizeUiComponent(main);
@@ -66,7 +66,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
     }
 
     @Override
-    public String getTabCaption(){
+    public String getTabCaption() {
         return "HaE";
     }
 
@@ -82,65 +82,48 @@ 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) {
+                List<Map<String, String>> result = null;
-                content = messageInfo.getRequest();
-            } else {
-                content = messageInfo.getResponse();
-            }
 
-            IHttpService iHttpService = null;
+                String originalColor = messageInfo.getHighlight();
+                String originalComment = messageInfo.getComment();
 
-            try {
+                try {
-                iHttpService = messageInfo.getHttpService();
+                    result = messageProcessor.processMessage(helpers, messageInfo, host, true);
-            } catch (Exception ignored) {
-            }
 
-            // 获取请求主机信息
+                    if (result != null && !result.isEmpty() && result.size() > 0) {
-            assert iHttpService != null;
+                        List<String> colorList = new ArrayList<>();
-            String host = iHttpService.getHost();
 
-            String c = new String(content, StandardCharsets.UTF_8).intern();
+                        if (originalColor != null) {
+                            colorList.add(originalColor);
+                        }
 
-            List<Map<String, String>> result = null;
+                        colorList.add(result.get(0).get("color"));
-            try {
+                        String resColor = colorProcessor.retrieveFinalColor(colorProcessor.retrieveColorIndices(colorList));
-                result = messageProcessor.processMessage(helpers, content, messageIsRequest, true, host);
+                        messageInfo.setHighlight(resColor);
-            } catch (NoSuchAlgorithmException e) {
-                throw new RuntimeException(e);
-            }
-            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) {
+                        String addComment = String.join(", ", result.get(1).get("comment"));
-                    colorList.add(originalColor);
+                        String allComment = !Objects.equals(originalComment, "") ? String.format("%s, %s", originalComment, addComment) : addComment;
+                        String resComment = StringHelper.mergeComment(allComment);
+                        messageInfo.setComment(resComment);
+
+                        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"));
-                resComment = !Objects.equals(originalComment, "") ? String.format("%s, %s", originalComment, addComment) : addComment;
-                messageInfo.setComment(resComment);
             }
 
-            String endComment = resComment.isEmpty() ? originalComment : resComment;
-            String endColor = resColor.isEmpty() ? originalColor : resColor;
-
-            if (!messageIsRequest && !endComment.isEmpty() && !endColor.isEmpty()) {
-                messagePanel.add(messageInfo, endComment, String.valueOf(content.length), endColor);
-            }
         }
     }
 
     class MarkInfoTab implements IMessageEditorTab {
         private final JTabbedPane jTabbedPane = new JTabbedPane();
-        private JTable jTable = new JTable();
+        private DatatablePanel dataPanel;
+        private JTable dataTable;
         private final IMessageEditorController controller;
         private Map<String, String> extractRequestMap;
         private Map<String, String> extractResponseMap;
@@ -160,30 +143,35 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
             jTabbedPane.addChangeListener(new ChangeListener() {
                 @Override
                 public void stateChanged(ChangeEvent arg0) {
-                    jTable = (JTable) ((JScrollPane)jTabbedPane.getSelectedComponent()).getViewport().getView();
+                    dataTable = ((DatatablePanel)jTabbedPane.getSelectedComponent()).getTable();
                 }
             });
-            return this.jTabbedPane;
+            return jTabbedPane;
         }
 
         @Override
         public boolean isEnabled(byte[] content, boolean isRequest) {
-            String c = new String(content, StandardCharsets.UTF_8).intern();
             List<Map<String, String>> result = null;
-            try {
+            if (content.length != 0 && !helpers.bytesToString(content).equals("Loading...")) {
-                result = messageProcessor.processMessage(helpers, content, isRequest, false, "");
+                try {
-            } catch (NoSuchAlgorithmException e) {
+                    if (isRequest) {
-                throw new RuntimeException(e);
+                        result = messageProcessor.processRequestMessage(helpers, content, "", false);
-            }
+                    } else {
-
+                        result = messageProcessor.processResponseMessage(helpers, content, "", false);
-            if (result != null && !result.isEmpty()) {
+                    }
-                Map<String, String> dataMap = result.get(0);
+                } catch (Exception e) {
-                if (isRequest) {
+                    e.printStackTrace();
-                    extractRequestMap = dataMap;
+                }
-                } else {
+
-                    extractResponseMap = dataMap;
+                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;
         }
@@ -203,15 +191,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
          */
         @Override
         public byte[] getSelectedData() {
-            int[] selectRows = jTable.getSelectedRows();
+            return helpers.stringToBytes(dataPanel.getSelectedData(dataTable));
-            StringBuilder selectData = new StringBuilder();
-            for (int row : selectRows) {
-                selectData.append(jTable.getValueAt(row, 0).toString()).append("\n");
-            }
-            // 便于单行复制，去除最后一个换行符
-            String revData = selectData.reverse().toString().replaceFirst("\n", "");
-            StringBuilder retData = new StringBuilder(revData).reverse();
-            return helpers.stringToBytes(retData.toString());
         }
 
         /**
@@ -219,7 +199,6 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
          */
         @Override
         public void setMessage(byte[] content, boolean isRequest) {
-            String c = new String(content, StandardCharsets.UTF_8).intern();
             if (content.length > 0) {
                 if (isRequest) {
                     makeTable(extractRequestMap);
@@ -234,18 +213,12 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
          */
         public void makeTable(Map<String, String> dataMap) {
             ArrayList<String> lTitleList = new ArrayList<>();
+
             dataMap.keySet().forEach(i->{
                 String[] extractData = dataMap.get(i).split("\n");
-                Object[][] data = new Object[extractData.length][1];
-                for (int x = 0; x < extractData.length; x++) {
-                    data[x][0] = extractData[x];
-                }
-                JTable infoTable = new JTable(data, new Object[]{"Information"});
-                infoTable.setAutoCreateRowSorter(true);
-                JScrollPane jScrollPane = new JScrollPane(infoTable);
-
                 lTitleList.add(i);
-                this.jTabbedPane.addTab(i, jScrollPane);
+                dataPanel = new DatatablePanel(i, Arrays.asList(extractData));
+                jTabbedPane.addTab(i, dataPanel);
             });
 
             /*
@@ -253,9 +226,9 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
              * 采用全局ArrayList的方式遍历删除Tab，以此应对BurpSuite缓存机制导致的MarkInfo UI错误展示。
              */
             titleList.forEach(t->{
-                int indexOfTab = this.jTabbedPane.indexOfTab(t);
+                int indexOfTab = jTabbedPane.indexOfTab(t);
                 if (indexOfTab != -1) {
-                    this.jTabbedPane.removeTabAt(indexOfTab);
+                    jTabbedPane.removeTabAt(indexOfTab);
                 }
             });
 
@@ -267,4 +240,4 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
     public IMessageEditorTab createNewInstance(IMessageEditorController controller, boolean editable) {
         return new MarkInfoTab(controller, editable);
     }
-}
+}

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

@@ -1,5 +1,6 @@
 package burp.config;
 
+import burp.BurpExtender;
 import burp.rule.utils.RuleTool;
 import burp.rule.utils.YamlTool;
 import java.io.*;
@@ -19,7 +20,7 @@ import org.yaml.snakeyaml.Yaml;
 
 public class ConfigLoader {
     private static final Yaml yaml = YamlTool.newStandardYaml();
-    private static final String HaEConfigPath = String.format("%s/.config/HaE", System.getProperty("user.home"));
+    private static final String HaEConfigPath = determineConfigPath();
     private static final String RulesFilePath = String.format("%s/%s", HaEConfigPath, "Rules.yml");
     private static final String ConfigFilePath =  String.format("%s/%s", HaEConfigPath, "Config.yml");
 
@@ -31,44 +32,66 @@ public class ConfigLoader {
         }
 
         File configFilePath = new File(ConfigFilePath);
-
         if (!(configFilePath.exists() && configFilePath.isFile())) {
             initConfig();
+        }
+
+        File rulesFilePath = new File(RulesFilePath);
+        if (!(rulesFilePath.exists() && rulesFilePath.isFile())) {
             initRules();
         }
-        ConfigEntry.globalRules = ConfigLoader.getRules();
+
+        ConfigEntry.globalRules = getRules();
     }
 
-    public void initConfig() {
+    private static String determineConfigPath() {
+        // 优先级1：用户根目录
+        String userConfigPath = String.format("%s/.config/HaE", System.getProperty("user.home"));
+        if (isValidConfigPath(userConfigPath)) {
+            return userConfigPath;
+        }
+
+        // 优先级2：Jar包所在目录
+        String jarPath = BurpExtender.callbacks.getExtensionFilename();
+        String jarDirectory = new File(jarPath).getParent();
+        String jarConfigPath = String.format("%s/.config/HaE", jarDirectory);
+        if (isValidConfigPath(jarConfigPath)) {
+            return jarConfigPath;
+        }
+        
+        return userConfigPath;
+    }
+
+    private static boolean isValidConfigPath(String configPath) {
+        File configPathFile = new File(configPath);
+        return configPathFile.exists() && configPathFile.isDirectory();
+    }
+
+    public static void initConfig() {
         Map<String, Object> r = new LinkedHashMap<>();
-        r.put("rulesPath", RulesFilePath);
         r.put("excludeSuffix", getExcludeSuffix());
         try {
             Writer ws = new OutputStreamWriter(Files.newOutputStream(Paths.get(ConfigFilePath)), StandardCharsets.UTF_8);
             yaml.dump(r, ws);
+            ws.close();
         } catch (Exception ex) {
             ex.printStackTrace();
         }
     }
 
-    public void initRules() {
+    public static void initRules() {
         RuleTool rt = new RuleTool(RulesFilePath);
         rt.getRulesFromSite();
     }
 
     public static String getRulesFilePath() {
-        try {
+        return RulesFilePath;
-            Map<String, Object> r = YamlTool.loadYaml(ConfigFilePath);
-            return r.get("rulesPath").toString();
-        } catch (Exception e) {
-            e.printStackTrace();
-            return RulesFilePath;
-        }
     }
 
-    public String getExcludeSuffix(){
+    public static String getExcludeSuffix(){
         String excludeSuffix = "";
         File yamlSetting = new File(ConfigFilePath);
+        
         if (yamlSetting.exists() && yamlSetting.isFile()) {
             try {
                 InputStream inorder = Files.newInputStream(Paths.get(ConfigFilePath));
@@ -81,6 +104,7 @@ public class ConfigLoader {
         } else {
             excludeSuffix = ConfigEntry.excludeSuffix;
         }
+        
         return excludeSuffix;
     }
 
@@ -112,20 +136,18 @@ public class ConfigLoader {
                 resRule.put(groupFields.get("group").toString(), dataArray);
             }
         }
-
         return resRule;
     }
 
-    public void setExcludeSuffix(String excludeSuffix){
+    public static void setExcludeSuffix(String excludeSuffix){
         Map<String,Object> r = new LinkedHashMap<>();
-        r.put("rulesPath", getRulesFilePath());
         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){
             ex.printStackTrace();
         }
     }
-
+}
-}

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;
@@ -11,12 +12,9 @@ import dk.brics.automaton.RegExp;
 import dk.brics.automaton.RunAutomaton;
 import java.nio.charset.StandardCharsets;
 import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
+import java.util.*;
-import java.util.HashMap;
+
-import java.util.HashSet;
+import java.util.concurrent.ConcurrentHashMap;
-import java.util.Map;
-import java.util.ArrayList;
-import java.util.List;
 import jregex.Matcher;
 import jregex.Pattern;
 
@@ -52,7 +50,7 @@ public class DataProcessingUnit {
 
     public Map<String, Map<String, Object>> matchContentByRegex(byte[] content, String headers, byte[] body, String scopeString, String host)
             throws NoSuchAlgorithmException {
-        // 先从池子里判断是否有已经匹配好的结果
+        // 先从缓存池里判断是否有已经匹配好的结果
         String messageIndex = HashCalculator.calculateHash(content);
         Map<String, Map<String, Object>> map = GlobalCachePool.getFromCache(messageIndex);
         if (map != null) {
@@ -60,44 +58,44 @@ public class DataProcessingUnit {
         } else {
             // 最终返回的结果
             Map<String, Map<String, Object>> finalMap = new HashMap<>();
-            ConfigEntry.globalRules.keySet().forEach(i -> {
+            ConfigEntry.globalRules.keySet().parallelStream().forEach(i -> {
                 for (Object[] objects : ConfigEntry.globalRules.get(i)) {
                     // 多线程执行，一定程度上减少阻塞现象
-                    Thread t = new Thread(() -> {
+                    String matchContent = "";
-                        String matchContent = "";
+                    // 遍历获取规则
-                        // 遍历获取规则
+                    List<String> result = new ArrayList<>();
-                        List<String> result = new ArrayList<>();
+                    Map<String, Object> tmpMap = new HashMap<>();
-                        Map<String, Object> tmpMap = new HashMap<>();
 
-                        String name = objects[1].toString();
+                    String name = objects[1].toString();
-                        boolean loaded = (Boolean) objects[0];
+                    boolean loaded = (Boolean) objects[0];
-                        String regex = objects[2].toString();
+                    String regex = objects[2].toString();
-                        String color = objects[3].toString();
+                    String color = objects[3].toString();
-                        String scope = objects[4].toString();
+                    String scope = objects[4].toString();
-                        String engine = objects[5].toString();
+                    String engine = objects[5].toString();
-                        boolean sensitive = (Boolean) objects[6];
+                    boolean sensitive = (Boolean) objects[6];
-                        // 判断规则是否开启与作用域
+                    // 判断规则是否开启与作用域
-                        if (loaded && (scope.contains(scopeString) || scope.contains("any"))) {
+                    if (loaded && (scope.contains(scopeString) || scope.contains("any"))) {
-                            switch (scope) {
+                        switch (scope) {
-                                case "any":
+                            case "any":
-                                case "request":
+                            case "request":
-                                case "response":
+                            case "response":
-                                    matchContent = new String(content, StandardCharsets.UTF_8).intern();
+                                matchContent = new String(content, StandardCharsets.UTF_8);
-                                    break;
+                                break;
-                                case "any header":
+                            case "any header":
-                                case "request header":
+                            case "request header":
-                                case "response header":
+                            case "response header":
-                                    matchContent = headers;
+                                matchContent = headers;
-                                    break;
+                                break;
-                                case "any body":
+                            case "any body":
-                                case "request body":
+                            case "request body":
-                                case "response body":
+                            case "response body":
-                                    matchContent = new String(body, StandardCharsets.UTF_8).intern();
+                                matchContent = new String(body, StandardCharsets.UTF_8);
-                                    break;
+                                break;
-                                default:
+                            default:
-                                    break;
+                                break;
-                            }
+                        }
 
+                        try {
                             if ("nfa".equals(engine)) {
                                 Pattern pattern;
                                 // 判断规则是否大小写敏感
@@ -124,73 +122,69 @@ public class DataProcessingUnit {
                                     result.add(autoMatcher.group());
                                 }
                             }
+                        } catch (Exception e) {
+                            BurpExtender.stdout.println(String.format("[x] Error Info:\nName: %s\nRegex: %s", name, regex));
+                            e.printStackTrace();
+                            continue;
+                        }
 
-                            // 去除重复内容
+                        // 去除重复内容
-                            HashSet tmpList = new HashSet(result);
+                        HashSet tmpList = new HashSet(result);
-                            result.clear();
+                        result.clear();
-                            result.addAll(tmpList);
+                        result.addAll(tmpList);
 
-                            String nameAndSize = String.format("%s (%s)", name, result.size());
+                        String nameAndSize = String.format("%s (%s)", name, result.size());
-                            if (!result.isEmpty()) {
+                        if (!result.isEmpty()) {
-                                tmpMap.put("color", color);
+                            tmpMap.put("color", color);
-                                String dataStr = String.join("\n", result);
+                            String dataStr = String.join("\n", result);
-                                tmpMap.put("data", dataStr);
+                            tmpMap.put("data", dataStr);
-                                finalMap.put(nameAndSize, tmpMap);
+                            finalMap.put(nameAndSize, tmpMap);
-
+                            // 添加到全局变量中，便于Databoard检索
-                                // 添加到全局变量中，便于Databoard检索
+                            if (!Objects.equals(host, "") && host != null) {
-                                if (!host.isEmpty()) {
+                                List<String> dataList = Arrays.asList(dataStr.split("\n"));
-                                    List<String> dataList = Arrays.asList(dataStr.split("\n"));
+                                if (ConfigEntry.globalDataMap.containsKey(host)) {
-                                    if (ConfigEntry.globalDataMap.containsKey(host)) {
+                                    ConcurrentHashMap<String, List<String>> gRuleMap = new ConcurrentHashMap<>(ConfigEntry.globalDataMap.get(host));
-                                        Map<String, List<String>> gRuleMap = new HashMap<>(ConfigEntry.globalDataMap.get(host));
+                                    if (gRuleMap.containsKey(name)) {
-                                        if (gRuleMap.containsKey(name)) {
+                                        // gDataList为不可变列表，因此需要重新创建一个列表以便于使用addAll方法
-                                            // gDataList为不可变列表，因此需要重新创建一个列表以便于使用addAll方法
+                                        List<String> gDataList = gRuleMap.get(name);
-                                            List<String> gDataList = gRuleMap.get(name);
+                                        List<String> newDataList = new ArrayList<>(gDataList);
-                                            List<String> newDataList = new ArrayList<>(gDataList);
+                                        newDataList.addAll(dataList);
-                                            newDataList.addAll(dataList);
+                                        newDataList = new ArrayList<>(new HashSet<>(newDataList));
-                                            newDataList = new ArrayList<>(new HashSet<>(newDataList));
+                                        gRuleMap.remove(name);
-                                            gRuleMap.remove(name);
+                                        gRuleMap.put(name, newDataList);
-                                            gRuleMap.put(name, newDataList);
-                                        } else {
-                                            gRuleMap.put(name, dataList);
-                                        }
-                                        ConfigEntry.globalDataMap.remove(host);
-                                        ConfigEntry.globalDataMap.put(host, gRuleMap);
                                     } else {
-                                        Map<String, List<String>> ruleMap = new HashMap<>();
+                                        gRuleMap.put(name, dataList);
-                                        ruleMap.put(name, dataList);
-                                        // 添加单一Host
-                                        ConfigEntry.globalDataMap.put(host, ruleMap);
                                     }
+                                    ConfigEntry.globalDataMap.remove(host);
+                                    ConfigEntry.globalDataMap.put(host, gRuleMap);
+                                } else {
+                                    Map<String, List<String>> ruleMap = new HashMap<>();
+                                    ruleMap.put(name, dataList);
+                                    // 添加单一Host
+                                    ConfigEntry.globalDataMap.put(host, ruleMap);
+                                }
 
-                                    String[] splitHost = host.split("\\.");
+                                String[] splitHost = host.split("\\.");
 
-                                    String anyHost = (splitHost.length > 2 && !MatchTool.matchIP(host)) ? StringHelper.replaceFirstOccurrence(host, splitHost[0], "*") : "";
+                                String anyHost = (splitHost.length > 2 && !MatchTool.matchIP(host)) ? StringHelper.replaceFirstOccurrence(host, splitHost[0], "*") : "";
 
-                                    if (!ConfigEntry.globalDataMap.containsKey(anyHost) && anyHost.length() > 0) {
+                                if (!ConfigEntry.globalDataMap.containsKey(anyHost) && anyHost.length() > 0) {
-                                        // 添加通配符Host，实际数据从查询哪里将所有数据提取
+                                    // 添加通配符Host，实际数据从查询哪里将所有数据提取
-                                        ConfigEntry.globalDataMap.put(anyHost, new HashMap<>());
+                                    ConfigEntry.globalDataMap.put(anyHost, new HashMap<>());
-                                    }
+                                }
 
-                                    if (!ConfigEntry.globalDataMap.containsKey("*")) {
+                                if (!ConfigEntry.globalDataMap.containsKey("*")) {
-                                        // 添加通配符全匹配，同上
+                                    // 添加通配符全匹配，同上
-                                        ConfigEntry.globalDataMap.put("*", new HashMap<>());
+                                    ConfigEntry.globalDataMap.put("*", new HashMap<>());
-                                    }
+                                }
 
-                                    if (!ConfigEntry.globalDataMap.containsKey("**")) {
+                                if (!ConfigEntry.globalDataMap.containsKey("**")) {
-                                        // 添加通配符全匹配，同上
+                                    // 添加通配符全匹配，同上
-                                        ConfigEntry.globalDataMap.put("**", new HashMap<>());
+                                    ConfigEntry.globalDataMap.put("**", new HashMap<>());
-                                    }
                                 }
                             }
                         }
-                    });
-                    t.start();
-                    try {
-                        t.join();
-                    } catch (Exception e) {
-                        e.printStackTrace();
                     }
-
                 }
             });
             GlobalCachePool.addToCache(messageIndex, finalMap);

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

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

@@ -1,5 +1,7 @@
 package burp.core.utils;
 
+import burp.BurpExtender;
+
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 

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

@@ -9,11 +9,8 @@ import burp.config.ConfigLoader;
  */
 
 public class MatchTool {
-    // 匹配后缀
-    ConfigLoader configLoader = new ConfigLoader();
-
     public boolean matchUrlSuffix(String str) {
-        Pattern pattern = new Pattern(String.format("[\\w]+[\\.](%s)", configLoader.getExcludeSuffix()), REFlags.IGNORE_CASE);
+        Pattern pattern = new Pattern(String.format("[\\w]+[\\.](%s)", ConfigLoader.getExcludeSuffix()), REFlags.IGNORE_CASE);
         jregex.Matcher matcher = pattern.matcher(str);
         return matcher.find();
     }

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,9 +1,9 @@
 package burp.rule.utils;
 
-import com.squareup.okhttp.OkHttpClient;
+import burp.*;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.Response;
 import java.io.FileOutputStream;
+import java.net.URL;
+import java.util.Arrays;
 import javax.swing.JOptionPane;
 
 /**
@@ -11,25 +11,42 @@ import javax.swing.JOptionPane;
  */
 public class RuleTool {
     private String rulesFilePath;
+    private boolean isSuccess;
 
     public RuleTool(String rulesFilePath) {
         this.rulesFilePath = rulesFilePath;
     }
 
     public void getRulesFromSite() {
-        String url = "https://cdn.jsdelivr.net/gh/gh0stkey/HaE@gh-pages/Rules.yml";
+        // 以独立线程使用BurpSuite官方请求接口获取规则
-        OkHttpClient httpClient = new OkHttpClient();
+        Thread t = new Thread(()->{
-        Request httpRequest = new Request.Builder().url(url).get().build();
+            try {
+                URL url = new URL("https://cdn.jsdelivr.net/gh/gh0stkey/HaE@gh-pages/Rules.yml");
+                IHttpService iHttpService = BurpExtender.helpers.buildHttpService(url.getHost(), 443, true);
+                IHttpRequestResponse iHttpRequestResponse = BurpExtender.callbacks.makeHttpRequest(iHttpService, BurpExtender.helpers.buildHttpRequest(url));
+                byte[] responseByte = iHttpRequestResponse.getResponse();
+                IResponseInfo iResponseInfo = BurpExtender.helpers.analyzeResponse(responseByte);
+                int bodyOffset = iResponseInfo.getBodyOffset();
+                byte[] responseBodyByte = Arrays.copyOfRange(responseByte, bodyOffset, responseByte.length);
+                FileOutputStream fileOutputStream = new FileOutputStream(this.rulesFilePath);
+                fileOutputStream.write(responseBodyByte);
+                fileOutputStream.close();
+                isSuccess = true;
+            } catch (Exception e) {
+                isSuccess = false;
+            }
+        });
+        t.start();
         try {
-            Response httpResponse = httpClient.newCall(httpRequest).execute();
+            t.join(10000);
-            // 获取官方规则文件，在线更新写入
+        } catch (Exception e) {
-            FileOutputStream fileOutputStream = new FileOutputStream(this.rulesFilePath);
+            isSuccess = false;
-            fileOutputStream.write(httpResponse.body().bytes());
+        }
-            JOptionPane.showMessageDialog(null, "Config file updated successfully!", "Error",
+
-                    JOptionPane.INFORMATION_MESSAGE);
+        if (isSuccess) {
-        } catch (Exception ignored) {
+            JOptionPane.showMessageDialog(null, "Rules update successfully!", "Info", JOptionPane.INFORMATION_MESSAGE);
-            JOptionPane.showMessageDialog(null, "Please check your network!", "Error",
+        } else {
-                    JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, "Rule update failed, please check the network!", "Error", JOptionPane.ERROR_MESSAGE);
         }
     }
 }

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

@@ -1,6 +1,9 @@
 package burp.rule.utils;
 
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.Map;
+
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
 import java.io.FileInputStream;
@@ -23,13 +26,11 @@ public class YamlTool {
 
     public static Map<String, Object> loadYaml(String filePath) {
         try {
-            InputStream inputStream = new FileInputStream(filePath);
+            InputStream inputStream = Files.newInputStream(Paths.get(filePath));
-            Yaml yaml = newStandardYaml();
+            return newStandardYaml().load(inputStream);
-            return yaml.load(inputStream);
+        } catch (Exception e) {
-        } catch (FileNotFoundException e) {
             e.printStackTrace();
             return null;
         }
     }
 }
-

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

@@ -3,10 +3,12 @@ package burp.ui;
 import burp.config.ConfigEntry;
 import burp.config.ConfigLoader;
 import burp.rule.RuleProcessor;
-import burp.rule.utils.RuleTool;
 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;
@@ -21,12 +23,9 @@ import java.util.Map;
  */
 
 public class MainUI extends JPanel {
-    private final ConfigLoader loadConn = new ConfigLoader();
-    private MessagePanel messagePanel;
 
     public MainUI(MessagePanel messagePanel) {
-        this.messagePanel = messagePanel;
+        databoardPanel = new Databoard(messagePanel);
-        databoardPanel = new Databoard(this.messagePanel);
         initComponents();
     }
 
@@ -41,13 +40,9 @@ public class MainUI extends JPanel {
 
     private void onlineUpdateActionPerformed(ActionEvent e) {
         // 添加提示框防止用户误触导致配置更新
-        int retCode = JOptionPane.showConfirmDialog(null, "Do you want to update config?", "Info",
+        int retCode = JOptionPane.showConfirmDialog(null, "Do you want to update rules?", "Info", JOptionPane.YES_NO_OPTION);
-                JOptionPane.YES_NO_CANCEL_OPTION);
         if (retCode == JOptionPane.YES_OPTION) {
-            String rulesFilePath = rulesPathTextField.getText();
+            ConfigLoader.initRules();
-            RuleTool rt = new RuleTool(rulesFilePath);
-            rt.getRulesFromSite();
-            new ConfigLoader();
             reloadRule();
         }
     }
@@ -61,7 +56,6 @@ public class MainUI extends JPanel {
                         i,
                         new RulePane(rules.get(i), ruleTabbedPane)
                 )
-
         );
         ruleTabbedPane.addTab("...", new JLabel());
         ruleSwitch.setListen(true);
@@ -72,9 +66,9 @@ public class MainUI extends JPanel {
     }
 
     private void excludeSuffixSaveActionPerformed(ActionEvent e) {
-        ConfigLoader loadCon = new ConfigLoader();
+        ConfigLoader.setExcludeSuffix(excludeSuffixTextField.getText());
-        loadCon.setExcludeSuffix(excludeSuffixTextField.getText());
     }
+
     private void initComponents() {
         JTabbedPane mainTabbedPane = new JTabbedPane();
         ruleTabbedPane = new JTabbedPane();
@@ -143,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));
 
@@ -151,10 +169,10 @@ public class MainUI extends JPanel {
                 ConfigEntry.globalRules.get(i),
                 ruleTabbedPane)));
 
-        ruleTabbedPane.addTab("...",new JLabel());
+        ruleTabbedPane.addTab("...", new JLabel());
 
         rulesPathTextField.setText(ConfigLoader.getRulesFilePath());
-        excludeSuffixTextField.setText(loadConn.getExcludeSuffix());
+        excludeSuffixTextField.setText(ConfigLoader.getExcludeSuffix());
         ruleSwitch = new TabTitleEditListener(ruleTabbedPane);
         ruleTabbedPane.addChangeListener(ruleSwitch);
         ruleTabbedPane.addMouseListener(ruleSwitch);
@@ -162,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;
@@ -311,4 +344,4 @@ class TabTitleEditListener extends MouseAdapter implements ChangeListener, Docum
         ruleEditTextField.setPreferredSize(ruleEditTextField.getText().length() > len ? null : dim);
         ruleEditTabbedPane.revalidate();
     }
-}
+}

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

@@ -8,23 +8,24 @@ import java.util.Map;
 import javax.swing.JTable;
 import javax.swing.table.DefaultTableCellRenderer;
 
-public class CustomTableCellRenderer extends DefaultTableCellRenderer {
+public class ColorRenderer extends DefaultTableCellRenderer {
 
     private List<LogEntry> log;
     private Map<String, Color> colorMap = new HashMap<>();
     private JTable table; // 保存对表格的引用
 
-    public CustomTableCellRenderer(List<LogEntry> log, JTable table) {
+    public ColorRenderer(List<LogEntry> log, JTable table) {
         this.log = log;
-        this.colorMap.put("red", Color.RED);
+        // 与BurpSuite的颜色保持一致
-        this.colorMap.put("orange", Color.ORANGE);
+        this.colorMap.put("red", new Color(0xFF, 0x64, 0x64));
-        this.colorMap.put("yellow", Color.YELLOW);
+        this.colorMap.put("orange", new Color(0xFF, 0xC8, 0x64));
-        this.colorMap.put("green", Color.GREEN);
+        this.colorMap.put("yellow", new Color(0xFF, 0xFF, 0x64));
-        this.colorMap.put("cyan", Color.CYAN);
+        this.colorMap.put("green", new Color(0x64, 0xFF, 0x64));
-        this.colorMap.put("blue", Color.BLUE);
+        this.colorMap.put("cyan", new Color(0x64, 0xFF, 0xFF));
-        this.colorMap.put("pink", Color.PINK);
+        this.colorMap.put("blue", new Color(0x64, 0x64, 0xFF));
-        this.colorMap.put("magenta", Color.MAGENTA);
+        this.colorMap.put("pink", new Color(0xFF, 0xC8, 0xC8));
-        this.colorMap.put("gray", Color.GRAY);
+        this.colorMap.put("magenta", new Color(0xFF, 0x64, 0xFF));
+        this.colorMap.put("gray", new Color(0xB4, 0xB4, 0xB4));
         this.table = table;
     }
 
@@ -40,13 +41,15 @@ public class CustomTableCellRenderer extends DefaultTableCellRenderer {
         Color color = colorMap.get(colorByLog);
 
         if (isSelected) {
-            // 如果行被选中，设置阴影颜色
+            // 通过更改RGB颜色来达成阴影效果
-            component.setBackground(new Color(173, 216, 230)); // Light Blue
+            component.setBackground(new Color(color.getRed()-0x20, color.getGreen()-0x20, color.getBlue()-0x20));
         } else {
             // 否则使用原始颜色
             component.setBackground(color);
         }
 
+        component.setForeground(Color.BLACK);
+
         return component;
     }
 

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

@@ -3,23 +3,18 @@ package burp.ui.board;
 import burp.config.ConfigEntry;
 import burp.core.utils.StringHelper;
 import burp.ui.board.MessagePanel.Table;
-import java.util.HashMap;
+
-import java.util.HashSet;
+import java.util.*;
-import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
-import javax.swing.event.ChangeEvent;
+import javax.swing.event.*;
-import javax.swing.event.ChangeListener;
-import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableColumnModel;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
 import java.awt.*;
 import java.awt.event.*;
-import java.util.ArrayList;
+import java.util.List;
-import java.util.Map;
 import javax.swing.*;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
 
 /**
  * @author LinChen && EvilChen
@@ -29,12 +24,27 @@ public class Databoard extends JPanel {
     private static Boolean isMatchHost = false;
     private JLabel hostLabel;
     private JTextField hostTextField;
-    private JTabbedPane dataTabbedPaneA;
+    private JTabbedPane dataTabbedPane;
-    private JTabbedPane dataTabbedPaneB;
     private JButton clearButton;
     private JSplitPane splitPane;
     private MessagePanel messagePanel;
     private Table table;
+    private SwingWorker<Object, Void> currentWorker;
+    private DefaultComboBoxModel comboBoxModel = new DefaultComboBoxModel();
+    private JComboBox hostComboBox = new JComboBox(comboBoxModel);
+    private ChangeListener changeListenerInstance = new ChangeListener() {
+        @Override
+        public void stateChanged(ChangeEvent e) {
+            int selectedIndex = dataTabbedPane.getSelectedIndex();
+            String selectedTitle = "";
+
+            if (selectedIndex != -1) {
+                selectedTitle = dataTabbedPane.getTitleAt(selectedIndex);
+            }
+
+            applyHostFilter(selectedTitle);
+        }
+    };
 
     public Databoard(MessagePanel messagePanel) {
         this.messagePanel = messagePanel;
@@ -42,33 +52,34 @@ public class Databoard extends JPanel {
     }
 
     private void cleanUI() {
-        dataTabbedPaneA.removeAll();
+        dataTabbedPane.removeAll();
-        dataTabbedPaneB.removeAll();
         splitPane.setVisible(false);
     }
 
     private void clearActionPerformed(ActionEvent e) {
-        cleanUI();
+        int retCode = JOptionPane.showConfirmDialog(null, "Do you want to clear data?", "Info",
+                JOptionPane.YES_NO_OPTION);
+        if (retCode == JOptionPane.YES_OPTION) {
+            cleanUI();
 
-        String host = hostTextField.getText();
+            String host = hostTextField.getText();
-        String cleanedHost = StringHelper.replaceFirstOccurrence(host, "*.", "");
+            String cleanedHost = StringHelper.replaceFirstOccurrence(host, "*.", "");
 
-        if (host.contains("*")) {
+            if (host.contains("*")) {
-            ConfigEntry.globalDataMap.keySet().removeIf(i -> i.contains(cleanedHost) || cleanedHost.equals("**"));
+                ConfigEntry.globalDataMap.keySet().removeIf(i -> i.contains(cleanedHost) || cleanedHost.contains("*"));
-        } else {
+            } else {
-            ConfigEntry.globalDataMap.remove(host);
+                ConfigEntry.globalDataMap.remove(host);
+            }
+
+            messagePanel.deleteByHost(cleanedHost);
         }
-
-        messagePanel.deleteByHost(cleanedHost);
     }
 
-
     private void initComponents() {
         // JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
         hostLabel = new JLabel();
         hostTextField = new JTextField();
-        dataTabbedPaneA = new JTabbedPane(JTabbedPane.TOP);
+        dataTabbedPane = new JTabbedPane(JTabbedPane.TOP);
-        dataTabbedPaneB = new JTabbedPane(JTabbedPane.TOP);
         clearButton = new JButton();
 
         //======== this ========
@@ -80,22 +91,22 @@ public class Databoard extends JPanel {
 
         //---- hostLabel ----
         hostLabel.setText("Host:");
-        add(hostLabel, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0,
+        add(hostLabel, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(8, 0, 5, 5), 0, 0));
-        add(hostTextField, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0,
+        add(hostTextField, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                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,
+        add(clearButton,  new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-                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, 3, 0.0, 0.0,
-        add(splitPane, new GridBagConstraints(1, 1, 3, 2, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(8, 0, 5, 5), 0, 0));
 
@@ -110,127 +121,123 @@ public class Databoard extends JPanel {
      * 设置输入自动匹配
      */
     private void setAutoMatch() {
-        final DefaultComboBoxModel comboBoxModel = new DefaultComboBoxModel();
+        populateComboBoxModel();
-
-        final JComboBox hostComboBox = new JComboBox(comboBoxModel) {
-            @Override
-            public Dimension getPreferredSize() {
-                return new Dimension(super.getPreferredSize().width, 0);
-            }
-        };
-
-        isMatchHost = false;
-
-        for (String host : getHostByList()) {
-            comboBoxModel.addElement(host);
-        }
 
         hostComboBox.setSelectedItem(null);
+        hostComboBox.addActionListener(this::handleComboBoxAction);
 
-        hostComboBox.addActionListener(e -> {
-            if (!isMatchHost) {
-                if (hostComboBox.getSelectedItem() != null) {
-                    hostTextField.setText(hostComboBox.getSelectedItem().toString());
-                    populateTabbedPaneByHost(hostComboBox);
-                }
-            }
-        });
-
-        // 事件监听
         hostTextField.addKeyListener(new KeyAdapter() {
             @Override
             public void keyPressed(KeyEvent e) {
-                isMatchHost = true;
+                handleKeyEvents(e);
-                int keyCode = e.getKeyCode();
-
-                if (keyCode == KeyEvent.VK_SPACE && hostComboBox.isPopupVisible()) {
-                    e.setKeyCode(KeyEvent.VK_ENTER);
-                }
-
-                if (keyCode == KeyEvent.VK_ENTER || keyCode == KeyEvent.VK_UP || keyCode == KeyEvent.VK_DOWN) {
-                    e.setSource(hostComboBox);
-                    hostComboBox.dispatchEvent(e);
-
-                    if (keyCode == KeyEvent.VK_ENTER) {
-                        String selectedItem = hostComboBox.getSelectedItem().toString();
-                        hostTextField.setText(selectedItem);
-                        populateTabbedPaneByHost(hostComboBox);
-                        hostComboBox.setPopupVisible(false);
-                        return;
-                    }
-                }
-
-                if (keyCode == KeyEvent.VK_ESCAPE) {
-                    hostComboBox.setPopupVisible(false);
-                }
-
-                isMatchHost = false;
             }
         });
 
         hostTextField.getDocument().addDocumentListener(new DocumentListener() {
             @Override
             public void insertUpdate(DocumentEvent e) {
-                updateList();
+                filterComboBoxList();
-
             }
 
             @Override
             public void removeUpdate(DocumentEvent e) {
-                updateList();
+                filterComboBoxList();
             }
 
             @Override
             public void changedUpdate(DocumentEvent e) {
-                updateList();
+                filterComboBoxList();
             }
 
-            private void updateList() {
+        });
-                isMatchHost = true;
+    }
-                comboBoxModel.removeAllElements();
+
-                String input = hostTextField.getText().toLowerCase();
+    private void populateComboBoxModel() {
-                if (!input.isEmpty()){
+        for (String host : getHostByList()) {
-                    for (String host : getHostByList()) {
+            comboBoxModel.addElement(host);
-                        String lowerCaseHost = host.toLowerCase();
+        }
-                        if (lowerCaseHost.contains(input)) {
+    }
-                            if (host.length() == input.length()){
+
-                                comboBoxModel.insertElementAt(host,0);
+    private void handleComboBoxAction(ActionEvent e) {
-                                comboBoxModel.setSelectedItem(host);
+        if (!isMatchHost && hostComboBox.getSelectedItem() != null) {
-                            } else {
+            String selectedHost = hostComboBox.getSelectedItem().toString();
-                                comboBoxModel.addElement(host);
+            hostTextField.setText(selectedHost);
-                            }
+            populateTabbedPaneByHost(selectedHost);
-                        }
+        }
+    }
+    private void handleKeyEvents(KeyEvent e) {
+        isMatchHost = true;
+        int keyCode = e.getKeyCode();
+
+        if (keyCode == KeyEvent.VK_SPACE && hostComboBox.isPopupVisible()) {
+            e.setKeyCode(KeyEvent.VK_ENTER);
+        }
+
+        if (Arrays.asList(KeyEvent.VK_DOWN, KeyEvent.VK_UP).contains(keyCode)) {
+            hostComboBox.dispatchEvent(e);
+        }
+
+        if (keyCode == KeyEvent.VK_ENTER) {
+            isMatchHost = false;
+            handleComboBoxAction(null);
+            hostComboBox.setPopupVisible(false);
+        }
+
+        if (keyCode == KeyEvent.VK_ESCAPE) {
+            hostComboBox.setPopupVisible(false);
+        }
+
+        isMatchHost = false;
+    }
+
+    private void filterComboBoxList() {
+        isMatchHost = true;
+        comboBoxModel.removeAllElements();
+        String input = hostTextField.getText().toLowerCase();
+
+        if (!input.isEmpty()) {
+            for (String host : getHostByList()) {
+                String lowerCaseHost = host.toLowerCase();
+                if (lowerCaseHost.contains(input)) {
+                    if (lowerCaseHost.equals(input)) {
+                        comboBoxModel.insertElementAt(lowerCaseHost, 0);
+                        comboBoxModel.setSelectedItem(lowerCaseHost);
+                    } else {
+                        comboBoxModel.addElement(host);
                     }
                 }
-                hostComboBox.setPopupVisible(comboBoxModel.getSize() > 0);
-                isMatchHost = false;
             }
-        });
+        }
 
-        hostTextField.setLayout(new BorderLayout());
+        hostComboBox.setPopupVisible(comboBoxModel.getSize() > 0);
-        hostTextField.add(hostComboBox, BorderLayout.SOUTH);
+        isMatchHost = false;
     }
 
     private void applyHostFilter(String filterText) {
         TableRowSorter<TableModel> sorter = (TableRowSorter<TableModel>) table.getRowSorter();
-        if (filterText.contains("*.")) {
+
-            filterText = StringHelper.replaceFirstOccurrence(filterText, "*.", "");
+        String cleanedText = StringHelper.replaceFirstOccurrence(filterText, "*.", "");
-        } else if (filterText.contains("*")) {
+
-            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(JComboBox<String> hostComboBox) {
+    private void populateTabbedPaneByHost(String selectedHost) {
-        if (hostComboBox.getSelectedItem() != null) {
+        if (!Objects.equals(selectedHost, "")) {
-            String selectedHost = hostComboBox.getSelectedItem().toString();
+            ConcurrentHashMap<String, Map<String, List<String>>> dataMap = ConfigEntry.globalDataMap;
-            Map<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<>();
@@ -255,51 +262,51 @@ public class Databoard extends JPanel {
                 selectedDataMap = dataMap.get(selectedHost);
             }
 
-            // 由于removeChangeListener不知什么原因不生效，因此建立两个tabbedPane
-            dataTabbedPaneA.removeAll();
-            dataTabbedPaneB.removeAll();
-
-            ChangeListener changeListenerInstance = new ChangeListener() {
-                @Override
-                public void stateChanged(ChangeEvent e) {
-                    int selectedIndex = dataTabbedPaneA.getSelectedIndex();
-                    String selectedTitle = "";
-                    if (selectedIndex != -1) {
-                        selectedTitle = dataTabbedPaneA.getTitleAt(selectedIndex);
-                    }
-                    applyHostFilter(selectedTitle);
-                }
-            };
-
             if (selectedHost.equals("**")) {
-                dataTabbedPaneA.setPreferredSize(new Dimension(500,0));
+                for (ConcurrentHashMap.Entry<String, Map<String, List<String>>> entry : dataMap.entrySet()) {
-                dataTabbedPaneA.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
-                splitPane.setLeftComponent(dataTabbedPaneA);
-                for (Map.Entry<String, Map<String, List<String>>> entry : dataMap.entrySet()) {
                     JTabbedPane newTabbedPane = new JTabbedPane();
                     newTabbedPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
+
                     for (Map.Entry<String, List<String>> entrySet : entry.getValue().entrySet()) {
-                        Thread t = new Thread(() -> {
+                        currentWorker = new SwingWorker<Object, Void>() {
-                            String tabTitle = String.format("%s (%s)", entrySet.getKey(), entrySet.getValue().size());
+                            @Override
-                            newTabbedPane.addTab(tabTitle, new JScrollPane(new DataTable(entrySet.getKey(), entrySet.getValue())));
+                            protected Object[] doInBackground() throws Exception {
-                            dataTabbedPaneA.addTab(entry.getKey(), newTabbedPane);
+                                String tabTitle = String.format("%s (%s)", entrySet.getKey(),
-                        });
+                                        entrySet.getValue().size());
-                        t.start();
+                                DatatablePanel datatablePanel = new DatatablePanel(entrySet.getKey(),
-                        try {
+                                        entrySet.getValue());
-                            t.join();
+                                datatablePanel.setTableListener(messagePanel);
-                        } catch (Exception e) {
+                                return new Object[] {tabTitle, datatablePanel};
-                            e.printStackTrace();
+                            }
-                        }
+
+                            @Override
+                            protected void done() {
+                                if (!isCancelled()) {
+                                    try {
+                                        Object[] result = (Object[]) get();
+                                        SwingUtilities.invokeLater(() -> {
+                                            newTabbedPane.addTab(result[0].toString(), (DatatablePanel) result[1]);
+                                            dataTabbedPane.addTab(entry.getKey(), newTabbedPane);
+                                        });
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                            }
+                        };
+                        currentWorker.execute();
                     }
                 }
-                dataTabbedPaneA.addChangeListener(changeListenerInstance);
+
+                dataTabbedPane.addChangeListener(changeListenerInstance);
             } else {
-                dataTabbedPaneB.setPreferredSize(new Dimension(500,0));
+                dataTabbedPane.removeChangeListener(changeListenerInstance);
-                dataTabbedPaneB.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
+
-                splitPane.setLeftComponent(dataTabbedPaneB);
                 for (Map.Entry<String, List<String>> entry : selectedDataMap.entrySet()) {
                     String tabTitle = String.format("%s (%s)", entry.getKey(), entry.getValue().size());
-                    dataTabbedPaneB.addTab(tabTitle, new JScrollPane(new DataTable(entry.getKey(), entry.getValue())));
+                    DatatablePanel datatablePanel = new DatatablePanel(entry.getKey(), entry.getValue());
+                    datatablePanel.setTableListener(messagePanel);
+                    dataTabbedPane.addTab(tabTitle, datatablePanel);
                 }
             }
 
@@ -325,34 +332,7 @@ public class Databoard extends JPanel {
             }
 
             hostTextField.setText(selectedHost);
+
         }
     }
-
+}
-
-    class DataTable extends JTable {
-        public DataTable(String tableName, List<String> list){
-            DefaultTableModel model = new DefaultTableModel();
-            Object[][] data = new Object[list.size()][1];
-            for (int x = 0; x < list.size(); x++) {
-                data[x][0] = list.get(x);
-            }
-            model.setDataVector(data, new Object[]{"Information"});
-            setAutoCreateRowSorter(true);
-            setModel(model);
-            setDefaultEditor(Object.class, null);
-
-            addMouseListener(new MouseAdapter() {
-                @Override
-                public void mouseClicked(MouseEvent e) {
-                    if (e.getClickCount() == 2) {
-                        int selectedRow = getSelectedRow();
-                        if (selectedRow != -1) {
-                            String rowData = getValueAt(selectedRow, 0).toString();
-                            messagePanel.applyMessageFilter(tableName, rowData);
-                        }
-                    }
-                }
-            });
-        }
-    }
-}

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

@@ -0,0 +1,243 @@
+package burp.ui.board;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.GridLayout;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import jregex.Pattern;
+import jregex.REFlags;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.Comparator;
+import java.util.List;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.JTextField;
+import javax.swing.RowFilter;
+import javax.swing.ScrollPaneConstants;
+import javax.swing.TransferHandler;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableRowSorter;
+
+public class DatatablePanel extends JPanel {
+    private final JTable table;
+    private final DefaultTableModel model;
+    private final JTextField searchField;
+    private TableRowSorter<DefaultTableModel> sorter;
+    private JScrollPane scrollPane;
+    private String tableName;
+    private JCheckBox searchMode = new JCheckBox("Reverse search");
+
+    public DatatablePanel(String tableName, List<String> list) {
+        this.tableName = tableName;
+
+        String[] columnNames = {"#", "Information"};
+        model = new DefaultTableModel(columnNames, 0);
+        table = new JTable(model);
+        sorter = new TableRowSorter<>(model);
+        // 设置ID排序
+        sorter.setComparator(0, new Comparator<Integer>() {
+            @Override
+            public int compare(Integer s1, Integer s2) {
+                return s1.compareTo(s2);
+            }
+        });
+
+        table.setRowSorter(sorter);
+        TableColumn idColumn = table.getColumnModel().getColumn(0);
+        idColumn.setMaxWidth(50);
+
+        for (String item : list) {
+            addRowToTable(model, new Object[]{item});
+        }
+
+        String defaultText = "Search";
+        searchField = new JTextField(defaultText);
+
+        // 设置灰色默认文本Search
+        searchField.setForeground(Color.GRAY);
+        searchField.addFocusListener(new FocusListener() {
+            @Override
+            public void focusGained(FocusEvent e) {
+                if (searchField.getText().equals(defaultText)) {
+                    searchField.setText("");
+                    searchField.setForeground(Color.BLACK);
+                }
+            }
+
+            @Override
+            public void focusLost(FocusEvent e) {
+                if (searchField.getText().isEmpty()) {
+                    searchField.setForeground(Color.GRAY);
+                    searchField.setText(defaultText);
+                }
+            }
+        });
+
+        // 监听输入框内容输入、更新、删除
+        searchField.getDocument().addDocumentListener(new DocumentListener() {
+            @Override
+            public void insertUpdate(DocumentEvent e) {
+                performSearch();
+            }
+
+            @Override
+            public void removeUpdate(DocumentEvent e) {
+                performSearch();
+            }
+
+            @Override
+            public void changedUpdate(DocumentEvent e) {
+                performSearch();
+            }
+
+        });
+
+        // 设置布局
+        scrollPane = new JScrollPane(table);
+        scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
+
+        searchMode.addItemListener(new ItemListener() {
+            public void itemStateChanged(ItemEvent e) {
+                performSearch();
+            }
+        });
+
+        setLayout(new BorderLayout(0, 5));
+
+        JPanel optionsPanel = new JPanel();
+        optionsPanel.setBorder(BorderFactory.createEmptyBorder(2, 3, 5, 5));
+        optionsPanel.setLayout(new BoxLayout(optionsPanel, BoxLayout.X_AXIS));
+
+        // 新增复选框要在这修改rows
+        JPanel menuPanel = new JPanel(new GridLayout(1, 1));
+        menuPanel.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
+        JPopupMenu menu = new JPopupMenu();
+        menuPanel.add(searchMode);
+        menu.add(menuPanel);
+
+        JButton settingsButton = new JButton("Settings");
+        settingsButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                int x = settingsButton.getX();
+                int y = settingsButton.getY() - menu.getPreferredSize().height;
+                menu.show(settingsButton, x, y);
+            }
+        });
+
+        optionsPanel.add(settingsButton);
+        optionsPanel.add(Box.createHorizontalStrut(5));
+        optionsPanel.add(searchField);
+
+        add(scrollPane, BorderLayout.CENTER);
+        add(optionsPanel, BorderLayout.SOUTH);
+    }
+
+    private static void addRowToTable(DefaultTableModel model, Object[] data) {
+        // 获取当前ID
+        int rowCount = model.getRowCount();
+        int id = rowCount > 0 ? (Integer) model.getValueAt(rowCount - 1, 0) + 1 : 1;
+        Object[] rowData = new Object[data.length + 1];
+        rowData[0] = id; // 设置ID列的值
+        System.arraycopy(data, 0, rowData, 1, data.length); // 拷贝其余数据
+        model.addRow(rowData); // 添加行
+    }
+
+    private void performSearch() {
+        // 检查文本字段的字体颜色是否为黑色，表示可以进行搜索
+        if (searchField.getForeground().equals(Color.BLACK)) {
+            // 获取搜索文本
+            String searchText = searchField.getText();
+
+            // 创建行过滤器
+            RowFilter<DefaultTableModel, Object> rowFilter;
+
+            // 检查搜索模式是否为选中状态
+            if (searchMode.isSelected()) {
+                // 反向搜索：创建一个过滤器以排除与正则表达式匹配的行
+                rowFilter = new RowFilter<DefaultTableModel, Object>() {
+                    public boolean include(Entry<? extends DefaultTableModel, ? extends Object> entry) {
+                        // 对每一行的第二列进行判断（假设第二列的索引是1）
+                        String entryValue = (String) entry.getValue(1);
+                        // 如果该列的值不包含搜索文本，则返回true，否则返回false
+                        Pattern pattern = new Pattern(searchText, REFlags.IGNORE_CASE);
+
+                        return searchText.isEmpty() || !pattern.matcher(entryValue).find();
+                    }
+                };
+            } else {
+                // 正向搜索：创建一个过滤器以包含与正则表达式匹配的行
+                rowFilter = RowFilter.regexFilter(String.format("(?i)%s", searchText), 1);
+            }
+
+            // 设置过滤器到排序器
+            sorter.setRowFilter(rowFilter);
+        }
+    }
+
+    public void setTableListener(MessagePanel messagePanel) {
+        table.setDefaultEditor(Object.class, null);
+
+        // 表格内容双击事件
+        table.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                if (e.getClickCount() == 2) {
+                    int selectedRow = table.getSelectedRow();
+                    if (selectedRow != -1) {
+                        String rowData = table.getValueAt(selectedRow, 1).toString();
+                        messagePanel.applyMessageFilter(tableName, rowData);
+                    }
+                }
+            }
+        });
+
+        table.setTransferHandler(new TransferHandler() {
+            @Override
+            public void exportToClipboard(JComponent comp, Clipboard clip, int action) throws IllegalStateException {
+                if (comp instanceof JTable) {
+                    StringSelection stringSelection = new StringSelection(getSelectedData(
+                            (JTable) comp));
+                    clip.setContents(stringSelection, null);
+                } else {
+                    super.exportToClipboard(comp, clip, action);
+                }
+            }
+        });
+    }
+
+    public String getSelectedData(JTable table) {
+        int[] selectRows = table.getSelectedRows();
+        StringBuilder selectData = new StringBuilder();
+        for (int row : selectRows) {
+            selectData.append(table.getValueAt(row, 1).toString()).append("\n");
+        }
+        // 便于单行复制，去除最后一个换行符
+        String revData = selectData.reverse().toString().replaceFirst("\n", "");
+        StringBuilder retData = new StringBuilder(revData).reverse();
+        return retData.toString();
+    }
+
+    public JTable getTable() {
+        return this.table;
+    }
+}

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

@@ -9,16 +9,18 @@ public class LogEntry {
     private final IHttpRequestResponsePersisted requestResponse;
     private final URL url;
     private final String length;
+    private final String status;
     private final String color;
     private final String method;
 
-    LogEntry(IHttpRequestResponsePersisted requestResponse, String method, URL url, String comment, String length, String color) {
+    LogEntry(IHttpRequestResponsePersisted requestResponse, String method, URL url, String comment, String length, String color, String status) {
         this.requestResponse = requestResponse;
         this.method = method;
         this.url = url;
         this.comment = comment;
         this.length = length;
         this.color = color;
+        this.status = status;
     }
 
     public String getColor() {
@@ -41,6 +43,10 @@ public class LogEntry {
         return this.method;
     }
 
+    public String getStatus() {
+        return this.status;
+    }
+
     public IHttpRequestResponsePersisted getRequestResponse() {
         return this.requestResponse;
     }

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

@@ -7,17 +7,24 @@ import burp.IHttpRequestResponsePersisted;
 import burp.IHttpService;
 import burp.IMessageEditor;
 import burp.IMessageEditorController;
+import burp.IRequestInfo;
 import burp.config.ConfigEntry;
+import burp.core.GlobalCachePool;
+import burp.core.utils.HashCalculator;
 import burp.core.utils.StringHelper;
+
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 import javax.swing.JScrollPane;
 import javax.swing.JSplitPane;
 import javax.swing.JTabbedPane;
 import javax.swing.JTable;
-import javax.swing.SwingUtilities;
 import javax.swing.SwingWorker;
 import javax.swing.table.AbstractTableModel;
 import javax.swing.table.DefaultTableModel;
@@ -46,12 +53,12 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
         splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
 
         logTable = new Table(MessagePanel.this);
-        logTable.setDefaultRenderer(Object.class, new CustomTableCellRenderer(filteredLog, logTable));
+        logTable.setDefaultRenderer(Object.class, new ColorRenderer(filteredLog, logTable));
         logTable.setAutoCreateRowSorter(true);
 
         // Length字段根据大小进行排序
         TableRowSorter<DefaultTableModel> sorter = (TableRowSorter<DefaultTableModel>) logTable.getRowSorter();
-        sorter.setComparator(3, new Comparator<String>() {
+        sorter.setComparator(4, new Comparator<String>() {
             @Override
             public int compare(String s1, String s2) {
                 Integer age1 = Integer.parseInt(s1);
@@ -60,7 +67,7 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
             }
         });
         // Color字段根据颜色顺序进行排序
-        sorter.setComparator(4, new Comparator<String>() {
+        sorter.setComparator(5, new Comparator<String>() {
             @Override
             public int compare(String s1, String s2) {
                 int index1 = getIndex(s1);
@@ -115,7 +122,7 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
     @Override
     public int getColumnCount()
     {
-        return 5;
+        return 6;
     }
 
     @Override
@@ -130,8 +137,10 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
             case 2:
                 return "Comment";
             case 3:
-                return "Length";
+                return "Status";
             case 4:
+                return "Length";
+            case 5:
                 return "Color";
             default:
                 return "";
@@ -147,6 +156,9 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
     @Override
     public Object getValueAt(int rowIndex, int columnIndex)
     {
+        if (filteredLog.isEmpty()) {
+            return "";
+        }
         LogEntry logEntry = filteredLog.get(rowIndex);
         switch (columnIndex)
         {
@@ -157,8 +169,10 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
             case 2:
                 return logEntry.getComment();
             case 3:
-                return logEntry.getLength();
+                return logEntry.getStatus();
             case 4:
+                return logEntry.getLength();
+            case 5:
                 return logEntry.getColor();
             default:
                 return "";
@@ -168,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);
             }
         }
@@ -184,15 +202,18 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
             byte[] requestByte = requestResponse.getRequest();
             byte[] responseByte = requestResponse.getResponse();
 
+            String requestString = new String(requestResponse.getRequest(), StandardCharsets.UTF_8);
+            String responseString = new String(requestResponse.getResponse(), StandardCharsets.UTF_8);
+
             List<String> requestTmpHeaders = helpers.analyzeRequest(requestByte).getHeaders();
-            byte[] requestHeaders = helpers.stringToBytes(String.join("\n", requestTmpHeaders));
+            String requestHeaders = new String(String.join("\n", requestTmpHeaders).getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8);
             int requestBodyOffset = helpers.analyzeRequest(requestByte).getBodyOffset();
-            byte[] requestBody = Arrays.copyOfRange(requestByte, requestBodyOffset, requestByte.length);
+            String requestBody = new String(Arrays.copyOfRange(requestByte, requestBodyOffset, requestByte.length), StandardCharsets.UTF_8);
 
             List<String> responseTmpHeaders = helpers.analyzeResponse(responseByte).getHeaders();
-            byte[] responseHeaders = helpers.stringToBytes(String.join("\n", responseTmpHeaders));
+            String responseHeaders = new String(String.join("\n", responseTmpHeaders).getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8);
             int responseBodyOffset = helpers.analyzeResponse(responseByte).getBodyOffset();
-            byte[] responseBody = Arrays.copyOfRange(responseByte, responseBodyOffset, responseByte.length);
+            String responseBody = new String(Arrays.copyOfRange(responseByte, responseBodyOffset, responseByte.length), StandardCharsets.UTF_8);
 
             final boolean[] isMatched = {false}; // 标志变量，表示是否满足过滤条件
 
@@ -205,31 +226,31 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
 
                         switch (scope) {
                             case "any":
-                                match = helpers.indexOf(requestByte, helpers.stringToBytes(filterText), true, 0, requestByte.length) != -1 || helpers.indexOf(responseByte, helpers.stringToBytes(filterText), true, 0, responseByte.length) != -1;
+                                match = requestString.contains(filterText) || responseString.contains(filterText);
                                 break;
                             case "request":
-                                match = helpers.indexOf(requestByte, helpers.stringToBytes(filterText), true, 0, requestByte.length) != -1;
+                                match = requestString.contains(filterText);
                                 break;
                             case "response":
-                                match = helpers.indexOf(responseByte, helpers.stringToBytes(filterText), true, 0, responseByte.length) != -1;
+                                match = responseString.contains(filterText);
                                 break;
                             case "any header":
-                                match = helpers.indexOf(requestHeaders, helpers.stringToBytes(filterText), true, 0, requestHeaders.length) != -1 || helpers.indexOf(responseHeaders, helpers.stringToBytes(filterText), true, 0, responseHeaders.length) != -1;
+                                match = requestHeaders.contains(filterText) || responseHeaders.contains(filterText);
                                 break;
                             case "request header":
-                                match = helpers.indexOf(requestHeaders, helpers.stringToBytes(filterText), true, 0, requestHeaders.length) != -1;
+                                match = requestHeaders.contains(filterText);
                                 break;
                             case "response header":
-                                match = helpers.indexOf(responseHeaders, helpers.stringToBytes(filterText), true, 0, responseHeaders.length) != -1;
+                                match = responseHeaders.contains(filterText);
                                 break;
                             case "any body":
-                                match = helpers.indexOf(requestBody, helpers.stringToBytes(filterText), true, 0, requestBody.length) != -1 || helpers.indexOf(responseBody, helpers.stringToBytes(filterText), true, 0, responseBody.length) != -1;
+                                match = requestBody.contains(filterText) || responseBody.contains(filterText);
                                 break;
                             case "request body":
-                                match = helpers.indexOf(requestBody, helpers.stringToBytes(filterText), true, 0, requestBody.length) != -1;
+                                match = requestBody.contains(filterText);
                                 break;
                             case "response body":
-                                match = helpers.indexOf(responseBody, helpers.stringToBytes(filterText), true, 0, responseBody.length) != -1;
+                                match = responseBody.contains(filterText);
                                 break;
                             default:
                                 break;
@@ -248,6 +269,7 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
             }
         }
         fireTableDataChanged();
+        logTable.lastSelectedIndex = -1;
     }
 
     public void deleteByHost(String filterText) {
@@ -290,18 +312,105 @@ 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)
+        synchronized(log) {
-        {
+            IRequestInfo iRequestInfo = helpers.analyzeRequest(messageInfo);
-            LogEntry logEntry = new LogEntry(callbacks.saveBuffersToTempFiles(messageInfo), helpers.analyzeRequest(messageInfo).getMethod(),
+            URL url = iRequestInfo.getUrl();
-                    helpers.analyzeRequest(messageInfo).getUrl(), comment, length, color);
+            String method = iRequestInfo.getMethod();
-            log.add(logEntry);
+            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 {
+                // 比较Hash，如若存在重复的请求或响应，则不放入消息内容里
+                byte[] reqByteA = messageInfo.getRequest();
+                byte[] resByteA = messageInfo.getResponse();
+                boolean isDuplicate = false;
+
+                if (log.size() > 0) {
+                    for (LogEntry entry : log) {
+                        IHttpRequestResponsePersisted reqResMessage = entry.getRequestResponse();
+                        byte[] reqByteB = reqResMessage.getRequest();
+                        byte[] resByteB = reqResMessage.getResponse();
+                        try {
+                            // 通过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;
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+
+                if (!isDuplicate) {
+                    log.add(logEntry);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
+
+    }
+
+    private Map<String, Map<String, Object>> getCacheData(byte[] content)
+            throws NoSuchAlgorithmException {
+        String hashIndex = HashCalculator.calculateHash(content);
+        return GlobalCachePool.getFromCache(hashIndex);
+    }
+
+    private boolean areMapsEqual(Map<String, Map<String, Object>> map1, Map<String, Map<String, Object>> map2) {
+        if (map1 == null || map2 == null) {
+            return false;
+        }
+        if (map1.size() != map2.size()) {
+            return false;
+        }
+
+        for (String key : map1.keySet()) {
+            if (!map2.containsKey(key)) {
+                return false;
+            }
+            if (!areInnerMapsEqual(map1.get(key), map2.get(key))) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private boolean areInnerMapsEqual(Map<String, Object> innerMap1, Map<String, Object> innerMap2) {
+        if (innerMap1.size() != innerMap2.size()) {
+            return false;
+        }
+
+        for (String key : innerMap1.keySet()) {
+            if (!innerMap2.containsKey(key)) {
+                return false;
+            }
+            Object value1 = innerMap1.get(key);
+            Object value2 = innerMap2.get(key);
+
+            // 如果值是Map，则递归对比
+            if (value1 instanceof Map && value2 instanceof Map) {
+                if (!areInnerMapsEqual((Map<String, Object>) value1, (Map<String, Object>) value2)) {
+                    return false;
+                }
+            } else if (!value1.equals(value2)) {
+                return false;
+            }
+        }
+
+        return true;
     }
 
     public class Table extends JTable {
         LogEntry logEntry;
-        private SwingWorker<Void, Void> currentWorker;
+        private SwingWorker<Object, Void> currentWorker;
+        // 设置响应报文返回的最大长度为3MB
+        private final int MAX_LENGTH = 3145728;
+        private int lastSelectedIndex = -1;
 
         public Table(TableModel tableModel) {
             super(tableModel);
@@ -309,37 +418,52 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
 
         @Override
         public void changeSelection(int row, int col, boolean toggle, boolean extend) {
-            logEntry = filteredLog.get(convertRowIndexToModel(row));
-            requestViewer.setMessage("Loading...".getBytes(), true);
-            responseViewer.setMessage("Loading...".getBytes(), false);
-            currentlyDisplayedItem = logEntry.getRequestResponse();
-
-            // 取消之前的后台任务
-            if (currentWorker != null && !currentWorker.isDone()) {
-                currentWorker.cancel(true);
-            }
-            // 在后台线程中执行耗时操作
-            SwingWorker<Void, Void> worker = new SwingWorker<Void, Void>() {
-                @Override
-                protected Void doInBackground() throws Exception {
-                    refreshMessage();
-                    return null;
-                }
-            };
-            // 设置当前后台任务
-            currentWorker = worker;
-            // 启动后台线程
-            worker.execute();
             super.changeSelection(row, col, toggle, extend);
-        }
+            int selectedIndex = convertRowIndexToModel(row);
+            if (lastSelectedIndex != selectedIndex) {
+                lastSelectedIndex = selectedIndex;
+                logEntry = filteredLog.get(selectedIndex);
 
-        private void refreshMessage() {
+                requestViewer.setMessage("Loading...".getBytes(), true);
-            SwingUtilities.invokeLater(() -> {
+                responseViewer.setMessage("Loading...".getBytes(), false);
-                requestViewer.setMessage(logEntry.getRequestResponse().getRequest(), true);
+                currentlyDisplayedItem = logEntry.getRequestResponse();
-                responseViewer.setMessage(logEntry.getRequestResponse().getResponse(), false);
+
-            });
+                if (currentWorker != null && !currentWorker.isDone()) {
+                    currentWorker.cancel(true);
+                }
+
+                currentWorker = new SwingWorker<Object, Void>() {
+                    @Override
+                    protected byte[][] doInBackground() throws Exception {
+                        byte[] requestByte = logEntry.getRequestResponse().getRequest();
+                        byte[] responseByte = logEntry.getRequestResponse().getResponse();
+
+                        if (responseByte.length > MAX_LENGTH) {
+                            String ellipsis = "\r\n......";
+                            responseByte = Arrays.copyOf(responseByte, MAX_LENGTH + ellipsis.length());
+                            byte[] ellipsisBytes = ellipsis.getBytes();
+                            System.arraycopy(ellipsisBytes, 0, responseByte, MAX_LENGTH, ellipsisBytes.length);
+                        }
+
+                        return new byte[][] {requestByte, responseByte};
+                    }
+
+                    @Override
+                    protected void done() {
+                        if (!isCancelled()) {
+                            try {
+                                byte[][] result = (byte[][]) get();
+                                requestViewer.setMessage(result[0], true);
+                                responseViewer.setMessage(result[1], false);
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    }
+                };
+                currentWorker.execute();
+            }
         }
     }
 
-}
+}
-