Version: 2.5.6 Update

src/main/java/burp/BurpExtender.java

@@ -4,7 +4,11 @@ import burp.config.ConfigLoader;
 import burp.core.processor.ColorProcessor;
 import burp.core.processor.MessageProcessor;
 import burp.ui.MainUI;
+import burp.ui.board.DatatablePanel;
 import burp.ui.board.MessagePanel;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.net.URL;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
 import javax.swing.*;
@@ -35,7 +39,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 
         new ConfigLoader();
 
-        String version = "2.5.3";
+        String version = "2.5.6";
         callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
 
         // 定义输出
@@ -57,7 +61,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);
@@ -65,13 +69,49 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
     }
 
     @Override
-    public String getTabCaption(){
+    public String getTabCaption() {
         return "HaE";
     }
 
     @Override
     public Component getUiComponent() {
-        return main;
+        JTabbedPane HaETabbedPane = new JTabbedPane();
+        HaETabbedPane.addTab("", getImageIcon(false), main);
+        HaETabbedPane.addTab(" Highlighter and Extractor - Empower ethical hacker for efficient operations ", null);
+        HaETabbedPane.setEnabledAt(1, false);
+        HaETabbedPane.addPropertyChangeListener("background", new PropertyChangeListener() {
+            @Override
+            public void propertyChange(PropertyChangeEvent e) {
+                boolean isDarkBg = isDarkBg();
+                HaETabbedPane.setIconAt(0, getImageIcon(isDarkBg));
+            }
+
+            private boolean isDarkBg() {
+                Color bg = HaETabbedPane.getBackground();
+                int r = bg.getRed();
+                int g = bg.getGreen();
+                int b = bg.getBlue();
+                int avg = (r + g + b) / 3;
+
+                return avg < 128;
+            }
+        });
+        return HaETabbedPane;
+    }
+
+    private ImageIcon getImageIcon(boolean isDark) {
+        ClassLoader classLoader = getClass().getClassLoader();
+        URL imageURL;
+        if (isDark) {
+            imageURL = classLoader.getResource("logo.png");
+        } else {
+            imageURL = classLoader.getResource("logo_black.png");
+        }
+        ImageIcon originalIcon = new ImageIcon(imageURL);
+        Image originalImage = originalIcon.getImage();
+        Image scaledImage = originalImage.getScaledInstance(30, 20, Image.SCALE_FAST);
+        ImageIcon scaledIcon = new ImageIcon(scaledImage);
+        return scaledIcon;
     }
 
     /**
@@ -178,7 +218,8 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 
     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;
@@ -198,10 +239,10 @@ 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
@@ -241,15 +282,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
          */
         @Override
         public byte[] getSelectedData() {
-            int[] selectRows = jTable.getSelectedRows();
-            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());
+            return helpers.stringToBytes(dataPanel.getSelectedData(dataTable));
         }
 
         /**
@@ -271,18 +304,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);
             });
 
             /*
@@ -290,9 +317,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);
                 }
             });
 

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

@@ -1,6 +1,5 @@
 package burp.core.processor;
 
-import burp.BurpExtender;
 import burp.core.GlobalCachePool;
 import burp.core.utils.HashCalculator;
 import burp.core.utils.MatchTool;
@@ -57,10 +56,9 @@ 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 = "";
                     // 遍历获取规则
                     List<String> result = new ArrayList<>();
@@ -179,14 +177,6 @@ public class DataProcessingUnit {
                             }
                         }
                     }
-                    });
-                    t.start();
-                    try {
-                        t.join();
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-
                 }
             });
             GlobalCachePool.addToCache(messageIndex, finalMap);

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

@@ -1,6 +1,8 @@
 package burp.core.processor;
 
 import burp.IExtensionHelpers;
+import burp.IRequestInfo;
+import burp.IResponseInfo;
 import burp.core.utils.MatchTool;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
@@ -20,7 +22,8 @@ public class MessageProcessor {
         Map<String, Map<String, Object>> obj;
 
         if (isRequest) {
-            List<String> requestTmpHeaders = helpers.analyzeRequest(content).getHeaders();
+            IRequestInfo requestInfo = helpers.analyzeRequest(content);
+            List<String> requestTmpHeaders = requestInfo.getHeaders();
             String requestHeaders = String.join("\n", requestTmpHeaders);
 
             try {
@@ -33,22 +36,23 @@ public class MessageProcessor {
                 return result;
             }
 
-            int requestBodyOffset = helpers.analyzeRequest(content).getBodyOffset();
+            int requestBodyOffset = requestInfo.getBodyOffset();
             byte[] requestBody = Arrays.copyOfRange(content, requestBodyOffset, content.length);
             obj = dataProcessingUnit.matchContentByRegex(content, requestHeaders, requestBody, "request", host);
         } else {
+            IResponseInfo responseInfo = helpers.analyzeResponse(content);
             try {
-                String inferredMimeType = String.format("hae.%s", helpers.analyzeResponse(content).getInferredMimeType().toLowerCase());
-                String statedMimeType = String.format("hae.%s", helpers.analyzeResponse(content).getStatedMimeType().toLowerCase());
+                String inferredMimeType = String.format("hae.%s", responseInfo.getInferredMimeType().toLowerCase());
+                String statedMimeType = String.format("hae.%s", responseInfo.getStatedMimeType().toLowerCase());
                 if (matcher.matchUrlSuffix(statedMimeType) || matcher.matchUrlSuffix(inferredMimeType)) {
                     return result;
                 }
             } catch (Exception e) {
                 return result;
             }
-            List<String> responseTmpHeaders = helpers.analyzeResponse(content).getHeaders();
+            List<String> responseTmpHeaders = responseInfo.getHeaders();
             String responseHeaders = String.join("\n", responseTmpHeaders);
-            int responseBodyOffset = helpers.analyzeResponse(content).getBodyOffset();
+            int responseBodyOffset = responseInfo.getBodyOffset();
             byte[] responseBody = Arrays.copyOfRange(content, responseBodyOffset, content.length);
             obj = dataProcessingUnit.matchContentByRegex(content, responseHeaders, responseBody, "response", host);
         }

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

@@ -13,6 +13,7 @@ import javax.swing.JOptionPane;
  */
 public class RuleTool {
     private String rulesFilePath;
+    private boolean isSuccess;
 
     public RuleTool(String rulesFilePath) {
         this.rulesFilePath = rulesFilePath;
@@ -32,18 +33,22 @@ public class RuleTool {
                 FileOutputStream fileOutputStream = new FileOutputStream(this.rulesFilePath);
                 fileOutputStream.write(responseBodyByte);
                 fileOutputStream.close();
-                JOptionPane.showMessageDialog(null, "Rules update successfully!", "Info",
-                        JOptionPane.INFORMATION_MESSAGE);
+                isSuccess = true;
             } catch (Exception e) {
-                JOptionPane.showMessageDialog(null, e, "Error",
-                        JOptionPane.ERROR_MESSAGE);
+                isSuccess = false;
             }
         });
         t.start();
         try {
-            t.join();
+            t.join(10000);
         } catch (Exception e) {
-            e.printStackTrace();
+            isSuccess = false;
+        }
+
+        if (isSuccess) {
+            JOptionPane.showMessageDialog(null, "Rules update successfully!", "Info", JOptionPane.INFORMATION_MESSAGE);
+        } else {
+            JOptionPane.showMessageDialog(null, "Rule update failed, please check the network!", "Error", JOptionPane.ERROR_MESSAGE);
         }
     }
 }

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

