Version: 2.4.3 Update

.gitignore

@@ -1,3 +1,137 @@
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### JetBrains+all Patch ###
+# Ignore everything but code style settings and run configurations
+# that are supposed to be shared within teams.
+
+.idea/*
+
+!.idea/codeStyles
+!.idea/runConfigurations
+
+### macOS ###
+# General
 .DS_Store
-.idea
+.AppleDouble
-.gradle
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Gradle ###
+.gradle
+**/build/
+!src/**/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Avoid ignore Gradle wrappper properties
+!gradle-wrapper.properties
+
+# Cache of project
+.gradletasknamecache
+
+# Eclipse Gradle plugin generated files
+# Eclipse Core
+.project
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# End of https://www.toptal.com/developers/gitignore/api/macos,gradle,jetbrains+all

README.md

@@ -1,44 +1,46 @@
-# HaE - Highlighter and Extractor
+<div align="center">
+<img src="images/logo.png" style="width: 20%" />
+<h4><a href="https://gh0st.cn/HaE/">赋能白帽，高效作战！</a></h4>
+<h5>第一作者： <a href="https://github.com/gh0stkey">EvilChen</a>（中孚信息元亨实验室）, 第二作者： <a href="https://github.com/0chencc">0chencc</a>（米斯特安全团队）</h5>
+</div>
 
-核心功能作者: [@EvilChen](https://github.com/gh0stkey)
 
-架构作者: [@0chencc](https://github.com/0Chencc)
+## 项目介绍
 
-## 公共规则网站
+**HaE**是基于 `BurpSuite Java插件API` 开发的请求高亮标记与信息提取的辅助型框架式插件，该插件可以通过自定义正则的方式匹配响应报文或请求报文，并对满足正则匹配的报文进行信息高亮与提取。
 
-https://gh0st.cn/HaE/
+现代化Web应用走上前后端分离开发模式，这就导致在日常测试时候会有许多的流量，如果你想要尽可能全面的对一个Web应用进行测试评估，将花费大量精力浪费在无用的报文上；**HaE的出现正是为了解决这一类似场景**，借助HaE你可以**有效的减少**测试的时间，将更多的精力放在**有价值、有意义**的报文上，**提高漏洞挖掘效率**。
 
-## 介绍
+**注**: 要想灵活的使用`HaE`，你需要掌握正则表达式阅读、编写、修改能力；由于`Java`正则表达式的库并没有`Python`的优雅或方便，所以HaE要求使用者必须用`()`将所需提取的表达式内容包含；例如你要匹配一个**Shiro应用**的响应报文，正常匹配规则为`rememberMe=delete`，如果你要提取这段内容的话就需要变成`(rememberMe=delete)`。
-
-**HaE**是基于 `BurpSuite` 插件 `JavaAPI` 开发的请求高亮标记与信息提取的辅助型插件。
-
-![-w1070](images/16000706401522.jpg)
-
-该插件可以通过自定义正则的方式匹配**响应报文或请求报文**，可以自行决定符合该自定义正则匹配的相应请求是否需要高亮标记、信息提取。
-
-**注**: `HaE`的使用，对测试人员来说需要基本的正则表达式基础，由于`Java`正则表达式的库并没有`Python`的优雅或方便，在使用正则的，HaE要求使用者必须使用`()`将所需提取的表达式内容包含；例如你要匹配一个**Shiro应用**的响应报文，正常匹配规则为`rememberMe=delete`，如果你要提取这段内容的话就需要变成`(rememberMe=delete)`。
 
 ## 使用方法
 
 插件装载: `Extender - Extensions - Add - Select File - Next`
 
-初次装载`HaE`会初始化配置文件，默认配置文件内置一个正则: `Email`，初始化的配置文件会放在与`BurpSuite Jar`包同级目录下。
+初次装载`HaE`会初始化配置文件，默认配置文件内置一个正则: `Email`，初始化的配置文件会放在的`/用户根目录/.config/HaE/`目录下。
 
-除了初始化的配置文件外，还有`Setting.yml`，该文件用于存储配置文件路径；`HaE`支持自定义配置文件路径，你可以通过点击`Select File`按钮进行选择自定义配置文件。
+![-w477](images/show_config.png)
 
-![-w477](images/16000710069404.jpg)
+除了初始化的配置文件外，还有`Setting.yml`，该文件用于存储配置文件路径与排除后缀名；`HaE`支持在线更新配置文件，你可以通过点击`Online Update`按钮进行更新（部分网络需要挂代理）。
 
-## 插件优点
+## 优势特点
+
+1. **精细化配置项**：高自由度配置更适配精细化场景需求；
+2. **简洁可视界面**：简洁的可视化界面让你更加清晰了解HaE的各项配置，操作更轻松，使用更简单；
+3. **颜色升级算法**：内置颜色升级算法，避免“屠龙者终成恶龙”场景，突出最具价值的请求；
+4. **标签化规则项**：标签化你的正则规则，让规则可分类，让管理更轻松；
+5. **数据集合面板**：将所有匹配数据集合到Databoard中，使得测试、梳理更高效；
+6. **高亮标记一体**：在Proxy - History页面你可以通过颜色高亮与Comment判断请求价值；
+7. **实战化官方库**：基于实战化场景、案例进行输出的官方规则库，提升测试实战性；
+8. **配置文件易读**：配置文件使用YAML格式存储，更加便于阅读与修改。
+
+| 界面名称                  | 界面展示                                              |
+| ------------------------- | ----------------------------------------------------- |
+| Rules（规则信息管理）     | <img src="images/rules.png" style="width: 80%" />     |
+| Config（配置信息管理）    | <img src="images/config.png" style="width: 80%" />    |
+| Databoard（数据集合面板） | <img src="images/databoard.png" style="width: 80%" /> |
 
-1. 多选项自定义控制适配需求
-2. 多颜色高亮分类，将BurpSuite的所有高亮颜色集成: `red, orange, yellow, green, cyan, blue, pink, magenta, gray`
-3. **颜色升级算法**: 利用下标的方式进行优先级排序，当满足2个同颜色条件则以优先级顺序上升颜色（例如: **两个正则，颜色为橘黄色，该请求两个正则都匹配到了，那么将升级为红色**）
-4. 配置文件采用YAML格式存储，更加便于阅读和修改
-5. 内置简单缓存，在“多正则、大数据”的场景下减少卡顿现象
-6. **支持标签分页**，点击`...`即可添加新的标签页，对着标签页右键即可删除
-7. 高亮信息添加的同时添加Comment，便于查找请求
 
-![-w477](images/16000720732851.jpg)
 
 ## 实际使用
 
@@ -48,43 +50,17 @@ https://gh0st.cn/HaE/
 
 访问该地址，在`Proxy - HTTP History`中可以看见高亮请求，响应标签页中含有`MarkINFO`标签，其中将匹配到的信息提取了出来。
 
-![-w1047](images/16000720732854.jpg)
+![-w1047](images/16000720732854.png)
 
+## 文末随笔
 
-## 正则优化
+正义感是一个不可丢失的东西。
 
-有些正则在实战应用场景中并不理想
+如果你觉得HaE好用，可以打赏一下作者，给作者持续更新下去的动力！
 
-在正则匹配手机号、身份证号码的时候（纯数字类）会存在一些误报（这里匹配身份证号码无法进行校验，误报率很高），但手机号处理这一块可以解决: 
+<div align=center>
-
+<img src="images/reward.jpeg" style="width: 30%" />
-原正则: 
+</div>
-
-```
-1[3-9]\d{9}
-```
-
-误报场景: `12315188888888123`，这时候会匹配到`15188888888`，而实际上这一段并不是手机号，所以修改正则为: 
-
-```
-[^0-9]+(1[3-9]\d{9})[^0-9]+
-```
-
-也就是要求匹配的手机号前后不能为0-9的数字。
-
-## 实战用法
-
-1. CMS指纹识别，Discuz正则: `(Powered by Discuz!)`
-2. OSS对象存储信息泄露，正则: `([A|a]ccess[K|k]ey[I|i]d|[A|a]ccess[K|k]ey[S|s]ecret)`
-3. 内网地址信息提取，正则: `(?:10\.\d{1,3}\.\d{1,3}\.\d{1,3})|(?:172\.(?:(?:1[6-9])|(?:2\d)|(?:3[01]))\.\d{1,3}\.\d{1,3})|(?:192\.168\.\d{1,3}\.\d{1,3})`
-4. 实战插件关联搭配，漏洞挖掘案例: https://mp.weixin.qq.com/s/5vNn7dMRZBtv0ojPBAHV7Q
-
-...还有诸多使用方法等待大家去发掘。
-
-## 文末
-
-随笔: 正义感是一个不可丢失的东西。
-
-Github项目地址（BUG、需求、正则欢迎提交）: https://github.com/gh0stkey/HaE
 
 ## 404StarLink 2.0 - Galaxy
 

build.gradle

@@ -30,4 +30,5 @@ dependencies {
     compile group: 'org.yaml', name: 'snakeyaml', version: '1.28'
     compile 'net.sourceforge.jregex:jregex:1.2_01'
     compile 'dk.brics.automaton:automaton:1.11-8'
+    compile 'com.squareup.okhttp:okhttp:2.7.5'
 }

src/main/java/burp/BurpExtender.java

@@ -3,20 +3,25 @@ package burp;
 import burp.action.*;
 import burp.ui.MainUI;
 
+import java.util.Map;
+import java.util.Objects;
 import javax.swing.*;
 import java.awt.*;
 import java.nio.charset.StandardCharsets;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 
-/*
+/**
- * @author EvilChen
+ * @author EvilChen & 0chencc
  */
 
 public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEditorTabFactory, ITab {
     private final MainUI main = new MainUI();
-    private static PrintWriter stdout;
+    // stdout变成公开属性，便于其他类调用输出调试信息
+    public static PrintWriter stdout;
     private IBurpExtenderCallbacks callbacks;
     private static IExtensionHelpers helpers;
     GetColorKey gck = new GetColorKey();
@@ -29,12 +34,12 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
         this.callbacks = callbacks;
         BurpExtender.helpers = callbacks.getHelpers();
 
-        String version = "2.1.2";
+        String version = "2.4.3";
         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("@UI Author: 0chencc");
+        stdout.println("@Second Author: 0chencc");
         stdout.println("@Github: https://github.com/gh0stkey/HaE");
         // UI
         SwingUtilities.invokeLater(this::initialize);
@@ -42,10 +47,12 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
         callbacks.registerHttpListener(BurpExtender.this);
         callbacks.registerMessageEditorTabFactory(BurpExtender.this);
     }
+
     private void initialize(){
         callbacks.customizeUiComponent(main);
         callbacks.addSuiteTab(BurpExtender.this);
     }
+
     @Override
     public String getTabCaption(){
         return "HaE";
@@ -56,7 +63,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
         return main;
     }
 
-    /*
+    /**
      * 使用processHttpMessage用来做Highlighter
      */
     @Override
@@ -69,45 +76,52 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
             } else {
                 content = messageInfo.getResponse();
             }
-            String c = new String(content, StandardCharsets.UTF_8).intern();
+
             IHttpService iHttpService = null;
             try {
                 iHttpService = messageInfo.getHttpService();
-            } catch(Exception e) {
+            } catch (Exception ignored) {
-                // stdout.println("iHttpService Error: " + e);
             }
-            List<String> result = pm.processMessageByContent(helpers, iHttpService, content, messageIsRequest, true);
+            // 获取请求主机信息
+            assert iHttpService != null;
+            String host = iHttpService.getHost();
+
+            String c = new String(content, StandardCharsets.UTF_8).intern();
+
+            List<Map<String, String>> result = pm.processMessageByContent(helpers, content, messageIsRequest, true, host);
             if (result != null && !result.isEmpty() && result.size() > 0) {
                 String originalColor = messageInfo.getHighlight();
                 String originalComment = messageInfo.getComment();
                 List<String> colorList = new ArrayList<>();
+
                 if (originalColor != null) {
                     colorList.add(originalColor);
                 }
-                colorList.add(result.get(0));
+
+                colorList.add(result.get(0).get("color"));
                 String color = uc.getEndColor(gck.getColorKeys(colorList));
 
                 messageInfo.setHighlight(color);
-                String addComment = String.join(", ", result.get(1));
+
-                String resComment = originalComment != null ? String.format("%s, %s", originalComment, addComment) : addComment;
+                String addComment = String.join(", ", result.get(1).get("comment"));
+                stdout.println(addComment);
+                String resComment = !Objects.equals(originalComment, "") ? String.format("%s, %s", originalComment, addComment) : addComment;
 
                 messageInfo.setComment(resComment);
             }
         }
