Version: 2.4.4 Update

README.md

@@ -21,7 +21,7 @@
 
 ![-w477](images/show_config.png)
 
-除了初始化的配置文件外，还有`Setting.yml`，该文件用于存储配置文件路径与排除后缀名；`HaE`支持自定义配置文件路径，你可以通过点击`Select File`按钮进行选择自定义配置文件。
+除了初始化的配置文件外，还有`Setting.yml`，该文件用于存储配置文件路径与排除后缀名；`HaE`支持在线更新配置文件，你可以通过点击`Online Update`按钮进行更新（部分网络需要挂代理）。
 
 ## 优势特点
 

src/main/java/burp/BurpExtender.java

@@ -3,8 +3,8 @@ package burp;
 import burp.action.*;
 import burp.ui.MainUI;
 
-import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import javax.swing.*;
 import java.awt.*;
 import java.nio.charset.StandardCharsets;
@@ -34,12 +34,12 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
         this.callbacks = callbacks;
         BurpExtender.helpers = callbacks.getHelpers();
 
-        String version = "2.4.1";
+        String version = "2.4.4";
         callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
         // 定义输出
         stdout = new PrintWriter(callbacks.getStdout(), true);
-        stdout.println("@Core Author: EvilChen");
+        stdout.println("@First Author: EvilChen");
-        stdout.println("@Architecture Author: 0chencc");
+        stdout.println("@Second Author: 0chencc");
         stdout.println("@Github: https://github.com/gh0stkey/HaE");
         // UI
         SwingUtilities.invokeLater(this::initialize);
@@ -102,8 +102,10 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
                 String color = uc.getEndColor(gck.getColorKeys(colorList));
 
                 messageInfo.setHighlight(color);
+
                 String addComment = String.join(", ", result.get(1).get("comment"));
-                String resComment = originalComment != null ? String.format("%s, %s", originalComment, addComment) : addComment;
+                stdout.println(addComment);
+                String resComment = !Objects.equals(originalComment, "") ? String.format("%s, %s", originalComment, addComment) : addComment;
 
                 messageInfo.setComment(resComment);
             }

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

