Version: 4.0.5 Update

修复了社区版会无法正常使用HaE的问题

src/main/java/hae/Config.java

@@ -61,6 +61,8 @@ public class Config {
             "gray"
     };
 
+    public static Boolean proVersionStatus = true;
+
     public static Map<String, Object[][]> globalRules = new HashMap<>();
 
     public static ConcurrentHashMap<String, Map<String, List<String>>> globalDataMap = new ConcurrentHashMap<>();

src/main/java/hae/HaE.java

@@ -10,6 +10,7 @@ import hae.component.board.message.MessageTableModel;
 import hae.instances.editor.RequestEditor;
 import hae.instances.editor.ResponseEditor;
 import hae.instances.editor.WebSocketEditor;
+import hae.instances.http.HttpMessagePassiveHandler;
 import hae.instances.websocket.WebSocketMessageHandler;
 import hae.utils.ConfigLoader;
 import hae.utils.DataManager;
@@ -18,8 +19,8 @@ public class HaE implements BurpExtension {
     @Override
     public void initialize(MontoyaApi api) {
         // 设置扩展名称
-        String version = "4.0";
         api.extension().setName("HaE - Highlighter and Extractor");
+        String version = "4.0.5";
 
         // 加载扩展后输出的项目信息
         Logging logging = api.logging();
@@ -33,6 +34,9 @@ public class HaE implements BurpExtension {
 
         MessageTableModel messageTableModel = new MessageTableModel(api, configLoader);
 
+        // 设置BurpSuite专业版状态
+        Config.proVersionStatus = getBurpSuiteProStatus(api, configLoader, messageTableModel);
+
         // 注册Tab页（用于查询数据）
         api.userInterface().registerSuiteTab("HaE", new Main(api, configLoader, messageTableModel));
 
@@ -48,6 +52,7 @@ public class HaE implements BurpExtension {
         DataManager dataManager = new DataManager(api);
         dataManager.loadData(messageTableModel);
 
+
         api.extension().registerUnloadingHandler(new ExtensionUnloadingHandler() {
             @Override
             public void extensionUnloaded() {
@@ -57,4 +62,19 @@ public class HaE implements BurpExtension {
             }
         });
     }
+
+    private Boolean getBurpSuiteProStatus(MontoyaApi api, ConfigLoader configLoader, MessageTableModel messageTableModel) {
+        boolean burpSuiteProStatus = false;
+        try {
+            burpSuiteProStatus = api.burpSuite().version().name().contains("Professional");
+        } catch (Exception e) {
+            try {
+                api.scanner().registerScanCheck(new HttpMessagePassiveHandler(api, configLoader, messageTableModel)).deregister();
+                burpSuiteProStatus = true;
+            } catch (Exception ignored) {
+            }
+        }
+
+        return burpSuiteProStatus;
+    }
 }

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

@@ -135,6 +135,7 @@ public class Config extends JPanel {
         modePanel.setLayout(new BoxLayout(modePanel, BoxLayout.X_AXIS));
 
         JCheckBox checkBox = new JCheckBox("Enable active http message handler");
+        checkBox.setEnabled(hae.Config.proVersionStatus);
         modePanel.add(checkBox);
         checkBox.addActionListener(e -> updateModeStatus(checkBox));
         checkBox.setSelected(configLoader.getMode());
@@ -379,7 +380,7 @@ public class Config extends JPanel {
         configLoader.setMode(selected ? "true" : "false");
 
         if (checkBox.isSelected()) {
-            if (passiveHandler.isRegistered()) {
+            if (hae.Config.proVersionStatus && passiveHandler.isRegistered()) {
                 passiveHandler.deregister();
             }
 
@@ -387,7 +388,7 @@ public class Config extends JPanel {
                 activeHandler = api.http().registerHttpHandler(new HttpMessageActiveHandler(api, configLoader, messageTableModel));
             }
         } else {
-            if (!passiveHandler.isRegistered()) {
+            if (hae.Config.proVersionStatus && !passiveHandler.isRegistered()) {
                 passiveHandler = api.scanner().registerScanCheck(new HttpMessagePassiveHandler(api, configLoader, messageTableModel));
             }
 

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

@@ -136,6 +136,7 @@ public class MessageTableModel extends AbstractTableModel {
 
             if (!isDuplicate) {
                 if (flag) {
+                    try {
                         DataManager dataManager = new DataManager(api);
                         // 数据存储在BurpSuite空间内
                         PersistedObject persistedObject = PersistedObject.persistedObject();
@@ -144,6 +145,9 @@ public class MessageTableModel extends AbstractTableModel {
                         persistedObject.setString("color", color);
                         String uuidIndex = StringProcessor.getRandomUUID();
                         dataManager.putData("message", uuidIndex, persistedObject);
+                    } catch (Exception ignored) {
+
+                    }
                 }
 
                 // 添加进日志

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

@@ -30,6 +30,7 @@ public class Datatable extends JPanel {
     private final JTextField secondSearchField;
     private final TableRowSorter<DefaultTableModel> sorter;
     private final JCheckBox searchMode = new JCheckBox("Reverse search");
+    private final JCheckBox regexMode = new JCheckBox("Regex mode");
     private final String tabName;
     private final JPanel footerPanel;
 
@@ -51,6 +52,8 @@ public class Datatable extends JPanel {
     }
 
     private void initComponents(List<String> dataList) {
+        dataTable.setRowSorter(sorter);
+
         // 设置ID排序
         sorter.setComparator(0, new Comparator<Integer>() {
             @Override
@@ -107,7 +110,6 @@ public class Datatable extends JPanel {
         JScrollPane scrollPane = new JScrollPane(dataTable);
         scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
 
-        dataTable.setRowSorter(sorter);
         TableColumn idColumn = dataTable.getColumnModel().getColumn(0);
         idColumn.setPreferredWidth(50);
         idColumn.setMaxWidth(100);
@@ -118,10 +120,12 @@ public class Datatable extends JPanel {
         optionsPanel.setLayout(new BoxLayout(optionsPanel, BoxLayout.X_AXIS));
 
         // Settings按钮
-        JPanel settingMenuPanel = new JPanel(new GridLayout(1, 1));
+        JPanel settingMenuPanel = new JPanel(new GridLayout(2, 1));
         settingMenuPanel.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
         JPopupMenu settingMenu = new JPopupMenu();
         settingMenuPanel.add(searchMode);
+        settingMenuPanel.add(regexMode);
+        regexMode.setSelected(true);
         searchMode.addItemListener(e -> performSearch());
         settingMenu.add(settingMenuPanel);
 
@@ -162,8 +166,8 @@ public class Datatable extends JPanel {
     }
 
     private void performSearch() {
-        RowFilter<Object, Object> firstRowFilter = applyFirstSearchFilter();
-        RowFilter<Object, Object> secondRowFilter = applySecondFilter();
+        RowFilter<Object, Object> firstRowFilter = getObjectObjectRowFilter(searchField, true);
+        RowFilter<Object, Object> secondRowFilter = getObjectObjectRowFilter(secondSearchField, false);
         if (searchField.getForeground().equals(Color.BLACK)) {
             sorter.setRowFilter(firstRowFilter);
             if (secondSearchField.getForeground().equals(Color.BLACK)) {
@@ -175,44 +179,29 @@ public class Datatable extends JPanel {
         }
     }
 
-    private RowFilter<Object, Object> applyFirstSearchFilter() {
+    private RowFilter<Object, Object> getObjectObjectRowFilter(JTextField searchField, boolean firstFlag) {
         return new RowFilter<Object, Object>() {
             public boolean include(Entry<?, ?> entry) {
                 String searchFieldTextText = searchField.getText();
+                searchFieldTextText = searchFieldTextText.toLowerCase();
+                String entryValue = ((String) entry.getValue(1)).toLowerCase();
+                boolean filterReturn = searchFieldTextText.isEmpty();
+                boolean firstFlagReturn = searchMode.isSelected() && firstFlag;
+                if (regexMode.isSelected()) {
                     Pattern pattern = null;
                     try {
                         pattern = Pattern.compile(searchFieldTextText, Pattern.CASE_INSENSITIVE);
                     } catch (Exception ignored) {
                     }
 
-                String entryValue = ((String) entry.getValue(1)).toLowerCase();
-                searchFieldTextText = searchFieldTextText.toLowerCase();
                     if (pattern != null) {
-                    return searchFieldTextText.isEmpty() || pattern.matcher(entryValue).find() != searchMode.isSelected();
+                        filterReturn = filterReturn || pattern.matcher(entryValue).find() != firstFlagReturn;
+                    }
                 } else {
-                    return searchFieldTextText.isEmpty() || entryValue.contains(searchFieldTextText) != searchMode.isSelected();
-                }
-            }
-        };
+                    filterReturn = filterReturn || entryValue.contains(searchFieldTextText) != firstFlagReturn;
                 }
 
-    private RowFilter<Object, Object> applySecondFilter() {
-        return new RowFilter<Object, Object>() {
-            public boolean include(Entry<?, ?> entry) {
-                String searchFieldTextText = secondSearchField.getText();
-                Pattern pattern = null;
-                try {
-                    pattern = Pattern.compile(searchFieldTextText, Pattern.CASE_INSENSITIVE);
-                } catch (Exception ignored) {
-                }
-
-                String entryValue = ((String) entry.getValue(1)).toLowerCase();
-                searchFieldTextText = searchFieldTextText.toLowerCase();
-                if (pattern != null) {
-                    return searchFieldTextText.isEmpty() || pattern.matcher(entryValue).find();
-                } else {
-                    return searchFieldTextText.isEmpty() || entryValue.contains(searchFieldTextText);
-                }
+                return filterReturn;
             }
         };
     }
@@ -248,22 +237,6 @@ public class Datatable extends JPanel {
         });
     }
 
-    private String getTableData(JTable table) {
-        StringBuilder selectData = new StringBuilder();
-        int rowCount = table.getRowCount();
-        for (int i = 0; i < rowCount; i++) {
-            selectData.append(table.getValueAt(i, 1).toString()).append("\r\n");
-        }
-
-        if (!selectData.isEmpty()) {
-            selectData.delete(selectData.length() - 2, selectData.length());
-        } else {
-            return "";
-        }
-
-        return selectData.toString();
-    }
-
     public String getSelectedDataAtTable(JTable table) {
         int[] selectRows = table.getSelectedRows();
         StringBuilder selectData = new StringBuilder();

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

@@ -111,7 +111,7 @@ public class RegularMatcher {
         }
     }
 
-    public static void putDataToGlobalMap(MontoyaApi api, String host, String name, List<String> dataList, boolean flag) {
+    public synchronized static void putDataToGlobalMap(MontoyaApi api, String host, String name, List<String> dataList, boolean flag) {
         // 添加到全局变量中，便于Databoard检索
         if (!Objects.equals(host, "") && host != null) {
             Config.globalDataMap.compute(host, (existingHost, existingMap) -> {
@@ -125,6 +125,7 @@ public class RegularMatcher {
 
                 if (flag) {
                     // 数据存储在BurpSuite空间内
+                    try {
                         DataManager dataManager = new DataManager(api);
                         PersistedObject persistedObject = PersistedObject.persistedObject();
                         gRuleMap.forEach((kName, vList) -> {
@@ -133,6 +134,8 @@ public class RegularMatcher {
                             persistedObject.setStringList(kName, persistedList);
                         });
                         dataManager.putData("data", host, persistedObject);
+                    } catch (Exception ignored) {
+                    }
                 }
 
                 return gRuleMap;

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

@@ -19,12 +19,31 @@ public class DataManager {
         this.persistence = api.persistence();
     }
 
+    public synchronized void putData(String dataType, String dataName, PersistedObject persistedObject) {
+        if (persistence.extensionData().getChildObject(dataName) != null) {
+            persistence.extensionData().deleteChildObject(dataName);
+        }
+        persistence.extensionData().setChildObject(dataName, persistedObject);
+
+        saveIndex(dataType, dataName);
+    }
+
+    public synchronized void loadData(MessageTableModel messageTableModel) {
+        // 1. 获取索引
+        PersistedList<String> dataIndex = persistence.extensionData().getStringList("data"); // 数据索引
+        PersistedList<String> messageIndex = persistence.extensionData().getStringList("message"); // 消息索引
+
+        // 2. 从索引获取数据
+        loadHaEData(dataIndex);
+        loadMessageData(messageIndex, messageTableModel);
+    }
+
     private void saveIndex(String indexName, String indexValue) {
         PersistedList<String> indexList = persistence.extensionData().getStringList(indexName);
 
         if (indexList != null && !indexList.isEmpty()) {
             persistence.extensionData().deleteStringList(indexName);
-        } else {
+        } else if (indexList == null) {
             indexList = PersistedList.persistedStringList();
         }
 
@@ -35,40 +54,25 @@ public class DataManager {
         persistence.extensionData().setStringList(indexName, indexList);
     }
 
-    public void putData(String dataType, String dataName, PersistedObject persistedObject) {
-        if (persistence.extensionData().getChildObject(dataName) != null) {
-            persistence.extensionData().deleteChildObject(dataName);
-        }
-        persistence.extensionData().setChildObject(dataName, persistedObject);
-        saveIndex(dataType, dataName);
-    }
-
-    public void loadData(MessageTableModel messageTableModel) {
-        // 1. 获取索引
-        PersistedList<String> dataIndex = persistence.extensionData().getStringList("data"); // 数据索引
-        PersistedList<String> messageIndex = persistence.extensionData().getStringList("message"); // 消息索引
-
-        // 2. 从索引获取数据
-        loadHaEData(dataIndex);
-        loadMessageData(messageIndex, messageTableModel);
-
-    }
-
     private void loadHaEData(PersistedList<String> dataIndex) {
         if (dataIndex != null && !dataIndex.isEmpty()) {
-            dataIndex.parallelStream().forEach(index -> {
+            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);
                     });
+                } catch (Exception ignored) {
+                }
             });
         }
     }
 
     private void loadMessageData(PersistedList<String> messageIndex, MessageTableModel messageTableModel) {
         if (messageIndex != null && !messageIndex.isEmpty()) {
-            messageIndex.parallelStream().forEach(index -> {
+            messageIndex.forEach(index -> {
                 PersistedObject dataObj = persistence.extensionData().getChildObject(index);
+                if (dataObj != null) {
                     HttpRequestResponse messageInfo = dataObj.getHttpRequestResponse("messageInfo");
                     String comment = dataObj.getString("comment");
                     String color = dataObj.getString("color");
@@ -79,6 +83,7 @@ public class DataManager {
                     String status = String.valueOf(response.statusCode());
                     String length = String.valueOf(response.toByteArray().length());
                     messageTableModel.add(messageInfo, url, method, status, length, comment, color, false);
+                }
             });
         }
     }

src/main/resources/rules/Rules.yml

@@ -231,7 +231,7 @@ rules:
     rule:
       - name: Linkfinder
         loaded: true
-        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,}|)))(?:"|')
+        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,})?(?:"|')
         s_regex: ''
         format: '{0}'
         color: gray