-
     }
 
     class MarkInfoTab implements IMessageEditorTab {
-        private final ITextEditor markInfoText;
+        private final JTabbedPane jTabbedPane = new JTabbedPane();
-        private byte[] currentMessage;
+        private JTable jTable = new JTable();
         private final IMessageEditorController controller;
-        private byte[] extractRequestContent;
+        private Map<String, String> extractRequestMap;
-        private byte[] extractResponseContent;
+        private Map<String, String> extractResponseMap;
+        private ArrayList<String> titleList = new ArrayList<>();
 
         public MarkInfoTab(IMessageEditorController controller, boolean editable) {
             this.controller = controller;
-            markInfoText = callbacks.createTextEditor();
-            markInfoText.setEditable(editable);
         }
 
         @Override
@@ -117,48 +131,58 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 
         @Override
         public Component getUiComponent() {
-            return markInfoText.getComponent();
+            jTabbedPane.addChangeListener(new ChangeListener() {
+                @Override
+                public void stateChanged(ChangeEvent arg0) {
+                    jTable = (JTable) ((JScrollPane)jTabbedPane.getSelectedComponent()).getViewport().getView();
+                }
+            });
+            return this.jTabbedPane;
         }
 
         @Override
         public boolean isEnabled(byte[] content, boolean isRequest) {
             String c = new String(content, StandardCharsets.UTF_8).intern();
-            IHttpService iHttpService = null;
+            List<Map<String, String>> result = pm.processMessageByContent(helpers, content, isRequest, false, "");
-            try {
-                iHttpService = controller.getHttpService();
-            } catch(Exception e) {
-                // stdout.println("iHttpService Error: " + e);
-            }
-            List<String> result = pm.processMessageByContent(helpers, iHttpService, content, isRequest, false);
             if (result != null && !result.isEmpty()) {
+                Map<String, String> dataMap = result.get(0);
                 if (isRequest) {
-                    extractRequestContent = result.get(0).getBytes();
+                    extractRequestMap = dataMap;
                 } else {
-                    extractResponseContent = result.get(0).getBytes();
+                    extractResponseMap = dataMap;
                 }
                 return true;
             }
-
             return false;
-
         }
 
         @Override
         public byte[] getMessage() {
-            return currentMessage;
+            return null;
         }
 
         @Override
         public boolean isModified() {
-            return markInfoText.isTextModified();
+            return false;
         }
 
+        /**
+         * 快捷键复制功能
+         */
         @Override
         public byte[] getSelectedData() {
-            return markInfoText.getSelectedText();
+            int[] selectRows = jTable.getSelectedRows();
+            StringBuilder selectData = new StringBuilder();
+            for (int row : selectRows) {
+                selectData.append(jTable.getValueAt(row, 0).toString()).append("\n");
+            }
+            // 便于单行复制，去除最后一个换行符
+            String revData = selectData.reverse().toString().replaceFirst("\n", "");
+            StringBuilder retData = new StringBuilder(revData).reverse();
+            return helpers.stringToBytes(retData.toString());
         }
 
-        /*
+        /**
          * 使用setMessage用来做Extractor
          */
         @Override
@@ -166,12 +190,42 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
             String c = new String(content, StandardCharsets.UTF_8).intern();
             if (content.length > 0) {
                 if (isRequest) {
-                    markInfoText.setText(extractRequestContent);
+                    makeTable(extractRequestMap);
                 } else {
-                    markInfoText.setText(extractResponseContent);
+                    makeTable(extractResponseMap);
                 }
             }
-            currentMessage = content;
+        }
+
+        /**
+         * 创建MarkInfo表单
+         */
+        public void makeTable(Map<String, String> dataMap) {
+            ArrayList<String> lTitleList = new ArrayList<>();
+            dataMap.keySet().forEach(i->{
+                String[] extractData = dataMap.get(i).split("\n");
+                Object[][] data = new Object[extractData.length][1];
+                for (int x = 0; x < extractData.length; x++) {
+                    data[x][0] = extractData[x];
+                    // stdout.println(extractData[x]);
+                }
+                JScrollPane jScrollPane = new JScrollPane(new JTable(data, new Object[]{"Information"}));
+                lTitleList.add(i);
+                this.jTabbedPane.addTab(i, jScrollPane);
+            });
+
+            /*
+             * 使用removeAll会导致MarkInfo UI出现空白的情况，为了改善用户侧体验，采用remove的方式进行删除；
+             * 采用全局ArrayList的方式遍历删除Tab，以此应对BurpSuite缓存机制导致的MarkInfo UI错误展示。
+             */
+            titleList.forEach(t->{
+                int indexOfTab = this.jTabbedPane.indexOfTab(t);
+                if (indexOfTab != -1) {
+                    this.jTabbedPane.removeTabAt(indexOfTab);
+                }
+            });
+
+            titleList = lTitleList;
         }
     }
 

src/main/java/burp/Config.java

@@ -1,10 +1,12 @@
 package burp;
 
-/*
+/**
  * @author EvilChen
  */
 
 import java.util.HashMap;
+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";
@@ -24,8 +26,6 @@ public class Config {
             "dfa"
     };
 
-    public static String outputTplString = "[%s]\n%s\n\n";
-
     public static String[] colorArray = new String[] {
             "red",
             "orange",
@@ -37,4 +37,8 @@ public class Config {
             "magenta",
             "gray"
     };
+
+    public static Map<String,Object[][]> ruleConfig = null;
+
+    public static Map<String, Map<String, List<String>>> globalDataMap = new HashMap<>();
 }

src/main/java/burp/action/DoAction.java

@@ -1,24 +1,24 @@
 package burp.action;
 
+import burp.BurpExtender;
+import java.util.HashMap;
 import java.util.Map;
-import burp.Config;
 import java.util.ArrayList;
 import java.util.List;
 