@@ -143,7 +143,12 @@ public class Databoard extends JPanel {
                 if (!input.isEmpty()){
                     for (String host : getHostByList()) {
                         if (host.toLowerCase().contains(input.toLowerCase())) {
-                            comboBoxModel.addElement(host);
+                            if (host.length() == input.length()){
+                                comboBoxModel.insertElementAt(host,0);
+                                comboBoxModel.setSelectedItem(host);
+                            }else{
+                                comboBoxModel.addElement(host);
+                            }
                         }
                     }
                 }

src/main/java/burp/ui/JTabbedPaneCloseButton.java

@@ -60,7 +60,6 @@ public class JTabbedPaneCloseButton extends JTabbedPane {
 
     /** Button */
     public class CloseButtonTab extends JPanel {
-
         public CloseButtonTab(final Component tab, String title, Icon icon) {
             setOpaque(false);
             FlowLayout flowLayout = new FlowLayout(FlowLayout.CENTER, 3, 3);

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

@@ -44,7 +44,7 @@ public class MainUI extends JPanel{
         }
     }
 
-    private void onlineUpdateMouseClicked(MouseEvent e) {
+    private void onlineUpdateActionPerformed(ActionEvent e) {
         String url = "https://raw.githubusercontent.com/gh0stkey/HaE/gh-pages/Config.yml";
         OkHttpClient httpClient = new OkHttpClient();
         Request httpRequest = new Request.Builder().url(url).get().build();
@@ -62,6 +62,7 @@ public class MainUI extends JPanel{
         }
 
         new LoadConfig();
+        reloadRule();
     }
 
     private void reloadRule(){
@@ -78,11 +79,11 @@ public class MainUI extends JPanel{
         ruleSwitch.setListen(true);
     }
 
-    private void reloadMouseClicked(MouseEvent e) {
+    private void reloadActionPerformed(ActionEvent e) {
         reloadRule();
     }
 
-    private void excludeSuffixSaveMouseClicked(MouseEvent e) {
+    private void excludeSuffixSaveActionPerformed(ActionEvent e) {
         LoadConfig loadCon = new LoadConfig();
         loadCon.setExcludeSuffix(excludeSuffixTextField.getText());
     }
@@ -125,23 +126,13 @@ public class MainUI extends JPanel{
                         new Insets(5, 5, 5, 5), 0, 0));
 
                 onlineUpdateButton.setText("Online Update");
-                onlineUpdateButton.addMouseListener(new MouseAdapter() {
+                onlineUpdateButton.addActionListener(this::onlineUpdateActionPerformed);
-                    @Override
-                    public void mouseClicked(MouseEvent e) {
-                        onlineUpdateMouseClicked(e);
-                    }
-                });
                 rulePanel.add(onlineUpdateButton, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0,
                         GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                         new Insets(5, 0, 5, 5), 0, 0));
 
                 reloadButton.setText("Reload");
-                reloadButton.addMouseListener(new MouseAdapter() {
+                reloadButton.addActionListener(this::reloadActionPerformed);
-                    @Override
-                    public void mouseClicked(MouseEvent e) {
-                        reloadMouseClicked(e);
-                    }
-                });
                 rulePanel.add(reloadButton, new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0,
 
                         GridBagConstraints.CENTER, GridBagConstraints.BOTH,
@@ -156,12 +147,7 @@ public class MainUI extends JPanel{
                         new Insets(0, 0, 0, 5), 0, 0));
 
                 excludeSuffixSaveButton.setText("Save");
-                excludeSuffixSaveButton.addMouseListener(new MouseAdapter() {
+                excludeSuffixSaveButton.addActionListener(this::excludeSuffixSaveActionPerformed);
-                    @Override
-                    public void mouseClicked(MouseEvent e) {
-                        excludeSuffixSaveMouseClicked(e);
-                    }
-                });
                 rulePanel.add(excludeSuffixSaveButton, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0,
                         GridBagConstraints.SOUTH, GridBagConstraints.HORIZONTAL,
                         new Insets(0, 0, 0, 5), 0, 0));
@@ -183,7 +169,7 @@ public class MainUI extends JPanel{
         ruleSwitch = new TabTitleEditListener(ruleTabbedPane);
         ruleTabbedPane.addChangeListener(ruleSwitch);
         ruleTabbedPane.addMouseListener(ruleSwitch);
-        closeTabMenuItem.addActionListener(e -> closeTabActionPerformed(e));
+        closeTabMenuItem.addActionListener(this::closeTabActionPerformed);
         tabMenu.add(closeTabMenuItem);
     }
 

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

@@ -2,15 +2,14 @@ package burp.ui;
 
 import burp.yaml.SetConfig;
 
-import java.awt.event.ComponentListener;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import javax.swing.*;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableRowSorter;
 import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.util.Vector;
 
 /**
@@ -24,7 +23,7 @@ public class RulePane extends JPanel {
     private SetConfig setConfig = new SetConfig();
     private Boolean isEdit = false;
 
-    private void ruleAddMouseClicked(MouseEvent e, JTabbedPane pane) {
+    private void ruleAddActionPerformed(ActionEvent e, JTabbedPane pane) {
         RuleSetting ruleSettingPanel = new RuleSetting();
         int showState = JOptionPane.showConfirmDialog(null, ruleSettingPanel, "RuleSetting - Add Rule", JOptionPane.OK_OPTION);
         if(showState == 0){
@@ -42,7 +41,7 @@ public class RulePane extends JPanel {
         }
     }
 
-    private void ruleEditMouseClicked(MouseEvent e, JTabbedPane pane){
+    private void ruleEditActionPerformed(ActionEvent e, JTabbedPane pane){
         if (ruleTable.getSelectedRowCount() >= 1){
             RuleSetting ruleSettingPanel = new RuleSetting();
             ruleSettingPanel.ruleNameTextField.setText(ruleTable.getValueAt(ruleTable.getSelectedRow(), 1).toString());
@@ -71,7 +70,7 @@ public class RulePane extends JPanel {
         }
     }
 
-    private void ruleRemoveMouseClicked(MouseEvent e, JTabbedPane pane){
+    private void ruleRemoveActionPerformed(ActionEvent e, JTabbedPane pane){
         if (ruleTable.getSelectedRowCount() >= 1){
             int isOk = JOptionPane.showConfirmDialog(null, "Are your sure?", "RuleSetting - Delete Rule", JOptionPane.OK_OPTION);
             if (isOk == 0){
@@ -109,11 +108,11 @@ public class RulePane extends JPanel {
         //---- addButton ----
         addButton.setText("Add");
 
-        addButton.addMouseListener(new MouseAdapter() {
+        addButton.addActionListener(new ActionListener() {
             @Override
-            public void mouseClicked(MouseEvent e) {
+            public void actionPerformed(ActionEvent e) {
                 isEdit = true;
-                ruleAddMouseClicked(e, pane);
+                ruleAddActionPerformed(e, pane);
                 model = (DefaultTableModel) ruleTable.getModel();
                 isEdit = false;
             }
@@ -125,11 +124,11 @@ public class RulePane extends JPanel {
 
         //---- editButton ----
         editButton.setText("Edit");
-        editButton.addMouseListener(new MouseAdapter() {
+        editButton.addActionListener(new ActionListener() {
             @Override
-            public void mouseClicked(MouseEvent e) {
+            public void actionPerformed(ActionEvent e) {
                 isEdit = true;
-                ruleEditMouseClicked(e, pane);
+                ruleEditActionPerformed(e, pane);
                 model = (DefaultTableModel) ruleTable.getModel();
                 isEdit = false;
             }
@@ -158,11 +157,11 @@ public class RulePane extends JPanel {
         //---- removeButton ----
         removeButton.setText("Remove");
 
-        removeButton.addMouseListener(new MouseAdapter() {
+        removeButton.addActionListener(new ActionListener() {
             @Override
-            public void mouseClicked(MouseEvent e) {
+            public void actionPerformed(ActionEvent e) {
                 isEdit = true;
-                ruleRemoveMouseClicked(e, pane);
+                ruleRemoveActionPerformed(e, pane);
                 model = (DefaultTableModel) ruleTable.getModel();
                 isEdit = false;
             }