Version: 2.6.1 Update

.github/ISSUE_TEMPLATE/问题反馈.md

@@ -26,3 +26,11 @@ JDK版本：
 ## 解决建议
 
 无。
+
+## 赞助
+
+如果你觉得HaE好用，可以打赏一下作者，给作者持续更新下去的动力！
+
+<div align=center>
+<img src="https://raw.githubusercontent.com/gh0stkey/HaE/master/images/reward.jpeg" style="width: 30%" />
+</div>

README.md

@@ -25,17 +25,19 @@
 
 ### 规则释义
 
-HaE目前的规则一共有6个字段，分别是规则名称、规则正则、规则作用域、正则引擎、规则匹配颜色、规则敏感性。
+HaE目前的规则一共有8个字段，分别是规则名称、规则正则、规则作用域、正则引擎、规则匹配颜色、规则敏感性。
 
 详细的含义如下所示：
 
 | 字段      | 含义                                                                                                                                                                                                   |
 |-----------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | Name      | 规则名称，主要用于简短概括当前规则的作用。                                                                                                                                                               |
-| Regex     | 规则正则，主要用于填写正则表达式。在HaE中所需提取匹配的内容需要用`(`、`)`将正则表达式进行包裹。                                                                                                            |
+| F-Regex     | 规则正则，主要用于填写正则表达式。在HaE中所需提取匹配的内容需要用`(`、`)`将正则表达式进行包裹。|
-| Scope     | 规则作用域，主要用于表示当前规则作用与HTTP报文的哪个部分。                                                                                                                                               |
+| S-Regex     | 规则正则，作用及使用同F-Regex。S-Regex为二次正则，可以用于对F-Regex匹配的数据结果进行二次的匹配提取，如不需要的情况下可以留空。|
+| Format     | 格式化输出，在NFA引擎的正则表达式中，我们可以通过`{0}`、`{1}`、`{2}`…的方式进行取分组格式化输出。默认情况下使用`{0}`即可。          |
+| Scope     | 规则作用域，主要用于表示当前规则作用于HTTP报文的哪个部分。                                                                                                                                               |
 | Engine    | 正则引擎，主要用于表示当前规则的正则表达式所使用的引擎。**DFA引擎**：对于文本串里的每一个字符只需扫描一次，速度快、特性少；**NFA引擎**：要翻来覆去标注字符、取消标注字符，速度慢，但是特性（如:分组、替换、分割）丰富。 |
-| Color     | 规则匹配颜色，主要用于表示当前规则匹配到对应HTTP报文时所需标记的高亮颜色。                                                                                                                               |
+| Color     | 规则匹配颜色，主要用于表示当前规则匹配到对应HTTP报文时所需标记的高亮颜色。在HaE中具备颜色升级算法，当出现相同颜色时会自动向上升级一个颜色进行标记。                                                                                                                               |
 | 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.6.1";
         callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
 
         // 定义输出
@@ -128,6 +128,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
         private Map<String, String> extractRequestMap;
         private Map<String, String> extractResponseMap;
         private ArrayList<String> titleList = new ArrayList<>();