-/*
+/**
  * @author EvilChen
  */
 
 public class DoAction {
-    public String extractString(Map<String, Map<String, Object>> obj) {
+    public Map<String, String> extractString(Map<String, Map<String, Object>> obj) {
-        String[] result = {""};
+        Map<String, String> resultMap = new HashMap<>();
         obj.keySet().forEach(i->{
             Map<String, Object> tmpMap = obj.get(i);
             String data = tmpMap.get("data").toString();
-            String tmpStr = String.format(Config.outputTplString, i, data).intern();
+            resultMap.put(i, data);
-            result[0] += tmpStr;
         });
-        return result[0];
+        return resultMap;
     }
 
     public List<List<String>> highlightAndComment(Map<String, Map<String, Object>> obj) {

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

@@ -2,8 +2,7 @@ package burp.action;
 
 import java.nio.charset.StandardCharsets;
 import java.util.*;
-
+import burp.Config;
-import burp.yaml.LoadConfig;
 import dk.brics.automaton.Automaton;
 import dk.brics.automaton.AutomatonMatcher;
 import dk.brics.automaton.RegExp;
@@ -11,18 +10,17 @@ import dk.brics.automaton.RunAutomaton;
 import jregex.Matcher;
 import jregex.Pattern;
 
-/*
+/**
  * @author EvilChen
  */
 
 public class ExtractContent {
 
-    public Map<String, Map<String, Object>> matchRegex(byte[] content, String headers, byte[] body, String scopeString) {
+    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<>(); // 最终返回的结果
-        Map<String,Object[][]> rules = LoadConfig.getRules();
+        Config.ruleConfig.keySet().forEach(i -> {
-        rules.keySet().forEach(i -> {
             String matchContent = "";
-            for (Object[] objects : rules.get(i)) {
+            for (Object[] objects : Config.ruleConfig.get(i)) {
                 // 遍历获取规则
                 List<String> result = new ArrayList<>();
                 Map<String, Object> tmpMap = new HashMap<>();
@@ -33,8 +31,9 @@ public class ExtractContent {
                 String color = objects[3].toString();
                 String scope = objects[4].toString();
                 String engine = objects[5].toString();
+                boolean sensitive = (Boolean) objects[6];
                 // 判断规则是否开启与作用域
-                if (loaded && (scope.contains(scopeString) || scope.equals("any"))) {
+                if (loaded && (scope.contains(scopeString) || "any".equals(scope))) {
                     switch (scope) {
                         case "any":
                         case "request":
@@ -49,10 +48,19 @@ public class ExtractContent {
                         case "response body":
                             matchContent = new String(body, StandardCharsets.UTF_8).intern();
                             break;
+                        default:
+                            break;
                     }
 
-                    if (engine.equals("nfa")) {
+                    if ("nfa".equals(engine)) {
-                        Pattern pattern = new Pattern(regex);
+                        Pattern pattern;
+                        // 判断规则是否大小写敏感
+                        if (sensitive) {
+                            pattern = new Pattern(regex);
+                        } else {
+                            pattern = new Pattern(regex, Pattern.IGNORE_CASE);
+                        }
+
                         Matcher matcher = pattern.matcher(matchContent);
                         while (matcher.find()) {
                             // 添加匹配数据至list
@@ -86,6 +94,38 @@ public class ExtractContent {
             }
         });
 
+        // 将提取的数据存放到全局变量中
+        if (!host.isEmpty()) {
+            map.keySet().forEach(i -> {
+                Map<String, Object> tmpMap = map.get(i);
+                List<String> dataList = Arrays.asList(tmpMap.get("data").toString().split("\n"));
+                // 判断Host是否存在，如存在则进行数据更新，反之则新增数据
+                if (Config.globalDataMap.containsKey(host)) {
+                    Map<String, List<String>> gRuleMap = Config.globalDataMap.get(host);
+                    // 判断匹配规则是否存在（逻辑同Host判断）
+                    if (gRuleMap.containsKey(i)) {
+                        List<String> gDataList = gRuleMap.get(i);
+                        List<String> mergeDataList = new ArrayList<>();
+                        // 合并两个List
+                        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);
+                    }
+                } else {
+                    Map<String, List<String>> ruleMap = new HashMap<>();
+                    ruleMap.put(i, dataList);
+                    Config.globalDataMap.put(host, ruleMap);
+                }
+            });
+        }
+
         return map;
     }
 }

src/main/java/burp/action/GetColorKey.java

@@ -4,12 +4,12 @@ import burp.Config;
 import java.util.ArrayList;
 import java.util.List;
 
-/*
+/**
  * @author EvilChen
  */
 
 public class GetColorKey {
-    /*
+    /**
      * 颜色下标获取
      */
     public List<Integer> getColorKeys(List<String> keys){

src/main/java/burp/action/MatchHTTP.java

@@ -5,7 +5,7 @@ import jregex.Pattern;
 import jregex.REFlags;
 import burp.yaml.LoadConfig;
 
-/*
+/**
  * @author EvilChen
  */
 

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

@@ -1,10 +1,9 @@
 package burp.action;
 
 import burp.IExtensionHelpers;
-import burp.IHttpService;
-
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -15,14 +14,19 @@ public class ProcessMessage {
     GetColorKey gck = new GetColorKey();
     UpgradeColor uc = new UpgradeColor();
 
-    public List<String> processMessageByContent(IExtensionHelpers helpers, IHttpService httpService, byte[] content, boolean isRequest, boolean messageInfo) {
+    public List<Map<String, String>> processMessageByContent(IExtensionHelpers helpers, byte[] content, boolean isRequest, boolean messageInfo, String host) {
-        List<String> result = new ArrayList<>();;
+        List<Map<String, String>> result = new ArrayList<>();;
         Map<String, Map<String, Object>> obj;
 
         if (isRequest) {
+
+            // 获取报文头
+            List<String> requestTmpHeaders = helpers.analyzeRequest(content).getHeaders();
+            String requestHeaders = String.join("\n", requestTmpHeaders);
+
             try {
                 // 流量清洗
-                String urlString = helpers.analyzeRequest(httpService, content).getUrl().toString();
+                String urlString = requestTmpHeaders.get(0).split(" ")[1];
                 urlString = urlString.indexOf("?") > 0 ? urlString.substring(0, urlString.indexOf("?")) : urlString;
 
                 // 正则判断
@@ -32,15 +36,13 @@ public class ProcessMessage {
             } catch (Exception e) {
                 return result;
             }
-            // 获取报文头
+
-            List<String> requestTmpHeaders = helpers.analyzeRequest(httpService, content).getHeaders();
-            String requestHeaders = String.join("\n", requestTmpHeaders);
 
             // 获取报文主体
-            int requestBodyOffset = helpers.analyzeRequest(httpService, content).getBodyOffset();
+            int requestBodyOffset = helpers.analyzeRequest(content).getBodyOffset();
             byte[] requestBody = Arrays.copyOfRange(content, requestBodyOffset, content.length);
 
-            obj = ec.matchRegex(content, requestHeaders, requestBody, "request");
+            obj = ec.matchRegex(content, requestHeaders, requestBody, "request", host);
         } else {
             try {
                 // 流量清洗
@@ -61,20 +63,26 @@ public class ProcessMessage {
             int responseBodyOffset = helpers.analyzeResponse(content).getBodyOffset();
             byte[] responseBody = Arrays.copyOfRange(content, responseBodyOffset, content.length);
 
-            obj = ec.matchRegex(content, responseHeaders, responseBody, "response");
+            obj = ec.matchRegex(content, responseHeaders, responseBody, "response", host);
         }
 
-        if (messageInfo) {
+        if (obj.size() > 0) {
-            List<List<String>> resultList = da.highlightAndComment(obj);
+            if (messageInfo) {
-            List<String> colorList = resultList.get(0);
+                List<List<String>> resultList = da.highlightAndComment(obj);
-            List<String> commentList = resultList.get(1);
+                List<String> colorList = resultList.get(0);
-            if (colorList.size() != 0 && commentList.size() != 0) {
+                List<String> commentList = resultList.get(1);
-                String color = uc.getEndColor(gck.getColorKeys(colorList));
+                if (colorList.size() != 0 && commentList.size() != 0) {
-                result.add(color);
+                    String color = uc.getEndColor(gck.getColorKeys(colorList));
-                result.add(String.join(", ", commentList));
+                    Map<String, String> colorMap = new HashMap<String, String>(){{
-            }
+                        put("color", color);
-        } else {
+                    }};
-            if (obj.size() > 0) {
+                    Map<String, String> commentMap = new HashMap<String, String>(){{
+                        put("comment", String.join(", ", commentList));
+                    }};
+                    result.add(colorMap);
+                    result.add(commentMap);
+                }
+            } else {
                 result.add(da.extractString(obj));
             }
         }

src/main/java/burp/action/UpgradeColor.java

@@ -4,13 +4,13 @@ import burp.Config;
 
 import java.util.*;
 
-/*
+/**
  * @author EvilChen
  */
 
 public class UpgradeColor {
     private String endColor = "";
-    /*
+    /**
      * 颜色升级递归算法
      */
     private void colorUpgrade(List<Integer> colorList) {

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

@@ -0,0 +1,190 @@
+package burp.ui;
+
+import burp.Config;
+import java.util.List;
+import javax.swing.table.DefaultTableModel;
+import org.jetbrains.annotations.NotNull;
+
+import java.awt.*;
+import java.awt.event.*;
+import java.util.ArrayList;
+import java.util.Map;
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+/**
+ * @author LinChen
+ */
+
+public class Databoard extends JPanel {
+    public Databoard() {
+        initComponents();
+    }
+
+    private void initComponents() {
+        // JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
+        hostLabel = new JLabel();
+        hostTextField = new JTextField();
+        dataTabbedPane = new JTabbedPane();
+
+        //======== this ========
+        setLayout(new GridBagLayout());
+        ((GridBagLayout)getLayout()).columnWidths = new int[] {25, 0, 0, 0, 20, 0};
+        ((GridBagLayout)getLayout()).rowHeights = new int[] {0, 65, 20, 0};
+        ((GridBagLayout)getLayout()).columnWeights = new double[] {0.0, 0.0, 1.0, 0.0, 0.0, 1.0E-4};
+        ((GridBagLayout)getLayout()).rowWeights = new double[] {0.0, 1.0, 0.0, 1.0E-4};
+
+        //---- hostLabel ----
+        hostLabel.setText("Host:");
+        add(hostLabel, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0,
+                GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+                new Insets(8, 0, 5, 5), 0, 0));
+        add(hostTextField, new GridBagConstraints(2, 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));
+
+        setAutoMatch(hostTextField, dataTabbedPane);
+    }
+
+    /**
+     * 获取Host列表
+     */
+    private static List<String> getHostByList(){
+        List<String> hostList = new ArrayList<>();
+        Config.globalDataMap.keySet().forEach(i -> {
+            hostList.add(i);
+        });
+        return hostList;
+    }
+
+    /**
+     * 设置输入自动匹配
+     */
+    public static void setAutoMatch(JTextField textField, JTabbedPane tabbedPane) {
+        final DefaultComboBoxModel comboBoxModel = new DefaultComboBoxModel();
+
+        final JComboBox hostComboBox = new JComboBox(comboBoxModel) {
+            @Override
+            public Dimension getPreferredSize() {
+                return new Dimension(super.getPreferredSize().width, 0);
+            }
+        };
+
+        isMatchHost = false;
+
+        for (String host : getHostByList()) {
+            comboBoxModel.addElement(host);
+        }
+
+        hostComboBox.setSelectedItem(null);
+
+        hostComboBox.addActionListener(e -> {
+            if (!isMatchHost) {
+                if (hostComboBox.getSelectedItem() != null) {
+                    textField.setText(hostComboBox.getSelectedItem().toString());
+                    getInfoByHost(hostComboBox, tabbedPane, textField);
+                }
+            }
+        });
+
+        // 事件监听
+        textField.addKeyListener(new KeyAdapter() {
+            @Override
+            public void keyPressed(KeyEvent e) {
+                isMatchHost = true;
+                if (e.getKeyCode() == KeyEvent.VK_SPACE) {
+                    if (hostComboBox.isPopupVisible()) {
+                        e.setKeyCode(KeyEvent.VK_ENTER);
+                    }
+                }
+                if (e.getKeyCode() == KeyEvent.VK_ENTER
+                        || e.getKeyCode() == KeyEvent.VK_UP
+                        || e.getKeyCode() == KeyEvent.VK_DOWN) {
+                    e.setSource(hostComboBox);
+                    hostComboBox.dispatchEvent(e);
+                    if (e.getKeyCode() == KeyEvent.VK_ENTER) {
+                        textField.setText(hostComboBox.getSelectedItem().toString());
+                        getInfoByHost(hostComboBox, tabbedPane, textField);
+                        hostComboBox.setPopupVisible(false);
+                    }
+                }
+                if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
+                    hostComboBox.setPopupVisible(false);
+                }
+                isMatchHost = false;
+            }
+        });
+
+        textField.getDocument().addDocumentListener(new DocumentListener() {
+            @Override
+            public void insertUpdate(DocumentEvent e) {
+                updateList();
+            }
+
+            @Override
+            public void removeUpdate(DocumentEvent e) {
+                updateList();
+            }
+
+            @Override
+            public void changedUpdate(DocumentEvent e) {
+                updateList();
+            }
+
+            private void updateList() {
+                isMatchHost = true;
+                comboBoxModel.removeAllElements();
+                String input = textField.getText();
+                if (!input.isEmpty()){
+                    for (String host : getHostByList()) {
+                        if (host.toLowerCase().contains(input.toLowerCase())) {
+                            comboBoxModel.addElement(host);
+                        }
+                    }
+                }
+                hostComboBox.setPopupVisible(comboBoxModel.getSize() > 0);
+                isMatchHost = false;
+            }
+        });
+
+        textField.setLayout(new BorderLayout());
+        textField.add(hostComboBox, BorderLayout.SOUTH);
+    }
+
+    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());
+            tabbedPane.removeAll();
+            for(Map.Entry<String, List<String>> entry: selectUrl.entrySet()){
+                tabbedPane.addTab(entry.getKey(), new JScrollPane(new HitRuleDataList(entry.getValue())));
+            }
+            textField.setText(hostComboBox.getSelectedItem().toString());
+        }
+    }
+
+    // JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
+    private JLabel hostLabel;
+    private JTextField hostTextField;
+    private JTabbedPane dataTabbedPane;
+    // JFormDesigner - End of variables declaration  //GEN-END:variables
+
+    // 是否自动匹配Host
+    private static Boolean isMatchHost = false;
+}
+class HitRuleDataList extends JTable {
+    public HitRuleDataList(List<String> list){
+        DefaultTableModel model = new DefaultTableModel();
+        Object[][] data = new Object[list.size()][1];
+        for (int x = 0; x < list.size(); x++) {
+            data[x][0] = list.get(x);
+        }
+        model.setDataVector(data, new Object[]{"Information"});
+        this.setModel(model);
+    }
+}

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

@@ -6,7 +6,7 @@ import java.awt.*;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 
-/*
+/**
  * @author 6dc
  *
  * A class which creates a JTabbedPane and auto sets a close button when you add a tab
@@ -18,7 +18,7 @@ public class JTabbedPaneCloseButton extends JTabbedPane {
         super();
     }
 
-    /* Override Addtab in order to add the close Button everytime */
+    /** Override Addtab in order to add the close Button everytime */
     @Override
     public void addTab(String title, Icon icon, Component component, String tip) {
         super.addTab(title, icon, component, tip);
@@ -45,7 +45,7 @@ public class JTabbedPaneCloseButton extends JTabbedPane {
         }
     }
 
-    /* addTabNoExit */
+    /** addTabNoExit */
     public void addTabNoExit(String title, Icon icon, Component component, String tip) {
         super.addTab(title, icon, component, tip);
     }
@@ -58,9 +58,8 @@ public class JTabbedPaneCloseButton extends JTabbedPane {
         addTabNoExit(title, null, component);
     }
 
-    /* Button */
+    /** 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);
@@ -74,7 +73,7 @@ public class JTabbedPaneCloseButton extends JTabbedPane {
             add(button);
         }
     }
-    /* ClickListener */
+    /** ClickListener */
     public class CloseListener implements MouseListener
     {
         private final Component tab;

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

@@ -1,19 +1,23 @@
 package burp.ui;
 
+import burp.Config;
 import burp.yaml.LoadConfig;
 import burp.yaml.SetConfig;
 
+import com.squareup.okhttp.OkHttpClient;
+import com.squareup.okhttp.Request;
+import com.squareup.okhttp.Response;
+import java.io.FileOutputStream;
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import javax.swing.filechooser.FileNameExtensionFilter;
 import java.awt.*;
 import java.awt.event.*;
 import java.util.Map;
 
-/*
+/**
  * @author LinChen
  */
 
@@ -23,264 +27,246 @@ public class MainUI extends JPanel{
     public MainUI() {
         initComponents();
     }
+
     public void closeTabActionPerformed(ActionEvent e){
-        if (tabbedPane1.getTabCount()>2){
+        if (ruleTabbedPane.getTabCount()>2){
-            if (tabbedPane1.getSelectedIndex()!=0){
+            if (ruleTabbedPane.getSelectedIndex()!=0){
                 SetConfig setConn = new SetConfig();
-                setConn.deleteRules(tabbedPane1.getTitleAt(tabbedPane1.getSelectedIndex()));
+                setConn.deleteRules(ruleTabbedPane.getTitleAt(ruleTabbedPane.getSelectedIndex()));
-                tabbedPane1.remove(tabbedPane1.getSelectedIndex());
+                ruleTabbedPane.remove(ruleTabbedPane.getSelectedIndex());
-                tabbedPane1.setSelectedIndex(tabbedPane1.getSelectedIndex()-1);
+                ruleTabbedPane.setSelectedIndex(ruleTabbedPane.getSelectedIndex()-1);
-            }else{
+            } else {
                 SetConfig setConn = new SetConfig();
-                setConn.deleteRules(tabbedPane1.getTitleAt(tabbedPane1.getSelectedIndex()));
+                setConn.deleteRules(ruleTabbedPane.getTitleAt(ruleTabbedPane.getSelectedIndex()));
-                tabbedPane1.remove(tabbedPane1.getSelectedIndex());
+                ruleTabbedPane.remove(ruleTabbedPane.getSelectedIndex());
-                tabbedPane1.setSelectedIndex(tabbedPane1.getSelectedIndex());
+                ruleTabbedPane.setSelectedIndex(ruleTabbedPane.getSelectedIndex());
             }
         }
     }
 
-    private void SelectFileMouseClicked(MouseEvent e) {
+    private void onlineUpdateActionPerformed(ActionEvent e) {
-        JFileChooser selectFile = new JFileChooser();
+        String url = "https://raw.githubusercontent.com/gh0stkey/HaE/gh-pages/Config.yml";
-        selectFile.setFileSelectionMode(JFileChooser.FILES_ONLY);
+        OkHttpClient httpClient = new OkHttpClient();
-        FileNameExtensionFilter filter = new FileNameExtensionFilter("Yaml File (.yml/.yaml)","yaml", "yml");
+        Request httpRequest = new Request.Builder().url(url).get().build();
-        selectFile.setFileFilter(filter);
+        try {
-        int selectframe = selectFile.showDialog(new JLabel(),"Select");
+            Response httpResponse = httpClient.newCall(httpRequest).execute();
-        if (selectframe == JFileChooser.APPROVE_OPTION){
+            // 获取官方规则文件，在线更新写入
-            String configpath = selectFile.getSelectedFile().toString();
+            String configFile = configTextField.getText();
-            reloadRule(configpath);
+            FileOutputStream fileOutputStream = new FileOutputStream(configFile);
-            loadConn.setConfigPath(configpath);
+            fileOutputStream.write(httpResponse.body().bytes());
+            JOptionPane.showMessageDialog(null, "Config file updated successfully!", "Error",
+                    JOptionPane.INFORMATION_MESSAGE);
+        } catch (Exception ignored) {
+            JOptionPane.showMessageDialog(null, "Please check your network!", "Error",
+                    JOptionPane.ERROR_MESSAGE);
         }
-        configFilepathtext.setText(loadConn.getConfigPath());
+
+        new LoadConfig();
         reloadRule();
     }
-    private void reloadRule(String configFile){
+
-        tabbedPane1.removeAll();
-        Map<String,Object[][]> config = loadConn.getRules();
-        ruleSwitch.setListen(false);
-        config.keySet().forEach(i->tabbedPane1.addTab(i,new RulePane(config.get(i),tabbedPane1)));
-        tabbedPane1.addTab("...",new JLabel());
-        ruleSwitch.setListen(true);
-    }
     private void reloadRule(){
-        tabbedPane1.removeAll();
+        ruleTabbedPane.removeAll();
-        Map<String,Object[][]> config = loadConn.getRules();
         ruleSwitch.setListen(false);
-        config.keySet().forEach(i->tabbedPane1.addTab(i,new RulePane(config.get(i),tabbedPane1))
+        Map<String,Object[][]> rules = LoadConfig.getRules();
+        rules.keySet().forEach(
+                i-> ruleTabbedPane.addTab(
+                        i,
+                        new RulePane(rules.get(i), ruleTabbedPane)
+                )
         );
-        tabbedPane1.addTab("...",new JLabel());
+        ruleTabbedPane.addTab("...", new JLabel());
         ruleSwitch.setListen(true);
     }
 
-    private void reloadMouseClicked(MouseEvent e) {
+    private void reloadActionPerformed(ActionEvent e) {
         reloadRule();
     }
 
-    private void ESSaveMouseClicked(MouseEvent e) {
+    private void excludeSuffixSaveActionPerformed(ActionEvent e) {
-        // TODO add your code here
         LoadConfig loadCon = new LoadConfig();
-        loadCon.setExcludeSuffix(EStext.getText());
+        loadCon.setExcludeSuffix(excludeSuffixTextField.getText());
     }
     private void initComponents() {
-        tabbedPane2 = new JTabbedPane();
+        mainTabbedPane = new JTabbedPane();
-        tabbedPane1 = new JTabbedPane();
+        ruleTabbedPane = new JTabbedPane();
-        panel3 = new JPanel();
+        rulePanel = new JPanel();
-        configFilepathtext = new JTextField();
+        configTextField = new JTextField();
-        label1 = new JLabel();
+        configLabel = new JLabel();
-        SelectFile = new JButton();
+        onlineUpdateButton = new JButton();
-        reload = new JButton();
+        reloadButton = new JButton();
-        label2 = new JLabel();
+        excludeSuffixLabel = new JLabel();
-        EStext = new JTextField();
+        excludeSuffixTextField = new JTextField();
-        ESSave = new JButton();
+        excludeSuffixSaveButton = new JButton();
 
-        //======== this ========
         setLayout(new GridBagLayout());
         ((GridBagLayout)getLayout()).columnWidths = new int[] {0, 0};
         ((GridBagLayout)getLayout()).rowHeights = new int[] {0, 0};
         ((GridBagLayout)getLayout()).columnWeights = new double[] {1.0, 1.0E-4};
         ((GridBagLayout)getLayout()).rowWeights = new double[] {1.0, 1.0E-4};
 
-        //======== tabbedPane2 ========
         {
-            tabbedPane2.addTab("Rules", tabbedPane1);
+            mainTabbedPane.addTab("Rules", ruleTabbedPane);
 
-            //======== panel3 ========
             {
-                panel3.setLayout(new GridBagLayout());
+                rulePanel.setLayout(new GridBagLayout());
-                ((GridBagLayout)panel3.getLayout()).columnWidths = new int[] {0, 0, 0, 0, 0};
+                ((GridBagLayout) rulePanel.getLayout()).columnWidths = new int[] {0, 0, 0, 0, 0};
-                ((GridBagLayout)panel3.getLayout()).rowHeights = new int[] {0, 0, 0};
+                ((GridBagLayout) rulePanel.getLayout()).rowHeights = new int[] {0, 0, 0};
-                ((GridBagLayout)panel3.getLayout()).columnWeights = new double[] {0.0, 1.0, 0.0, 0.0, 1.0E-4};
+                ((GridBagLayout) rulePanel.getLayout()).columnWeights = new double[] {0.0, 1.0, 0.0, 0.0, 1.0E-4};
-                ((GridBagLayout)panel3.getLayout()).rowWeights = new double[] {0.0, 0.0, 1.0E-4};
+                ((GridBagLayout) rulePanel.getLayout()).rowWeights = new double[] {0.0, 0.0, 1.0E-4};
 
-                //---- configFilepathtext ----
+                configTextField.setEditable(false);
-                configFilepathtext.setEditable(false);
+                rulePanel.add(configTextField, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0,
-                panel3.add(configFilepathtext, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0,
                         GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                         new Insets(5, 0, 5, 5), 0, 0));
 
-                //---- label1 ----
+                configLabel.setText("Config Path:");
-                label1.setText("Config File Path:");
+                rulePanel.add(configLabel, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
-                panel3.add(label1, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
                         GridBagConstraints.WEST, GridBagConstraints.VERTICAL,
                         new Insets(5, 5, 5, 5), 0, 0));
 
-                //---- SelectFile ----
+                onlineUpdateButton.setText("Online Update");
-                SelectFile.setText("Select File ...");
+                onlineUpdateButton.addActionListener(this::onlineUpdateActionPerformed);
-                SelectFile.addMouseListener(new MouseAdapter() {
+                rulePanel.add(onlineUpdateButton, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0,
-                    @Override
-                    public void mouseClicked(MouseEvent e) {
-                        SelectFileMouseClicked(e);
-                    }
-                });
-                panel3.add(SelectFile, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0,
                         GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                         new Insets(5, 0, 5, 5), 0, 0));
 
-                //---- reload ----
+                reloadButton.setText("Reload");
-                reload.setText("Reload");
+                reloadButton.addActionListener(this::reloadActionPerformed);
-                reload.addMouseListener(new MouseAdapter() {
+                rulePanel.add(reloadButton, new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0,
-                    @Override
-                    public void mouseClicked(MouseEvent e) {
-                        reloadMouseClicked(e);
-                    }
-                });
-                panel3.add(reload, new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0,
 
                         GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                         new Insets(5, 0, 5, 5), 0, 0));
-//---- label2 ----
+
-                label2.setText("ExcludeSuffix:");
+                excludeSuffixLabel.setText("Exclude Suffix:");
-                panel3.add(label2, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0,
+                rulePanel.add(excludeSuffixLabel, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0,
                         GridBagConstraints.SOUTHWEST, GridBagConstraints.NONE,
                         new Insets(0, 5, 5, 5), 0, 0));
-                panel3.add(EStext, new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0,
+                rulePanel.add(excludeSuffixTextField, new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0,
                         GridBagConstraints.SOUTH, GridBagConstraints.HORIZONTAL,
                         new Insets(0, 0, 0, 5), 0, 0));
 
-                //---- ESSave ----
+                excludeSuffixSaveButton.setText("Save");
-                ESSave.setText("Save");
+                excludeSuffixSaveButton.addActionListener(this::excludeSuffixSaveActionPerformed);
-                ESSave.addMouseListener(new MouseAdapter() {
+                rulePanel.add(excludeSuffixSaveButton, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0,
-                    @Override
-                    public void mouseClicked(MouseEvent e) {
-                        ESSaveMouseClicked(e);
-                    }
-                });
-                panel3.add(ESSave, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0,
                         GridBagConstraints.SOUTH, GridBagConstraints.HORIZONTAL,
                         new Insets(0, 0, 0, 5), 0, 0));
             }
-            tabbedPane2.addTab("Config", panel3);
+            mainTabbedPane.addTab("Config", rulePanel);
+            mainTabbedPane.addTab("Databoard", databoardPanel);
         }
-        add(tabbedPane2, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
+        add(mainTabbedPane, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
                 GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, 0, 0, 0), 0, 0));
-        // JFormDesigner - End of component initialization  //GEN-END:initComponents
 
-        Map<String,Object[][]> config = loadConn.getRules();
+        Config.ruleConfig.keySet().forEach(i-> ruleTabbedPane.addTab(i,new RulePane(Config.ruleConfig.get(i),
-        config.keySet().forEach(i->tabbedPane1.addTab(i,new RulePane(config.get(i),tabbedPane1)));
+                ruleTabbedPane)));
 
-        tabbedPane1.addTab("...",new JLabel());
+        ruleTabbedPane.addTab("...",new JLabel());
 
-        //TabTitleEditListener ruleSwitch = new TabTitleEditListener(tabbedPane1);
+        configTextField.setText(LoadConfig.getConfigPath());
-        configFilepathtext.setText(loadConn.getConfigPath());
+        excludeSuffixTextField.setText(loadConn.getExcludeSuffix());
-        EStext.setText(loadConn.getExcludeSuffix());
+        ruleSwitch = new TabTitleEditListener(ruleTabbedPane);
-        ruleSwitch = new TabTitleEditListener(tabbedPane1);
+        ruleTabbedPane.addChangeListener(ruleSwitch);
-        tabbedPane1.addChangeListener(ruleSwitch);
+        ruleTabbedPane.addMouseListener(ruleSwitch);
-        tabbedPane1.addMouseListener(ruleSwitch);
+        closeTabMenuItem.addActionListener(this::closeTabActionPerformed);
-        closeTab.addActionListener(e -> closeTabActionPerformed(e));
+        tabMenu.add(closeTabMenuItem);
-        tabMenu.add(closeTab);
     }
 
-    // JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
+    private JTabbedPane mainTabbedPane;
-    private JTabbedPane tabbedPane2;
+    private JTabbedPane ruleTabbedPane;
-    private JTabbedPane tabbedPane1;
+    private JPanel rulePanel;
-    private JPanel panel3;
+    private JTextField configTextField;
-    private JTextField configFilepathtext;
+    private JLabel configLabel;
-    private JLabel label1;
+    private JButton onlineUpdateButton;
-    private JButton SelectFile;
+    private JButton reloadButton;
-    private JButton reload;
+    private JLabel excludeSuffixLabel;
-    private JLabel label2;
+    private JTextField excludeSuffixTextField;
-    private JTextField EStext;
+    private JButton excludeSuffixSaveButton;
-    private JButton ESSave;
+    private Databoard databoardPanel = new Databoard();
-    // JFormDesigner - End of variables declaration  //GEN-END:variables
     protected static JPopupMenu tabMenu = new JPopupMenu();
-    private JMenuItem closeTab = new JMenuItem("Delete");
+    private JMenuItem closeTabMenuItem = new JMenuItem("Delete");
     private TabTitleEditListener ruleSwitch;
 }
 
 class TabTitleEditListener extends MouseAdapter implements ChangeListener, DocumentListener {
-    protected final JTextField editor = new JTextField();
+    protected final JTextField ruleEditTextField = new JTextField();
-    protected final JTabbedPane tabbedPane;
+    protected final JTabbedPane ruleEditTabbedPane;
-    protected int editingIdx = -1;
+    protected int editingIndex = -1;
     protected int len = -1;
     protected Boolean listen = true;
     protected Dimension dim;
     protected Component tabComponent;
     protected Boolean isRenameOk = false;
     protected SetConfig setConfig = new SetConfig();
+
     protected final Action startEditing = new AbstractAction() {
         @Override public void actionPerformed(ActionEvent e) {
-            editingIdx = tabbedPane.getSelectedIndex();
+            editingIndex = ruleEditTabbedPane.getSelectedIndex();
-            tabComponent = tabbedPane.getTabComponentAt(editingIdx);
+            tabComponent = ruleEditTabbedPane.getTabComponentAt(editingIndex);
-            tabbedPane.setTabComponentAt(editingIdx, editor);
+            ruleEditTabbedPane.setTabComponentAt(editingIndex, ruleEditTextField);
             isRenameOk = true;
-            editor.setVisible(true);
+            ruleEditTextField.setVisible(true);
-            editor.setText(tabbedPane.getTitleAt(editingIdx));
+            ruleEditTextField.setText(ruleEditTabbedPane.getTitleAt(editingIndex));
-            editor.selectAll();
+            ruleEditTextField.selectAll();
-            editor.requestFocusInWindow();
+            ruleEditTextField.requestFocusInWindow();
-            len = editor.getText().length();
+            len = ruleEditTextField.getText().length();
-            dim = editor.getPreferredSize();
+            dim = ruleEditTextField.getPreferredSize();
-            editor.setMinimumSize(dim);
+            ruleEditTextField.setMinimumSize(dim);
         }
     };
+
     protected final Action renameTabTitle = new AbstractAction() {
         @Override public void actionPerformed(ActionEvent e) {
-            String title = editor.getText().trim();
+            String title = ruleEditTextField.getText().trim();
-            if (editingIdx >= 0 && !title.isEmpty()) {
+            if (editingIndex >= 0 && !title.isEmpty()) {
-                String oldName = tabbedPane.getTitleAt(editingIdx);
+                String oldName = ruleEditTabbedPane.getTitleAt(editingIndex);
-                tabbedPane.setTitleAt(editingIdx, title);
+                ruleEditTabbedPane.setTitleAt(editingIndex, title);
                 setConfig.rename(oldName,title);
             }
             cancelEditing.actionPerformed(null);
         }
     };
+
     protected final Action cancelEditing = new AbstractAction() {
         @Override public void actionPerformed(ActionEvent e) {
-            if (editingIdx >= 0) {
+            if (editingIndex >= 0) {
-                tabbedPane.setTabComponentAt(editingIdx, tabComponent);
+                ruleEditTabbedPane.setTabComponentAt(editingIndex, tabComponent);
-                editor.setVisible(false);
+                ruleEditTextField.setVisible(false);
-                editingIdx = -1;
+                editingIndex = -1;
                 len = -1;
                 tabComponent = null;
-                editor.setPreferredSize(null);
+                ruleEditTextField.setPreferredSize(null);
-                tabbedPane.requestFocusInWindow();
+                ruleEditTabbedPane.requestFocusInWindow();
             }
         }
     };
 
     protected TabTitleEditListener(JTabbedPane tabbedPane) {
         super();
-        this.tabbedPane = tabbedPane;
+        this.ruleEditTabbedPane = tabbedPane;
-        editor.setBorder(BorderFactory.createEmptyBorder());
+        ruleEditTextField.setBorder(BorderFactory.createEmptyBorder());
-        editor.addFocusListener(new FocusAdapter() {
+        ruleEditTextField.addFocusListener(new FocusAdapter() {
             @Override public void focusLost(FocusEvent e) {
                 renameTabTitle.actionPerformed(null);
             }
         });
-        InputMap im = editor.getInputMap(JComponent.WHEN_FOCUSED);
+        InputMap im = ruleEditTextField.getInputMap(JComponent.WHEN_FOCUSED);
-        ActionMap am = editor.getActionMap();
+        ActionMap am = ruleEditTextField.getActionMap();
         im.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "cancel-editing");
         am.put("cancel-editing", cancelEditing);
         im.put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "rename-tab-title");
         am.put("rename-tab-title", renameTabTitle);
-        editor.getDocument().addDocumentListener(this);
+        ruleEditTextField.getDocument().addDocumentListener(this);
         tabbedPane.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "start-editing");
         tabbedPane.getActionMap().put("start-editing", startEditing);
-            }
+    }
-            @Override public void stateChanged(ChangeEvent e) {
+
-                if (e.getSource() instanceof JTabbedPane && listen) {
+    @Override public void stateChanged(ChangeEvent e) {
-                    JTabbedPane pane = (JTabbedPane) e.getSource();
+        if (e.getSource() instanceof JTabbedPane && listen) {
-                    if (!isRenameOk){
+            JTabbedPane pane = (JTabbedPane) e.getSource();
-                        if (pane.getSelectedIndex() == pane.getComponentCount()-1){
+            if (!isRenameOk){
+                if (pane.getSelectedIndex() == pane.getComponentCount()-1){
                     newTab();
                 }
             }else{
@@ -291,18 +277,22 @@ class TabTitleEditListener extends MouseAdapter implements ChangeListener, Docum
         }
         renameTabTitle.actionPerformed(null);
     }
+
     public void newTab(){
-        Object[][] data = new Object[][]{{false, "New Name", "(New Regex)", "gray", "any", "nfa"}};
+        Object[][] data = new Object[][]{{false, "New Name", "(New Regex)", "gray", "any", "nfa", false}};
-        insertTab(tabbedPane, setConfig.newRules(),data);
+        insertTab(ruleEditTabbedPane, setConfig.newRules(),data);
     }
+
     public void insertTab(JTabbedPane pane,String title,Object[][] data){
         pane.addTab(title,new RulePane(data,pane));
         pane.remove(pane.getSelectedIndex());
         pane.addTab("...",new JLabel());
     }
+
     public void setListen(Boolean listen){
         this.listen = listen;
     }
+
     @Override public void insertUpdate(DocumentEvent e) {
         updateTabSize();
     }
@@ -317,7 +307,7 @@ class TabTitleEditListener extends MouseAdapter implements ChangeListener, Docum
         switch (e.getButton()){
             case 1:
             {
-                Rectangle r = tabbedPane.getBoundsAt(tabbedPane.getSelectedIndex());
+                Rectangle r = ruleEditTabbedPane.getBoundsAt(ruleEditTabbedPane.getSelectedIndex());
                 boolean isDoubleClick = e.getClickCount() >= 2;
                 if (isDoubleClick && r.contains(e.getPoint())) {
                     startEditing.actionPerformed(null);
@@ -336,7 +326,7 @@ class TabTitleEditListener extends MouseAdapter implements ChangeListener, Docum
     }
 
     protected void updateTabSize() {
-        editor.setPreferredSize(editor.getText().length() > len ? null : dim);
+        ruleEditTextField.setPreferredSize(ruleEditTextField.getText().length() > len ? null : dim);
-        tabbedPane.revalidate();
+        ruleEditTabbedPane.revalidate();
     }
 }

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

@@ -2,93 +2,101 @@ package burp.ui;
 
 import burp.yaml.SetConfig;
 
+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;
 
-/*
+/**
  * @author LinChen
  */
 
 public class RulePane extends JPanel {
-    public RulePane(Object[][] data,JTabbedPane pane) {
+    public RulePane(Object[][] data, JTabbedPane pane) {
-        initComponents(data,pane);
+        initComponents(data, pane);
     }
-    private SetConfig setruleconfig = new SetConfig();
+    private SetConfig setConfig = new SetConfig();
     private Boolean isEdit = false;
-    private void RuleAddMouseClicked(MouseEvent e, JTabbedPane pane) {
+
-        // TODO add your code here
+    private void ruleAddActionPerformed(ActionEvent e, JTabbedPane pane) {
-        RuleSetting add = new RuleSetting();
+        RuleSetting ruleSettingPanel = new RuleSetting();
-        int isOk = JOptionPane.showConfirmDialog(null,add,"RuleSetting - Add Rule",JOptionPane.OK_OPTION);
+        int showState = JOptionPane.showConfirmDialog(null, ruleSettingPanel, "RuleSetting - Add Rule", JOptionPane.OK_OPTION);
-        if(isOk == 0){
+        if(showState == 0){
-            Vector data = new Vector();
+            Vector ruleData = new Vector();
-            data.add(false);
+            ruleData.add(false);
-            data.add(add.Name.getText());
+            ruleData.add(ruleSettingPanel.ruleNameTextField.getText());
-            data.add(add.Regex.getText());
+            ruleData.add(ruleSettingPanel.regexTextField.getText());
-            data.add(add.ColorSelect.getSelectedItem().toString());
+            ruleData.add(ruleSettingPanel.colorComboBox.getSelectedItem().toString());
-            data.add(add.ScopeSelect.getSelectedItem().toString());
+            ruleData.add(ruleSettingPanel.scopeComboBox.getSelectedItem().toString());
-            data.add(add.EngineSelect.getSelectedItem().toString());
+            ruleData.add(ruleSettingPanel.engineComboBox.getSelectedItem().toString());
-            model.insertRow(model.getRowCount(),data);
+            ruleData.add(ruleSettingPanel.sensitiveComboBox.getSelectedItem());
-            model = (DefaultTableModel) table.getModel();
+            model.insertRow(model.getRowCount(), ruleData);
-            setruleconfig.add(data,pane.getTitleAt(pane.getSelectedIndex()));
+            model = (DefaultTableModel) ruleTable.getModel();
+            setConfig.add(ruleData, pane.getTitleAt(pane.getSelectedIndex()));
         }
     }
 
-    private void RuleEditMouseClicked(MouseEvent e,JTabbedPane pane){
+    private void ruleEditActionPerformed(ActionEvent e, JTabbedPane pane){
-        if (table.getSelectedRowCount()>=1){
+        if (ruleTable.getSelectedRowCount() >= 1){
-            RuleSetting edit = new RuleSetting();
+            RuleSetting ruleSettingPanel = new RuleSetting();
-            edit.Name.setText(table.getValueAt(table.getSelectedRow(),1).toString());
+            ruleSettingPanel.ruleNameTextField.setText(ruleTable.getValueAt(ruleTable.getSelectedRow(), 1).toString());
-            edit.Regex.setText(table.getValueAt(table.getSelectedRow(),2).toString());
+            ruleSettingPanel.regexTextField.setText(ruleTable.getValueAt(ruleTable.getSelectedRow(), 2).toString());
-            edit.ColorSelect.setSelectedItem(table.getValueAt(table.getSelectedRow(),3).toString());
+            ruleSettingPanel.colorComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 3).toString());
-            edit.ScopeSelect.setSelectedItem(table.getValueAt(table.getSelectedRow(),4).toString());
+            ruleSettingPanel.scopeComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 4).toString());
-            edit.EngineSelect.setSelectedItem(table.getValueAt(table.getSelectedRow(),5).toString());
+            ruleSettingPanel.engineComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 5).toString());
-            int isOk = JOptionPane.showConfirmDialog(null,edit,"RuleSetting - Edit Rule",JOptionPane.OK_OPTION);
+            ruleSettingPanel.sensitiveComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(),6));
-            if (isOk ==0){
+
-                int select = table.convertRowIndexToModel(table.getSelectedRow());
+            ruleSettingPanel.sensitiveComboBox.setEnabled(
-                model.setValueAt(edit.Name.getText(),select,1);
+                ruleSettingPanel.engineComboBox.getSelectedItem().toString().equals("nfa")
-                model.setValueAt(edit.Regex.getText(),select,2);
+            );
-                model.setValueAt(edit.ColorSelect.getSelectedItem().toString(),select,3);
+
-                model.setValueAt(edit.ScopeSelect.getSelectedItem().toString(),select,4);
+            int showState = JOptionPane.showConfirmDialog(null, ruleSettingPanel, "RuleSetting - Edit Rule", JOptionPane.OK_OPTION);
-                model.setValueAt(edit.EngineSelect.getSelectedItem().toString(),select,5);
+            if (showState == 0){
-                model = (DefaultTableModel) table.getModel();
+                int select = ruleTable.convertRowIndexToModel(ruleTable.getSelectedRow());
-                setruleconfig.edit((Vector) model.getDataVector().get(select),select,pane.getTitleAt(pane.getSelectedIndex()));
+                model.setValueAt(ruleSettingPanel.ruleNameTextField.getText(), select, 1);
+                model.setValueAt(ruleSettingPanel.regexTextField.getText(), select, 2);
+                model.setValueAt(ruleSettingPanel.colorComboBox.getSelectedItem().toString(), select, 3);
+                model.setValueAt(ruleSettingPanel.scopeComboBox.getSelectedItem().toString(), select, 4);
+                model.setValueAt(ruleSettingPanel.engineComboBox.getSelectedItem().toString(), select, 5);
+                model.setValueAt(ruleSettingPanel.sensitiveComboBox.getSelectedItem(), select, 6);
+                model = (DefaultTableModel) ruleTable.getModel();
+                setConfig.edit((Vector) model.getDataVector().get(select), select, pane.getTitleAt(pane.getSelectedIndex()));
             }
         }
     }
 
-    private void RuleRemoveMouseClicked(MouseEvent e,JTabbedPane pane){
+    private void ruleRemoveActionPerformed(ActionEvent e, JTabbedPane pane){
-        if (table.getSelectedRowCount()>=1){
+        if (ruleTable.getSelectedRowCount() >= 1){
-            int isOk = JOptionPane.showConfirmDialog(null,"Are your sure?","RuleSetting - Delete Rule",JOptionPane.OK_OPTION);
+            int isOk = JOptionPane.showConfirmDialog(null, "Are your sure?", "RuleSetting - Delete Rule", JOptionPane.OK_OPTION);
-            if (isOk==0){
+            if (isOk == 0){
-                int select = table.convertRowIndexToModel(table.getSelectedRow());
+                int select = ruleTable.convertRowIndexToModel(ruleTable.getSelectedRow());
                 model.removeRow(select);
-                model = (DefaultTableModel) table.getModel();
+                model = (DefaultTableModel) ruleTable.getModel();
-                setruleconfig.remove(select,pane.getTitleAt(pane.getSelectedIndex()));
+                setConfig.remove(select, pane.getTitleAt(pane.getSelectedIndex()));
             }
         }
     }
 
-    private void RuleTableChange(TableModelEvent e,JTabbedPane pane) {
+    private void ruleTableChange(TableModelEvent e, JTabbedPane pane) {
-        if (e.getColumn()==0&&table.getSelectedRow()!=-1&&!isEdit){
+        if (e.getColumn() == 0 && ruleTable.getSelectedRow() != -1 && !isEdit){
-            model = (DefaultTableModel) table.getModel();
+            model = (DefaultTableModel) ruleTable.getModel();
-            int select = table.convertRowIndexToModel(table.getSelectedRow());
+            int select = ruleTable.convertRowIndexToModel(ruleTable.getSelectedRow());
-            setruleconfig.edit((Vector) model.getDataVector().get(select),select,pane.getTitleAt(pane.getSelectedIndex()));
+            setConfig.edit((Vector) model.getDataVector().get(select), select, pane.getTitleAt(pane.getSelectedIndex()));
         }
     }
 
-    private void initComponents(Object[][] data,JTabbedPane pane) {
+    private void initComponents(Object[][] data, JTabbedPane pane) {
         // JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
-        RuleAdd = new JButton();
+        addButton = new JButton();
-        RuleEdit = new JButton();
+        editButton = new JButton();
         scrollPane = new JScrollPane();
-        table = new JTable();
+        ruleTable = new JTable();
-        Remove = new JButton();
+        removeButton = new JButton();
 
         //======== this ========
         setLayout(new GridBagLayout());
@@ -97,100 +105,106 @@ public class RulePane extends JPanel {
         ((GridBagLayout)getLayout()).columnWeights = new double[] {0.0, 1.0, 1.0E-4};
         ((GridBagLayout)getLayout()).rowWeights = new double[] {0.0, 0.0, 0.0, 1.0, 1.0E-4};
 
-        //---- RuleAdd ----
+        //---- addButton ----
-        RuleAdd.setText("Add");
+        addButton.setText("Add");
-        RuleAdd.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mouseClicked(MouseEvent e) {
-                isEdit = true;
-                RuleAddMouseClicked(e,pane);
-                model = (DefaultTableModel) table.getModel();
-                isEdit = false;
-            }
-        });
-        add(RuleAdd, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
-            GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-            new Insets(15, 5, 3, 2), 0, 0));
 
-        //---- RuleEdit ----
+        addButton.addActionListener(new ActionListener() {
-        RuleEdit.setText("Edit");
-        RuleEdit.addMouseListener(new MouseAdapter() {
             @Override
-            public void mouseClicked(MouseEvent e) {
+            public void actionPerformed(ActionEvent e) {
                 isEdit = true;
-                RuleEditMouseClicked(e,pane);
+                ruleAddActionPerformed(e, pane);
-                model = (DefaultTableModel) table.getModel();
+                model = (DefaultTableModel) ruleTable.getModel();
                 isEdit = false;
             }
         });
-        add(RuleEdit, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0,
+
-            GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+        add(addButton, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
-            new Insets(0, 5, 3, 2), 0, 0));
+                GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+                new Insets(15, 5, 3, 2), 0, 0));
+
+        //---- editButton ----
+        editButton.setText("Edit");
+        editButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                isEdit = true;
+                ruleEditActionPerformed(e, pane);
+                model = (DefaultTableModel) ruleTable.getModel();
+                isEdit = false;
+            }
+        });
+
+        add(editButton, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0,
+                GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+                new Insets(0, 5, 3, 2), 0, 0));
 
         //======== scrollPane ========
         {
-
             //---- table ----
-            table.setShowVerticalLines(false);
+            ruleTable.setShowVerticalLines(false);
-            table.setVerifyInputWhenFocusTarget(false);
+            ruleTable.setVerifyInputWhenFocusTarget(false);
-            table.setUpdateSelectionOnSort(false);
+            ruleTable.setUpdateSelectionOnSort(false);
-            table.setShowHorizontalLines(false);
+            ruleTable.setShowHorizontalLines(false);
-            table.setModel(new DefaultTableModel());
+            ruleTable.setModel(new DefaultTableModel());
-            table.setSurrendersFocusOnKeystroke(true);
+            ruleTable.setSurrendersFocusOnKeystroke(true);
-            scrollPane.setViewportView(table);
+            scrollPane.setViewportView(ruleTable);
         }
-        add(scrollPane, new GridBagConstraints(1, 0, 1, 4, 0.0, 0.0,
-            GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-            new Insets(15, 5, 5, 5), 0, 0));
 
-        //---- Remove ----
+        add(scrollPane, new GridBagConstraints(1, 0, 1, 4, 0.0, 0.0,
-        Remove.setText("Remove");
+                GridBagConstraints.CENTER, GridBagConstraints.BOTH,
-        Remove.addMouseListener(new MouseAdapter() {
+                new Insets(15, 5, 5, 5), 0, 0));
+
+        //---- removeButton ----
+        removeButton.setText("Remove");
+
+        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) table.getModel();
+                model = (DefaultTableModel) ruleTable.getModel();
                 isEdit = false;
             }
         });
-        add(Remove, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0,
+
-            GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+        add(removeButton, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0,
-            new Insets(0, 5, 3, 2), 0, 0));
+                GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+                new Insets(0, 5, 3, 2), 0, 0));
+
         // JFormDesigner - End of component initialization  //GEN-END:initComponents
-        table.setModel(model);
+        ruleTable.setModel(model);
-        model.setDataVector(data,title);
+        model.setDataVector(data, title);
         model.addTableModelListener(new TableModelListener() {
             @Override
             public void tableChanged(TableModelEvent e) {
-                RuleTableChange(e,pane);
+                ruleTableChange(e, pane);
             }
         });
-        table.setRowSorter(new TableRowSorter(model));
+
+        ruleTable.setRowSorter(new TableRowSorter(model));
     }
 
     // JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
-    public JButton RuleAdd;
+    public JButton addButton;
-    public JButton RuleEdit;
+    public JButton editButton;
     public JScrollPane scrollPane;
-    public JTable table;
+    public JTable ruleTable;
-    public JButton Remove;
+    public JButton removeButton;
     // JFormDesigner - End of variables declaration  //GEN-END:variables
-    private final String[] title = new String[]{"Loaded", "Name", "Regex", "Color", "Scope", "Engine"};
+    private final String[] title = new String[]{"Loaded", "Name", "Regex", "Color", "Scope", "Engine", "Sensitive"};
     private DefaultTableModel model = new DefaultTableModel() {
-        public Class<?> getColumnClass ( int column){
+        @Override
+        public Class<?> getColumnClass (int column){
             if (column == 0) {
                 return Boolean.class;
             }else{
                 return String.class;
             }
         }
-        public boolean isCellEditable(int row,int column){
+
-            if (column ==0){
+        @Override
-                return true;
+        public boolean isCellEditable(int row, int column){
-            }else {
+            return column == 0;
-                return false;
-            }
         }
     };
 }

src/main/java/burp/ui/RuleSetting.java

@@ -1,10 +1,14 @@
 package burp.ui;
 
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
 import javax.swing.*;
 import java.awt.*;
 import burp.Config;
 
-/*
+/**
  * @author LinChen
  */
 
@@ -14,67 +18,77 @@ public class RuleSetting extends JPanel {
     }
 
     public void initComponents() {
-        // JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
+        sensitiveLabel = new JLabel();
-        label5 = new JLabel();
+        engineLabel = new JLabel();
-        label4 = new JLabel();
+        scopeLabel = new JLabel();
-        Regex = new JTextField();
+        regexTextField = new JTextField();
-        label3 = new JLabel();
+        regexLabel = new JLabel();
-        label2 = new JLabel();
+        nameLabel = new JLabel();
-        Name = new JTextField();
+        ruleNameTextField = new JTextField();
-        ScopeSelect = new JComboBox<>();
+        scopeComboBox = new JComboBox<>();
-        EngineSelect = new JComboBox<>();
+        engineComboBox = new JComboBox<>();
-        label6 = new JLabel();
+        colorLabel = new JLabel();
-        ColorSelect = new JComboBox<>();
+        colorComboBox = new JComboBox<>();
+        sensitiveComboBox = new JComboBox<>();
 
-        //======== this ========
         setLayout(null);
 
-        //---- label5 ----
+        engineLabel.setText("Engine:");
-        label5.setText("Engine:");
+        add(engineLabel);
-        add(label5);
+        engineLabel.setBounds(new Rectangle(new Point(10, 175), engineLabel.getPreferredSize()));
-        label5.setBounds(new Rectangle(new Point(10, 175), label5.getPreferredSize()));
 
-        //---- label4 ----
+        sensitiveLabel.setText("Sensitive:");
-        label4.setText("Scope:");
+        add(sensitiveLabel);
-        add(label4);
+        sensitiveLabel.setBounds(new Rectangle(new Point(10,215), sensitiveLabel.getPreferredSize()));
-        label4.setBounds(new Rectangle(new Point(10, 135), label4.getPreferredSize()));
-        add(Regex);
-        Regex.setBounds(70, 50, 265, 30);
 
-        //---- label3 ----
+        scopeLabel.setText("Scope:");
-        label3.setText("Regex:");
+        add(scopeLabel);
-        add(label3);
+        scopeLabel.setBounds(new Rectangle(new Point(10, 135), scopeLabel.getPreferredSize()));
-        label3.setBounds(new Rectangle(new Point(10, 55), label3.getPreferredSize()));
+        add(regexTextField);
+        regexTextField.setBounds(70, 50, 265, 30);
 
-        //---- label2 ----
+        regexLabel.setText("Regex:");
-        label2.setText("Name:");
+        add(regexLabel);
-        add(label2);
+        regexLabel.setBounds(new Rectangle(new Point(10, 55), regexLabel.getPreferredSize()));
-        label2.setBounds(new Rectangle(new Point(10, 15), label2.getPreferredSize()));
-        add(Name);
-        Name.setBounds(70, 10, 265, 30);
 
-        //---- ScopeSelect ----
+        nameLabel.setText("Name:");
-        ScopeSelect.setModel(new DefaultComboBoxModel<>(Config.scopeArray));
+        add(nameLabel);
-        add(ScopeSelect);
+        nameLabel.setBounds(new Rectangle(new Point(10, 15), nameLabel.getPreferredSize()));
-        ScopeSelect.setBounds(70, 130, 265, ScopeSelect.getPreferredSize().height);
+        add(ruleNameTextField);
+        ruleNameTextField.setBounds(70, 10, 265, 30);
 
-        //---- EngineSelect ----
+        scopeComboBox.setModel(new DefaultComboBoxModel<>(Config.scopeArray));
-        EngineSelect.setModel(new DefaultComboBoxModel<>(Config.engineArray));
+        add(scopeComboBox);
-        add(EngineSelect);
+        scopeComboBox.setBounds(70, 130, 265, scopeComboBox.getPreferredSize().height);
-        EngineSelect.setBounds(70, 170, 265, EngineSelect.getPreferredSize().height);
 
-        //---- label7 ----
+        engineComboBox.setModel(new DefaultComboBoxModel<>(Config.engineArray));
-        label6.setText("Color:");
+        engineComboBox.addActionListener(new ActionListener() {
-        add(label6);
+            @Override
-        label6.setBounds(new Rectangle(new Point(10, 95), label6.getPreferredSize()));
+            public void actionPerformed(ActionEvent e) {
+                String engineValue = engineComboBox.getSelectedItem().toString();
+                if (engineValue.equals("nfa")) {
+                    sensitiveComboBox.setEnabled(true);
+                } else {
+                    sensitiveComboBox.setEnabled(false);
+                }
+            }
+        });
+        add(engineComboBox);
+        engineComboBox.setBounds(70, 170, 265, engineComboBox.getPreferredSize().height);
 
-        //---- ColorSelect ----
+        colorLabel.setText("Color:");
-        ColorSelect.setModel(new DefaultComboBoxModel<>(Config.colorArray));
+        add(colorLabel);
-        add(ColorSelect);
+        colorLabel.setBounds(new Rectangle(new Point(10, 95), colorLabel.getPreferredSize()));
-        ColorSelect.setBounds(70, 90, 265, ColorSelect.getPreferredSize().height);
+
+        colorComboBox.setModel(new DefaultComboBoxModel<>(Config.colorArray));
+        add(colorComboBox);
+        colorComboBox.setBounds(70, 90, 265, colorComboBox.getPreferredSize().height);
+
+        sensitiveComboBox.setModel(new DefaultComboBoxModel<>(new Boolean[]{true, false}));
+        add(sensitiveComboBox);
+        sensitiveComboBox.setBounds(70,210,265,sensitiveComboBox.getPreferredSize().height);
 
         {
-            // compute preferred size
             Dimension preferredSize = new Dimension();
             for(int i = 0; i < getComponentCount(); i++) {
                 Rectangle bounds = getComponent(i).getBounds();
@@ -87,19 +101,18 @@ public class RuleSetting extends JPanel {
             setMinimumSize(preferredSize);
             setPreferredSize(preferredSize);
         }
-        // JFormDesigner - End of component initialization  //GEN-END:initComponents
     }
 
-    // JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
+    private JLabel engineLabel;
-    private JLabel label5;
+    private JLabel sensitiveLabel;
-    private JLabel label4;
+    private JLabel scopeLabel;
-    public JTextField Regex;
+    public JTextField regexTextField;
-    private JLabel label3;
+    private JLabel regexLabel;
-    private JLabel label2;
+    private JLabel nameLabel;
-    public JTextField Name;
+    public JTextField ruleNameTextField;
-    public JComboBox<String> ScopeSelect;
+    public JComboBox<String> scopeComboBox;
-    public JComboBox<String> EngineSelect;
+    public JComboBox<String> engineComboBox;
-    private JLabel label6;
+    private JLabel colorLabel;
-    public JComboBox<String> ColorSelect;
+    public JComboBox<String> colorComboBox;
-    // JFormDesigner - End of variables declaration  //GEN-END:variables
+    public JComboBox<Boolean> sensitiveComboBox;
 }

src/main/java/burp/yaml/LoadConfig.java

@@ -17,18 +17,26 @@ import org.yaml.snakeyaml.nodes.Tag;
 
 public class LoadConfig {
     private static final Yaml yaml = new Yaml();
-    private static final String SettingPath = "Setting.yml";
+    private static String HaEConfigPath = String.format("%s/.config/HaE", System.getProperty("user.home"));
-    private static final String ConfigPath = "Config.yml";
+    private static String SettingPath = String.format("%s/%s", HaEConfigPath, "Setting.yml");
+    private static String ConfigPath =  String.format("%s/%s", HaEConfigPath, "Config.yml");
 
     public LoadConfig() {
         // 构造函数，初始化配置
-        File yamlSetting = new File(SettingPath);
+        File HaEConfigPathFile = new File(HaEConfigPath);
-        if (!(yamlSetting.exists() && yamlSetting.isFile())) {
+        if (!(HaEConfigPathFile.exists() && HaEConfigPathFile.isDirectory())) {
+            HaEConfigPathFile.mkdirs();
+        }
+
+        File settingPathFile = new File(SettingPath);
+        if (!(settingPathFile.exists() && settingPathFile.isFile())) {
             initSetting();
             initRules();
         }
+        Config.ruleConfig = LoadConfig.getRules();
     }
 
+
     // 初始化设置信息
     public void initSetting() {
         Map<String, Object> r = new HashMap<>();
@@ -51,6 +59,8 @@ public class LoadConfig {
         rule.setEngine("nfa");
         rule.setScope("response");
         rule.setRegex("(([a-zA-Z0-9][_|\\.])*[a-zA-Z0-9]+@([a-zA-Z0-9][-|_|\\.])*[a-zA-Z0-9]+\\.((?!js|css|jpg|jpeg|png|ico)[a-zA-Z]{2,}))");
+        rule.setSensitive(false);
+
         Rules rules = new Rules();
         rules.setType("Basic Information");
         ArrayList<Rule> rl = new ArrayList<>();
@@ -80,26 +90,32 @@ public class LoadConfig {
     public static String getConfigPath(){
         try {
             InputStream inorder = new FileInputStream(SettingPath);
-            Map<String,Object> r;
+            Map<String,Object> r = yaml.load(inorder);
-            r = yaml.load(inorder);
             return r.get("configPath").toString();
         } catch (FileNotFoundException e) {
             e.printStackTrace();
             return ConfigPath;
         }
+
     }
 
     // 获取不包含的后缀名
     public String getExcludeSuffix(){
-        try {
+        String excludeSuffix = "";
-            InputStream inorder = new FileInputStream(SettingPath);
+        File yamlSetting = new File(SettingPath);
-            Map<String,Object> r;
+        if (yamlSetting.exists() && yamlSetting.isFile()) {
-            r = yaml.load(inorder);
+            try {
-            return r.get("excludeSuffix").toString();
+                InputStream inorder = new FileInputStream(SettingPath);
-        } catch (FileNotFoundException e) {
+                Map<String,Object> r = yaml.load(inorder);
-            e.printStackTrace();
+                excludeSuffix = r.get("excludeSuffix").toString();
-            return Config.excludeSuffix;
+            } catch (Exception e) {
+                // e.printStackTrace();
+                excludeSuffix = "";
+            }
+        } else {
+            excludeSuffix = Config.excludeSuffix;
         }
+        return excludeSuffix;
     }
 
     // 获取规则配置
@@ -129,18 +145,6 @@ public class LoadConfig {
         return resRule;
     }
 
-    // 设置配置路径
-    public void setConfigPath(String filePath){
-        Map<String,Object> r = new HashMap<>();
-        r.put("configPath", filePath);
-        r.put("excludeSuffix", getExcludeSuffix());
-        try{
-            Writer ws = new OutputStreamWriter(new FileOutputStream(SettingPath), StandardCharsets.UTF_8);
-            yaml.dump(r, ws);
-        }catch (Exception ex){
-            ex.printStackTrace();
-        }
-    }
 
     // 设置不包含的后缀名
     public void setExcludeSuffix(String excludeSuffix){

src/main/java/burp/yaml/SetConfig.java

@@ -1,5 +1,6 @@
 package burp.yaml;
 
+import burp.Config;
 import burp.yaml.template.Rule;
 import burp.yaml.template.Rules;
 import org.yaml.snakeyaml.DumperOptions;
@@ -17,8 +18,6 @@ import java.util.*;
 
 public class SetConfig {
 
-    private Map<String, Object[][]> ruleConfig = LoadConfig.getRules();
-
     public void format() {
         DumperOptions dop = new DumperOptions();
         dop.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
@@ -28,12 +27,12 @@ public class SetConfig {
         RulesConfig con = new RulesConfig();
         List<Rules> rls = new ArrayList<>();
 
-        ruleConfig.keySet().forEach(i->
+        Config.ruleConfig.keySet().forEach(i->
         {
             Rules rlsTmp = new Rules();
             rlsTmp.setType(i);
             List<Rule> rl = new ArrayList<>();
-            for (Object[] objects : ruleConfig.get(i)) {
+            for (Object[] objects : Config.ruleConfig.get(i)) {
                 Rule rlTmp = new Rule();
                 rlTmp.setName((String) objects[1]);
                 rlTmp.setLoaded((Boolean) objects[0]);
@@ -41,6 +40,7 @@ public class SetConfig {
                 rlTmp.setColor((String) objects[3]);
                 rlTmp.setScope((String) objects[4]);
                 rlTmp.setEngine((String) objects[5]);
+                rlTmp.setSensitive((Boolean) objects[6]);
                 rl.add(rlTmp);
             }
             rlsTmp.setRule(rl);
@@ -57,47 +57,45 @@ public class SetConfig {
     }
 
     public void edit(Vector data, int select, String type) {
-        ruleConfig = LoadConfig.getRules();
+        Config.ruleConfig.get(type)[select] = data.toArray();
-        ruleConfig.get(type)[select] = data.toArray();
         this.format();
     }
 
     public void add(Vector data, String type) {
-        ruleConfig = LoadConfig.getRules();
+        ArrayList<Object[]> x = new ArrayList<>(Arrays.asList(Config.ruleConfig.get(type)));
-        ArrayList<Object[]> x = new ArrayList<>(Arrays.asList(ruleConfig.get(type)));
         x.add(data.toArray());
-        ruleConfig.put(type,x.toArray(new Object[x.size()][]));
+        Config.ruleConfig.put(type,x.toArray(new Object[x.size()][]));
         this.format();
     }
     public void remove(int select,String type) {
-        ruleConfig = LoadConfig.getRules();
+        ArrayList<Object[]> x = new ArrayList<>(Arrays.asList(Config.ruleConfig.get(type)));
-        ArrayList<Object[]> x = new ArrayList<>(Arrays.asList(ruleConfig.get(type)));
         x.remove(select);
-        ruleConfig.put(type,x.toArray(new Object[x.size()][]));
+        Config.ruleConfig.put(type,x.toArray(new Object[x.size()][]));
         this.format();
     }
 
     public void rename(String oldName, String newName) {
-        ruleConfig = LoadConfig.getRules();
+        Config.ruleConfig.put(newName, Config.ruleConfig.remove(oldName));
-        ruleConfig.put(newName, ruleConfig.remove(oldName));
         this.format();
     }
 
     public void deleteRules(String Rules) {
-        ruleConfig = LoadConfig.getRules();
+        Config.ruleConfig.remove(Rules);
-        ruleConfig.remove(Rules);
         this.format();
     }
     public String newRules() {
         int i = 0;
-        ruleConfig = LoadConfig.getRules();
         String name = "New ";
-        Object[][] data = new Object[][]{{false, "New Name", "(New Regex)", "gray", "any", "nfa"}};
+        Object[][] data = new Object[][]{
-        while (ruleConfig.containsKey(name + i)) {
+                {
+                    false, "New Name", "(New Regex)", "gray", "any", "nfa", false
+                }
+        };
+        while (Config.ruleConfig.containsKey(name + i)) {
             i++;
         }
-        ruleConfig.put(name+i, data);
+        Config.ruleConfig.put(name + i, data);
         this.format();
-        return name+i;
+        return name + i;
     }
 }

src/main/java/burp/yaml/template/Rule.java

@@ -3,7 +3,7 @@ package burp.yaml.template;
 import java.util.HashMap;
 import java.util.Map;
 
-/*
+/**
  * @author LinChen
  */
 
@@ -14,6 +14,7 @@ public class Rule {
     private String Color;
     private String Engine;
     private String Scope;
+    private Boolean Sensitive;
 
     public Boolean getLoaded() {
         return Loaded;
@@ -38,6 +39,9 @@ public class Rule {
         return Scope;
     }
 
+    public Boolean getSensitive(){
+        return Sensitive = Sensitive;
+    }
     public void setLoaded(Boolean loaded) {
         this.Loaded = loaded;
     }
@@ -62,9 +66,12 @@ public class Rule {
     public void setScope(String scope) {
         this.Scope = scope;
     }
+    public void setSensitive(Boolean sensitive){
+        this.Sensitive = sensitive;
+    }
 
     public Object[] getRuleObject() {
-        return new Object[] { Loaded, Name, Regex, Color, Scope, Engine };
+        return new Object[] { Loaded, Name, Regex, Color, Scope, Engine,Sensitive };
     }
 
     public Map<String, Object> getRuleObjMap(){
@@ -75,10 +82,12 @@ public class Rule {
         r.put("Color", Color);
         r.put("Scope", Scope);
         r.put("Engine", Engine);
+        r.put("Sensitive", Sensitive);
         return r;
     }
 
+    @Override
     public String toString() {
-        return "{ \nLoaded: " + Loaded + "\nName: " + Name + "\nRegex: " + Regex + "\nColor: " + Color + "\nScope: " + Scope + "\nEngine: " + Engine + "\n}";
+        return "{ \nLoaded: " + Loaded + "\nName: " + Name + "\nRegex: " + Regex + "\nColor: " + Color + "\nScope: " + Scope + "\nEngine: " + Engine + "\nSensitive: " + Sensitive + "\n }";
     }
 }

src/main/java/burp/yaml/template/Rules.java

@@ -4,7 +4,7 @@ import burp.yaml.template.Rule;
 
 import java.util.List;
 
-/*
+/**
  * @author LinChen
  */
 
@@ -28,9 +28,9 @@ public class Rules {
         this.rule = rule;
     }
 
-    public void setRuleObj(){
+    public void setRuleObj(){}
 
-    }
+    @Override
     public String toString(){
         return "{ type: "+type+"\n config: "+ rule +"}\n";
     }