Version: 2.4.7 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.7";
         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,9 @@ 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;
+                String resComment = !Objects.equals(originalComment, "") ? String.format("%s, %s", originalComment, addComment) : addComment;
 
                 messageInfo.setComment(resComment);
             }
@@ -142,6 +143,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
         public boolean isEnabled(byte[] content, boolean isRequest) {
             String c = new String(content, StandardCharsets.UTF_8).intern();
             List<Map<String, String>> result = pm.processMessageByContent(helpers, content, isRequest, false, "");
+
             if (result != null && !result.isEmpty()) {
                 Map<String, String> dataMap = result.get(0);
                 if (isRequest) {
@@ -207,7 +209,10 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
                     data[x][0] = extractData[x];
                     // stdout.println(extractData[x]);
                 }
-                JScrollPane jScrollPane = new JScrollPane(new JTable(data, new Object[]{"Information"}));
+                JTable infoTable = new JTable(data, new Object[]{"Information"});
+                infoTable.setAutoCreateRowSorter(true);
+                JScrollPane jScrollPane = new JScrollPane(infoTable);
+
                 lTitleList.add(i);
                 this.jTabbedPane.addTab(i, jScrollPane);
             });

src/main/java/burp/Config.java

@@ -9,10 +9,12 @@ import java.util.List;
 import java.util.Map;
 
 public class Config {
-    public static String excludeSuffix = "3g2|3gp|7z|aac|abw|aif|aifc|aiff|arc|au|avi|azw|bin|bmp|bz|bz2|cmx|cod|csh|css|csv|doc|docx|eot|epub|gif|gz|ico|ics|ief|jar|jfif|jpe|jpeg|jpg|m3u|mid|midi|mjs|mp2|mp3|mpa|mpe|mpeg|mpg|mpkg|mpp|mpv2|odp|ods|odt|oga|ogv|ogx|otf|pbm|pdf|pgm|png|pnm|ppm|ppt|pptx|ra|ram|rar|ras|rgb|rmi|rtf|snd|svg|swf|tar|tif|tiff|ttf|vsd|wav|weba|webm|webp|woff|woff2|xbm|xls|xlsx|xpm|xul|xwd|zip|zip";
+    public static String excludeSuffix = "3g2|3gp|7z|aac|abw|aif|aifc|aiff|apk|arc|au|avi|azw|bat|bin|bmp|bz|bz2|cmd|cmx|cod|com|csh|css|csv|dll|doc|docx|ear|eot|epub|exe|flac|flv|gif|gz|ico|ics|ief|jar|jfif|jpe|jpeg|jpg|less|m3u|mid|midi|mjs|mkv|mov|mp2|mp3|mp4|mpa|mpe|mpeg|mpg|mpkg|mpp|mpv2|odp|ods|odt|oga|ogg|ogv|ogx|otf|pbm|pdf|pgm|png|pnm|ppm|ppt|pptx|ra|ram|rar|ras|rgb|rmi|rtf|scss|sh|snd|svg|swf|tar|tif|tiff|ttf|vsd|war|wav|weba|webm|webp|wmv|woff|woff2|xbm|xls|xlsx|xpm|xul|xwd|zip";
 
     public static String[] scopeArray = new String[] {
             "any",
+            "any header",
+            "any body",
             "response",
             "response header",
             "response body",

src/main/java/burp/action/ExtractContent.java

@@ -1,5 +1,6 @@
 package burp.action;
 
+import burp.BurpExtender;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import burp.Config;
@@ -19,8 +20,10 @@ public class ExtractContent {
     public Map<String, Map<String, Object>> matchRegex(byte[] content, String headers, byte[] body, String scopeString, String host) {
         Map<String, Map<String, Object>> map = new HashMap<>(); // 最终返回的结果
         Config.ruleConfig.keySet().forEach(i -> {
-            String matchContent = "";
             for (Object[] objects : Config.ruleConfig.get(i)) {
+                // 多线程执行，一定程度上减少阻塞现象
+                Thread t = new Thread(() -> {
+                    String matchContent = "";
                     // 遍历获取规则
                     List<String> result = new ArrayList<>();
                     Map<String, Object> tmpMap = new HashMap<>();
@@ -33,17 +36,19 @@ public class ExtractContent {
                     String engine = objects[5].toString();
                     boolean sensitive = (Boolean) objects[6];
                     // 判断规则是否开启与作用域
-                if (loaded && (scope.contains(scopeString) || "any".equals(scope))) {
+                    if (loaded && (scope.contains(scopeString) || scope.contains("any"))) {
                         switch (scope) {
                             case "any":
                             case "request":
                             case "response":
                                 matchContent = new String(content, StandardCharsets.UTF_8).intern();
                                 break;
+                            case "any header":
                             case "request header":
                             case "response header":
                                 matchContent = headers;
                                 break;
+                            case "any body":
                             case "request body":
                             case "response body":
                                 matchContent = new String(body, StandardCharsets.UTF_8).intern();
@@ -84,48 +89,58 @@ public class ExtractContent {
                         result.clear();
                         result.addAll(tmpList);
 
+                        String nameAndSize = String.format("%s (%s)", name, result.size());
                         if (!result.isEmpty()) {
                             tmpMap.put("color", color);
-                        tmpMap.put("data", String.join("\n", result));
+                            String dataStr = String.join("\n", result);
-                        // 初始化格式
+                            tmpMap.put("data", dataStr);
-                        map.put(name, tmpMap);
+                            map.put(nameAndSize, tmpMap);
-                    }
-                }
-            }
-        });
 
-        // 将提取的数据存放到全局变量中
+                            // 添加到全局变量中，便于Databoard检索
                             if (!host.isEmpty()) {
-            map.keySet().forEach(i -> {
+                                String[] splitHost = host.split("\\.");
-                Map<String, Object> tmpMap = map.get(i);
+                                String anyHost = (splitHost.length > 2 && !host.matches("\\b(?:\\d{1,3}\\.){3}\\d{1,3}\\b")) ? host.replace(splitHost[0], "*") : "";
-                List<String> dataList = Arrays.asList(tmpMap.get("data").toString().split("\n"));
+                                List<String> dataList = Arrays.asList(dataStr.split("\n"));
-                // 判断Host是否存在，如存在则进行数据更新，反之则新增数据
                                 if (Config.globalDataMap.containsKey(host)) {
-                    Map<String, List<String>> gRuleMap = Config.globalDataMap.get(host);
+                                    Map<String, List<String>> gRuleMap = new HashMap<>(Config.globalDataMap.get(host));
-                    // 判断匹配规则是否存在（逻辑同Host判断）
+                                    if (gRuleMap.containsKey(name)) {
-                    if (gRuleMap.containsKey(i)) {
+                                        List<String> gDataList = gRuleMap.get(name);
-                        List<String> gDataList = gRuleMap.get(i);
+                                        gDataList.addAll(dataList);
-                        List<String> mergeDataList = new ArrayList<>();
+                                        gDataList = new ArrayList<>(new HashSet<>(gDataList));
-                        // 合并两个List
+                                        gRuleMap.replace(name, gDataList);
-                        mergeDataList.addAll(gDataList);
-                        mergeDataList.addAll(dataList);
-                        // 去重操作
-                        HashSet tmpList = new HashSet(mergeDataList);
-                        mergeDataList.clear();
-                        mergeDataList.addAll(tmpList);
-                        // 替换操作
-                        gRuleMap.replace(i, gDataList, mergeDataList);
                                     } else {
-                        gRuleMap.put(i, dataList);
+                                        gRuleMap.put(name, dataList);
                                     }
+                                    Config.globalDataMap.remove(host);
+                                    Config.globalDataMap.put(host, gRuleMap);
                                 } else {
                                     Map<String, List<String>> ruleMap = new HashMap<>();
-                    ruleMap.put(i, dataList);
+                                    ruleMap.put(name, dataList);
+                                    // 添加单一Host
                                     Config.globalDataMap.put(host, ruleMap);
                                 }
+
+                                if (!Config.globalDataMap.containsKey(anyHost) && anyHost.length() > 0) {
+                                    // 添加通配符Host，实际数据从查询哪里将所有数据提取
+                                    Config.globalDataMap.put(anyHost, new HashMap<>());
+                                } else if (!Config.globalDataMap.containsKey("*")) {
+                                    // 添加通配符全匹配，同上
+                                    Config.globalDataMap.put("*", new HashMap<>());
+                                }
+                            }
+                        }
+                    }
                 });
+                t.start();
+                try {
+                    t.join();
+                } catch (InterruptedException e) {
+                    BurpExtender.stdout.println(e);
                 }
 
+
+            }
+        });
         return map;
     }
 }

src/main/java/burp/action/ProcessMessage.java

@@ -1,5 +1,6 @@
 package burp.action;
 
+import burp.BurpExtender;
 import burp.IExtensionHelpers;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -37,7 +38,6 @@ public class ProcessMessage {
                 return result;
             }
 
-
             // 获取报文主体
             int requestBodyOffset = helpers.analyzeRequest(content).getBodyOffset();
             byte[] requestBody = Arrays.copyOfRange(content, requestBodyOffset, content.length);
@@ -62,7 +62,6 @@ public class ProcessMessage {
             // 获取报文主体
             int responseBodyOffset = helpers.analyzeResponse(content).getBodyOffset();
             byte[] responseBody = Arrays.copyOfRange(content, responseBodyOffset, content.length);
-
             obj = ec.matchRegex(content, responseHeaders, responseBody, "response", host);
         }
 

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

@@ -1,6 +1,8 @@
 package burp.ui;
 
 import burp.Config;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import javax.swing.table.DefaultTableModel;
 import org.jetbrains.annotations.NotNull;
@@ -14,7 +16,7 @@ import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
 /**
- * @author LinChen
+ * @author LinChen && EvilChen
  */
 
 public class Databoard extends JPanel {
@@ -22,11 +24,31 @@ public class Databoard extends JPanel {
         initComponents();
     }
 
+    /**
+     * 清空数据
+     */
+    private void clearActionPerformed(ActionEvent e) {
+        // 清空页面
+        dataTabbedPane.removeAll();
+        String host = hostTextField.getText();
+        if (host.contains("*")) {
+            Map<String, Map<String, List<String>>> ruleMap = Config.globalDataMap;
+            ruleMap.keySet().forEach(i -> {
+                if (i.contains(host.replace("*.", "")) || host.equals("*")) {
+                    Config.globalDataMap.remove(i);
+                }
+            });
+        } else {
+            Config.globalDataMap.remove(host);
+        }
+    }
+
     private void initComponents() {
         // JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
         hostLabel = new JLabel();
         hostTextField = new JTextField();
         dataTabbedPane = new JTabbedPane();
+        clearButton = new JButton();
 
         //======== this ========
         setLayout(new GridBagLayout());
@@ -43,7 +65,11 @@ public class Databoard extends JPanel {
         add(hostTextField, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(8, 0, 5, 5), 0, 0));
-
+        clearButton.setText("Clear");
+        clearButton.addActionListener(this::clearActionPerformed);
+        add(clearButton,  new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0,
+                GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+                new Insets(8, 0, 5, 5), 0, 0));
         add(dataTabbedPane, new GridBagConstraints(1, 1, 3, 2, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(8, 0, 0, 5), 0, 0));
@@ -56,9 +82,7 @@ public class Databoard extends JPanel {
      */
     private static List<String> getHostByList(){
         List<String> hostList = new ArrayList<>();
-        Config.globalDataMap.keySet().forEach(i -> {
+        hostList.addAll(Config.globalDataMap.keySet());
-            hostList.add(i);
-        });
         return hostList;
     }
 
@@ -143,10 +167,15 @@ public class Databoard extends JPanel {
                 if (!input.isEmpty()){
                     for (String host : getHostByList()) {
                         if (host.toLowerCase().contains(input.toLowerCase())) {
+                            if (host.length() == input.length()){
+                                comboBoxModel.insertElementAt(host,0);
+                                comboBoxModel.setSelectedItem(host);
+                            }else{
                                 comboBoxModel.addElement(host);
                             }
                         }
                     }
+                }
                 hostComboBox.setPopupVisible(comboBoxModel.getSize() > 0);
                 isMatchHost = false;
             }
@@ -159,10 +188,37 @@ public class Databoard extends JPanel {
     private static void getInfoByHost(@NotNull JComboBox hostComboBox, JTabbedPane tabbedPane, JTextField textField) {
         if (hostComboBox.getSelectedItem() != null) {
             Map<String, Map<String, List<String>>> ruleMap = Config.globalDataMap;
-            Map<String, List<String>> selectUrl = ruleMap.get(hostComboBox.getSelectedItem());
+            Map<String, List<String>> selectHost = new HashMap<>();
+            String host = hostComboBox.getSelectedItem().toString();
+            if (host.contains("*")) {
+                // 通配符数据
+                Map<String, List<String>> finalSelectHost = selectHost;
+                ruleMap.keySet().forEach(i -> {
+                    if (i.contains(host.replace("*.", "")) || host.equals("*")) {
+                        ruleMap.get(i).keySet().forEach(e -> {
+                            if (finalSelectHost.containsKey(e)) {
+                                // 合并操作
+                                List<String> newList = new ArrayList<>(finalSelectHost.get(e));
+                                newList.addAll(ruleMap.get(i).get(e));
+                                // 去重操作
+                                HashSet tmpList = new HashSet(newList);
+                                newList.clear();
+                                newList.addAll(tmpList);
+                                // 添加操作
+                                finalSelectHost.put(e, newList);
+                            } else {
+                                finalSelectHost.put(e, ruleMap.get(i).get(e));
+                            }
+                        });
+                    }
+                });
+            } else {
+                selectHost = ruleMap.get(host);
+            }
+
             tabbedPane.removeAll();
-            for(Map.Entry<String, List<String>> entry: selectUrl.entrySet()){
+            for(Map.Entry<String, List<String>> entry: selectHost.entrySet()){
-                tabbedPane.addTab(entry.getKey(), new JScrollPane(new HitRuleDataList(entry.getValue())));
+                tabbedPane.addTab(String.format("%s (%s)", entry.getKey(), entry.getValue().size()), new JScrollPane(new HitRuleDataList(entry.getValue())));
             }
             textField.setText(hostComboBox.getSelectedItem().toString());
         }
@@ -172,6 +228,7 @@ public class Databoard extends JPanel {
     private JLabel hostLabel;
     private JTextField hostTextField;
     private JTabbedPane dataTabbedPane;
+    private JButton clearButton;
     // JFormDesigner - End of variables declaration  //GEN-END:variables
 
     // 是否自动匹配Host
@@ -185,6 +242,7 @@ class HitRuleDataList extends JTable {
             data[x][0] = list.get(x);
         }
         model.setDataVector(data, new Object[]{"Information"});
+        this.setAutoCreateRowSorter(true);
         this.setModel(model);
     }
 }

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

@@ -18,7 +18,7 @@ import java.awt.event.*;
 import java.util.Map;
 
 /**
- * @author LinChen
+ * @author LinChen && EvilChen
  */
 
 public class MainUI extends JPanel{
@@ -44,8 +44,12 @@ 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";
+        // 添加提示框防止用户误触导致配置更新
+        int retCode = JOptionPane.showConfirmDialog(null, "Do you want to update config?", "Info",
+                JOptionPane.YES_NO_CANCEL_OPTION);
+        if (retCode == JOptionPane.YES_OPTION) {
+            String url = "https://cdn.jsdelivr.net/gh/gh0stkey/HaE@gh-pages/Config.yml";
             OkHttpClient httpClient = new OkHttpClient();
             Request httpRequest = new Request.Builder().url(url).get().build();
             try {
@@ -62,6 +66,8 @@ public class MainUI extends JPanel{
             }
 
             new LoadConfig();
+            reloadRule();
+        }
     }
 
     private void reloadRule(){
@@ -78,11 +84,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 +131,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 +152,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 +174,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;
             }