Version: 2.5.6 Update

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

@@ -21,12 +21,10 @@ import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 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;
@@ -158,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)
         {
@@ -264,6 +265,7 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
             }
         }
         fireTableDataChanged();
+        logTable.lastSelectedIndex = -1;
     }
 
     public void deleteByHost(String filterText) {
@@ -355,6 +357,9 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
     }
 
     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;
         }
@@ -398,7 +403,10 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
 
     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);
@@ -407,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();
+                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;
+                if (currentWorker != null && !currentWorker.isDone()) {
+                    currentWorker.cancel(true);
                 }
-            };
-            // 设置当前后台任务
-            currentWorker = worker;
-            // 启动后台线程
-            worker.execute();
-        }
 
-        private synchronized void refreshMessage() {
-            SwingUtilities.invokeLater(() -> {
-                requestViewer.setMessage(logEntry.getRequestResponse().getRequest(), true);
-                responseViewer.setMessage(logEntry.getRequestResponse().getResponse(), false);
-            });
+                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();
+            }
         }
     }