@@ -20,11 +20,9 @@ import java.util.Map;
  */
 
 public class MainUI extends JPanel {
-    private MessagePanel messagePanel;
 
     public MainUI(MessagePanel messagePanel) {
-        this.messagePanel = messagePanel;
-        databoardPanel = new Databoard(this.messagePanel);
+        databoardPanel = new Databoard(messagePanel);
         initComponents();
     }
 
@@ -67,6 +65,7 @@ public class MainUI extends JPanel {
     private void excludeSuffixSaveActionPerformed(ActionEvent e) {
         ConfigLoader.setExcludeSuffix(excludeSuffixTextField.getText());
     }
+
     private void initComponents() {
         JTabbedPane mainTabbedPane = new JTabbedPane();
         ruleTabbedPane = new JTabbedPane();
@@ -143,7 +142,7 @@ public class MainUI extends JPanel {
                 ConfigEntry.globalRules.get(i),
                 ruleTabbedPane)));
 
-        ruleTabbedPane.addTab("...",new JLabel());
+        ruleTabbedPane.addTab("...", new JLabel());
 
         rulesPathTextField.setText(ConfigLoader.getRulesFilePath());
         excludeSuffixTextField.setText(ConfigLoader.getExcludeSuffix());

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

@@ -7,7 +7,6 @@ import burp.ui.board.MessagePanel.Table;
 import java.util.*;
 import javax.swing.event.ChangeEvent;
 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;
@@ -27,12 +26,28 @@ public class Databoard extends JPanel {
     private static Boolean isMatchHost = false;
     private JLabel hostLabel;
     private JTextField hostTextField;
-    private JTabbedPane dataTabbedPaneA;
-    private JTabbedPane dataTabbedPaneB;
+    private JTabbedPane dataTabbedPane;
     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;
@@ -40,8 +55,7 @@ public class Databoard extends JPanel {
     }
 
     private void cleanUI() {
-        dataTabbedPaneA.removeAll();
-        dataTabbedPaneB.removeAll();
+        dataTabbedPane.removeAll();
         splitPane.setVisible(false);
     }
 
@@ -68,8 +82,7 @@ public class Databoard extends JPanel {
         // JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
         hostLabel = new JLabel();
         hostTextField = new JTextField();
-        dataTabbedPaneA = new JTabbedPane(JTabbedPane.TOP);
-        dataTabbedPaneB = new JTabbedPane(JTabbedPane.TOP);
+        dataTabbedPane = new JTabbedPane(JTabbedPane.TOP);
         clearButton = new JButton();
 
         //======== this ========
@@ -100,6 +113,23 @@ public class Databoard extends JPanel {
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(8, 0, 5, 5), 0, 0));
 
+        hostTextField.setLayout(new BorderLayout());
+        hostTextField.add(hostComboBox, BorderLayout.SOUTH);
+        hostComboBox.setMaximumRowCount(5);
+        hostComboBox.setPreferredSize(new Dimension(super.getPreferredSize().width, 0));
+
+        // 由于主题切换造成的UI组件重绘，而自定义组件没有正确地与之同步，因此需要事件监听来进行同步
+        UIManager.addPropertyChangeListener(evt -> {
+            if ("lookAndFeel".equals(evt.getPropertyName())) {
+                SwingUtilities.invokeLater(() -> {
+                    hostTextField.remove(hostComboBox);
+                    hostTextField.add(hostComboBox, BorderLayout.SOUTH);
+                    hostTextField.revalidate();
+                    hostTextField.repaint();
+                });
+            }
+        });
+
         setAutoMatch();
     }
 
@@ -111,38 +141,55 @@ public class Databoard extends JPanel {
      * 设置输入自动匹配
      */
     private void setAutoMatch() {
-        final DefaultComboBoxModel comboBoxModel = new DefaultComboBoxModel();
+        populateComboBoxModel();
 
-        final JComboBox hostComboBox = new JComboBox(comboBoxModel) {
+        hostComboBox.setSelectedItem(null);
+        hostComboBox.addActionListener(this::handleComboBoxAction);
+
+        hostTextField.addKeyListener(new KeyAdapter() {
             @Override
-            public Dimension getPreferredSize() {
-                setMaximumRowCount(5);
-                return new Dimension(super.getPreferredSize().width, 0);
+            public void keyPressed(KeyEvent e) {
+                handleKeyEvents(e);
             }
-        };
+        });
 
-        isMatchHost = false;
+        hostTextField.getDocument().addDocumentListener(new DocumentListener() {
+            @Override
+            public void insertUpdate(DocumentEvent e) {
+                update(e);
+            }
 
+            @Override
+            public void removeUpdate(DocumentEvent e) {
+                update(e);
+            }
+
+            @Override
+            public void changedUpdate(DocumentEvent e) {
+                update(e);
+            }
+
+            public void update(DocumentEvent e) {
+                filterComboBoxList();
+            }
+        });
+    }
+
+    private void populateComboBoxModel() {
         for (String host : getHostByList()) {
             comboBoxModel.addElement(host);
         }
+    }
 
-        hostComboBox.setSelectedItem(null);
-
-        hostComboBox.addActionListener(e -> {
-            if (!isMatchHost) {
-                if (hostComboBox.getSelectedItem() != null) {
+    private void handleComboBoxAction(ActionEvent e) {
+        if (!isMatchHost && hostComboBox.getSelectedItem() != null) {
             String selectedHost = hostComboBox.getSelectedItem().toString();
             hostTextField.setText(selectedHost);
             populateTabbedPaneByHost(selectedHost);
         }
     }
-        });
 
-        // 事件监听
-        hostTextField.addKeyListener(new KeyAdapter() {
-            @Override
-            public void keyPressed(KeyEvent e) {
+    private void handleKeyEvents(KeyEvent e) {
         isMatchHost = true;
         int keyCode = e.getKeyCode();
 
@@ -150,16 +197,13 @@ public class Databoard extends JPanel {
             e.setKeyCode(KeyEvent.VK_ENTER);
         }
 
-                if (keyCode == KeyEvent.VK_ENTER || keyCode == KeyEvent.VK_UP || keyCode == KeyEvent.VK_DOWN) {
+        if (Arrays.asList(KeyEvent.VK_ENTER, KeyEvent.VK_UP, KeyEvent.VK_DOWN).contains(keyCode)) {
             e.setSource(hostComboBox);
             hostComboBox.dispatchEvent(e);
-
             if (keyCode == KeyEvent.VK_ENTER) {
-                        String selectedItem = hostComboBox.getSelectedItem().toString();
-                        hostTextField.setText(selectedItem);
-                        populateTabbedPaneByHost(selectedItem);
+                updateTextFieldFromComboBox();
                 hostComboBox.setPopupVisible(false);
-                        return;
+                e.consume();
             }
         }
 
@@ -169,29 +213,22 @@ public class Databoard extends JPanel {
 
         isMatchHost = false;
     }
-        });
 
-        hostTextField.getDocument().addDocumentListener(new DocumentListener() {
-            @Override
-            public void insertUpdate(DocumentEvent e) {
-                updateList();
+    private void updateTextFieldFromComboBox() {
+        Object selectedItem = hostComboBox.getSelectedItem();
+        if (selectedItem != null) {
+            String selectedHost = selectedItem.toString();
+            hostTextField.setText(selectedHost);
+            populateTabbedPaneByHost(selectedHost);
+        }
     }
 
-            @Override
-            public void removeUpdate(DocumentEvent e) {
-                updateList();
-            }
-
-            @Override
-            public void changedUpdate(DocumentEvent e) {
-                updateList();
-            }
-
-            private void updateList() {
+    private void filterComboBoxList() {
         isMatchHost = true;
         comboBoxModel.removeAllElements();
         String input = hostTextField.getText().toLowerCase();
-                if (!input.isEmpty()){
+
+        if (!input.isEmpty()) {
             for (String host : getHostByList()) {
                 String lowerCaseHost = host.toLowerCase();
                 if (lowerCaseHost.contains(input)) {
@@ -204,22 +241,20 @@ public class Databoard extends JPanel {
                 }
             }
         }
+
         hostComboBox.setPopupVisible(comboBoxModel.getSize() > 0);
         isMatchHost = false;
     }
-        });
-
-        hostTextField.setLayout(new BorderLayout());
-        hostTextField.add(hostComboBox, BorderLayout.SOUTH);
-    }
 
     private void applyHostFilter(String filterText) {
         TableRowSorter<TableModel> sorter = (TableRowSorter<TableModel>) table.getRowSorter();
+
         if (filterText.contains("*.")) {
             filterText = StringHelper.replaceFirstOccurrence(filterText, "*.", "");
         } else if (filterText.contains("*")) {
             filterText = "";
         }
+
         RowFilter<TableModel, Integer> filter = RowFilter.regexFilter(filterText, 1);
         sorter.setRowFilter(filter);
         filterText = filterText.isEmpty() ? "*" : filterText;
@@ -256,51 +291,58 @@ public class Databoard extends JPanel {
                 selectedDataMap = dataMap.get(selectedHost);
             }
 
-            // 由于removeChangeListener不知什么原因不生效，因此建立两个tabbedPane
-            dataTabbedPaneA.removeAll();
-            dataTabbedPaneB.removeAll();
+            dataTabbedPane.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);
-                }
-            };
+            dataTabbedPane.setPreferredSize(new Dimension(500,0));
+            dataTabbedPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
+            splitPane.setLeftComponent(dataTabbedPane);
 
             if (selectedHost.equals("**")) {
-                dataTabbedPaneA.setPreferredSize(new Dimension(500,0));
-                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);
+                    if (currentWorker != null && !currentWorker.isDone()) {
+                        currentWorker.cancel(true);
+                    }
+
                     for (Map.Entry<String, List<String>> entrySet : entry.getValue().entrySet()) {
-                        Thread t = new Thread(() -> {
-                            String tabTitle = String.format("%s (%s)", entrySet.getKey(), entrySet.getValue().size());
-                            newTabbedPane.addTab(tabTitle, new DataTable(entrySet.getKey(), entrySet.getValue()));
-                            dataTabbedPaneA.addTab(entry.getKey(), newTabbedPane);
-                        });
-                        t.start();
+                        currentWorker = new SwingWorker<Object, Void>() {
+                            @Override
+                            protected Object[] doInBackground() throws Exception {
+                                String tabTitle = String.format("%s (%s)", entrySet.getKey(),
+                                        entrySet.getValue().size());
+                                DatatablePanel datatablePanel = new DatatablePanel(entrySet.getKey(),
+                                        entrySet.getValue());
+                                datatablePanel.setTableListener(messagePanel);
+                                return new Object[] {tabTitle, datatablePanel};
+                            }
+
+                            @Override
+                            protected void done() {
+                                if (!isCancelled()) {
                                     try {
-                            t.join();
+                                        Object[] result = (Object[]) get();
+                                        newTabbedPane.addTab(result[0].toString(), (DatatablePanel) result[1]);
+                                        dataTabbedPane.addTab(entry.getKey(), newTabbedPane);
                                     } catch (Exception e) {
                                         e.printStackTrace();
                                     }
                                 }
                             }
-                dataTabbedPaneA.addChangeListener(changeListenerInstance);
+                        };
+                        currentWorker.execute();
+                    }
+                }
+
+                dataTabbedPane.addChangeListener(changeListenerInstance);
             } else {
-                dataTabbedPaneB.setPreferredSize(new Dimension(500,0));
-                dataTabbedPaneB.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
-                splitPane.setLeftComponent(dataTabbedPaneB);
+                dataTabbedPane.removeChangeListener(changeListenerInstance);
+
                 for (Map.Entry<String, List<String>> entry : selectedDataMap.entrySet()) {
                     String tabTitle = String.format("%s (%s)", entry.getKey(), entry.getValue().size());
-                    dataTabbedPaneB.addTab(tabTitle, new DataTable(entry.getKey(), entry.getValue()));
+                    DatatablePanel datatablePanel = new DatatablePanel(entry.getKey(), entry.getValue());
+                    datatablePanel.setTableListener(messagePanel);
+                    dataTabbedPane.addTab(tabTitle, datatablePanel);
                 }
             }
 
@@ -326,103 +368,21 @@ public class Databoard extends JPanel {
             }
 
             hostTextField.setText(selectedHost);
-        }
-    }
 
-    class DataTable extends JPanel {
-        private final JTable table;
-        private final DefaultTableModel model;
-        private final JTextField searchField;
-        private TableRowSorter<DefaultTableModel> sorter;
-
-
-        public DataTable(String tableName, List<String> list) {
-            model = new DefaultTableModel();
-            table = new JTable(model);
-            sorter = new TableRowSorter<>(model);
-
-            table.setRowSorter(sorter);
-            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, 0).toString();
-                            messagePanel.applyMessageFilter(tableName, rowData);
+            ChangeListener changeListener = new ChangeListener() {
+                public void stateChanged(ChangeEvent e) {
+                    JTabbedPane tabSource = (JTabbedPane) e.getSource();
+                    int index = tabSource.getSelectedIndex();
+                    if (index != -1) {
+                        Component selectedComponent = tabSource.getComponentAt(index);
+                        if (selectedComponent instanceof DatatablePanel) {
+                            ((DatatablePanel) selectedComponent).updatePageSize();
                         }
                     }
                 }
-            });
+            };
 
-            model.addColumn("Information");
-            for (String item : list) {
-                model.addRow(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();
-                }
-
-                private void performSearch() {
-                    // 通过字体颜色来判断是否可以进行过滤
-                    if (searchField.getForeground() == Color.BLACK) {
-                        String searchText = searchField.getText();
-                        if (sorter == null) {
-                            sorter = new TableRowSorter<>(model);
-                            table.setRowSorter(sorter);
-                        }
-                        RowFilter<DefaultTableModel, Object> rowFilter = RowFilter.regexFilter(searchText, 0);
-                        sorter.setRowFilter(rowFilter);
-                    }
-                }
-            });
-
-            // 设置布局
-            JScrollPane scrollPane = new JScrollPane(table);
-
-            setLayout(new BorderLayout(0, 5));
-            add(scrollPane, BorderLayout.CENTER);
-            add(searchField, BorderLayout.SOUTH);
+            dataTabbedPane.addChangeListener(changeListener);
         }
     }
 }

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

