Version: 3.3.4 Update

.github/ISSUE_TEMPLATE/问题反馈.md

@@ -14,7 +14,9 @@ HaE 版本：
 有无自定义规则：
 BurpSuite 版本：
 操作系统版本：
-有无仔细阅读README：
+是否阅读README：
+是否知晓注意事项：
+是否查阅历史ISSUE：
 ```
 
 ## 问题详情

README.md

@@ -12,9 +12,14 @@
 
 > 随着现代化Web应用采用前后端分离的开发模式，日常漏洞挖掘的过程中，捕获的HTTP请求流量也相应增加。若想全面评估一个Web应用，会花费大量时间在无用的报文上。**HaE的出现旨在解决这类情况**，借助HaE，您能够**有效减少**测试时间，将更多精力集中在**有价值且有意义**的报文上，从而**提高漏洞挖掘效率**。
 
+GitHub项目地址：https://github.com/gh0stkey/HaE
+
+GitCode项目地址：https://gitcode.com/gh0stkey/HaE
+
 **所获荣誉**:
 
 1. [入选2022年KCon兵器谱](https://mp.weixin.qq.com/s/JohMsl1WD29LHCHuLf8mVQ)
+2. [入选GitCode G-Star项目](https://gitcode.com/gh0stkey/HaE)
 
 **注意事项**:
 

build.gradle

@@ -22,6 +22,8 @@ dependencies {
     implementation 'org.yaml:snakeyaml:2.0'
     implementation 'dk.brics.automaton:automaton:1.11-8'
     implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
+    implementation 'com.google.code.gson:gson:2.11.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
 }
 
 test {

src/main/java/hae/Config.java

@@ -12,6 +12,8 @@ public class Config {
 
     public static String status = "404";
 
+    public static String size = "0";
+
     public static String boundary = "\n\t\n";
 
     public static String[] scope = new String[]{

src/main/java/hae/HaE.java

@@ -18,7 +18,7 @@ public class HaE implements BurpExtension {
     @Override
     public void initialize(MontoyaApi api) {
         // 设置扩展名称
-        String version = "3.3.2";
+        String version = "3.3.4";
         api.extension().setName(String.format("HaE (%s) - Highlighter and Extractor", version));
 
         // 加载扩展后输出的项目信息
@@ -30,7 +30,7 @@ public class HaE implements BurpExtension {
         // 配置文件加载
         ConfigLoader configLoader = new ConfigLoader(api);
 
-        MessageTableModel messageTableModel = new MessageTableModel(api);
+        MessageTableModel messageTableModel = new MessageTableModel(api, configLoader);
 
         // 注册Tab页（用于查询数据）
         api.userInterface().registerSuiteTab("HaE", new Main(api, configLoader, messageTableModel));

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

@@ -66,7 +66,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", "Limit size (MB)"};
         JPanel settingPanel = createConfigTablePanel(settingMode, "Setting");
         JPanel scopePanel = getScopePanel();
         JScrollPane scopeScrollPane = new JScrollPane(scopePanel);
@@ -153,6 +153,13 @@ public class Config extends JPanel {
                         configLoader.setExcludeStatus(values);
                     }
                 }
+
+                if (selected.contains("Limit size")) {
+                    if (!values.equals(configLoader.getExcludeStatus()) && !values.isEmpty()) {
+                        String[] limit = values.split("\\|");
+                        configLoader.setLimitSize(limit[limit.length - 1]);
+                    }
+                }
             }
         };
     }
@@ -175,6 +182,10 @@ public class Config extends JPanel {
                 if (selected.equals("Exclude status")) {
                     addDataToTable(configLoader.getExcludeStatus().replaceAll("\\|", "\r\n"), model);
                 }
+
+                if (selected.contains("Limit size")) {
+                    addDataToTable(configLoader.getLimitSize(), model);
+                }
             }
         };
     }
@@ -279,13 +290,13 @@ public class Config extends JPanel {
         settingPanel.add(inputPanel, BorderLayout.CENTER);
 
 
-        addButton.addActionListener(e -> addActionPerformed(e, model, addTextField));
+        addButton.addActionListener(e -> addActionPerformed(e, model, addTextField, setTypeComboBox.getSelectedItem().toString()));
 
         addTextField.addKeyListener(new KeyAdapter() {
             @Override
             public void keyPressed(KeyEvent e) {
                 if (e.getKeyCode() == KeyEvent.VK_ENTER) {
-                    addActionPerformed(null, model, addTextField);
+                    addActionPerformed(null, model, addTextField, setTypeComboBox.getSelectedItem().toString());
                 }
             }
         });
@@ -294,7 +305,9 @@ public class Config extends JPanel {
             Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
             try {
                 String data = (String) clipboard.getData(DataFlavor.stringFlavor);
-
+                if (setTypeComboBox.getSelectedItem().toString().contains("Limit size")) {
+                    model.setRowCount(0);
+                }
                 if (data != null && !data.isEmpty()) {
                     addDataToTable(data, model);
                 }
@@ -385,14 +398,17 @@ public class Config extends JPanel {
         configLoader.setScope(String.join("|", HaEScope));
     }
 
-    private void addActionPerformed(ActionEvent e, DefaultTableModel model, JTextField addTextField) {
+    private void addActionPerformed(ActionEvent e, DefaultTableModel model, JTextField addTextField, String comboBoxSelected) {
         String addTextFieldText = addTextField.getText();
-        if (!addTextFieldText.equals(defaultText)) {
+        if (addTextField.getForeground().equals(Color.BLACK)) {
-            addDataToTable(addTextFieldText, model);
+            if (comboBoxSelected.contains("Limit size")) {
+                model.setRowCount(0);
             }
+            addDataToTable(addTextFieldText, model);
             addTextField.setText("");
             addTextField.requestFocusInWindow();
         }
+    }
 
     private void onlineUpdateActionPerformed(ActionEvent e) {
         // 添加提示框防止用户误触导致配置更新

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

@@ -419,8 +419,8 @@ public class Databoard extends JPanel {
         JTable taskStatusTable = new JTable(taskStatusTableModel);
 
         for (Object[] data : dataList) {
-            int rowCount = taskStatusTable.getRowCount();
+            int rowCount = taskStatusTableModel.getRowCount();
-            int id = rowCount > 0 ? (Integer) taskStatusTable.getValueAt(rowCount - 1, 0) + 1 : 1;
+            int id = rowCount > 0 ? (Integer) taskStatusTableModel.getValueAt(rowCount - 1, 0) + 1 : 1;
             Object[] rowData = new Object[data.length + 1];
             rowData[0] = id;
             System.arraycopy(data, 0, rowData, 1, data.length);

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

@@ -1,7 +1,6 @@
 package hae.component.board.message;
 
 import burp.api.montoya.MontoyaApi;
-import burp.api.montoya.core.ByteArray;
 import burp.api.montoya.http.message.HttpHeader;
 import burp.api.montoya.http.message.HttpRequestResponse;
 import burp.api.montoya.http.message.requests.HttpRequest;
@@ -11,6 +10,7 @@ import burp.api.montoya.ui.editor.HttpRequestEditor;
 import burp.api.montoya.ui.editor.HttpResponseEditor;
 import hae.Config;
 import hae.cache.CachePool;
+import hae.utils.ConfigLoader;
 import hae.utils.project.FileProcessor;
 import hae.utils.string.HashCalculator;
 import hae.utils.string.StringProcessor;
@@ -23,6 +23,8 @@ import javax.swing.table.TableRowSorter;
 import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
 import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
@@ -30,15 +32,17 @@ import static burp.api.montoya.ui.editor.EditorOptions.READ_ONLY;
 
 public class MessageTableModel extends AbstractTableModel {
     private final MontoyaApi api;
+    private final ConfigLoader configLoader;
     private final MessageTable messageTable;
     private final JSplitPane splitPane;
     private final LinkedList<MessageEntry> log = new LinkedList<>();
     private final LinkedList<MessageEntry> filteredLog;
     private SwingWorker<Void, Void> currentWorker;
 
-    public MessageTableModel(MontoyaApi api) {
+    public MessageTableModel(MontoyaApi api, ConfigLoader configLoader) {
         this.filteredLog = new LinkedList<>();
         this.api = api;
+        this.configLoader = configLoader;
 
         JTabbedPane messageTab = new JTabbedPane();
         UserInterface userInterface = api.userInterface();
@@ -435,7 +439,7 @@ public class MessageTableModel extends AbstractTableModel {
 
     public class MessageTable extends JTable {
         private MessageEntry messageEntry;
-        private SwingWorker<ByteArray[], Void> currentWorker;
+        private final ExecutorService executorService;
         private int lastSelectedIndex = -1;
         private final HttpRequestEditor requestEditor;
         private final HttpResponseEditor responseEditor;
@@ -444,52 +448,31 @@ public class MessageTableModel extends AbstractTableModel {
             super(messageTableModel);
             this.requestEditor = requestEditor;
             this.responseEditor = responseEditor;
+            this.executorService = Executors.newSingleThreadExecutor();
         }
 
         @Override
         public void changeSelection(int row, int col, boolean toggle, boolean extend) {
             super.changeSelection(row, col, toggle, extend);
-
-            if (currentWorker != null && !currentWorker.isDone()) {
-                currentWorker.cancel(true);
-            }
-
-            currentWorker = new SwingWorker<>() {
-                @Override
-                protected ByteArray[] doInBackground() {
             int selectedIndex = convertRowIndexToModel(row);
             if (lastSelectedIndex != selectedIndex) {
                 lastSelectedIndex = selectedIndex;
-                        messageEntry = filteredLog.get(selectedIndex);
+                executorService.execute(this::getSelectedMessage);
+            }
+        }
+
+        private void getSelectedMessage() {
+            messageEntry = filteredLog.get(lastSelectedIndex);
 
             HttpRequestResponse httpRequestResponse = messageEntry.getRequestResponse();
 
-                        ByteArray requestByte = httpRequestResponse.request().toByteArray();
+            requestEditor.setRequest(HttpRequest.httpRequest(messageEntry.getRequestResponse().httpService(), httpRequestResponse.request().toByteArray()));
-                        ByteArray responseByte = httpRequestResponse.response().toByteArray();
+            int responseSizeWithMb = httpRequestResponse.response().toString().length() / 1024 / 1024;
-
+            if ((responseSizeWithMb < Integer.parseInt(configLoader.getLimitSize())) || configLoader.getLimitSize().equals("0")) {
-                        ByteArray[] httpByteArray = new ByteArray[2];
+                responseEditor.setResponse(httpRequestResponse.response());
-                        httpByteArray[0] = requestByte;
+            } else {
-                        httpByteArray[1] = responseByte;
+                responseEditor.setResponse(HttpResponse.httpResponse("Exceeds length limit."));
-                        return httpByteArray;
             }
-
-                    return null;
-                }
-
-                @Override
-                protected void done() {
-                    try {
-                        ByteArray[] retByteArray = get();
-                        if (retByteArray != null) {
-                            requestEditor.setRequest(HttpRequest.httpRequest(messageEntry.getRequestResponse().httpService(), retByteArray[0]));
-                            responseEditor.setResponse(HttpResponse.httpResponse(retByteArray[1]));
-                        }
-                    } catch (Exception ignored) {
-                    }
-                }
-            };
-
-            currentWorker.execute();
         }
     }
 }

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

@@ -23,6 +23,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.lang.reflect.Type;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -34,6 +35,7 @@ public class Datatable extends JPanel {
     private final JTable dataTable;
     private final DefaultTableModel dataTableModel;
     private final JTextField searchField;
+    private final JTextField secondSearchField;
     private final TableRowSorter<DefaultTableModel> sorter;
     private final JCheckBox searchMode = new JCheckBox("Reverse search");
     private final String tabName;
@@ -52,7 +54,8 @@ public class Datatable extends JPanel {
 
         this.dataTable = new JTable(dataTableModel);
         this.sorter = new TableRowSorter<>(dataTableModel);
-        this.searchField = new JTextField();
+        this.searchField = new JTextField(10);
+        this.secondSearchField = new JTextField(10);
         this.aiEmpoweredMenu = new JPopupMenu();
         this.footerPanel = new JPanel(new BorderLayout(0, 5));
 
@@ -70,21 +73,13 @@ public class Datatable extends JPanel {
             }
         });
 
-        dataTable.setRowSorter(sorter);
-        TableColumn idColumn = dataTable.getColumnModel().getColumn(0);
-        idColumn.setMaxWidth(50);
-
         for (String item : dataList) {
             if (!item.isEmpty()) {
                 addRowToTable(new Object[]{item});
             }
         }
 
-        // 设置灰色默认文本
+        UIEnhancer.setTextFieldPlaceholder(searchField, "Search");
-        String searchText = "Search";
-        UIEnhancer.setTextFieldPlaceholder(searchField, searchText);
-
-        // 监听输入框内容输入、更新、删除
         searchField.getDocument().addDocumentListener(new DocumentListener() {
             @Override
             public void insertUpdate(DocumentEvent e) {
@@ -103,10 +98,34 @@ public class Datatable extends JPanel {
 
         });
 
+        UIEnhancer.setTextFieldPlaceholder(secondSearchField, "Second search");
+        secondSearchField.getDocument().addDocumentListener(new DocumentListener() {
+            @Override
+            public void insertUpdate(DocumentEvent e) {
+                performSearch();
+            }
+
+            @Override
+            public void removeUpdate(DocumentEvent e) {
+                performSearch();
+            }
+
+            @Override
+            public void changedUpdate(DocumentEvent e) {
+                performSearch();
+            }
+
+        });
+
         // 设置布局
         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);
+
         setLayout(new BorderLayout(0, 5));
 
         JPanel optionsPanel = new JPanel();
@@ -162,6 +181,8 @@ public class Datatable extends JPanel {
         optionsPanel.add(Box.createHorizontalStrut(5));
         optionsPanel.add(searchField);
         optionsPanel.add(Box.createHorizontalStrut(5));
+        optionsPanel.add(secondSearchField);
+        optionsPanel.add(Box.createHorizontalStrut(5));
         optionsPanel.add(aiEmpoweredButton);
 
         footerPanel.setBorder(BorderFactory.createEmptyBorder(2, 3, 5, 3));
@@ -252,8 +273,21 @@ public class Datatable extends JPanel {
     }
 
     private void performSearch() {
+        RowFilter<Object, Object> firstRowFilter = applyFirstSearchFilter();
+        RowFilter<Object, Object> secondRowFilter = applySecondFilter();
         if (searchField.getForeground().equals(Color.BLACK)) {
-            RowFilter<Object, Object> rowFilter = new RowFilter<Object, Object>() {
+            sorter.setRowFilter(firstRowFilter);
+            if (secondSearchField.getForeground().equals(Color.BLACK)) {
+                List<RowFilter<Object, Object>> filters = new ArrayList<>();
+                filters.add(firstRowFilter);
+                filters.add(secondRowFilter);
+                sorter.setRowFilter(RowFilter.andFilter(filters));
+            }
+        }
+    }
+
+    private RowFilter<Object, Object> applyFirstSearchFilter() {
+        return new RowFilter<Object, Object>() {
             public boolean include(Entry<?, ?> entry) {
                 String searchFieldTextText = searchField.getText();
                 Pattern pattern = null;
@@ -271,8 +305,27 @@ public class Datatable extends JPanel {
                 }
             }
         };
-            sorter.setRowFilter(rowFilter);
     }
+
+    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);
+                }
+            }
+        };
     }
 
     public void setTableListener(MessageTableModel messagePanel) {

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

@@ -80,6 +80,7 @@ public class ConfigLoader {
         r.put("ExcludeSuffix", getExcludeSuffix());
         r.put("BlockHost", getBlockHost());
         r.put("ExcludeStatus", getExcludeStatus());
+        r.put("LimitSize", getLimitSize());
         r.put("HaEScope", getScope());
         try {
             Writer ws = new OutputStreamWriter(Files.newOutputStream(Paths.get(configFilePath)), StandardCharsets.UTF_8);
@@ -160,6 +161,10 @@ public class ConfigLoader {
         return getValueFromConfig("ExcludeStatus", Config.status);
     }
 
+    public String getLimitSize() {
+        return getValueFromConfig("LimitSize", Config.size);
+    }
+
     public String getScope() {
         return getValueFromConfig("HaEScope", Config.scopeOptions);
     }
@@ -206,6 +211,10 @@ public class ConfigLoader {
         setValueToConfig("ExcludeStatus", status);
     }
 
+    public void setLimitSize(String size) {
+        setValueToConfig("LimitSize", size);
+    }
+
     public void setScope(String scope) {
         setValueToConfig("HaEScope", scope);
     }

src/main/resources/rules/Rules.yml

@@ -1,5 +1,5 @@
 rules:
-- group: Fingerprint
+  - group: Fingerprint
     rule:
       - name: Shiro
         loaded: true
@@ -46,7 +46,7 @@ rules:
         scope: response body
         engine: dfa
         sensitive: false
-- group: Maybe Vulnerability
+  - group: Maybe Vulnerability
     rule:
       - name: Java Deserialization
         loaded: true
@@ -93,7 +93,7 @@ rules:
         scope: request
         engine: dfa
         sensitive: false
-- group: Basic Information
+  - group: Basic Information
     rule:
       - name: Email
         loaded: true
@@ -140,7 +140,7 @@ rules:
         scope: response
         engine: nfa
         sensitive: true
-- group: Sensitive Information
+  - group: Sensitive Information
     rule:
       - name: Cloud Key
         loaded: true
@@ -217,7 +217,7 @@ rules:
         scope: response
         engine: nfa
         sensitive: false
-- group: Other
+  - group: Other
     rule:
       - name: Linkfinder
         loaded: true