+        private byte[] message;
 
         public MarkInfoTab(IMessageEditorController controller, boolean editable) {
             this.controller = controller;
@@ -151,6 +152,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 
         @Override
         public boolean isEnabled(byte[] content, boolean isRequest) {
+            this.message = content;
             List<Map<String, String>> result = null;
             if (content.length != 0 && !helpers.bytesToString(content).equals("Loading...")) {
                 try {
@@ -178,7 +180,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 
         @Override
         public byte[] getMessage() {
-            return null;
+            return message;
         }
 
         @Override

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

@@ -112,7 +112,7 @@ public class ConfigLoader {
     public static Map<String, Object[][]> getRules() {
         Map<String, Object> rulesMap = YamlTool.loadYaml(getRulesFilePath());
         Map<String, Object[][]> resRule = new HashMap<>();
-        String[] fieldKeys = {"loaded", "name", "regex", "color", "scope", "engine", "sensitive"};
+        String[] fieldKeys = {"loaded", "name", "f_regex", "s_regex", "format", "color", "scope", "engine", "sensitive"};
 
         Object rulesObj = rulesMap.get("rules");
         if (rulesObj instanceof List) {

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

@@ -12,6 +12,7 @@ import dk.brics.automaton.RegExp;
 import dk.brics.automaton.RunAutomaton;
 import java.nio.charset.StandardCharsets;
 import java.security.NoSuchAlgorithmException;
+import java.text.MessageFormat;
 import java.util.*;
 
 import java.util.concurrent.ConcurrentHashMap;
@@ -66,13 +67,16 @@ public class DataProcessingUnit {
                     List<String> result = new ArrayList<>();
                     Map<String, Object> tmpMap = new HashMap<>();
 
-                    String name = objects[1].toString();
                     boolean loaded = (Boolean) objects[0];
-                    String regex = objects[2].toString();
+                    String name = objects[1].toString();
-                    String color = objects[3].toString();
+                    String f_regex = objects[2].toString();
-                    String scope = objects[4].toString();
+                    String s_regex = objects[3].toString();
-                    String engine = objects[5].toString();
+                    String format = objects[4].toString();
-                    boolean sensitive = (Boolean) objects[6];
+                    String color = objects[5].toString();
+                    String scope = objects[6].toString();
+                    String engine = objects[7].toString();
+                    boolean sensitive = (Boolean) objects[8];
+
                     // 判断规则是否开启与作用域
                     if (loaded && (scope.contains(scopeString) || scope.contains("any"))) {
                         switch (scope) {
@@ -96,34 +100,9 @@ public class DataProcessingUnit {
                         }
 
                         try {
-                            if ("nfa".equals(engine)) {
+                            result.addAll(matchByRegex(f_regex, s_regex, matchContent, format, engine, sensitive));
-                                Pattern pattern;
-                                // 判断规则是否大小写敏感
-                                if (sensitive) {
-                                    pattern = new Pattern(regex);
-                                } else {
-                                    pattern = new Pattern(regex, Pattern.IGNORE_CASE);
-                                }
-
-                                Matcher matcher = pattern.matcher(matchContent);
-                                while (matcher.find()) {
-                                    // 添加匹配数据至list
-                                    // 强制用户使用()包裹正则
-                                    result.add(matcher.group(1));
-                                }
-                            } else {
-                                RegExp regexp = new RegExp(regex);
-                                Automaton auto = regexp.toAutomaton();
-                                RunAutomaton runAuto = new RunAutomaton(auto, true);
-                                AutomatonMatcher autoMatcher = runAuto.newMatcher(matchContent);
-                                while (autoMatcher.find()) {
-                                    // 添加匹配数据至list
-                                    // 强制用户使用()包裹正则
-                                    result.add(autoMatcher.group());
-                                }
-                            }
                         } catch (Exception e) {
-                            BurpExtender.stdout.println(String.format("[x] Error Info:\nName: %s\nRegex: %s", name, regex));
+                            BurpExtender.stdout.println(String.format("[x] Error Info:\nName: %s\nRegex: %s", name, f_regex));
                             e.printStackTrace();
                             continue;
                         }
@@ -190,6 +169,138 @@ public class DataProcessingUnit {
             GlobalCachePool.addToCache(messageIndex, finalMap);
             return finalMap;
         }
+    }
 
+    private List<String> matchByRegex(String f_regex, String s_regex, String content, String format, String engine, boolean sensitive) {
+        List<String> retList = new ArrayList<>();
+        if ("nfa".equals(engine)) {
+            Matcher matcher = createPatternMatcher(f_regex, content, sensitive);
+            retList.addAll(extractMatches(s_regex, format, sensitive, matcher));
+        } else {
+            // DFA不支持格式化输出，因此不关注format
+            String newContent = content;
+            String newFirstRegex = f_regex;
+            if (!sensitive) {
+                newContent = content.toLowerCase();
+                newFirstRegex = f_regex.toLowerCase();
+            }
+            AutomatonMatcher autoMatcher = createAutomatonMatcher(newFirstRegex, newContent);
+            retList.addAll(extractMatches(s_regex, autoMatcher, content));
+        }
+        return retList;
+    }
+
+    private List<String> extractMatches(String s_regex, String format, boolean sensitive, Matcher matcher) {
+        List<String> matches = new ArrayList<>();
+        if (s_regex.isEmpty()) {
+            matches.addAll(getFormatString(matcher, format));
+        } else {
+            while (matcher.find()) {
+                String matchContent = matcher.group(1);
+                if (!matchContent.isEmpty()) {
+                    matcher = createPatternMatcher(s_regex, matchContent, sensitive);
+                    matches.addAll(getFormatString(matcher, format));
                 }
             }
+        }
+        return matches;
+    }
+
+    private List<String> extractMatches(String s_regex, AutomatonMatcher autoMatcher, String content) {
+        List<String> matches = new ArrayList<>();
+        if (s_regex.isEmpty()) {
+            matches.addAll(getFormatString(autoMatcher, content));
+        } else {
+            while (autoMatcher.find()) {
+                String s = autoMatcher.group();
+                if (!s.isEmpty()) {
+                    autoMatcher = createAutomatonMatcher(s_regex, getSubString(content, s));
+                    matches.addAll(getFormatString(autoMatcher, content));
+                }
+            }
+        }
+        return matches;
+    }
+
+    public List<String> getFormatString(Matcher matcher, String format) {
+        List<Integer> indexList = parseIndexesFromString(format);
+        List<String> stringList = new ArrayList<>();
+
+        while (matcher.find()) {
+            if (!matcher.group(1).isEmpty()) {
+                Object[] params = indexList.stream().map(i -> {
+                    if (!matcher.group(i+1).isEmpty()) {
+                        return matcher.group(i+1);
+                    }
+                    return "";
+                }).toArray();
+
+                stringList.add(MessageFormat.format(reorderIndex(format), params));
+            }
+        }
+
+        return stringList;
+    }
+
+    public List<String> getFormatString(AutomatonMatcher matcher, String content) {
+        List<String> stringList = new ArrayList<>();
+
+        while (matcher.find()) {
+            String s = matcher.group(0);
+            if (!s.isEmpty()) {
+                stringList.add(getSubString(content, s));
+            }
+        }
+
+        return stringList;
+    }
+
+    private Matcher createPatternMatcher(String regex, String content, boolean sensitive) {
+        Pattern pattern = (sensitive) ? new Pattern(regex) : new Pattern(regex, Pattern.IGNORE_CASE);
+        return pattern.matcher(content);
+    }
+
+    private AutomatonMatcher createAutomatonMatcher(String regex, String content) {
+        RegExp regexp = new RegExp(regex);
+        Automaton auto = regexp.toAutomaton();
+        RunAutomaton runAuto = new RunAutomaton(auto, true);
+        return runAuto.newMatcher(content);
+    }
+
+    private LinkedList<Integer> parseIndexesFromString(String input) {
+        LinkedList<Integer> indexes = new LinkedList<>();
+        Pattern pattern = new Pattern("\\{(\\d+)}");
+        Matcher matcher = pattern.matcher(input);
+
+        while (matcher.find()) {
+            String index = matcher.group(1);
+            if (!index.isEmpty()) {
+                indexes.add(Integer.valueOf(index));
+            }
+        }
+
+        return indexes;
+    }
+
+    private String getSubString(String content, String s) {
+        byte[] contentByte = BurpExtender.helpers.stringToBytes(content);
+        byte[] sByte = BurpExtender.helpers.stringToBytes(s);
+        int startIndex = BurpExtender.helpers.indexOf(contentByte, sByte, false, 1, contentByte.length);
+        int endIndex = startIndex + s.length();
+        return content.substring(startIndex, endIndex);
+    }
+
+    private String reorderIndex(String format) {
+        Pattern pattern = new Pattern("\\{(\\d+)}");
+        Matcher matcher = pattern.matcher(format);
+        int count = 0;
+        while (matcher.find()) {
+            String newStr = String.format("{%s}", count);
+            String matchStr = matcher.group(0);
+            format = format.replace(matchStr, newStr);
+            count++;
+        }
+        return format;
+    }
+}
+

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

@@ -1,5 +1,6 @@
 package burp.core.processor;
 
+import burp.BurpExtender;
 import burp.IExtensionHelpers;
 import burp.IHttpRequestResponse;
 import burp.IRequestInfo;
@@ -79,20 +80,29 @@ public class MessageProcessor {
         Map<String, Map<String, Object>> obj;
 
         IResponseInfo responseInfo = helpers.analyzeResponse(content);
+        List<String> responseTmpHeaders = responseInfo.getHeaders();
+        String responseHeaders = String.join("\n", responseTmpHeaders);
+
+        int responseBodyOffset = responseInfo.getBodyOffset();
+        byte[] responseBody = Arrays.copyOfRange(content, responseBodyOffset, content.length);
+
+        if (responseBody.length > 1) {
             try {
-            String inferredMimeType = String.format("hae.%s", responseInfo.getInferredMimeType().toLowerCase());
+                // TODO: 需要加入文件头校验来排除静态二进制文件
-            String statedMimeType = String.format("hae.%s", responseInfo.getStatedMimeType().toLowerCase());
+                String inferredMimeType = String.format("hae.%s", responseInfo.getInferredMimeType());
-            if (matcher.matchUrlSuffix(statedMimeType) || matcher.matchUrlSuffix(inferredMimeType)) {
+                String statedMimeType = String.format("hae.%s", responseInfo.getStatedMimeType());
+                if (matcher.matchUrlSuffix(statedMimeType) || matcher.matchUrlSuffix(inferredMimeType))
+                {
                     return null;
                 }
             } catch (Exception e) {
                 e.printStackTrace();
                 return null;
             }
-        List<String> responseTmpHeaders = responseInfo.getHeaders();
+        } else {
-        String responseHeaders = String.join("\n", responseTmpHeaders);
+            return null;
-        int responseBodyOffset = responseInfo.getBodyOffset();
+        }
-        byte[] responseBody = Arrays.copyOfRange(content, responseBodyOffset, content.length);
+
         obj = dataProcessingUnit.matchContentByRegex(content, responseHeaders, responseBody, "response", host);
 
         return getDataList(obj, actionFlag);

src/main/java/burp/rule/RuleProcessor.java

@@ -33,7 +33,9 @@ public class RuleProcessor {
                             (String) objects[3],
                             (String) objects[4],
                             (String) objects[5],
-                            (boolean) objects[6]))
+                            (String) objects[6],
+                            (String) objects[7],
+                            (boolean) objects[8]))
                     .collect(Collectors.toList());
             ruleGroupList.add(new RuleGroup(k, ruleList));
         });
@@ -80,17 +82,20 @@ public class RuleProcessor {
         ConfigEntry.globalRules.remove(Rules);
         this.rulesFormatAndSave();
     }
+
     public String newRule() {
         int i = 0;
         String name = "New ";
         Object[][] data = new Object[][] {
                 {
-                    false, "New Name", "(New Regex)", "gray", "any", "nfa", false
+                    false, "New Name", "(First Regex)", "(Second Regex)", "{0}", "gray", "any", "nfa", false
                 }
         };
+
         while (ConfigEntry.globalRules.containsKey(name + i)) {
             i++;
         }
+
         ConfigEntry.globalRules.put(name + i, data);
         this.rulesFormatAndSave();
         return name + i;

src/main/java/burp/rule/model/Rule.java

@@ -10,11 +10,13 @@ import java.util.Map;
 public class Rule {
     private Map<String, Object> fields;
 
-    public Rule(boolean loaded, String name, String regex, String color, String scope, String engine, boolean sensitive) {
+    public Rule(boolean loaded, String name, String f_regex, String s_regex, String format, String color, String scope, String engine, boolean sensitive) {
         fields = new LinkedHashMap<>();
         fields.put("name", name);
         fields.put("loaded", loaded);
-        fields.put("regex", regex);
+        fields.put("f_regex", f_regex);
+        fields.put("s_regex", s_regex);
+        fields.put("format", format);
         fields.put("color", color);
         fields.put("scope", scope);
         fields.put("engine", engine);

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

@@ -294,7 +294,7 @@ class TabTitleEditListener extends MouseAdapter implements ChangeListener, Docum
     }
 
     public void newTab(){
-        Object[][] data = new Object[][]{{false, "New Name", "(New Regex)", "gray", "any", "nfa", false}};
+        Object[][] data = new Object[][]{{false, "New Name", "(New Regex)", "", "{0}", "gray", "any", "nfa", false}};
         insertTab(ruleEditTabbedPane, ruleProcessor.newRule(),data);
     }
 

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

@@ -76,7 +76,6 @@ public class Databoard extends JPanel {
     }
 
     private void initComponents() {
-        // JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
         hostLabel = new JLabel();
         hostTextField = new JTextField();
         dataTabbedPane = new JTabbedPane(JTabbedPane.TOP);
@@ -110,9 +109,28 @@ public class Databoard extends JPanel {
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(8, 0, 5, 5), 0, 0));
 
+        splitPane.addComponentListener(new ComponentAdapter() {
+            @Override
+            public void componentResized(ComponentEvent e) {
+                resizePanel();
+            }
+        });
+
         setAutoMatch();
     }
 
+    private void resizePanel() {
+        splitPane.setDividerLocation(0.4);
+        TableColumnModel columnModel = table.getColumnModel();
+        int totalWidth = (int) (getWidth() * 0.6);
+        columnModel.getColumn(0).setPreferredWidth((int) (totalWidth * 0.1));
+        columnModel.getColumn(1).setPreferredWidth((int) (totalWidth * 0.3));
+        columnModel.getColumn(2).setPreferredWidth((int) (totalWidth * 0.3));
+        columnModel.getColumn(3).setPreferredWidth((int) (totalWidth * 0.1));
+        columnModel.getColumn(4).setPreferredWidth((int) (totalWidth * 0.1));
+        columnModel.getColumn(5).setPreferredWidth((int) (totalWidth * 0.1));
+    }
+
     private static List<String> getHostByList() {
         return new ArrayList<>(ConfigEntry.globalDataMap.keySet());
     }
@@ -165,6 +183,7 @@ public class Databoard extends JPanel {
             populateTabbedPaneByHost(selectedHost);
         }
     }
+    
     private void handleKeyEvents(KeyEvent e) {
         isMatchHost = true;
         int keyCode = e.getKeyCode();
@@ -236,6 +255,7 @@ public class Databoard extends JPanel {
             dataTabbedPane.removeAll();
             dataTabbedPane.setPreferredSize(new Dimension(500,0));
             dataTabbedPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
+            dataTabbedPane.removeChangeListener(changeListenerInstance);
             splitPane.setLeftComponent(dataTabbedPane);
 
             if (selectedHost.contains("*")) {
@@ -263,10 +283,12 @@ public class Databoard extends JPanel {
             }
 
             if (selectedHost.equals("**")) {
+                if (currentWorker != null && !currentWorker.isDone()) {
+                    currentWorker.cancel(true);
+                }
                 for (ConcurrentHashMap.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()) {
                         currentWorker = new SwingWorker<Object, Void>() {
                             @Override
@@ -300,8 +322,6 @@ public class Databoard extends JPanel {
 
                 dataTabbedPane.addChangeListener(changeListenerInstance);
             } else {
-                dataTabbedPane.removeChangeListener(changeListenerInstance);
-
                 for (Map.Entry<String, List<String>> entry : selectedDataMap.entrySet()) {
                     String tabTitle = String.format("%s (%s)", entry.getKey(), entry.getValue().size());
                     DatatablePanel datatablePanel = new DatatablePanel(entry.getKey(), entry.getValue());
@@ -313,17 +333,11 @@ public class Databoard extends JPanel {
             // 展示请求消息表单
             JSplitPane messageSplitPane = this.messagePanel.getPanel();
             this.splitPane.setRightComponent(messageSplitPane);
-            // 获取字段
             table = this.messagePanel.getTable();
 
-            // 设置对应字段宽度
+            resizePanel();
-            TableColumnModel columnModel = table.getColumnModel();
-            TableColumn column = columnModel.getColumn(1);
-            column.setPreferredWidth(300);
-            column = columnModel.getColumn(2);
-            column.setPreferredWidth(300);
-
             splitPane.setVisible(true);
+
             applyHostFilter(selectedHost);
 
             // 主动调用一次stateChanged，使得dataTabbedPane可以精准展示内容
@@ -333,20 +347,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,12 @@ public class DatatablePanel extends JPanel {
         TableColumn idColumn = table.getColumnModel().getColumn(0);
         idColumn.setMaxWidth(50);
 
+        for (String item : list) {
+            if (!item.isEmpty()) {
+                addRowToTable(model, new Object[]{item});
+            }
+        }
+
         String defaultText = "Search";
         searchField = new JTextField(defaultText);
 
@@ -122,31 +116,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 +123,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 +130,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,56 +152,6 @@ public class DatatablePanel extends JPanel {
 
         add(scrollPane, BorderLayout.CENTER);
         add(optionsPanel, BorderLayout.SOUTH);
-
-        loadPageData();
-    }
-
-    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 value = (String) entry.getValue(1);
-                        // 如果该列的值不包含搜索文本，则返回true，否则返回false
-                        return searchText.isEmpty() ? true : !value.toLowerCase().contains(searchText.toLowerCase());
-                    }
-                };
-            } else {
-                // 正向搜索：创建一个过滤器以包含与正则表达式匹配的行
-                rowFilter = RowFilter.regexFilter("(?i)" + Pattern.quote(searchText), 1);
-            }
-
-            // 设置过滤器到排序器
-            sorter.setRowFilter(rowFilter);
-        }
-    }
-
-    // 加载指定页的数据
-    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) {
@@ -258,21 +164,28 @@ public class DatatablePanel extends JPanel {
         model.addRow(rowData); // 添加行
     }
 
-    public void updatePageSize() {
+    private void performSearch() {
-        if (fullList.size() > SHOW_LENGTH && isShowing()) {
+        if (searchField.getForeground().equals(Color.BLACK)) {
-            int oldPageSize = pageSize;
+            RowFilter<Object, Object> rowFilter = new RowFilter<Object, Object>() {
-            pageSize = getDynamicSize();
+                public boolean include(Entry<?, ?> entry) {
-            if (oldPageSize != pageSize) {
+                    String searchFieldTextText = searchField.getText();
-                currentPage = 0;
+                    Pattern pattern = null;
-                loadPageData();
+                    try {
-            }
+                        pattern = new Pattern(searchFieldTextText, REFlags.IGNORE_CASE);
-        }
+                    } catch (Exception ignored) {
                     }
 
-    private int getDynamicSize() {
+                    String entryValue = ((String) entry.getValue(1)).toLowerCase();
-        int visibleHeight = scrollPane.getViewport().getViewRect().height;
+                    searchFieldTextText = searchFieldTextText.toLowerCase();
-        int rowHeight = table.getRowHeight();
+                    if (pattern != null) {
-        return Math.max(1, visibleHeight / rowHeight + 5);
+                        return searchFieldTextText.isEmpty() || pattern.matcher(entryValue).find() != searchMode.isSelected();
+                    } else {
+                        return searchFieldTextText.isEmpty() || entryValue.contains(searchFieldTextText) != searchMode.isSelected();
+                    }
+                }
+            };
+            sorter.setRowFilter(rowFilter);
+        }
     }
 
     public void setTableListener(MessagePanel messagePanel) {
@@ -312,10 +225,13 @@ public class DatatablePanel extends JPanel {
         for (int row : selectRows) {
             selectData.append(table.getValueAt(row, 1).toString()).append("\n");
         }
+
         // 便于单行复制，去除最后一个换行符
-        String revData = selectData.reverse().toString().replaceFirst("\n", "");
+        if (selectData.length() > 0){
-        StringBuilder retData = new StringBuilder(revData).reverse();
+            selectData.deleteCharAt(selectData.length() - 1);
-        return retData.toString();
+        }
+
+        return selectData.toString();
     }
 
     public JTable getTable() {

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

@@ -16,11 +16,13 @@ import burp.core.utils.StringHelper;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.security.NoSuchAlgorithmException;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 import javax.swing.JScrollPane;
 import javax.swing.JSplitPane;
 import javax.swing.JTabbedPane;
@@ -44,7 +46,7 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
     private final List<LogEntry> filteredLog = new ArrayList<LogEntry>();
     private IHttpRequestResponse currentlyDisplayedItem;
     private final IExtensionHelpers helpers;
-    private Table logTable;
+    private final Table logTable;
 
     public MessagePanel(IBurpExtenderCallbacks callbacks, IExtensionHelpers helpers) {
         this.callbacks = callbacks;
@@ -66,6 +68,7 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
                 return age1.compareTo(age2);
             }
         });
+
         // Color字段根据颜色顺序进行排序
         sorter.setComparator(5, new Comparator<String>() {
             @Override
@@ -215,56 +218,61 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
             int responseBodyOffset = helpers.analyzeResponse(responseByte).getBodyOffset();
             String responseBody = new String(Arrays.copyOfRange(responseByte, responseBodyOffset, responseByte.length), StandardCharsets.UTF_8);
 
-            final boolean[] isMatched = {false}; // 标志变量，表示是否满足过滤条件
+            // 标志变量，表示是否满足过滤条件
+            AtomicBoolean isMatched = new AtomicBoolean(false);
 
             ConfigEntry.globalRules.keySet().forEach(i -> {
                 for (Object[] objects : ConfigEntry.globalRules.get(i)) {
                     String name = objects[1].toString();
-                    String scope = objects[4].toString();
+                    String format = objects[4].toString();
-                    if (name.contains(tableName)) {
+                    String scope = objects[6].toString();
-                        boolean match = false; // 标志变量，表示当前规则是否匹配
+
+                    // 从注释中查看是否包含当前规则名，包含的再进行查询，有效减少无意义的检索时间
+                    if (entry.getComment().contains(name)) {
+                        if (name.equals(tableName)) {
+                            // 标志变量，表示当前规则是否匹配
+                            boolean isMatch = false;
 
                             switch (scope) {
                                 case "any":
-                                match = requestString.contains(filterText) || responseString.contains(filterText);
+                                    isMatch = matchingString(format, filterText, requestString) || matchingString(format, filterText, responseString);
                                     break;
                                 case "request":
-                                match = requestString.contains(filterText);
+                                    isMatch = matchingString(format, filterText, requestString);
                                     break;
                                 case "response":
-                                match = responseString.contains(filterText);
+                                    isMatch = matchingString(format, filterText, responseString);
                                     break;
                                 case "any header":
-                                match = requestHeaders.contains(filterText) || responseHeaders.contains(filterText);
+                                    isMatch = matchingString(format, filterText, requestHeaders) || matchingString(format, filterText, responseHeaders);
                                     break;
                                 case "request header":
-                                match = requestHeaders.contains(filterText);
+                                    isMatch = matchingString(format, filterText, requestHeaders);
                                     break;
                                 case "response header":
-                                match = responseHeaders.contains(filterText);
+                                    isMatch = matchingString(format, filterText, responseHeaders);
                                     break;
                                 case "any body":
-                                match = requestBody.contains(filterText) || responseBody.contains(filterText);
+                                    isMatch = matchingString(format, filterText, requestBody) || matchingString(format, filterText, responseBody);
                                     break;
                                 case "request body":
-                                match = requestBody.contains(filterText);
+                                    isMatch = matchingString(format, filterText, requestBody);
                                     break;
                                 case "response body":
-                                match = responseBody.contains(filterText);
+                                    isMatch = matchingString(format, filterText, responseBody);
                                     break;
                                 default:
                                     break;
                             }
 
-                        if (match) {
+                            isMatched.set(isMatch);
-                            isMatched[0] = true;
                             break;
                         }
                     }
                 }
             });
 
-            if (isMatched[0]) {
+            if (isMatched.get()) {
                 filteredLog.add(entry);
             }
         }
@@ -272,6 +280,26 @@ public class MessagePanel extends AbstractTableModel implements IMessageEditorCo
         logTable.lastSelectedIndex = -1;
     }
 
+    private boolean matchingString(String format, String filterText, String target) {
+        boolean isMatch = true;
+
+        try {
+            MessageFormat mf = new MessageFormat(format);
+            Object[] parsedObjects = mf.parse(filterText);
+
+            for (Object parsedObject : parsedObjects) {
+                if (!target.contains(parsedObject.toString())) {
+                    isMatch = false;
+                    break;
+                }
+            }
+        } catch (Exception e) {
+            isMatch = false;
+        }
+
+        return isMatch;
+    }
+
     public void deleteByHost(String filterText) {
         filteredLog.clear();
         List<Integer> rowsToRemove = new ArrayList<>();

src/main/java/burp/ui/rule/RulePane.java

@@ -20,7 +20,7 @@ public class RulePane extends JPanel {
     private DefaultTableModel model = createModel();
     private static final int YES_OPTION = JOptionPane.YES_OPTION;
     private static final String[] TITLE = {
-            "Loaded", "Name", "Regex", "Color", "Scope", "Engine", "Sensitive"
+            "Loaded", "Name", "F-Regex", "S-Regex", "Format", "Color", "Scope", "Engine", "Sensitive"
     };
 
     public RulePane(Object[][] data, JTabbedPane pane) {
@@ -44,14 +44,19 @@ public class RulePane extends JPanel {
     private void updateModel() {
         model = (DefaultTableModel) ruleTable.getModel();
     }
+
     private void ruleAddActionPerformed(ActionEvent e, JTabbedPane pane) {
         RuleSetting ruleSettingPanel = new RuleSetting();
+        ruleSettingPanel.formatTextField.setText("{0}");
+
         int showState = JOptionPane.showConfirmDialog(null, ruleSettingPanel, "Add Rule", JOptionPane.OK_OPTION);
         if (showState == YES_OPTION) {
             Vector<Object> ruleData = new Vector<>();
             ruleData.add(false);
             ruleData.add(ruleSettingPanel.ruleNameTextField.getText());
-            ruleData.add(ruleSettingPanel.regexTextField.getText());
+            ruleData.add(ruleSettingPanel.firstRegexTextField.getText());
+            ruleData.add(ruleSettingPanel.secondRegexTextField.getText());
+            ruleData.add(ruleSettingPanel.formatTextField.getText());
             ruleData.add(ruleSettingPanel.colorComboBox.getSelectedItem().toString());
             ruleData.add(ruleSettingPanel.scopeComboBox.getSelectedItem().toString());
             ruleData.add(ruleSettingPanel.engineComboBox.getSelectedItem().toString());
@@ -66,13 +71,15 @@ public class RulePane extends JPanel {
         if (ruleTable.getSelectedRowCount() >= 1){
             RuleSetting ruleSettingPanel = new RuleSetting();
             ruleSettingPanel.ruleNameTextField.setText(ruleTable.getValueAt(ruleTable.getSelectedRow(), 1).toString());
-            ruleSettingPanel.regexTextField.setText(ruleTable.getValueAt(ruleTable.getSelectedRow(), 2).toString());
+            ruleSettingPanel.firstRegexTextField.setText(ruleTable.getValueAt(ruleTable.getSelectedRow(), 2).toString());
-            ruleSettingPanel.colorComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 3).toString());
+            ruleSettingPanel.secondRegexTextField.setText(ruleTable.getValueAt(ruleTable.getSelectedRow(), 3).toString());
-            ruleSettingPanel.scopeComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 4).toString());
+            ruleSettingPanel.formatTextField.setText(ruleTable.getValueAt(ruleTable.getSelectedRow(), 4).toString());
-            ruleSettingPanel.engineComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 5).toString());
+            ruleSettingPanel.colorComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 5).toString());
-            ruleSettingPanel.sensitiveComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(),6));
+            ruleSettingPanel.scopeComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 6).toString());
+            ruleSettingPanel.engineComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 7).toString());
+            ruleSettingPanel.sensitiveComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(),8));
 
-            ruleSettingPanel.sensitiveComboBox.setEnabled(
+            ruleSettingPanel.formatTextField.setEnabled(
                 ruleSettingPanel.engineComboBox.getSelectedItem().toString().equals("nfa")
             );
 
@@ -80,11 +87,13 @@ public class RulePane extends JPanel {
             if (showState == 0){
                 int select = ruleTable.convertRowIndexToModel(ruleTable.getSelectedRow());
                 model.setValueAt(ruleSettingPanel.ruleNameTextField.getText(), select, 1);
-                model.setValueAt(ruleSettingPanel.regexTextField.getText(), select, 2);
+                model.setValueAt(ruleSettingPanel.firstRegexTextField.getText(), select, 2);
-                model.setValueAt(ruleSettingPanel.colorComboBox.getSelectedItem().toString(), select, 3);
+                model.setValueAt(ruleSettingPanel.secondRegexTextField.getText(), select, 3);
-                model.setValueAt(ruleSettingPanel.scopeComboBox.getSelectedItem().toString(), select, 4);
+                model.setValueAt(ruleSettingPanel.formatTextField.getText(), select, 4);
-                model.setValueAt(ruleSettingPanel.engineComboBox.getSelectedItem().toString(), select, 5);
+                model.setValueAt(ruleSettingPanel.colorComboBox.getSelectedItem().toString(), select, 5);
-                model.setValueAt(ruleSettingPanel.sensitiveComboBox.getSelectedItem(), select, 6);
+                model.setValueAt(ruleSettingPanel.scopeComboBox.getSelectedItem().toString(), select, 6);
+                model.setValueAt(ruleSettingPanel.engineComboBox.getSelectedItem().toString(), select, 7);
+                model.setValueAt(ruleSettingPanel.sensitiveComboBox.getSelectedItem(), select, 8);
                 model = (DefaultTableModel) ruleTable.getModel();
                 ruleProcessor.changeRule((Vector) model.getDataVector().get(select), select, pane.getTitleAt(pane.getSelectedIndex()));
             }
@@ -93,7 +102,7 @@ public class RulePane extends JPanel {
 
     private void ruleRemoveActionPerformed(ActionEvent e, JTabbedPane pane){
         if (ruleTable.getSelectedRowCount() >= 1){
-            int isOk = JOptionPane.showConfirmDialog(null, "Are your sure?", "Delete Rule", JOptionPane.OK_OPTION);
+            int isOk = JOptionPane.showConfirmDialog(null, "Are you sure you want to delete this rule?", "Info", JOptionPane.OK_OPTION);
             if (isOk == 0){
                 int select = ruleTable.convertRowIndexToModel(ruleTable.getSelectedRow());
                 model.removeRow(select);

src/main/java/burp/ui/rule/RuleSetting.java

@@ -9,8 +9,9 @@ import burp.config.ConfigEntry;
  */
 
 public class RuleSetting extends JPanel {
-
+    public JTextField firstRegexTextField;
-    public JTextField regexTextField;
+    public JTextField secondRegexTextField;
+    public JTextField formatTextField;
     public JTextField ruleNameTextField;
     public JComboBox<String> scopeComboBox;
     public JComboBox<String> engineComboBox;
@@ -29,21 +30,31 @@ public class RuleSetting extends JPanel {
         addLabel("Name:", 0, c);
         ruleNameTextField = addTextField(0, c);
 
-        addLabel("Regex:", 1, c);
+        addLabel("F-Regex:", 1, c);
-        regexTextField = addTextField(1, c);
+        firstRegexTextField = addTextField(1, c);
 
-        addLabel("Scope:", 2, c);
+        addLabel("S-Regex:", 2, c);
-        scopeComboBox = addComboBox(ConfigEntry.scopeArray, 2, c);
+        secondRegexTextField = addTextField(2, c);
 
-        addLabel("Engine:", 3, c);
+        addLabel("Format:", 3, c);
-        engineComboBox = addComboBox(ConfigEntry.engineArray, 3, c);
+        formatTextField = addTextField(3, c);
-        engineComboBox.addActionListener(e -> sensitiveComboBox.setEnabled("nfa".equals(engineComboBox.getSelectedItem().toString())));
 
-        addLabel("Color:", 4, c);
+        addLabel("Scope:", 4, c);
-        colorComboBox = addComboBox(ConfigEntry.colorArray, 4, c);
+        scopeComboBox = addComboBox(ConfigEntry.scopeArray, 4, c);
 
-        addLabel("Sensitive:", 5, c);
+        addLabel("Engine:", 5, c);
-        sensitiveComboBox = addComboBox(new Boolean[]{true, false}, 5, c);
+        engineComboBox = addComboBox(ConfigEntry.engineArray, 5, c);
+        engineComboBox.addActionListener(e -> {
+            boolean isNfa = "nfa".equals(engineComboBox.getSelectedItem().toString());
+            formatTextField.setEnabled(isNfa);
+            formatTextField.setText(isNfa ? formatTextField.getText() : "{0}");
+        });
+
+        addLabel("Color:", 6, c);
+        colorComboBox = addComboBox(ConfigEntry.colorArray, 6, c);
+
+        addLabel("Sensitive:", 7, c);
+        sensitiveComboBox = addComboBox(new Boolean[]{true, false}, 7, c);
     }
 
     private void addLabel(String text, int y, GridBagConstraints c) {