@@ -0,0 +1,234 @@
+package burp.ui.board;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
+import java.awt.event.AdjustmentEvent;
+import java.awt.event.AdjustmentListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.List;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+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 int pageSize; // 动态计算的，每页显示多少条记录
+    private int currentPage; // 当前页码
+    private List<String> fullList; // 假设这是一个包含所有数据的列表
+    private JScrollPane scrollPane;
+    private String tableName;
+    private final int SHOW_LENGTH = 3000;
+
+    public DatatablePanel(String tableName, List<String> list) {
+        fullList = list;
+        currentPage = 0;
+        pageSize = 10;
+        this.tableName = tableName;
+
+        String[] columnNames = {"#", "Information"};
+        model = new DefaultTableModel(columnNames, 0);
+        table = new JTable(model);
+        sorter = new TableRowSorter<>(model);
+
+        table.setRowSorter(sorter);
+        TableColumn idColumn = table.getColumnModel().getColumn(0);
+        idColumn.setMaxWidth(50);
+
+        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();
+            }
+
+            private void performSearch() {
+                // 通过字体颜色来判断是否可以进行过滤
+                if (searchField.getForeground() == Color.BLACK) {
+                    String searchText = searchField.getText();
+                    if (sorter == null) {
+                        sorter = new TableRowSorter<>(model);
+                        table.setRowSorter(sorter);
+                    }
+                    RowFilter<DefaultTableModel, Object> rowFilter = RowFilter.regexFilter(String.format("%s%s", "(?i)", searchText), 1);
+                    sorter.setRowFilter(rowFilter);
+                }
+            }
+        });
+
+        // 设置布局
+        scrollPane = new JScrollPane(table);
+        scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
+        scrollPane.addComponentListener(new ComponentAdapter() {
+            @Override
+            public void componentResized(ComponentEvent e) {
+                updatePageSize();
+            }
+        });
+
+        // 添加滚动监听器，以加载更多数据
+        scrollPane.getVerticalScrollBar().addAdjustmentListener(new AdjustmentListener() {
+            @Override
+            public void adjustmentValueChanged(AdjustmentEvent e) {
+                if (fullList.size() > SHOW_LENGTH) {
+                    if (!e.getValueIsAdjusting() && !scrollPane.getVerticalScrollBar().getValueIsAdjusting()) {
+                        if (scrollPane.getVerticalScrollBar().getValue() == scrollPane.getVerticalScrollBar().getMaximum() - scrollPane.getVerticalScrollBar().getVisibleAmount()) {
+                            if ((currentPage + 1) * pageSize < fullList.size()) {
+                                currentPage++;
+                                loadPageData();
+                            }
+                        }
+                    }
+                }
+            }
+        });
+
+        setLayout(new BorderLayout(0, 5));
+        add(scrollPane, BorderLayout.CENTER);
+        add(searchField, BorderLayout.SOUTH);
+        loadPageData();
+    }
+
+    // 加载指定页的数据
+    private void loadPageData() {
+        if (fullList.size() > SHOW_LENGTH) {
+            int start = currentPage * pageSize;
+            int end = Math.min((currentPage + 1) * pageSize, fullList.size());
+            int lastRow = model.getRowCount();
+            start = Math.max(start, lastRow);
+
+            for (int i = start; i < end; i++) {
+                addRowToTable(model, new Object[]{fullList.get(i)});
+            }
+        } else {
+            for (String item : fullList) {
+                addRowToTable(model, new Object[]{item});
+            }
+        }
+    }
+
+    public void updatePageSize() {
+        if (fullList.size() > SHOW_LENGTH && isShowing()) {
+            int oldPageSize = pageSize;
+            pageSize = getDynamicSize();
+            if (oldPageSize != pageSize) {
+                currentPage = 0;
+                loadPageData();
+            }
+        }
+    }
+
+    private int getDynamicSize() {
+        int visibleHeight = scrollPane.getViewport().getViewRect().height;
+        int rowHeight = table.getRowHeight();
+        return Math.max(1, visibleHeight / rowHeight + 2);
+    }
+
+    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, 0).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();
+    }
+
+    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); // 添加行
+    }
+
+    public JTable getTable() {
+        return this.table;
+    }
+}

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

