Version: 4.2 Update

Signed-off-by: gh0stkey <24655118+gh0stkey@users.noreply.github.com>

README.md

@@ -65,22 +65,27 @@ We appreciate everyone's support for the project. The following list is sorted b
 
 | ID       | Amount |
 | -------- | -------- |
-| 毁三观大人      | 200.00¥  |
-| ttt      | 50.00¥ |
-| C_soon5  | 66.66¥ |
-| 1wtbb    | 25.00¥ |
-| Deep     | 66.66¥ |
-| NaTsUk0  | 50.00¥ |
-| Kite     | 48.00¥ |
-| 红色键盘 | 99.99¥ |
-| 曾哥     | 188.88¥ |
-| NOP Team     | 200.00¥ |
-| vaycore     | 188.88¥ |
-| xccc     | 168.00¥ |
-| 柯林斯-民间新秀     | 1000.00¥ |
-| Cuber     | 100.00¥ |
-| 时光难逆     | 50.00¥ |
-| Celvin     | 66.00¥ |
+| 毁三观大人      | 200.00 CNY  |
+| ttt      | 50.00 CNY |
+| C_soon5  | 66.66 CNY |
+| 1wtbb    | 25.00 CNY |
+| Deep     | 66.66 CNY |
+| NaTsUk0  | 50.00 CNY |
+| Kite     | 48.00 CNY |
+| 红色键盘 | 99.99 CNY |
+| 曾哥     | 188.88 CNY |
+| NOP Team     | 200.00 CNY |
+| vaycore     | 188.88 CNY |
+| xccc     | 168.00 CNY |
+| 柯林斯-民间新秀     | 1000.00 CNY |
+| Cuber     | 100.00 CNY |
+| 时光难逆     | 50.00 CNY |
+| Celvin     | 132.00 CNY |
+| 呱呱     | 18.80 CNY |
+| 红炉点雪     | 50.00 CNY |
+| 王傑     | 100.00 CNY |
+| 联系不到我请拨打我手机号码     | 200.00 CNY |
+| Shu2e     | 50.00 CNY |
 
 ## Support the Project
 

README_CN.md

@@ -93,7 +93,12 @@ HaE目前的规则一共有8个字段，详细的含义如下所示：
 | 柯林斯-民间新秀     | 1000.00元 |
 | Cuber     | 100.00元 |
 | 时光难逆     | 50.00元 |
-| Celvin     | 66.00元 |
+| Celvin     | 132.00元 |
+| 呱呱     | 18.80元 |
+| 红炉点雪     | 50.00元 |
+| 王傑     | 100.00元 |
+| 联系不到我请拨打我手机号码     | 200.00元 |
+| Shu2e     | 50.00元 |
 
 ## 支持项目
 

src/main/java/hae/Config.java

