Version: 2.5.10 Update

README.md

@@ -33,7 +33,7 @@ HaE目前的规则一共有6个字段，分别是规则名称、规则正则、
 |-----------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | Name      | 规则名称，主要用于简短概括当前规则的作用。                                                                                                                                                               |
 | Regex     | 规则正则，主要用于填写正则表达式。在HaE中所需提取匹配的内容需要用`(`、`)`将正则表达式进行包裹。                                                                                                            |
-| Scope     | 规则作用域，主要用于表示当前规则作用与HTTP报文的哪个部分。                                                                                                                                               |
+| Scope     | 规则作用域，主要用于表示当前规则作用于HTTP报文的哪个部分。                                                                                                                                               |
 | Engine    | 正则引擎，主要用于表示当前规则的正则表达式所使用的引擎。**DFA引擎**：对于文本串里的每一个字符只需扫描一次，速度快、特性少；**NFA引擎**：要翻来覆去标注字符、取消标注字符，速度慢，但是特性（如:分组、替换、分割）丰富。 |
 | Color     | 规则匹配颜色，主要用于表示当前规则匹配到对应HTTP报文时所需标记的高亮颜色。                                                                                                                               |
 | Sensitive | 规则敏感性，主要用于表示当前规则对于大小写字母是否敏感，敏感（`True`）则严格按照大小写要求匹配，不敏感（`False`）则反之。                                                                                      |

src/main/java/burp/BurpExtender.java

@@ -36,7 +36,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 
         new ConfigLoader();
 
-        String version = "2.5.9";
+        String version = "2.5.10";
         callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
 
         // 定义输出

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

@@ -333,20 +333,6 @@ public class Databoard extends JPanel {
 
             hostTextField.setText(selectedHost);
 
-            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();
-                        }
-                    }
-                }
-            };
-
-            dataTabbedPane.addChangeListener(changeListener);
         }
     }
 }

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

@@ -7,19 +7,16 @@ import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.StringSelection;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-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 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 java.util.regex.Pattern;
 import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
@@ -45,20 +42,11 @@ public class DatatablePanel extends JPanel {
     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 = 5000;
     private JCheckBox searchMode = new JCheckBox("Reverse search");
-    private JCheckBox showMode = new JCheckBox("Show all data");
-    private boolean scrollFlag = true;
 
     public DatatablePanel(String tableName, List<String> list) {
-        fullList = list;
-        currentPage = 0;
-        pageSize = 10;
         this.tableName = tableName;
 
         String[] columnNames = {"#", "Information"};
@@ -77,6 +65,10 @@ public class DatatablePanel extends JPanel {
         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);
 
@@ -122,31 +114,6 @@ public class DatatablePanel extends JPanel {
         // 设置布局
         scrollPane = new JScrollPane(table);
         scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
-        scrollPane.addComponentListener(new ComponentAdapter() {
-            @Override
-            public void componentResized(ComponentEvent e) {
-                updatePageSize();
-            }
-        });
-
-        // 添加滚动监听器，以加载更多数据
-        AdjustmentListener scrollListener = 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();
-                            }
-                        }
-                    }
-                }
-            }
-        };
-
-        scrollPane.getVerticalScrollBar().addAdjustmentListener(scrollListener);
 
         searchMode.addItemListener(new ItemListener() {
             public void itemStateChanged(ItemEvent e) {
@@ -154,18 +121,6 @@ public class DatatablePanel extends JPanel {
             }
         });
 
-        showMode.addItemListener(new ItemListener() {
-            @Override
-            public void itemStateChanged(ItemEvent e) {
-                model.setRowCount(0);
-                if (e.getStateChange() == ItemEvent.SELECTED) {
-                    scrollFlag = false;
-                    loadPageData();
-                    showMode.setEnabled(false);
-                }
-            }
-        });
-
         setLayout(new BorderLayout(0, 5));
 
         JPanel optionsPanel = new JPanel();
@@ -173,11 +128,10 @@ public class DatatablePanel extends JPanel {
         optionsPanel.setLayout(new BoxLayout(optionsPanel, BoxLayout.X_AXIS));
 
         // 新增复选框要在这修改rows
-        JPanel menuPanel = new JPanel(new GridLayout(2, 1));
+        JPanel menuPanel = new JPanel(new GridLayout(1, 1));
         menuPanel.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
         JPopupMenu menu = new JPopupMenu();
         menuPanel.add(searchMode);
-        menuPanel.add(showMode);
         menu.add(menuPanel);
 
         JButton settingsButton = new JButton("Settings");
@@ -196,8 +150,16 @@ public class DatatablePanel extends JPanel {
 
         add(scrollPane, BorderLayout.CENTER);
         add(optionsPanel, BorderLayout.SOUTH);
+    }
 
-        loadPageData();
+    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() {
@@ -215,14 +177,16 @@ public class DatatablePanel extends JPanel {
                 rowFilter = new RowFilter<DefaultTableModel, Object>() {
                     public boolean include(Entry<? extends DefaultTableModel, ? extends Object> entry) {
                         // 对每一行的第二列进行判断（假设第二列的索引是1）
-                        String value = (String) entry.getValue(1);
+                        String entryValue = (String) entry.getValue(1);
                         // 如果该列的值不包含搜索文本，则返回true，否则返回false
-                        return searchText.isEmpty() ? true : !value.toLowerCase().contains(searchText.toLowerCase());
+                        Pattern pattern = new Pattern(searchText, REFlags.IGNORE_CASE);
+
+                        return searchText.isEmpty() || !pattern.matcher(entryValue).find();
                     }
                 };
             } else {
                 // 正向搜索：创建一个过滤器以包含与正则表达式匹配的行
-                rowFilter = RowFilter.regexFilter("(?i)" + Pattern.quote(searchText), 1);
+                rowFilter = RowFilter.regexFilter(String.format("(?i)%s", searchText), 1);
             }
 
             // 设置过滤器到排序器
@@ -230,51 +194,6 @@ public class DatatablePanel extends JPanel {
         }
     }
 
-    // 加载指定页的数据
-    private void loadPageData() {
-        if (fullList.size() > SHOW_LENGTH && scrollFlag) {
-            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});
-            }
-        }
-    }
-
-    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 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 + 5);
-    }
-
     public void setTableListener(MessagePanel messagePanel) {
         table.setDefaultEditor(Object.class, null);