@@ -9,6 +9,7 @@ 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;
 
@@ -19,11 +20,11 @@ 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;
@@ -57,7 +58,7 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
 
         // 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);
@@ -66,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);
@@ -155,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)
         {
@@ -261,6 +265,7 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
             }
         }
         fireTableDataChanged();
+        logTable.lastSelectedIndex = -1;
     }
 
     public void deleteByHost(String filterText) {
@@ -314,20 +319,24 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
 
             try {
                 // 比较Hash，如若存在重复的请求或响应，则不放入消息内容里
-                String reqHashA = getMessageHash(true, messageInfo.getRequest());
-                String resHashA = getMessageHash(false, messageInfo.getResponse());
+                byte[] reqByteA = messageInfo.getRequest();
+                byte[] resByteA = messageInfo.getResponse();
                 boolean isDuplicate = false;
 
+                if (log.size() > 0) {
                     for (LogEntry entry : log) {
                         IHttpRequestResponsePersisted reqResMessage = entry.getRequestResponse();
-                    String reqHashB = getMessageHash(true, reqResMessage.getRequest());
-                    String resHashB = getMessageHash(false, reqResMessage.getResponse());
-
-                    if (reqHashB.equals(reqHashA) || resHashB.equals(resHashA)) {
-                        if (entry.getComment().equals(comment)) {
+                        byte[] reqByteB = reqResMessage.getRequest();
+                        byte[] resByteB = reqResMessage.getResponse();
+                        try {
+                            // 采用匹配数据结果比对
+                            if (areMapsEqual(getCacheData(reqByteB), getCacheData(reqByteA)) && areMapsEqual(getCacheData(resByteB), getCacheData(resByteA))) {
                                 isDuplicate = true;
                                 break;
                             }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                     }
                 }
 
@@ -341,24 +350,63 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
 
     }
 
-    private String getMessageHash(boolean isRequest, byte[] content)
+    private Map<String, Map<String, Object>> getCacheData(byte[] content)
             throws NoSuchAlgorithmException {
-        String hash = "";
-
-        if (isRequest) {
-            hash = HashCalculator.calculateHash(content);
-        } else {
-            int responseBodyOffset = helpers.analyzeResponse(content).getBodyOffset();
-            byte[] responseBody = Arrays.copyOfRange(content, responseBodyOffset, content.length);
-            hash = HashCalculator.calculateHash(responseBody);
+        String hashIndex = HashCalculator.calculateHash(content);
+        return GlobalCachePool.getFromCache(hashIndex);
     }
 
-        return hash;
+    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);
@@ -367,35 +415,50 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
         @Override
         public void changeSelection(int row, int col, boolean toggle, boolean extend) {
             super.changeSelection(row, col, toggle, extend);
+            int selectedIndex = convertRowIndexToModel(row);
+            if (lastSelectedIndex != selectedIndex) {
+                lastSelectedIndex = selectedIndex;
+                logEntry = filteredLog.get(selectedIndex);
 
-            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>() {
+
+                currentWorker = new SwingWorker<Object, Void>() {
                     @Override
-                protected Void doInBackground() throws Exception {
-                    refreshMessage();
-                    return null;
-                }
-            };
-            // 设置当前后台任务
-            currentWorker = worker;
-            // 启动后台线程
-            worker.execute();
+                    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);
                         }
 
-        private synchronized void refreshMessage() {
-            SwingUtilities.invokeLater(() -> {
-                requestViewer.setMessage(logEntry.getRequestResponse().getRequest(), true);
-                responseViewer.setMessage(logEntry.getRequestResponse().getResponse(), false);
-            });
+                        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();
+            }
         }
     }