@@ -12,6 +12,8 @@ public class Config {
 
     public static String status = "404";
 
+    public static String header = "Last-Modified|Date|Connection|ETag";
+
     public static String size = "0";
 
     public static String boundary = "\n\t\n";

src/main/java/hae/HaE.java

@@ -2,9 +2,8 @@ package hae;
 
 import burp.api.montoya.BurpExtension;
 import burp.api.montoya.MontoyaApi;
-import burp.api.montoya.extension.ExtensionUnloadingHandler;
 import burp.api.montoya.logging.Logging;
-import hae.cache.MessageCache;
+import hae.cache.DataCache;
 import hae.component.Main;
 import hae.component.board.message.MessageTableModel;
 import hae.instances.editor.RequestEditor;
@@ -20,7 +19,7 @@ public class HaE implements BurpExtension {
     public void initialize(MontoyaApi api) {
         // 设置扩展名称
         api.extension().setName("HaE - Highlighter and Extractor");
-        String version = "4.1";
+        String version = "4.2";
 
         // 加载扩展后输出的项目信息
         Logging logging = api.logging();
@@ -41,7 +40,7 @@ public class HaE implements BurpExtension {
         api.userInterface().registerSuiteTab("HaE", new Main(api, configLoader, messageTableModel));
 
         // 注册WebSocket处理器
-        api.proxy().registerWebSocketCreationHandler(proxyWebSocketCreation -> proxyWebSocketCreation.proxyWebSocket().registerProxyMessageHandler(new WebSocketMessageHandler(api)));
+        api.proxy().registerWebSocketCreationHandler(proxyWebSocketCreation -> proxyWebSocketCreation.proxyWebSocket().registerProxyMessageHandler(new WebSocketMessageHandler(api, configLoader)));
 
         // 注册消息编辑框（用于展示数据）
         api.userInterface().registerHttpRequestEditorProvider(new RequestEditor(api, configLoader));
@@ -52,21 +51,17 @@ public class HaE implements BurpExtension {
         DataManager dataManager = new DataManager(api);
         dataManager.loadData(messageTableModel);
 
-
-        api.extension().registerUnloadingHandler(new ExtensionUnloadingHandler() {
-            @Override
-            public void extensionUnloaded() {
-                // 卸载清空数据
-                Config.globalDataMap.clear();
-                MessageCache.clear();
-            }
+        api.extension().registerUnloadingHandler(() -> {
+            // 卸载清空数据
+            Config.globalDataMap.clear();
+            DataCache.clear();
         });
     }
 
     private Boolean getBurpSuiteProStatus(MontoyaApi api, ConfigLoader configLoader, MessageTableModel messageTableModel) {
         boolean burpSuiteProStatus = false;
         try {
-            burpSuiteProStatus = api.burpSuite().version().name().contains("Professional");
+            burpSuiteProStatus = api.burpSuite().version().edition().displayName().equals("Professional");
         } catch (Exception e) {
             try {
                 api.scanner().registerScanCheck(new HttpMessagePassiveHandler(api, configLoader, messageTableModel)).deregister();

src/main/java/hae/cache/DataCache.java

@@ -6,9 +6,9 @@ import com.github.benmanes.caffeine.cache.Caffeine;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-public class MessageCache {
+public class DataCache {
     private static final int MAX_SIZE = 100000;
-    private static final int EXPIRE_DURATION = 5;
+    private static final int EXPIRE_DURATION = 4;
 
     private static final Cache<String, Map<String, Map<String, Object>>> cache =
             Caffeine.newBuilder()
@@ -24,10 +24,6 @@ public class MessageCache {
         return cache.getIfPresent(key);
     }
 
-    public static void remove(String key) {
-        cache.invalidate(key);
-    }
-
     public static void clear() {
         cache.invalidateAll();
     }

src/main/java/hae/cache/DataQueryCache.java

@@ -1,46 +0,0 @@
-package hae.cache;
-
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-public class DataQueryCache {
-    private static final int MAX_SIZE = 1000;
-    private static final int EXPIRE_DURATION = 30;
-
-    private static final Cache<String, Map<String, List<String>>> hostQueryCache =
-            Caffeine.newBuilder()
-                    .maximumSize(MAX_SIZE)
-                    .expireAfterWrite(EXPIRE_DURATION, TimeUnit.MINUTES)
-                    .build();
-
-    private static final Cache<String, List<String>> hostFilterCache =
-            Caffeine.newBuilder()
-                    .maximumSize(MAX_SIZE)
-                    .expireAfterWrite(EXPIRE_DURATION, TimeUnit.MINUTES)
-                    .build();
-
-    public static void putHostQueryResult(String host, Map<String, List<String>> result) {
-        hostQueryCache.put(host, result);
-    }
-
-    public static Map<String, List<String>> getHostQueryResult(String host) {
-        return hostQueryCache.getIfPresent(host);
-    }
-
-    public static void putHostFilterResult(String input, List<String> result) {
-        hostFilterCache.put(input, result);
-    }
-
-    public static List<String> getHostFilterResult(String input) {
-        return hostFilterCache.getIfPresent(input);
-    }
-
-    public static void clearCache() {
-        hostQueryCache.invalidateAll();
-        hostFilterCache.invalidateAll();
-    }
-}

src/main/java/hae/component/Config.java

@@ -14,7 +14,6 @@ import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import javax.swing.table.DefaultTableModel;
 import java.awt.*;
@@ -74,7 +73,7 @@ public class Config extends JPanel {
         constraints.gridx = 1;
         JTabbedPane configTabbedPanel = new JTabbedPane();
 
-        String[] settingMode = new String[]{"Exclude suffix", "Block host", "Exclude status"};
+        String[] settingMode = new String[]{"Exclude suffix", "Block host", "Exclude status", "Dynamic Header"};
         JPanel settingPanel = createConfigTablePanel(settingMode);
 
         JPanel northPanel = new JPanel(new BorderLayout());
@@ -174,12 +173,10 @@ public class Config extends JPanel {
     }
 
     private TableModelListener craeteSettingTableModelListener(JComboBox<String> setTypeComboBox, DefaultTableModel model) {
-        return new TableModelListener() {
-            @Override
-            public void tableChanged(TableModelEvent e) {
-                String selected = (String) setTypeComboBox.getSelectedItem();
-                String values = getFirstColumnDataAsString(model);
-
+        return e -> {
+            String selected = (String) setTypeComboBox.getSelectedItem();
+            String values = getFirstColumnDataAsString(model);
+            if (selected != null) {
                 if (selected.equals("Exclude suffix")) {
                     if (!values.equals(configLoader.getExcludeSuffix()) && !values.isEmpty()) {
                         configLoader.setExcludeSuffix(values);
@@ -198,17 +195,20 @@ public class Config extends JPanel {
                     }
                 }
 
+                if (selected.equals("Dynamic Header")) {
+                    if (!values.equals(configLoader.getExcludeStatus()) && !values.isEmpty()) {
+                        configLoader.setDynamicHeader(values);
+                    }
+                }
             }
         };
     }
 
     private ActionListener createSettingActionListener(JComboBox<String> setTypeComboBox, DefaultTableModel model) {
-        return new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                String selected = (String) setTypeComboBox.getSelectedItem();
-                model.setRowCount(0);
-
+        return e -> {
+            String selected = (String) setTypeComboBox.getSelectedItem();
+            model.setRowCount(0);
+            if (selected != null) {
                 if (selected.equals("Exclude suffix")) {
                     addDataToTable(configLoader.getExcludeSuffix().replaceAll("\\|", "\r\n"), model);
                 }
@@ -220,11 +220,14 @@ public class Config extends JPanel {
                 if (selected.equals("Exclude status")) {
                     addDataToTable(configLoader.getExcludeStatus().replaceAll("\\|", "\r\n"), model);
                 }
+
+                if (selected.equals("Dynamic Header")) {
+                    addDataToTable(configLoader.getDynamicHeader().replaceAll("\\|", "\r\n"), model);
+                }
             }
         };
     }
 
-
     private JPanel createConfigTablePanel(String[] mode) {
         GridBagConstraints constraints = new GridBagConstraints();
         constraints.weightx = 1.0;
@@ -286,13 +289,13 @@ public class Config extends JPanel {
         settingPanel.add(inputPanel, BorderLayout.CENTER);
 
 
-        addButton.addActionListener(e -> addActionPerformed(e, model, addTextField, setTypeComboBox.getSelectedItem().toString()));
+        addButton.addActionListener(e -> addActionPerformed(e, model, addTextField));
 
         addTextField.addKeyListener(new KeyAdapter() {
             @Override
             public void keyPressed(KeyEvent e) {
                 if (e.getKeyCode() == KeyEvent.VK_ENTER) {
-                    addActionPerformed(null, model, addTextField, setTypeComboBox.getSelectedItem().toString());
+                    addActionPerformed(null, model, addTextField);
                 }
             }
         });
@@ -413,7 +416,7 @@ public class Config extends JPanel {
         configLoader.setScope(String.join("|", HaEScope));
     }
 
-    private void addActionPerformed(ActionEvent e, DefaultTableModel model, JTextField addTextField, String comboBoxSelected) {
+    private void addActionPerformed(ActionEvent e, DefaultTableModel model, JTextField addTextField) {
         String addTextFieldText = addTextField.getText();
         if (addTextField.getForeground().equals(Color.BLACK)) {
             addDataToTable(addTextFieldText, model);

src/main/java/hae/component/board/Databoard.java

@@ -2,7 +2,7 @@ package hae.component.board;
 
 import burp.api.montoya.MontoyaApi;
 import hae.Config;
-import hae.cache.DataQueryCache;
+import hae.cache.DataCache;
 import hae.component.board.message.MessageTableModel;
 import hae.component.board.message.MessageTableModel.MessageTable;
 import hae.component.board.table.Datatable;
@@ -46,19 +46,6 @@ public class Databoard extends JPanel {
         initComponents();
     }
 
-    public static void setProgressBar(boolean status, JProgressBar progressBar, String showString) {
-        progressBar.setIndeterminate(status);
-        if (!status) {
-            progressBar.setMaximum(100);
-            progressBar.setString("OK");
-            progressBar.setStringPainted(true);
-            progressBar.setValue(progressBar.getMaximum());
-        } else {
-            progressBar.setString(showString);
-            progressBar.setStringPainted(true);
-        }
-    }
-
     private void initComponents() {
         setLayout(new GridBagLayout());
         ((GridBagLayout) getLayout()).columnWidths = new int[]{25, 0, 0, 0, 20, 0};
@@ -67,12 +54,14 @@ public class Databoard extends JPanel {
         ((GridBagLayout) getLayout()).rowWeights = new double[]{0.0, 1.0, 0.0, 0.0, 1.0E-4};
         JLabel hostLabel = new JLabel("Host:");
 
-        JButton clearButton = new JButton("Clear");
+        JButton clearDataButton = new JButton("Clear data");
+        JButton clearCacheButton = new JButton("Clear cache");
         JButton actionButton = new JButton("Action");
-        JPanel menuPanel = new JPanel(new GridLayout(1, 1, 0, 5));
+        JPanel menuPanel = new JPanel(new GridLayout(2, 1, 0, 5));
         menuPanel.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
         JPopupMenu menu = new JPopupMenu();
-        menuPanel.add(clearButton);
+        menuPanel.add(clearDataButton);
+        menuPanel.add(clearCacheButton);
         menu.add(menuPanel);
 
         hostTextField = new JTextField();
@@ -90,7 +79,8 @@ public class Databoard extends JPanel {
             menu.show(actionButton, x, y);
         });
 
-        clearButton.addActionListener(this::clearActionPerformed);
+        clearDataButton.addActionListener(this::clearDataActionPerformed);
+        clearCacheButton.addActionListener(this::clearCacheActionPerformed);
 
         progressBar = new JProgressBar();
         splitPane.addComponentListener(new ComponentAdapter() {
@@ -136,7 +126,16 @@ public class Databoard extends JPanel {
     }
 
     private void setProgressBar(boolean status) {
-        setProgressBar(status, progressBar, "Loading ...");
+        progressBar.setIndeterminate(status);
+        if (!status) {
+            progressBar.setMaximum(100);
+            progressBar.setString("OK");
+            progressBar.setStringPainted(true);
+            progressBar.setValue(progressBar.getMaximum());
+        } else {
+            progressBar.setString("Loading...");
+            progressBar.setStringPainted(true);
+        }
     }
 
     private void setAutoMatch() {
@@ -182,7 +181,7 @@ public class Databoard extends JPanel {
                     handleComboBoxWorker.cancel(true);
                 }
 
-                handleComboBoxWorker = new SwingWorker<Map<String, List<String>>, Void>() {
+                handleComboBoxWorker = new SwingWorker<>() {
                     @Override
                     protected Map<String, List<String>> doInBackground() {
                         return getSelectedMapByHost(selectedHost);
@@ -253,12 +252,6 @@ public class Databoard extends JPanel {
     }
 
     private Map<String, List<String>> getSelectedMapByHost(String selectedHost) {
-        // 先尝试从缓存获取结果
-        Map<String, List<String>> cachedResult = DataQueryCache.getHostQueryResult(selectedHost);
-        if (cachedResult != null) {
-            return cachedResult;
-        }
-
         ConcurrentHashMap<String, Map<String, List<String>>> dataMap = Config.globalDataMap;
         Map<String, List<String>> selectedDataMap;
 
@@ -284,11 +277,6 @@ public class Databoard extends JPanel {
             selectedDataMap = dataMap.get(selectedHost);
         }
 
-        // 将结果存入缓存
-        if (selectedDataMap != null) {
-            DataQueryCache.putHostQueryResult(selectedHost, selectedDataMap);
-        }
-
         return selectedDataMap;
     }
 
@@ -323,10 +311,10 @@ public class Databoard extends JPanel {
             applyHostFilterWorker.cancel(true);
         }
 
-        applyHostFilterWorker = new SwingWorker<Void, Void>() {
+        applyHostFilterWorker = new SwingWorker<>() {
             @Override
-            protected Void doInBackground() throws Exception {
-                RowFilter<Object, Object> rowFilter = new RowFilter<Object, Object>() {
+            protected Void doInBackground() {
+                RowFilter<Object, Object> rowFilter = new RowFilter<>() {
                     public boolean include(Entry<?, ?> entry) {
                         if (cleanedText.equals("*")) {
                             return true;
@@ -348,24 +336,23 @@ public class Databoard extends JPanel {
     }
 
     private List<String> getHostByList() {
-        // 先尝试从缓存获取结果
-        List<String> cachedResult = DataQueryCache.getHostFilterResult("all_hosts");
-        if (cachedResult != null) {
-            return cachedResult;
-        }
-
         List<String> result = new ArrayList<>();
         if (!Config.globalDataMap.isEmpty()) {
             result = new ArrayList<>(Config.globalDataMap.keySet());
-            // 将结果存入缓存
-            DataQueryCache.putHostFilterResult("all_hosts", result);
         }
+
         return result;
     }
 
-    private void clearActionPerformed(ActionEvent e) {
-        // 清除缓存
-        DataQueryCache.clearCache();
+    private void clearCacheActionPerformed(ActionEvent e) {
+        int retCode = JOptionPane.showConfirmDialog(this, "Do you want to clear cache?", "Info",
+                JOptionPane.YES_NO_OPTION);
+        if (retCode == JOptionPane.YES_OPTION) {
+            DataCache.clear();
+        }
+    }
+
+    private void clearDataActionPerformed(ActionEvent e) {
         int retCode = JOptionPane.showConfirmDialog(this, "Do you want to clear data?", "Info",
                 JOptionPane.YES_NO_OPTION);
         String host = hostTextField.getText();

src/main/java/hae/component/board/message/MessageTableModel.java

@@ -10,10 +10,8 @@ import burp.api.montoya.ui.UserInterface;
 import burp.api.montoya.ui.editor.HttpRequestEditor;
 import burp.api.montoya.ui.editor.HttpResponseEditor;
 import hae.Config;
-import hae.cache.MessageCache;
 import hae.utils.ConfigLoader;
 import hae.utils.DataManager;
-import hae.utils.string.HashCalculator;
 import hae.utils.string.StringProcessor;
 
 import javax.swing.*;
@@ -58,14 +56,25 @@ public class MessageTableModel extends AbstractTableModel {
         messageTable.setAutoCreateRowSorter(true);
 
         // Length字段根据大小进行排序
+        TableRowSorter<DefaultTableModel> sorter = getDefaultTableModelTableRowSorter();
+        messageTable.setRowSorter(sorter);
+        messageTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+
+        splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
+        // 请求/响应文本框
+        JScrollPane scrollPane = new JScrollPane(messageTable);
+        scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
+        scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
+        splitPane.setLeftComponent(scrollPane);
+        splitPane.setRightComponent(messageTab);
+    }
+
+    private TableRowSorter<DefaultTableModel> getDefaultTableModelTableRowSorter() {
         TableRowSorter<DefaultTableModel> sorter = (TableRowSorter<DefaultTableModel>) messageTable.getRowSorter();
-        sorter.setComparator(4, new Comparator<String>() {
-            @Override
-            public int compare(String s1, String s2) {
-                Integer age1 = Integer.parseInt(s1);
-                Integer age2 = Integer.parseInt(s2);
-                return age1.compareTo(age2);
-            }
+        sorter.setComparator(4, (Comparator<String>) (s1, s2) -> {
+            Integer age1 = Integer.parseInt(s1);
+            Integer age2 = Integer.parseInt(s2);
+            return age1.compareTo(age2);
         });
 
         // Color字段根据颜色顺序进行排序
@@ -86,48 +95,31 @@ public class MessageTableModel extends AbstractTableModel {
                 return -1;
             }
         });
-        messageTable.setRowSorter(sorter);
-        messageTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
-
-        splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
-        // 请求/响应文本框
-        JScrollPane scrollPane = new JScrollPane(messageTable);
-        scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
-        scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
-        splitPane.setLeftComponent(scrollPane);
-        splitPane.setRightComponent(messageTab);
+        return sorter;
     }
 
     public synchronized void add(HttpRequestResponse messageInfo, String url, String method, String status, String length, String comment, String color, boolean flag) {
         synchronized (log) {
-            boolean isDuplicate = false;
-            MessageEntry logEntry = new MessageEntry(messageInfo, method, url, comment, length, color, status);
-
-            byte[] reqByteA = new byte[0];
-            byte[] resByteA = new byte[0];
-
-            if (messageInfo != null) {
-                HttpRequest httpRequest = messageInfo.request();
-                HttpResponse httpResponse = messageInfo.response();
-
-                reqByteA = httpRequest.toByteArray().getBytes();
-                resByteA = httpResponse.toByteArray().getBytes();
+            if (messageInfo == null) {
+                return;
             }
 
-            // 比较Hash，如若存在重复的请求或响应，则不放入消息内容里
+            boolean isDuplicate = false;
             try {
-                if (!log.isEmpty()) {
+                if (!log.isEmpty() && flag) {
+                    String host = StringProcessor.getHostByUrl(url);
+
                     for (MessageEntry entry : log) {
-                        HttpRequestResponse reqResMessage = entry.getRequestResponse();
-                        byte[] reqByteB = reqResMessage.request().toByteArray().getBytes();
-                        byte[] resByteB = reqResMessage.response().toByteArray().getBytes();
-                        try {
-                            // 通过URL、请求和响应报文、匹配数据内容，多维度进行对比
-                            if ((entry.getUrl().equals(url) || (Arrays.equals(reqByteB, reqByteA) || Arrays.equals(resByteB, resByteA))) && (areMapsEqual(getCacheData(reqByteB), getCacheData(reqByteA)) && areMapsEqual(getCacheData(resByteB), getCacheData(resByteA)))) {
+                        if (host.equals(StringProcessor.getHostByUrl(entry.getUrl()))) {
+                            if (isRequestDuplicate(
+                                    messageInfo, entry.getRequestResponse(),
+                                    url, entry.getUrl(),
+                                    comment, entry.getComment(),
+                                    color, entry.getColor()
+                            )) {
                                 isDuplicate = true;
                                 break;
                             }
-                        } catch (Exception ignored) {
                         }
                     }
                 }
@@ -136,42 +128,82 @@ public class MessageTableModel extends AbstractTableModel {
 
             if (!isDuplicate) {
                 if (flag) {
-                    try {
-                        DataManager dataManager = new DataManager(api);
-                        // 数据存储在BurpSuite空间内
-                        PersistedObject persistedObject = PersistedObject.persistedObject();
-                        persistedObject.setHttpRequestResponse("messageInfo", messageInfo);
-                        persistedObject.setString("comment", comment);
-                        persistedObject.setString("color", color);
-                        String uuidIndex = StringProcessor.getRandomUUID();
-                        dataManager.putData("message", uuidIndex, persistedObject);
-                    } catch (Exception ignored) {
-
-                    }
+                    persistData(messageInfo, comment, color);
                 }
-
-                // 添加进日志
-                log.add(logEntry);
+                log.add(new MessageEntry(messageInfo, method, url, comment, length, color, status));
             }
         }
-
     }
 
-    public synchronized void addBatch(List<Object[]> batchData) {
-        synchronized (log) {
-            for (Object[] data : batchData) {
-                HttpRequestResponse messageInfo = (HttpRequestResponse) data[0];
-                String url = (String) data[1];
-                String method = (String) data[2];
-                String status = (String) data[3];
-                String length = (String) data[4];
-                String comment = (String) data[5];
-                String color = (String) data[6];
+    private boolean isRequestDuplicate(
+            HttpRequestResponse newReq, HttpRequestResponse existingReq,
+            String newUrl, String existingUrl,
+            String newComment, String existingComment,
+            String newColor, String existingColor) {
+        try {
+            // 基础属性匹配
+            String normalizedNewUrl = normalizeUrl(newUrl);
+            String normalizedExistingUrl = normalizeUrl(existingUrl);
+            boolean basicMatch = normalizedNewUrl.equals(normalizedExistingUrl);
 
-                // 复用现有的 add 方法逻辑，但跳过重复检查
-                MessageEntry logEntry = new MessageEntry(messageInfo, method, url, comment, length, color, status);
-                log.add(logEntry);
-            }
+            // 请求响应内容匹配
+            byte[] newReqBytes = newReq.request().toByteArray().getBytes();
+            byte[] newResBytes = newReq.response().toByteArray().getBytes();
+            byte[] existingReqBytes = existingReq.request().toByteArray().getBytes();
+            byte[] existingResBytes = existingReq.response().toByteArray().getBytes();
+            boolean contentMatch = Arrays.equals(newReqBytes, existingReqBytes) &&
+                    Arrays.equals(newResBytes, existingResBytes);
+
+            // 注释和颜色匹配
+            boolean metadataMatch = areCommentsEqual(newComment, existingComment) &&
+                    newColor.equals(existingColor);
+
+            return (basicMatch || contentMatch) && metadataMatch;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    private String normalizeUrl(String url) {
+        if (url == null) {
+            return "";
+        }
+
+        String normalized = url.trim().toLowerCase();
+        while (normalized.endsWith("/")) {
+            normalized = normalized.substring(0, normalized.length() - 1);
+        }
+
+        return normalized.replaceAll("//", "/");
+    }
+
+    private boolean areCommentsEqual(String comment1, String comment2) {
+        if (comment1 == null || comment2 == null) {
+            return false;
+        }
+
+        try {
+            // 将注释按规则拆分并排序
+            Set<String> rules1 = new TreeSet<>(Arrays.asList(comment1.split(", ")));
+            Set<String> rules2 = new TreeSet<>(Arrays.asList(comment2.split(", ")));
+
+            return rules1.equals(rules2);
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    private void persistData(HttpRequestResponse messageInfo, String comment, String color) {
+        try {
+            DataManager dataManager = new DataManager(api);
+            PersistedObject persistedObject = PersistedObject.persistedObject();
+            persistedObject.setHttpRequestResponse("messageInfo", messageInfo);
+            persistedObject.setString("comment", comment);
+            persistedObject.setString("color", color);
+            String uuidIndex = StringProcessor.getRandomUUID();
+            dataManager.putData("message", uuidIndex, persistedObject);
+        } catch (Exception e) {
+            api.logging().logToError("Data persistence error: " + e.getMessage());
         }
     }
 
@@ -183,7 +215,7 @@ public class MessageTableModel extends AbstractTableModel {
             currentWorker.cancel(true);
         }
 
-        currentWorker = new SwingWorker<Void, Void>() {
+        currentWorker = new SwingWorker<>() {
             @Override
             protected Void doInBackground() {
                 for (int i = 0; i < log.size(); i++) {
@@ -210,17 +242,40 @@ public class MessageTableModel extends AbstractTableModel {
 
     public void applyHostFilter(String filterText) {
         filteredLog.clear();
+        fireTableDataChanged();
 
-        log.forEach(entry -> {
+        int batchSize = 500;
+
+        // 分批处理数据
+        List<MessageEntry> batch = new ArrayList<>(batchSize);
+        int count = 0;
+
+        for (MessageEntry entry : log) {
             String host = StringProcessor.getHostByUrl(entry.getUrl());
-            if (!host.isEmpty()) {
-                if (StringProcessor.matchesHostPattern(host, filterText) || filterText.contains("*")) {
-                    filteredLog.add(entry);
+            if (!host.isEmpty() && (StringProcessor.matchesHostPattern(host, filterText) || filterText.contains("*"))) {
+                batch.add(entry);
+                count++;
+
+                // 当批次达到指定大小时，更新UI
+                if (count % batchSize == 0) {
+                    final List<MessageEntry> currentBatch = new ArrayList<>(batch);
+                    SwingUtilities.invokeLater(() -> {
+                        filteredLog.addAll(currentBatch);
+                        fireTableDataChanged();
+                    });
+                    batch.clear();
                 }
             }
-        });
+        }
 
-        fireTableDataChanged();
+        // 处理最后一批
+        if (!batch.isEmpty()) {
+            final List<MessageEntry> finalBatch = new ArrayList<>(batch);
+            SwingUtilities.invokeLater(() -> {
+                filteredLog.addAll(finalBatch);
+                fireTableDataChanged();
+            });
+        }
     }
 
     public void applyMessageFilter(String tableName, String filterText) {
@@ -237,13 +292,13 @@ public class MessageTableModel extends AbstractTableModel {
             String requestBody = new String(httpRequest.body().getBytes(), StandardCharsets.UTF_8);
             String requestHeaders = httpRequest.headers().stream()
                     .map(HttpHeader::toString)
-                    .collect(Collectors.joining("\n"));
+                    .collect(Collectors.joining("\r\n"));
 
             String responseString = new String(httpResponse.toByteArray().getBytes(), StandardCharsets.UTF_8);
             String responseBody = new String(httpResponse.body().getBytes(), StandardCharsets.UTF_8);
             String responseHeaders = httpResponse.headers().stream()
                     .map(HttpHeader::toString)
-                    .collect(Collectors.joining("\n"));
+                    .collect(Collectors.joining("\r\n"));
 
             Config.globalRules.keySet().forEach(i -> {
                 for (Object[] objects : Config.globalRules.get(i)) {
@@ -333,56 +388,6 @@ public class MessageTableModel extends AbstractTableModel {
         return isMatch;
     }
 
-    private Map<String, Map<String, Object>> getCacheData(byte[] content) {
-        String hashIndex = HashCalculator.calculateHash(content);
-        return MessageCache.get(hashIndex);
-    }
-
-    private boolean areMapsEqual(Map<String, Map<String, Object>> map1, Map<String, Map<String, Object>> map2) {
-        if (map1 == null || map2 == null) {
-            return false;
-        }
-        if (map1.size() != map2.size()) {
-            return false;
-        }
-
-        for (String key : map1.keySet()) {
-            if (!map2.containsKey(key)) {
-                return false;
-            }
-            if (areInnerMapsEqual(map1.get(key), map2.get(key))) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private boolean areInnerMapsEqual(Map<String, Object> innerMap1, Map<String, Object> innerMap2) {
-        if (innerMap1.size() != innerMap2.size()) {
-            return true;
-        }
-
-        for (String key : innerMap1.keySet()) {
-            if (!innerMap2.containsKey(key)) {
-                return true;
-            }
-            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 true;
-                }
-            } else if (!value1.equals(value2)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     public JSplitPane getSplitPane() {
         return splitPane;
     }
@@ -391,10 +396,6 @@ public class MessageTableModel extends AbstractTableModel {
         return messageTable;
     }
 
-    public LinkedList<MessageEntry> getLogs() {
-        return log;
-    }
-
     @Override
     public int getRowCount() {
         return filteredLog.size();
@@ -447,7 +448,6 @@ public class MessageTableModel extends AbstractTableModel {
         private final ExecutorService executorService;
         private final HttpRequestEditor requestEditor;
         private final HttpResponseEditor responseEditor;
-        private MessageEntry messageEntry;
         private int lastSelectedIndex = -1;
 
         public MessageTable(TableModel messageTableModel, HttpRequestEditor requestEditor, HttpResponseEditor responseEditor) {
@@ -468,7 +468,7 @@ public class MessageTableModel extends AbstractTableModel {
         }
 
         private void getSelectedMessage() {
-            messageEntry = filteredLog.get(lastSelectedIndex);
+            MessageEntry messageEntry = filteredLog.get(lastSelectedIndex);
 
             HttpRequestResponse httpRequestResponse = messageEntry.getRequestResponse();
 

src/main/java/hae/component/board/table/Datatable.java

@@ -33,6 +33,7 @@ public class Datatable extends JPanel {
     private final JCheckBox regexMode = new JCheckBox("Regex mode");
     private final String tabName;
     private final JPanel footerPanel;
+    private SwingWorker<Void, Void> doubleClickWorker;
 
     public Datatable(MontoyaApi api, ConfigLoader configLoader, String tabName, List<String> dataList) {
         this.api = api;
@@ -55,12 +56,7 @@ public class Datatable extends JPanel {
         dataTable.setRowSorter(sorter);
 
         // 设置ID排序
-        sorter.setComparator(0, new Comparator<Integer>() {
-            @Override
-            public int compare(Integer s1, Integer s2) {
-                return s1.compareTo(s2);
-            }
-        });
+        sorter.setComparator(0, (Comparator<Integer>) Integer::compareTo);
 
         for (String item : dataList) {
             if (!item.isEmpty()) {
@@ -180,7 +176,7 @@ public class Datatable extends JPanel {
     }
 
     private RowFilter<Object, Object> getObjectObjectRowFilter(JTextField searchField, boolean firstFlag) {
-        return new RowFilter<Object, Object>() {
+        return new RowFilter<>() {
             public boolean include(Entry<?, ?> entry) {
                 String searchFieldTextText = searchField.getText();
                 searchFieldTextText = searchFieldTextText.toLowerCase();
@@ -206,6 +202,26 @@ public class Datatable extends JPanel {
         };
     }
 
+    private void handleDoubleClick(int selectedRow, MessageTableModel messagePanel) {
+        if (doubleClickWorker != null && !doubleClickWorker.isDone()) {
+            doubleClickWorker.cancel(true);
+        }
+
+        doubleClickWorker = new SwingWorker<>() {
+            @Override
+            protected Void doInBackground() {
+                String rowData = dataTable.getValueAt(selectedRow, 1).toString();
+                SwingUtilities.invokeLater(() -> {
+                    if (!isCancelled()) {
+                        messagePanel.applyMessageFilter(tabName, rowData);
+                    }
+                });
+                return null;
+            }
+        };
+        doubleClickWorker.execute();
+    }
+
     public void setTableListener(MessageTableModel messagePanel) {
         // 表格复制功能
         dataTable.setTransferHandler(new TransferHandler() {
@@ -229,8 +245,7 @@ public class Datatable extends JPanel {
                 if (e.getClickCount() == 2) {
                     int selectedRow = dataTable.getSelectedRow();
                     if (selectedRow != -1) {
-                        String rowData = dataTable.getValueAt(selectedRow, 1).toString();
-                        messagePanel.applyMessageFilter(tabName, rowData);
+                        handleDoubleClick(selectedRow, messagePanel);
                     }
                 }
             }

src/main/java/hae/component/rule/Rule.java

@@ -97,7 +97,7 @@ public class Rule extends JPanel {
         Display ruleDisplay = new Display();
         ruleDisplay.formatTextField.setText("{0}");
 
-        int showState = JOptionPane.showConfirmDialog(this, ruleDisplay, "Add Rule", JOptionPane.OK_OPTION);
+        int showState = JOptionPane.showConfirmDialog(this, ruleDisplay, "Add Rule", JOptionPane.YES_NO_OPTION);
         if (showState == YES_OPTION) {
             Vector<Object> ruleData = new Vector<>();
             ruleData.add(false);
@@ -132,7 +132,7 @@ public class Rule extends JPanel {
 
             ruleDisplay.formatTextField.setEnabled(ruleDisplay.engineComboBox.getSelectedItem().toString().equals("nfa"));
 
-            int showState = JOptionPane.showConfirmDialog(this, ruleDisplay, "Edit Rule", JOptionPane.OK_OPTION);
+            int showState = JOptionPane.showConfirmDialog(this, ruleDisplay, "Edit Rule", JOptionPane.YES_NO_OPTION);
             if (showState == 0) {
                 int select = ruleTable.convertRowIndexToModel(ruleTable.getSelectedRow());
                 model.setValueAt(ruleDisplay.ruleNameTextField.getText(), select, 1);

src/main/java/hae/component/rule/Rules.java

@@ -59,8 +59,6 @@ public class Rules extends JTabbedPane {
     private void initComponents() {
         reloadRuleGroup();
 
-        JTabbedPane tabbedPane = this;
-
         JMenuItem deleteMenuItem = new JMenuItem("Delete");
         JPopupMenu popupMenu = new JPopupMenu();
         popupMenu.add(deleteMenuItem);

src/main/java/hae/instances/editor/RequestEditor.java

@@ -73,7 +73,7 @@ public class RequestEditor implements HttpRequestEditorProvider {
             this.configLoader = configLoader;
             this.httpUtils = new HttpUtils(api, configLoader);
             this.creationContext = creationContext;
-            this.messageProcessor = new MessageProcessor(api);
+            this.messageProcessor = new MessageProcessor(api, configLoader);
         }
 
         @Override

src/main/java/hae/instances/editor/ResponseEditor.java

@@ -50,7 +50,7 @@ public class ResponseEditor implements HttpResponseEditorProvider {
             this.configLoader = configLoader;
             this.httpUtils = new HttpUtils(api, configLoader);
             this.creationContext = creationContext;
-            this.messageProcessor = new MessageProcessor(api);
+            this.messageProcessor = new MessageProcessor(api, configLoader);
         }
 
         @Override

src/main/java/hae/instances/editor/WebSocketEditor.java

@@ -44,7 +44,7 @@ public class WebSocketEditor implements WebSocketMessageEditorProvider {
             this.api = api;
             this.configLoader = configLoader;
             this.creationContext = creationContext;
-            this.messageProcessor = new MessageProcessor(api);
+            this.messageProcessor = new MessageProcessor(api, configLoader);
         }
 
         @Override

src/main/java/hae/instances/http/HttpMessageActiveHandler.java

@@ -35,7 +35,7 @@ public class HttpMessageActiveHandler implements HttpHandler {
         this.configLoader = configLoader;
         this.httpUtils = new HttpUtils(api, configLoader);
         this.messageTableModel = messageTableModel;
-        this.messageProcessor = new MessageProcessor(api);
+        this.messageProcessor = new MessageProcessor(api, configLoader);
     }
 
     @Override

src/main/java/hae/instances/http/HttpMessagePassiveHandler.java

@@ -37,7 +37,7 @@ public class HttpMessagePassiveHandler implements ScanCheck {
         this.configLoader = configLoader;
         this.httpUtils = new HttpUtils(api, configLoader);
         this.messageTableModel = messageTableModel;
-        this.messageProcessor = new MessageProcessor(api);
+        this.messageProcessor = new MessageProcessor(api, configLoader);
     }
 
     @Override

src/main/java/hae/instances/http/utils/MessageProcessor.java

@@ -5,6 +5,7 @@ import burp.api.montoya.http.message.HttpHeader;
 import burp.api.montoya.http.message.requests.HttpRequest;
 import burp.api.montoya.http.message.responses.HttpResponse;
 import hae.Config;
+import hae.utils.ConfigLoader;
 
 import java.nio.charset.StandardCharsets;
 import java.util.*;
@@ -14,18 +15,16 @@ public class MessageProcessor {
     private final MontoyaApi api;
     private final RegularMatcher regularMatcher;
 
-    private String finalColor = "";
-
-    public MessageProcessor(MontoyaApi api) {
+    public MessageProcessor(MontoyaApi api, ConfigLoader configLoader) {
         this.api = api;
-        this.regularMatcher = new RegularMatcher(api);
+        this.regularMatcher = new RegularMatcher(api, configLoader);
     }
 
     public List<Map<String, String>> processMessage(String host, String message, boolean flag) {
         Map<String, Map<String, Object>> obj = null;
 
         try {
-            obj = regularMatcher.match(host, "any", message, message, message);
+            obj = regularMatcher.performRegexMatching(host, "any", message, message, message);
         } catch (Exception ignored) {
         }
 
@@ -40,9 +39,9 @@ public class MessageProcessor {
             String body = new String(httpResponse.body().getBytes(), StandardCharsets.UTF_8);
             String header = httpResponse.headers().stream()
                     .map(HttpHeader::toString)
-                    .collect(Collectors.joining("\n"));
+                    .collect(Collectors.joining("\r\n"));
 
-            obj = regularMatcher.match(host, "response", response, header, body);
+            obj = regularMatcher.performRegexMatching(host, "response", response, header, body);
         } catch (Exception ignored) {
         }
 
@@ -57,9 +56,9 @@ public class MessageProcessor {
             String body = new String(httpRequest.body().getBytes(), StandardCharsets.UTF_8);
             String header = httpRequest.headers().stream()
                     .map(HttpHeader::toString)
-                    .collect(Collectors.joining("\n"));
+                    .collect(Collectors.joining("\r\n"));
 
-            obj = regularMatcher.match(host, "request", request, header, body);
+            obj = regularMatcher.performRegexMatching(host, "request", request, header, body);
         } catch (Exception ignored) {
         }
 
@@ -77,10 +76,10 @@ public class MessageProcessor {
                 List<String> commentList = resultList.get(1);
                 if (!colorList.isEmpty() && !commentList.isEmpty()) {
                     String color = retrieveFinalColor(retrieveColorIndices(colorList));
-                    Map<String, String> colorMap = new HashMap<String, String>() {{
+                    Map<String, String> colorMap = new HashMap<>() {{
                         put("color", color);
                     }};
-                    Map<String, String> commentMap = new HashMap<String, String>() {{
+                    Map<String, String> commentMap = new HashMap<>() {{
                         put("comment", String.join(", ", commentList));
                     }};
                     highlightList.add(colorMap);
@@ -137,41 +136,38 @@ public class MessageProcessor {
         return indices;
     }
 
-    private void upgradeColors(List<Integer> colorList) {
-        int colorSize = colorList.size();
-        String[] colorArray = Config.color;
-        colorList.sort(Comparator.comparingInt(Integer::intValue));
-        int i = 0;
-        List<Integer> stack = new ArrayList<>();
-        while (i < colorSize) {
-            if (stack.isEmpty()) {
-                stack.add(colorList.get(i));
-            } else {
-                if (!Objects.equals(colorList.get(i), stack.stream().reduce((first, second) -> second).orElse(99999999))) {
-                    stack.add(colorList.get(i));
-                } else {
-                    stack.set(stack.size() - 1, stack.get(stack.size() - 1) - 1);
-                }
-            }
-            i++;
+    private String upgradeColors(List<Integer> colorList) {
+        if (colorList == null || colorList.isEmpty()) {
+            return Config.color[0];
         }
-        // 利用HashSet删除重复元素
-        HashSet tmpList = new HashSet(stack);
-        if (stack.size() == tmpList.size()) {
-            stack.sort(Comparator.comparingInt(Integer::intValue));
-            if (stack.get(0) < 0) {
-                finalColor = colorArray[0];
-            } else {
-                finalColor = colorArray[stack.get(0)];
+
+        // 创建副本避免修改原始数据
+        List<Integer> indices = new ArrayList<>(colorList);
+        indices.sort(Comparator.comparingInt(Integer::intValue));
+
+        // 处理颜色升级
+        for (int i = 1; i < indices.size(); i++) {
+            if (indices.get(i).equals(indices.get(i - 1))) {
+                // 如果发现重复的颜色索引，将当前索引降级
+                indices.set(i - 1, indices.get(i - 1) - 1);
             }
-        } else {
-            upgradeColors(stack);
         }
+
+        // 获取最终的颜色索引
+        int finalIndex = indices.stream()
+                .min(Integer::compareTo)
+                .orElse(0);
+
+        // 处理负数索引情况
+        if (finalIndex < 0) {
+            return Config.color[0];
+        }
+
+        return Config.color[finalIndex];
     }
 
     public String retrieveFinalColor(List<Integer> colorList) {
-        upgradeColors(colorList);
-        return finalColor;
+        return upgradeColors(colorList);
     }
 
 }

src/main/java/hae/instances/http/utils/RegularMatcher.java

@@ -8,7 +8,8 @@ import dk.brics.automaton.AutomatonMatcher;
 import dk.brics.automaton.RegExp;
 import dk.brics.automaton.RunAutomaton;
 import hae.Config;
-import hae.cache.MessageCache;
+import hae.cache.DataCache;
+import hae.utils.ConfigLoader;
 import hae.utils.DataManager;
 import hae.utils.string.HashCalculator;
 import hae.utils.string.StringProcessor;
@@ -20,14 +21,17 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class RegularMatcher {
+    private static final Map<String, Pattern> nfaPatternCache = new ConcurrentHashMap<>();
+    private static final Map<String, RunAutomaton> dfaAutomatonCache = new ConcurrentHashMap<>();
     private final MontoyaApi api;
+    private final ConfigLoader configLoader;
 
-    public RegularMatcher(MontoyaApi api) {
+    public RegularMatcher(MontoyaApi api, ConfigLoader configLoader) {
         this.api = api;
-
+        this.configLoader = configLoader;
     }
 
-    public synchronized static void putDataToGlobalMap(MontoyaApi api, String host, String name, List<String> dataList, boolean flag) {
+    public synchronized static void updateGlobalMatchCache(MontoyaApi api, String host, String name, List<String> dataList, boolean flag) {
         // 添加到全局变量中，便于Databoard检索
         if (!Objects.equals(host, "") && host != null) {
             Config.globalDataMap.compute(host, (existingHost, existingMap) -> {
@@ -74,95 +78,123 @@ public class RegularMatcher {
         }
     }
 
-    public Map<String, Map<String, Object>> match(String host, String type, String message, String header, String body) {
-        // 先从缓存池里判断是否有已经匹配好的结果
-        String messageIndex = HashCalculator.calculateHash(message.getBytes());
-        Map<String, Map<String, Object>> map = MessageCache.get(messageIndex);
-        if (map != null) {
-            return map;
-        } else {
-            // 最终返回的结果
-            Map<String, Map<String, Object>> finalMap = new HashMap<>();
-            Config.globalRules.keySet().parallelStream().forEach(i -> {
-                for (Object[] objects : Config.globalRules.get(i)) {
-                    // 多线程执行，一定程度上减少阻塞现象
-                    String matchContent = "";
-                    // 遍历获取规则
-                    List<String> result;
-                    Map<String, Object> tmpMap = new HashMap<>();
+    public Map<String, Map<String, Object>> performRegexMatching(String host, String type, String message, String header, String body) {
+        // 删除动态响应头再进行存储
+        String originalMessage = message;
+        String dynamicHeader = configLoader.getDynamicHeader();
 
-                    boolean loaded = (Boolean) objects[0];
-                    String name = objects[1].toString();
-                    String f_regex = objects[2].toString();
-                    String s_regex = objects[3].toString();
-                    String format = objects[4].toString();
-                    String color = objects[5].toString();
-                    String scope = objects[6].toString();
-                    String engine = objects[7].toString();
-                    boolean sensitive = (Boolean) objects[8];
-
-                    // 判断规则是否开启与作用域
-                    if (loaded && (scope.contains(type) || scope.contains("any") || type.equals("any"))) {
-                        switch (scope) {
-                            case "any":
-                            case "request":
-                            case "response":
-                                matchContent = message;
-                                break;
-                            case "any header":
-                            case "request header":
-                            case "response header":
-                                matchContent = header;
-                                break;
-                            case "any body":
-                            case "request body":
-                            case "response body":
-                                matchContent = body;
-                                break;
-                            case "request line":
-                            case "response line":
-                                matchContent = message.split("\\r?\\n", 2)[0];
-                                break;
-                            default:
-                                break;
-                        }
-
-                        try {
-                            result = new ArrayList<>(matchByRegex(f_regex, s_regex, matchContent, format, engine, sensitive));
-                        } catch (Exception e) {
-                            api.logging().logToError(String.format("[x] Error Info:\nName: %s\nRegex: %s", name, f_regex));
-                            api.logging().logToError(e.getMessage());
-                            continue;
-                        }
-
-                        // 去除重复内容
-                        HashSet tmpList = new HashSet(result);
-                        result.clear();
-                        result.addAll(tmpList);
-
-                        if (!result.isEmpty()) {
-                            tmpMap.put("color", color);
-                            String dataStr = String.join(Config.boundary, result);
-                            tmpMap.put("data", dataStr);
-
-                            String nameAndSize = String.format("%s (%s)", name, result.size());
-                            finalMap.put(nameAndSize, tmpMap);
-
-                            putDataToGlobalMap(api, host, name, result, true);
-                        }
-                    }
-                }
-            });
-            MessageCache.put(messageIndex, finalMap);
-            return finalMap;
+        if (!dynamicHeader.isBlank()) {
+            String modifiedHeader = header.replaceAll(String.format("(%s):.*?\r\n", configLoader.getDynamicHeader()), "");
+            message = message.replace(header, modifiedHeader);
         }
+
+        String messageIndex = HashCalculator.calculateHash(message.getBytes());
+
+        // 从数据缓存中读取
+        Map<String, Map<String, Object>> dataCacheMap = DataCache.get(messageIndex);
+
+        // 存在则返回
+        if (dataCacheMap != null) {
+            return dataCacheMap;
+        }
+
+        // 最终返回的结果
+        String firstLine = originalMessage.split("\\r?\\n", 2)[0];
+        Map<String, Map<String, Object>> finalMap = applyMatchingRules(host, type, originalMessage, firstLine, header, body);
+
+        // 数据缓存写入，有可能是空值，当作匹配过的索引不再匹配
+        DataCache.put(messageIndex, finalMap);
+
+        return finalMap;
     }
 
-    private List<String> matchByRegex(String f_regex, String s_regex, String content, String format, String engine, boolean sensitive) {
+    private Map<String, Map<String, Object>> applyMatchingRules(String host, String type, String message, String firstLine, String header, String body) {
+        Map<String, Map<String, Object>> finalMap = new HashMap<>();
+
+        Config.globalRules.keySet().parallelStream().forEach(i -> {
+            for (Object[] objects : Config.globalRules.get(i)) {
+                String matchContent = "";
+                // 遍历获取规则
+                List<String> result;
+                Map<String, Object> tmpMap = new HashMap<>();
+
+                boolean loaded = (Boolean) objects[0];
+                String name = objects[1].toString();
+                String f_regex = objects[2].toString();
+                String s_regex = objects[3].toString();
+                String format = objects[4].toString();
+                String color = objects[5].toString();
+                String scope = objects[6].toString();
+                String engine = objects[7].toString();
+                boolean sensitive = (Boolean) objects[8];
+
+                // 判断规则是否开启与作用域
+                if (loaded && (scope.contains(type) || scope.contains("any") || type.equals("any"))) {
+                    // 在此处检查内容是否缓存，缓存则返回为空
+                    switch (scope) {
+                        case "any":
+                        case "request":
+                        case "response":
+                            matchContent = message;
+                            break;
+                        case "any header":
+                        case "request header":
+                        case "response header":
+                            matchContent = header;
+                            break;
+                        case "any body":
+                        case "request body":
+                        case "response body":
+                            matchContent = body;
+                            break;
+                        case "request line":
+                        case "response line":
+                            matchContent = firstLine;
+                            break;
+                        default:
+                            break;
+                    }
+
+                    // 匹配内容为空则跳出
+                    if (matchContent.isBlank()) {
+                        break;
+                    }
+
+                    try {
+                        result = new ArrayList<>(executeRegexEngine(f_regex, s_regex, matchContent, format, engine, sensitive));
+                    } catch (Exception e) {
+                        api.logging().logToError(String.format("[x] Error Info:\nName: %s\nRegex: %s", name, f_regex));
+                        api.logging().logToError(e.getMessage());
+                        continue;
+                    }
+
+                    // 去除重复内容
+                    HashSet tmpList = new HashSet(result);
+                    result.clear();
+                    result.addAll(tmpList);
+
+                    if (!result.isEmpty()) {
+                        tmpMap.put("color", color);
+                        String dataStr = String.join(Config.boundary, result);
+                        tmpMap.put("data", dataStr);
+
+                        String nameAndSize = String.format("%s (%s)", name, result.size());
+                        finalMap.put(nameAndSize, tmpMap);
+
+                        updateGlobalMatchCache(api, host, name, result, true);
+                    }
+                }
+            }
+        });
+
+        return finalMap;
+    }
+
+    private List<String> executeRegexEngine(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));
+            retList.addAll(extractRegexMatchResults(s_regex, format, sensitive, matcher));
         } else {
             // DFA不支持格式化输出，因此不关注format
             String newContent = content;
@@ -172,44 +204,44 @@ public class RegularMatcher {
                 newFirstRegex = f_regex.toLowerCase();
             }
             AutomatonMatcher autoMatcher = createAutomatonMatcher(newFirstRegex, newContent);
-            retList.addAll(extractMatches(s_regex, autoMatcher, content));
+            retList.addAll(extractRegexMatchResults(s_regex, autoMatcher, content));
         }
         return retList;
     }
 
-    private List<String> extractMatches(String s_regex, String format, boolean sensitive, Matcher matcher) {
+    private List<String> extractRegexMatchResults(String s_regex, String format, boolean sensitive, Matcher matcher) {
         List<String> matches = new ArrayList<>();
         if (s_regex.isEmpty()) {
-            matches.addAll(getFormatString(matcher, format));
+            matches.addAll(formatMatchResults(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));
+                    matches.addAll(formatMatchResults(matcher, format));
                 }
             }
         }
         return matches;
     }
 
-    private List<String> extractMatches(String s_regex, AutomatonMatcher autoMatcher, String content) {
+    private List<String> extractRegexMatchResults(String s_regex, AutomatonMatcher autoMatcher, String content) {
         List<String> matches = new ArrayList<>();
         if (s_regex.isEmpty()) {
-            matches.addAll(getFormatString(autoMatcher, content));
+            matches.addAll(formatMatchResults(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));
+                    autoMatcher = createAutomatonMatcher(s_regex, extractMatchedContent(content, s));
+                    matches.addAll(formatMatchResults(autoMatcher, content));
                 }
             }
         }
         return matches;
     }
 
-    private List<String> getFormatString(Matcher matcher, String format) {
+    private List<String> formatMatchResults(Matcher matcher, String format) {
         List<Integer> indexList = parseIndexesFromString(format);
         List<String> stringList = new ArrayList<>();
 
@@ -222,20 +254,20 @@ public class RegularMatcher {
                     return "";
                 }).toArray();
 
-                stringList.add(MessageFormat.format(reorderIndex(format), params));
+                stringList.add(MessageFormat.format(normalizeFormatIndexes(format), params));
             }
         }
 
         return stringList;
     }
 
-    private List<String> getFormatString(AutomatonMatcher matcher, String content) {
+    private List<String> formatMatchResults(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));
+                stringList.add(extractMatchedContent(content, s));
             }
         }
 
@@ -243,14 +275,21 @@ public class RegularMatcher {
     }
 
     private Matcher createPatternMatcher(String regex, String content, boolean sensitive) {
-        Pattern pattern = sensitive ? Pattern.compile(regex) : Pattern.compile(regex, Pattern.CASE_INSENSITIVE);
+        Pattern pattern = nfaPatternCache.computeIfAbsent(regex, k -> {
+            int flags = sensitive ? 0 : Pattern.CASE_INSENSITIVE;
+            return Pattern.compile(regex, flags);
+        });
+
         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);
+        RunAutomaton runAuto = dfaAutomatonCache.computeIfAbsent(regex, k -> {
+            RegExp regexp = new RegExp(regex);
+            Automaton auto = regexp.toAutomaton();
+            return new RunAutomaton(auto, true);
+        });
+
         return runAuto.newMatcher(content);
     }
 
@@ -269,15 +308,16 @@ public class RegularMatcher {
         return indexes;
     }
 
-    private String getSubString(String content, String s) {
+    private String extractMatchedContent(String content, String s) {
         byte[] contentByte = api.utilities().byteUtils().convertFromString(content);
         byte[] sByte = api.utilities().byteUtils().convertFromString(s);
         int startIndex = api.utilities().byteUtils().indexOf(contentByte, sByte, false, 1, contentByte.length);
         int endIndex = startIndex + s.length();
+
         return content.substring(startIndex, endIndex);
     }
 
-    private String reorderIndex(String format) {
+    private String normalizeFormatIndexes(String format) {
         Pattern pattern = Pattern.compile("\\{(\\d+)}");
         Matcher matcher = pattern.matcher(format);
         int count = 0;
@@ -287,6 +327,7 @@ public class RegularMatcher {
             format = format.replace(matchStr, newStr);
             count++;
         }
+
         return format;
     }
 }

src/main/java/hae/instances/websocket/WebSocketMessageHandler.java

@@ -4,6 +4,7 @@ import burp.api.montoya.MontoyaApi;
 import burp.api.montoya.core.HighlightColor;
 import burp.api.montoya.proxy.websocket.*;
 import hae.instances.http.utils.MessageProcessor;
+import hae.utils.ConfigLoader;
 
 import java.util.List;
 import java.util.Map;
@@ -12,9 +13,9 @@ public class WebSocketMessageHandler implements ProxyMessageHandler {
     private final MontoyaApi api;
     private final MessageProcessor messageProcessor;
 
-    public WebSocketMessageHandler(MontoyaApi api) {
+    public WebSocketMessageHandler(MontoyaApi api, ConfigLoader configLoader) {
         this.api = api;
-        this.messageProcessor = new MessageProcessor(api);
+        this.messageProcessor = new MessageProcessor(api, configLoader);
     }
 
     @Override

src/main/java/hae/utils/ConfigLoader.java

@@ -3,7 +3,9 @@ package hae.utils;
 import burp.api.montoya.MontoyaApi;
 import hae.Config;
 import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.SafeConstructor;
 import org.yaml.snakeyaml.representer.Representer;
 
 import java.io.*;
@@ -21,10 +23,7 @@ public class ConfigLoader {
 
     public ConfigLoader(MontoyaApi api) {
         this.api = api;
-        DumperOptions dop = new DumperOptions();
-        dop.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-        Representer representer = new Representer(dop);
-        this.yaml = new Yaml(representer, dop);
+        this.yaml = createSecureYaml();
 
         String configPath = determineConfigPath();
         this.configFilePath = String.format("%s/%s", configPath, "Config.yml");
@@ -54,6 +53,25 @@ public class ConfigLoader {
         return configPathFile.exists() && configPathFile.isDirectory();
     }
 
+    private Yaml createSecureYaml() {
+        // 配置 LoaderOptions 进行安全限制
+        LoaderOptions loaderOptions = new LoaderOptions();
+        // 禁用注释处理
+        loaderOptions.setProcessComments(false);
+        // 禁止递归键
+        loaderOptions.setAllowRecursiveKeys(false);
+
+        // 配置 DumperOptions 控制输出格式
+        DumperOptions dop = new DumperOptions();
+        dop.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+
+        // 创建 Representer
+        Representer representer = new Representer(dop);
+
+        // 使用 SafeConstructor创建安全的 YAML 实例
+        return new Yaml(new SafeConstructor(loaderOptions), representer, dop);
+    }
+
     private String determineConfigPath() {
         // 优先级1：用户根目录
         String userConfigPath = String.format("%s/.config/HaE", System.getProperty("user.home"));
@@ -79,6 +97,8 @@ public class ConfigLoader {
         r.put("ExcludeStatus", getExcludeStatus());
         r.put("LimitSize", getLimitSize());
         r.put("HaEScope", getScope());
+        r.put("DynamicHeader", getDynamicHeader());
+
         try {
             Writer ws = new OutputStreamWriter(Files.newOutputStream(Paths.get(configFilePath)), StandardCharsets.UTF_8);
             yaml.dump(r, ws);
@@ -97,10 +117,7 @@ public class ConfigLoader {
 
         try {
             InputStream inputStream = Files.newInputStream(Paths.get(getRulesFilePath()));
-            DumperOptions dop = new DumperOptions();
-            dop.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-            Representer representer = new Representer(dop);
-            Map<String, Object> rulesMap = new Yaml(representer, dop).load(inputStream);
+            Map<String, Object> rulesMap = yaml.load(inputStream);
 
             Object rulesObj = rulesMap.get("rules");
             if (rulesObj instanceof List) {
@@ -156,6 +173,14 @@ public class ConfigLoader {
         setValueToConfig("ExcludeStatus", status);
     }
 
+    public String getDynamicHeader() {
+        return getValueFromConfig("DynamicHeader", Config.header);
+    }
+
+    public void setDynamicHeader(String header) {
+        setValueToConfig("DynamicHeader", header);
+    }
+
     public String getLimitSize() {
         return getValueFromConfig("LimitSize", Config.size);
     }

src/main/java/hae/utils/DataManager.java

@@ -10,11 +10,10 @@ import burp.api.montoya.persistence.Persistence;
 import hae.component.board.message.MessageTableModel;
 import hae.instances.http.utils.RegularMatcher;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 
 public class DataManager {
     private final MontoyaApi api;
@@ -65,9 +64,7 @@ public class DataManager {
             dataIndex.forEach(index -> {
                 PersistedObject dataObj = persistence.extensionData().getChildObject(index);
                 try {
-                    dataObj.stringListKeys().forEach(dataKey -> {
-                        RegularMatcher.putDataToGlobalMap(api, index, dataKey, dataObj.getStringList(dataKey).stream().toList(), false);
-                    });
+                    dataObj.stringListKeys().forEach(dataKey -> RegularMatcher.updateGlobalMatchCache(api, index, dataKey, dataObj.getStringList(dataKey).stream().toList(), false));
                 } catch (Exception ignored) {
                 }
             });
@@ -79,69 +76,54 @@ public class DataManager {
             return;
         }
 
-        List<String> indexList = new ArrayList<>();
-        for (Object item : messageIndex) {
-            try {
-                if (item != null) {
-                    indexList.add(item.toString());
-                }
-            } catch (Exception e) {
-                api.logging().logToError("转换索引时出错: " + e.getMessage());
-            }
+        // 直接转换为List，简化处理
+        List<String> indexList = messageIndex.stream()
+                .filter(Objects::nonNull)
+                .map(Object::toString)
+                .toList();
+
+        if (indexList.isEmpty()) {
+            return;
         }
 
-        final int batchSize = 2000; // 增加批处理大小
-        final int threadCount = Math.max(8, Runtime.getRuntime().availableProcessors() * 2); // 增加线程数
-        int totalSize = indexList.size();
-
-        // 使用更高效的线程池
+        final int batchSize = 2000;
+        final int threadCount = Math.max(8, Runtime.getRuntime().availableProcessors() * 2);
         ExecutorService executorService = Executors.newWorkStealingPool(threadCount);
-        List<Future<List<Object[]>>> futures = new ArrayList<>();
 
-        // 分批并行处理数据
-        for (int i = 0; i < totalSize; i += batchSize) {
-            int endIndex = Math.min(i + batchSize, totalSize);
-            List<String> batch = indexList.subList(i, endIndex);
-
-            Future<List<Object[]>> future = executorService.submit(() -> processBatchParallel(batch));
-            futures.add(future);
-        }
-
-        // 批量添加数据到模型
         try {
-            for (Future<List<Object[]>> future : futures) {
-                List<Object[]> batchData = future.get();
-                messageTableModel.addBatch(batchData);
+            // 分批处理
+            for (int i = 0; i < indexList.size(); i += batchSize) {
+                int endIndex = Math.min(i + batchSize, indexList.size());
+                List<String> batch = indexList.subList(i, endIndex);
+
+                processBatch(batch, messageTableModel);
             }
-        } catch (Exception e) {
-            api.logging().logToError("批量添加数据时出错: " + e.getMessage());
         } finally {
             executorService.shutdown();
         }
     }
 
-    private List<Object[]> processBatchParallel(List<String> batch) {
-        List<Object[]> batchData = new ArrayList<>();
-        for (String index : batch) {
+    private void processBatch(List<String> batch, MessageTableModel messageTableModel) {
+        batch.forEach(index -> {
             try {
                 PersistedObject dataObj = persistence.extensionData().getChildObject(index);
                 if (dataObj != null) {
                     HttpRequestResponse messageInfo = dataObj.getHttpRequestResponse("messageInfo");
                     if (messageInfo != null) {
-                        batchData.add(prepareMessageData(messageInfo, dataObj));
+                        addMessageToModel(messageInfo, dataObj, messageTableModel);
                     }
                 }
             } catch (Exception e) {
-                api.logging().logToError("处理消息数据时出错: " + e.getMessage() + ", index: " + index);
+                api.logging().logToError("processBatch: " + e.getMessage());
             }
-        }
-        return batchData;
+        });
     }
 
-    private Object[] prepareMessageData(HttpRequestResponse messageInfo, PersistedObject dataObj) {
+    private void addMessageToModel(HttpRequestResponse messageInfo, PersistedObject dataObj, MessageTableModel messageTableModel) {
         HttpRequest request = messageInfo.request();
         HttpResponse response = messageInfo.response();
-        return new Object[]{
+
+        messageTableModel.add(
                 messageInfo,
                 request.url(),
                 request.method(),
@@ -150,6 +132,6 @@ public class DataManager {
                 dataObj.getString("comment"),
                 dataObj.getString("color"),
                 false
-        };
+        );
     }
 }

src/main/java/hae/utils/http/HttpUtils.java

@@ -25,16 +25,29 @@ public class HttpUtils {
         boolean retStatus = false;
         try {
             String host = StringProcessor.getHostByUrl(request.url());
-            String[] hostList = configLoader.getBlockHost().split("\\|");
-            boolean isBlockHost = isBlockHost(hostList, host);
 
-            List<String> suffixList = Arrays.asList(configLoader.getExcludeSuffix().split("\\|"));
-            boolean isExcludeSuffix = suffixList.contains(request.fileExtension().toLowerCase());
+            boolean isBlockHost = false;
+            String blockHost = configLoader.getBlockHost();
+            if (!blockHost.isBlank()) {
+                String[] hostList = configLoader.getBlockHost().split("\\|");
+                isBlockHost = isBlockHost(hostList, host);
+            }
+
+            boolean isExcludeSuffix = false;
+            String suffix = configLoader.getExcludeSuffix();
+            if (!suffix.isBlank()) {
+                List<String> suffixList = Arrays.asList(configLoader.getExcludeSuffix().split("\\|"));
+                isExcludeSuffix = suffixList.contains(request.fileExtension().toLowerCase());
+            }
 
             boolean isToolScope = !configLoader.getScope().contains(toolType);
 
-            List<String> statusList = Arrays.asList(configLoader.getExcludeStatus().split("\\|"));
-            boolean isExcludeStatus = statusList.contains(String.valueOf(response.statusCode()));
+            boolean isExcludeStatus = false;
+            String status = configLoader.getExcludeStatus();
+            if (!status.isBlank()) {
+                List<String> statusList = Arrays.asList(configLoader.getExcludeStatus().split("\\|"));
+                isExcludeStatus = statusList.contains(String.valueOf(response.statusCode()));
+            }
 
             retStatus = isExcludeSuffix || isBlockHost || isToolScope || isExcludeStatus;
         } catch (Exception ignored) {

src/main/java/hae/utils/rule/RuleProcessor.java

@@ -2,6 +2,7 @@ package hae.utils.rule;
 
 import burp.api.montoya.MontoyaApi;
 import hae.Config;
+import hae.cache.DataCache;
 import hae.utils.ConfigLoader;
 import hae.utils.rule.model.Group;
 import hae.utils.rule.model.Info;
@@ -27,6 +28,8 @@ public class RuleProcessor {
     }
 
     public void rulesFormatAndSave() {
+        DataCache.clear();
+
         DumperOptions dop = new DumperOptions();
         dop.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
         Representer representer = new Representer(dop);

src/main/resources/rules/Rules.yml

@@ -55,6 +55,15 @@ rules:
         scope: response body
         engine: dfa
         sensitive: false
+      - name: Vite DevMode
+        loaded: true
+        f_regex: (/@vite/client)
+        s_regex: ''
+        format: '{0}'
+        color: red
+        scope: response body
+        engine: dfa
+        sensitive: true
   - group: Maybe Vulnerability
     rule:
       - name: Java Deserialization
@@ -102,6 +111,24 @@ rules:
         scope: request
         engine: dfa
         sensitive: false
+      - name: Passwd File
+        loaded: true
+        f_regex: (/root:/bin/bash)
+        s_regex: ''
+        format: '{0}'
+        color: red
+        scope: response body
+        engine: dfa
+        sensitive: true
+      - name: Win.ini File
+        loaded: true
+        f_regex: (for 16-bit app)
+        s_regex: ''
+        format: '{0}'
+        color: red
+        scope: response body
+        engine: dfa
+        sensitive: true
   - group: Basic Information
     rule:
       - name: Email
@@ -244,7 +271,7 @@ rules:
     rule:
       - name: Linkfinder
         loaded: true
-        f_regex: (?:"|')((?:(?:[a-zA-Z]{1,10}://|//)[^"'/]{1,}\.[a-zA-Z]{2,}[^"']{0,})|(?:(?:(?:/|\.\./|\./)?[^"'><,;|*()(%%$^/\\\[\]][^"'><,;|()]{1,}\.[a-zA-Z]{1,4})|(?:(?:/|\.\./|\./)?[^"'><,;|*()(%%$^/\\\[\]][^"'><,;|()]{1,}/[^"'><,;|()]{1,}(?:\.[a-zA-Z]{1,4}|action)?)))(?:[\?|#][^"|']{0,})?(?:"|')
+        f_regex: (?:"|')(((?:[a-zA-Z]{1,10}://|//)[^"'/]{1,}\.[a-zA-Z]{2,}[^"']{0,})|((?:/|\.\./|\./)[^"'><,;|*()(%%$^/\\\[\]][^"'><,;|()]{1,})|([a-zA-Z0-9_\-/]{1,}/[a-zA-Z0-9_\-/]{1,}\.(?:[a-zA-Z]{1,4}|action)(?:[\?|#][^"|']{0,}|))|([a-zA-Z0-9_\-/]{1,}/[a-zA-Z0-9_\-/]{3,}(?:[\?|#][^"|']{0,}|))|([a-zA-Z0-9_\-]{1,}\.(?:\w)(?:[\?|#][^"|']{0,}|)))(?:"|')
         s_regex: ''
         format: '{0}'
         color: gray
@@ -271,7 +298,7 @@ rules:
         sensitive: false
       - name: URL Schemes
         loaded: true
-        f_regex: (\b(?![\w]{0,10}?https?://)(([-A-Za-z0-9]{1,20})://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]))
+        f_regex: (\b(?![\w]{0,10}?https?://)(([A-Za-z0-9-\.]{1,20})://([-\w+&@#/%?=~_|!:,.;]*[-\w+&@#/%=~_|])?))
         s_regex: ''
         format: '{0}'
         color: yellow