Version: 2.2.2 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
+.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

@@ -4,9 +4,13 @@
 
 架构作者: [@0chencc](https://github.com/0Chencc)
 
-## 公共规则网站
+## 公共规则 & 打赏
 
-https://gh0st.cn/HaE/
+公共规则下载地址：https://gh0st.cn/HaE/
+
+如果你觉得HaE好用，可以打赏一下作者，给作者持续更新下去的动力！
+
+![](images/reward.jpeg)
 
 ## 介绍
 
@@ -36,6 +40,7 @@ https://gh0st.cn/HaE/
 4. 配置文件采用YAML格式存储，更加便于阅读和修改
 5. 内置简单缓存，在“多正则、大数据”的场景下减少卡顿现象
 6. **支持标签分页**，点击`...`即可添加新的标签页，对着标签页右键即可删除
+7. 高亮信息添加的同时添加Comment，便于查找请求
 
 ![-w477](images/16000720732851.jpg)
 
@@ -47,7 +52,7 @@ https://gh0st.cn/HaE/
 
 访问该地址，在`Proxy - HTTP History`中可以看见高亮请求，响应标签页中含有`MarkINFO`标签，其中将匹配到的信息提取了出来。
 
-![-w1047](images/16000720732854.jpg)
+![-w1047](images/16000720732854.png)
 
 
 ## 正则优化

src/main/java/burp/BurpExtender.java

@@ -3,17 +3,18 @@ package burp;
 import burp.action.*;
 import burp.ui.MainUI;
 
+import java.util.Map;
 import javax.swing.*;
 import java.awt.*;
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.List;
 import java.io.PrintWriter;
-import java.util.Map;
+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 {
@@ -21,11 +22,9 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
     private static PrintWriter stdout;
     private IBurpExtenderCallbacks callbacks;
     private static IExtensionHelpers helpers;
-    MatchHTTP mh = new MatchHTTP();
-    ExtractContent ec = new ExtractContent();
-    DoAction da = new DoAction();
     GetColorKey gck = new GetColorKey();
     UpgradeColor uc = new UpgradeColor();
+    ProcessMessage pm = new ProcessMessage();
 
     @Override
     public void registerExtenderCallbacks(final IBurpExtenderCallbacks callbacks)
@@ -33,12 +32,12 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
         this.callbacks = callbacks;
         BurpExtender.helpers = callbacks.getHelpers();
 
-        String version = "2.0.7";
+        String version = "2.2.2";
         callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
         // 定义输出
         stdout = new PrintWriter(callbacks.getStdout(), true);
-        stdout.println("@UI Author: 0chencc");
         stdout.println("@Core Author: EvilChen");
+        stdout.println("@Architecture Author: 0chencc");
         stdout.println("@Github: https://github.com/gh0stkey/HaE");
         // UI
         SwingUtilities.invokeLater(this::initialize);
@@ -46,10 +45,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";
@@ -60,68 +61,50 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
         return main;
     }
 
-    /*
+    /**
      * 使用processHttpMessage用来做Highlighter
      */
     @Override
     public void processHttpMessage(int toolFlag, boolean messageIsRequest, IHttpRequestResponse messageInfo) {
         // 判断是否是响应，且该代码作用域为：REPEATER、INTRUDER、PROXY（分别对应toolFlag 64、32、4）
         if (toolFlag == 64 || toolFlag == 32 || toolFlag == 4) {
-            Map<String, Map<String, Object>> obj;
+            byte[] content;
-            // 流量清洗
-            String urlString = helpers.analyzeRequest(messageInfo.getHttpService(), messageInfo.getRequest()).getUrl().toString();
-            urlString = urlString.indexOf("?") > 0 ? urlString.substring(0, urlString.indexOf("?")) : urlString;
-
-            // 正则判断
-            if (mh.matchSuffix(urlString)) {
-                return;
-            }
-
             if (messageIsRequest) {
-                byte[] byteRequest = messageInfo.getRequest();
+                content = messageInfo.getRequest();
-                // 获取报文头
-                List<String> requestTmpHeaders = helpers.analyzeRequest(messageInfo.getHttpService(), byteRequest).getHeaders();
-                String requestHeaders = String.join("\n", requestTmpHeaders);
-
-                // 获取报文主体
-                int requestBodyOffset = helpers.analyzeRequest(messageInfo.getHttpService(), byteRequest).getBodyOffset();
-                byte[] requestBody = Arrays.copyOfRange(byteRequest, requestBodyOffset, byteRequest.length);
-
-                obj = ec.matchRegex(byteRequest, requestHeaders, requestBody, "request");
             } else {
-                byte[] byteResponse = messageInfo.getResponse();
+                content = messageInfo.getResponse();
-
-                // 获取报文头
-                List<String> responseTmpHeaders = helpers.analyzeRequest(messageInfo.getHttpService(), byteResponse).getHeaders();
-                String responseHeaders = String.join("\n", responseTmpHeaders);
-
-                // 获取报文主体
-                int responseBodyOffset = helpers.analyzeResponse(byteResponse).getBodyOffset();
-                byte[] responseBody = Arrays.copyOfRange(byteResponse, responseBodyOffset, byteResponse.length);
-
-                obj = ec.matchRegex(byteResponse, responseHeaders, responseBody, "response");
             }
 
-            List<String> colorList = da.highlightList(obj);
+            String c = new String(content, StandardCharsets.UTF_8).intern();
-            if (colorList.size() != 0) {
+            List<Map<String, String>> result = pm.processMessageByContent(helpers, content, messageIsRequest, true);
+            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).get("color"));
                 String color = uc.getEndColor(gck.getColorKeys(colorList));
-                messageInfo.setHighlight(color);
-            }
-        }
 
+                messageInfo.setHighlight(color);
+                String addComment = String.join(", ", result.get(1).get("comment"));
+                String resComment = originalComment != null ? 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;
 
         public MarkInfoTab(IMessageEditorController controller, boolean editable) {
             this.controller = controller;
-            markInfoText = callbacks.createTextEditor();
-            markInfoText.setEditable(editable);
         }
 
         @Override
@@ -131,75 +114,55 @@ 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) {
-            Map<String, Map<String, Object>> obj;
+            String c = new String(content, StandardCharsets.UTF_8).intern();
-
+            List<Map<String, String>> result = pm.processMessageByContent(helpers, content, isRequest, false);
+            if (result != null && !result.isEmpty()) {
+                Map<String, String> dataMap = result.get(0);
                 if (isRequest) {
-                try {
+                    extractRequestMap = dataMap;
-                    // 流量清洗
-                    String urlString = helpers.analyzeRequest(controller.getHttpService(), controller.getRequest()).getUrl().toString();
-                    urlString = urlString.indexOf("?") > 0 ? urlString.substring(0, urlString.indexOf("?")) : urlString;
-                    // 正则判断
-                    if (mh.matchSuffix(urlString)) {
-                        return false;
-                    }
-                } catch (Exception e) {
-                    return false;
-                }
-                IRequestInfo iRequestInfo = helpers.analyzeRequest(controller.getHttpService(), content);
-
-                // 获取报文头
-                List<String> requestTmpHeaders = iRequestInfo.getHeaders();
-                String requestHeaders = String.join("\n", requestTmpHeaders);
-                // 获取报文主体
-                int requestBodyOffset = iRequestInfo.getBodyOffset();
-                byte[] requestBody = Arrays.copyOfRange(content, requestBodyOffset, content.length);
-
-                obj = ec.matchRegex(content, requestHeaders, requestBody, "request");
-                if (obj.size() > 0) {
-                    String result = da.extractString(obj);
-                    extractRequestContent = result.getBytes();
-                    return true;
-                }
                 } else {
-                IResponseInfo iResponseInfo = helpers.analyzeResponse(content);
+                    extractResponseMap = dataMap;
-                // 获取报文头
-                List<String> responseTmpHeaders = iResponseInfo.getHeaders();
-                String responseHeaders = String.join("\n", responseTmpHeaders);
-                // 获取报文主体
-                int responseBodyOffset = iResponseInfo.getBodyOffset();
-                byte[] responseBody = Arrays.copyOfRange(content, responseBodyOffset, content.length);
-
-                obj = ec.matchRegex(content, responseHeaders, responseBody, "response");
-                if (obj.size() > 0) {
-                    String result = da.extractString(obj);
-                    extractResponseContent = result.getBytes();
-                    return true;
                 }
+                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");
+            }
+            return helpers.stringToBytes(selectData.toString());
         }
 
-        /*
+        /**
          * 使用setMessage用来做Extractor
          */
         @Override
@@ -207,15 +170,36 @@ 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) {
+            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];
+                }
+                int indexOfTab = this.jTabbedPane.indexOfTab(i);
+                JScrollPane jScrollPane = new JScrollPane(new JTable(data, new Object[] {"Information"}));
+                this.jTabbedPane.addTab(i, jScrollPane);
+                // 使用removeAll会导致UI出现空白的情况，为了改善用户侧体验，采用remove的方式进行删除
+                if (indexOfTab != -1) {
+                    this.jTabbedPane.remove(indexOfTab);
+                }
+            });
         }
     }
 
+
+
     @Override
     public IMessageEditorTab createNewInstance(IMessageEditorController controller, boolean editable) {
         return new MarkInfoTab(controller, editable);

src/main/java/burp/Config.java

@@ -1,9 +1,12 @@
 package burp;
 
-/*
+/**
  * @author EvilChen
  */
 
+import burp.yaml.LoadConfig;
+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";
 
@@ -22,7 +25,6 @@ public class Config {
             "dfa"
     };
 
-    public static String outputTplString = "[%s]\n%s\n\n";
 
     public static String[] colorArray = new String[] {
             "red",
@@ -35,4 +37,6 @@ public class Config {
             "magenta",
             "gray"
     };
+
+    public static Map<String,Object[][]> ruleConfig = null;
 }

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

@@ -1,33 +1,38 @@
 package burp.action;
 
+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<String, String>();
         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, String.format("%s\n", data).intern());
-            result[0] += tmpStr;
         });
-        return result[0];
+        return resultMap;
     }
 
-    public List<String> highlightList(Map<String, Map<String, Object>> obj) {
+    public List<List<String>> highlightAndComment(Map<String, Map<String, Object>> obj) {
         List<String> colorList = new ArrayList<>();
+        List<String> commentList = new ArrayList<>();
+        List<List<String>> result = new ArrayList<>();
         obj.keySet().forEach(i->{
             Map<String, Object> tmpMap = obj.get(i);
             String color = tmpMap.get("color").toString();
             colorList.add(color);
+            commentList.add(i);
         });
-        return colorList;
+        result.add(colorList);
+        result.add(commentList);
+        return result;
     }
 }

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

@@ -3,6 +3,8 @@ 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;
@@ -10,10 +12,7 @@ import dk.brics.automaton.RunAutomaton;
 import jregex.Matcher;
 import jregex.Pattern;
 
-import burp.yaml.LoadRule;
+/**
-import burp.yaml.LoadConfigFile;
-
-/*
  * @author EvilChen
  */
 
@@ -21,11 +20,9 @@ public class ExtractContent {
 
     public Map<String, Map<String, Object>> matchRegex(byte[] content, String headers, byte[] body, String scopeString) {
         Map<String, Map<String, Object>> map = new HashMap<>(); // 最终返回的结果
-        new LoadRule(LoadConfigFile.getConfigPath());
+        Config.ruleConfig.keySet().forEach(i -> {
-        Map<String,Object[][]> rules = LoadRule.getConfig();
-        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<>();
@@ -37,7 +34,7 @@ public class ExtractContent {
                 String scope = objects[4].toString();
                 String engine = objects[5].toString();
                 // 判断规则是否开启与作用域
-                if (loaded && (scope.contains(scopeString) || scope.equals("any"))) {
+                if (loaded && (scope.contains(scopeString) || "any".equals(scope))) {
                     switch (scope) {
                         case "any":
                         case "request":
@@ -52,9 +49,11 @@ 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);
                         Matcher matcher = pattern.matcher(matchContent);
                         while (matcher.find()) {

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

@@ -3,15 +3,15 @@ package burp.action;
 import jregex.Matcher;
 import jregex.Pattern;
 import jregex.REFlags;
-import burp.yaml.LoadConfigFile;
+import burp.yaml.LoadConfig;
 
-/*
+/**
  * @author EvilChen
  */
 
 public class MatchHTTP {
     // 匹配后缀
-    LoadConfigFile lc = new LoadConfigFile();
+    LoadConfig lc = new LoadConfig();
     public boolean matchSuffix(String str) {
         Pattern pattern = new Pattern(String.format("[\\w]+[\\.](%s)", lc.getExcludeSuffix()), REFlags.IGNORE_CASE);
         Matcher matcher = pattern.matcher(str);

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

@@ -0,0 +1,95 @@
+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;
+
+public class ProcessMessage {
+    MatchHTTP mh = new MatchHTTP();
+    ExtractContent ec = new ExtractContent();
+    DoAction da = new DoAction();
+    GetColorKey gck = new GetColorKey();
+    UpgradeColor uc = new UpgradeColor();
+
+    public List<Map<String, String>> processMessageByContent(IExtensionHelpers helpers, byte[] content, boolean isRequest, boolean messageInfo) {
+        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 = requestTmpHeaders.get(0).split(" ")[1];
+                urlString = urlString.indexOf("?") > 0 ? urlString.substring(0, urlString.indexOf("?")) : urlString;
+
+                // 正则判断
+                if (mh.matchSuffix(urlString)) {
+                    return result;
+                }
+            } catch (Exception e) {
+                return result;
+            }
+
+
+            // 获取报文主体
+            int requestBodyOffset = helpers.analyzeRequest(content).getBodyOffset();
+            byte[] requestBody = Arrays.copyOfRange(content, requestBodyOffset, content.length);
+
+            obj = ec.matchRegex(content, requestHeaders, requestBody, "request");
+        } else {
+            try {
+                // 流量清洗
+                String inferredMimeType = String.format("hae.%s", helpers.analyzeResponse(content).getInferredMimeType().toLowerCase());
+                String statedMimeType = String.format("hae.%s", helpers.analyzeResponse(content).getStatedMimeType().toLowerCase());
+                // 正则判断
+                if (mh.matchSuffix(statedMimeType) || mh.matchSuffix(inferredMimeType)) {
+                    return result;
+                }
+            } catch (Exception e) {
+                return result;
+            }
+            // 获取报文头
+            List<String> responseTmpHeaders = helpers.analyzeResponse(content).getHeaders();
+            String responseHeaders = String.join("\n", responseTmpHeaders);
+
+            // 获取报文主体
+            int responseBodyOffset = helpers.analyzeResponse(content).getBodyOffset();
+            byte[] responseBody = Arrays.copyOfRange(content, responseBodyOffset, content.length);
+
+            obj = ec.matchRegex(content, responseHeaders, responseBody, "response");
+        }
+
+        if (messageInfo) {
+            List<List<String>> resultList = da.highlightAndComment(obj);
+            List<String> colorList = resultList.get(0);
+            List<String> commentList = resultList.get(1);
+            if (colorList.size() != 0 && commentList.size() != 0) {
+                String color = uc.getEndColor(gck.getColorKeys(colorList));
+                Map<String, String> colorMap = new HashMap<String, String>(){{
+                    put("color", color);
+                }};
+                Map<String, String> commentMap = new HashMap<String, String>(){{
+                    put("comment", String.join(", ", commentList));
+                }};
+                result.add(colorMap);
+                result.add(commentMap);
+            }
+        } else {
+            if (obj.size() > 0) {
+                result.add(da.extractString(obj));
+            }
+        }
+
+        return result;
+
+    }
+}

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/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,12 +58,10 @@ public class JTabbedPaneCloseButton extends JTabbedPane {
         addTabNoExit(title, null, component);
     }
 
-    /* Button */
+    /** Button */
     public class CloseButtonTab extends JPanel {
-        private Component tab;
 
         public CloseButtonTab(final Component tab, String title, Icon icon) {
-            this.tab = tab;
             setOpaque(false);
             FlowLayout flowLayout = new FlowLayout(FlowLayout.CENTER, 3, 3);
             setLayout(flowLayout);
@@ -76,10 +74,10 @@ public class JTabbedPaneCloseButton extends JTabbedPane {
             add(button);
         }
     }
-    /* ClickListener */
+    /** ClickListener */
     public class CloseListener implements MouseListener
     {
-        private Component tab;
+        private final Component tab;
 
         public CloseListener(Component tab){
             this.tab=tab;

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

@@ -1,9 +1,8 @@
 package burp.ui;
 
-import org.jetbrains.annotations.NotNull;
+import burp.Config;
-import burp.yaml.LoadConfigFile;
+import burp.yaml.LoadConfig;
-import burp.yaml.LoadRule;
+import burp.yaml.SetConfig;
-import burp.yaml.SetRuleConfig;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -15,24 +14,26 @@ import java.awt.*;
 import java.awt.event.*;
 import java.util.Map;
 
-/*
+/**
  * @author LinChen
  */
 
 public class MainUI extends JPanel{
+    private final LoadConfig loadConn = new LoadConfig();
+
     public MainUI() {
         initComponents();
     }
     public void closeTabActionPerformed(ActionEvent e){
         if (tabbedPane1.getTabCount()>2){
             if (tabbedPane1.getSelectedIndex()!=0){
-                SetRuleConfig setruleconfig = new SetRuleConfig();
+                SetConfig setConn = new SetConfig();
-                setruleconfig.deleteRules(tabbedPane1.getTitleAt(tabbedPane1.getSelectedIndex()));
+                setConn.deleteRules(tabbedPane1.getTitleAt(tabbedPane1.getSelectedIndex()));
                 tabbedPane1.remove(tabbedPane1.getSelectedIndex());
                 tabbedPane1.setSelectedIndex(tabbedPane1.getSelectedIndex()-1);
             }else{
-                SetRuleConfig setruleconfig = new SetRuleConfig();
+                SetConfig setConn = new SetConfig();
-                setruleconfig.deleteRules(tabbedPane1.getTitleAt(tabbedPane1.getSelectedIndex()));
+                setConn.deleteRules(tabbedPane1.getTitleAt(tabbedPane1.getSelectedIndex()));
                 tabbedPane1.remove(tabbedPane1.getSelectedIndex());
                 tabbedPane1.setSelectedIndex(tabbedPane1.getSelectedIndex());
             }
@@ -40,33 +41,28 @@ public class MainUI extends JPanel{
     }
 
     private void SelectFileMouseClicked(MouseEvent e) {
-        JFileChooser chooseconfig = new JFileChooser();
+        JFileChooser selectFile = new JFileChooser();
-        chooseconfig.setFileSelectionMode(JFileChooser.FILES_ONLY);
+        selectFile.setFileSelectionMode(JFileChooser.FILES_ONLY);
         FileNameExtensionFilter filter = new FileNameExtensionFilter("Yaml File (.yml/.yaml)","yaml", "yml");
-        chooseconfig.setFileFilter(filter);
+        selectFile.setFileFilter(filter);
-        int selectframe = chooseconfig.showDialog(new JLabel(),"Select");
+        int selectFrame = selectFile.showDialog(new JLabel(),"Select");
-        if (selectframe == JFileChooser.APPROVE_OPTION){
+        if (selectFrame == JFileChooser.APPROVE_OPTION){
-            String configpath = chooseconfig.getSelectedFile().toString();
+            String configPath = selectFile.getSelectedFile().toString();
-            reloadRule(configpath);
+            reloadRule();
-            loadfile.setConfigPath(configpath);
+            loadConn.setConfigPath(configPath);
+            configFilepathtext.setText(configPath);
         }
-        configfilepathtext.setText(loadfile.getConfigPath());
-    }
-    private void reloadRule(String configfile){
-        tabbedPane1.removeAll();
-        LoadRule loadrule = new LoadRule(configfile);
-        Map<String,Object[][]> config = loadrule.getConfig();
-        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();
-        LoadRule loadrule = new LoadRule(loadfile.getConfigPath());
-        Map<String,Object[][]> config = loadrule.getConfig();
         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->tabbedPane1.addTab(
+                        i,
+                        new RulePane(rules.get(i), tabbedPane1)
+                )
         );
         tabbedPane1.addTab("...", new JLabel());
         ruleSwitch.setListen(true);
@@ -75,16 +71,16 @@ public class MainUI extends JPanel{
     private void reloadMouseClicked(MouseEvent e) {
         reloadRule();
     }
+
     private void ESSaveMouseClicked(MouseEvent e) {
-        // TODO add your code here
+        LoadConfig loadCon = new LoadConfig();
-        LoadConfigFile lcf = new LoadConfigFile();
+        loadCon.setExcludeSuffix(EStext.getText());
-        lcf.setExcludeSuffix(EStext.getText());
     }
     private void initComponents() {
         tabbedPane2 = new JTabbedPane();
         tabbedPane1 = new JTabbedPane();
         panel3 = new JPanel();
-        configfilepathtext = new JTextField();
+        configFilepathtext = new JTextField();
         label1 = new JLabel();
         SelectFile = new JButton();
         reload = new JButton();
@@ -111,9 +107,9 @@ public class MainUI extends JPanel{
                 ((GridBagLayout)panel3.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};
 
-                //---- configfilepathtext ----
+                //---- configFilepathtext ----
-                configfilepathtext.setEditable(false);
+                configFilepathtext.setEditable(false);
-                panel3.add(configfilepathtext, 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));
 
@@ -175,16 +171,13 @@ public class MainUI extends JPanel{
                 new Insets(0, 0, 0, 0), 0, 0));
         // JFormDesigner - End of component initialization  //GEN-END:initComponents
 
-        LoadRule loadRule = new LoadRule(loadfile.getConfigPath());
+        Config.ruleConfig.keySet().forEach(i->tabbedPane1.addTab(i,new RulePane(Config.ruleConfig.get(i),tabbedPane1)));
-        Map<String,Object[][]> config = loadRule.getConfig();
-        config.keySet().forEach(i->tabbedPane1.addTab(i,new RulePane(config.get(i),tabbedPane1)));
 
         tabbedPane1.addTab("...",new JLabel());
 
         //TabTitleEditListener ruleSwitch = new TabTitleEditListener(tabbedPane1);
-        configfilepathtext.setText(loadfile.getConfigPath());
+        configFilepathtext.setText(LoadConfig.getConfigPath());
-        LoadConfigFile lcf =new LoadConfigFile();
+        EStext.setText(loadConn.getExcludeSuffix());
-        EStext.setText(lcf.getExcludeSuffix());
         ruleSwitch = new TabTitleEditListener(tabbedPane1);
         tabbedPane1.addChangeListener(ruleSwitch);
         tabbedPane1.addMouseListener(ruleSwitch);
@@ -196,7 +189,7 @@ public class MainUI extends JPanel{
     private JTabbedPane tabbedPane2;
     private JTabbedPane tabbedPane1;
     private JPanel panel3;
-    private JTextField configfilepathtext;
+    private JTextField configFilepathtext;
     private JLabel label1;
     private JButton SelectFile;
     private JButton reload;
@@ -207,7 +200,6 @@ public class MainUI extends JPanel{
     protected static JPopupMenu tabMenu = new JPopupMenu();
     private JMenuItem closeTab = new JMenuItem("Delete");
     private TabTitleEditListener ruleSwitch;
-    private LoadConfigFile loadfile = new LoadConfigFile();
 }
 
 class TabTitleEditListener extends MouseAdapter implements ChangeListener, DocumentListener {
@@ -218,16 +210,14 @@ class TabTitleEditListener extends MouseAdapter implements ChangeListener, Docum
     protected Boolean listen = true;
     protected Dimension dim;
     protected Component tabComponent;
-    protected Boolean isRenamesucc = false;
+    protected Boolean isRenameOk = false;
-    protected LoadConfigFile loadfile = new LoadConfigFile();
+    protected SetConfig setConfig = new SetConfig();
-    protected LoadRule lr = new LoadRule(loadfile.getConfigPath());
-    protected SetRuleConfig setRuleConfig = new SetRuleConfig();
     protected final Action startEditing = new AbstractAction() {
         @Override public void actionPerformed(ActionEvent e) {
             editingIdx = tabbedPane.getSelectedIndex();
             tabComponent = tabbedPane.getTabComponentAt(editingIdx);
             tabbedPane.setTabComponentAt(editingIdx, editor);
-            isRenamesucc = true;
+            isRenameOk = true;
             editor.setVisible(true);
             editor.setText(tabbedPane.getTitleAt(editingIdx));
             editor.selectAll();
@@ -241,9 +231,9 @@ class TabTitleEditListener extends MouseAdapter implements ChangeListener, Docum
         @Override public void actionPerformed(ActionEvent e) {
             String title = editor.getText().trim();
             if (editingIdx >= 0 && !title.isEmpty()) {
-                String oldname = tabbedPane.getTitleAt(editingIdx);
+                String oldName = tabbedPane.getTitleAt(editingIdx);
                 tabbedPane.setTitleAt(editingIdx, title);
-                setRuleConfig.rename(oldname,title);
+                setConfig.rename(oldName,title);
             }
             cancelEditing.actionPerformed(null);
         }
@@ -284,7 +274,7 @@ class TabTitleEditListener extends MouseAdapter implements ChangeListener, Docum
     @Override public void stateChanged(ChangeEvent e) {
         if (e.getSource() instanceof JTabbedPane && listen) {
             JTabbedPane pane = (JTabbedPane) e.getSource();
-                    if (!isRenamesucc){
+            if (!isRenameOk){
                 if (pane.getSelectedIndex() == pane.getComponentCount()-1){
                     newTab();
                 }
@@ -298,9 +288,9 @@ class TabTitleEditListener extends MouseAdapter implements ChangeListener, Docum
     }
     public void newTab(){
         Object[][] data = new Object[][]{{false, "New Name", "(New Regex)", "gray", "any", "nfa"}};
-        insertTab(tabbedPane,setRuleConfig.newRules(),data);
+        insertTab(tabbedPane, setConfig.newRules(),data);
     }
-    public void insertTab(@NotNull JTabbedPane pane,String title,Object[][] 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());

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

@@ -1,6 +1,6 @@
 package burp.ui;
 
-import burp.yaml.SetRuleConfig;
+import burp.yaml.SetConfig;
 
 import javax.swing.*;
 import javax.swing.event.TableModelEvent;
@@ -12,7 +12,7 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.Vector;
 
-/*
+/**
  * @author LinChen
  */
 
@@ -20,10 +20,10 @@ public class RulePane extends JPanel {
     public RulePane(Object[][] data, JTabbedPane pane) {
         initComponents(data, pane);
     }
-    private SetRuleConfig setruleconfig = new SetRuleConfig();
+    private SetConfig setConfig = new SetConfig();
     private Boolean isEdit = false;
-    private void RuleAddMouseClicked(MouseEvent e, JTabbedPane pane) {
+
-        // TODO add your code here
+    private void ruleAddMouseClicked(MouseEvent e, JTabbedPane pane) {
         RuleSetting add = new RuleSetting();
         int isOk = JOptionPane.showConfirmDialog(null, add, "RuleSetting - Add Rule", JOptionPane.OK_OPTION);
         if(isOk == 0){
@@ -35,60 +35,60 @@ public class RulePane extends JPanel {
             data.add(add.ScopeSelect.getSelectedItem().toString());
             data.add(add.EngineSelect.getSelectedItem().toString());
             model.insertRow(model.getRowCount(), data);
-            model = (DefaultTableModel) table.getModel();
+            model = (DefaultTableModel) jTable.getModel();
-            setruleconfig.add(data,pane.getTitleAt(pane.getSelectedIndex()));
+            setConfig.add(data, pane.getTitleAt(pane.getSelectedIndex()));
         }
     }
 
-    private void RuleEditMouseClicked(MouseEvent e,JTabbedPane pane){
+    private void ruleEditMouseClicked(MouseEvent e, JTabbedPane pane){
-        if (table.getSelectedRowCount()>=1){
+        if (jTable.getSelectedRowCount() >= 1){
             RuleSetting edit = new RuleSetting();
-            edit.Name.setText(table.getValueAt(table.getSelectedRow(),1).toString());
+            edit.Name.setText(jTable.getValueAt(jTable.getSelectedRow(), 1).toString());
-            edit.Regex.setText(table.getValueAt(table.getSelectedRow(),2).toString());
+            edit.Regex.setText(jTable.getValueAt(jTable.getSelectedRow(), 2).toString());
-            edit.ColorSelect.setSelectedItem(table.getValueAt(table.getSelectedRow(),3).toString());
+            edit.ColorSelect.setSelectedItem(jTable.getValueAt(jTable.getSelectedRow(), 3).toString());
-            edit.ScopeSelect.setSelectedItem(table.getValueAt(table.getSelectedRow(),4).toString());
+            edit.ScopeSelect.setSelectedItem(jTable.getValueAt(jTable.getSelectedRow(), 4).toString());
-            edit.EngineSelect.setSelectedItem(table.getValueAt(table.getSelectedRow(),5).toString());
+            edit.EngineSelect.setSelectedItem(jTable.getValueAt(jTable.getSelectedRow(), 5).toString());
             int isOk = JOptionPane.showConfirmDialog(null, edit, "RuleSetting - Edit Rule", JOptionPane.OK_OPTION);
             if (isOk == 0){
-                int select = table.convertRowIndexToModel(table.getSelectedRow());
+                int select = jTable.convertRowIndexToModel(jTable.getSelectedRow());
                 model.setValueAt(edit.Name.getText(), select, 1);
                 model.setValueAt(edit.Regex.getText(), select, 2);
                 model.setValueAt(edit.ColorSelect.getSelectedItem().toString(), select, 3);
                 model.setValueAt(edit.ScopeSelect.getSelectedItem().toString(), select, 4);
                 model.setValueAt(edit.EngineSelect.getSelectedItem().toString(), select, 5);
-                model = (DefaultTableModel) table.getModel();
+                model = (DefaultTableModel) jTable.getModel();
-                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 RuleRemoveMouseClicked(MouseEvent e,JTabbedPane pane){
+    private void ruleRemoveMouseClicked(MouseEvent e, JTabbedPane pane){
-        if (table.getSelectedRowCount()>=1){
+        if (jTable.getSelectedRowCount() >= 1){
             int isOk = JOptionPane.showConfirmDialog(null, "Are your sure?", "RuleSetting - Delete Rule", JOptionPane.OK_OPTION);
             if (isOk == 0){
-                int select = table.convertRowIndexToModel(table.getSelectedRow());
+                int select = jTable.convertRowIndexToModel(jTable.getSelectedRow());
                 model.removeRow(select);
-                model = (DefaultTableModel) table.getModel();
+                model = (DefaultTableModel) jTable.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 && jTable.getSelectedRow() != -1 && !isEdit){
-            model = (DefaultTableModel) table.getModel();
+            model = (DefaultTableModel) jTable.getModel();
-            int select = table.convertRowIndexToModel(table.getSelectedRow());
+            int select = jTable.convertRowIndexToModel(jTable.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) {
         // 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();
+        jTable = new JTable();
-        Remove = new JButton();
+        removeButton = new JButton();
 
         //======== this ========
         setLayout(new GridBagLayout());
@@ -97,87 +97,95 @@ 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() {
+
+        addButton.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent e) {
                 isEdit = true;
-                RuleAddMouseClicked(e,pane);
+                ruleAddMouseClicked(e, pane);
-                model = (DefaultTableModel) table.getModel();
+                model = (DefaultTableModel) jTable.getModel();
                 isEdit = false;
             }
         });
-        add(RuleAdd, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
+
+        add(addButton, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, 
             GridBagConstraints.CENTER, GridBagConstraints.BOTH, 
             new Insets(15, 5, 3, 2), 0, 0));
 
-        //---- RuleEdit ----
+        //---- editButton ----
-        RuleEdit.setText("Edit");
+        editButton.setText("Edit");
-        RuleEdit.addMouseListener(new MouseAdapter() {
+        editButton.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent e) {
                 isEdit = true;
-                RuleEditMouseClicked(e,pane);
+                ruleEditMouseClicked(e, pane);
-                model = (DefaultTableModel) table.getModel();
+                model = (DefaultTableModel) jTable.getModel();
                 isEdit = false;
             }
         });
-        add(RuleEdit, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0,
+
+        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);
+            jTable.setShowVerticalLines(false);
-            table.setVerifyInputWhenFocusTarget(false);
+            jTable.setVerifyInputWhenFocusTarget(false);
-            table.setUpdateSelectionOnSort(false);
+            jTable.setUpdateSelectionOnSort(false);
-            table.setShowHorizontalLines(false);
+            jTable.setShowHorizontalLines(false);
-            table.setModel(new DefaultTableModel());
+            jTable.setModel(new DefaultTableModel());
-            table.setSurrendersFocusOnKeystroke(true);
+            jTable.setSurrendersFocusOnKeystroke(true);
-            scrollPane.setViewportView(table);
+            scrollPane.setViewportView(jTable);
         }
+
         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 ----
+        //---- removeButton ----
-        Remove.setText("Remove");
+        removeButton.setText("Remove");
-        Remove.addMouseListener(new MouseAdapter() {
+
+        removeButton.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent e) {
                 isEdit = true;
-                RuleRemoveMouseClicked(e,pane);
+                ruleRemoveMouseClicked(e, pane);
-                model = (DefaultTableModel) table.getModel();
+                model = (DefaultTableModel) jTable.getModel();
                 isEdit = false;
             }
         });
-        add(Remove, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0,
+
+        add(removeButton, new GridBagConstraints(0, 2, 1, 1, 0.0, 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);
+        jTable.setModel(model);
         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));
+
+        jTable.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 jTable;
-    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 DefaultTableModel model = new DefaultTableModel() {
+        @Override
         public Class<?> getColumnClass (int column){
             if (column == 0) {
                 return Boolean.class;
@@ -185,12 +193,10 @@ public class RulePane extends JPanel {
                 return String.class;
             }
         }
+
+        @Override
         public boolean isCellEditable(int row, int column){
-            if (column ==0){
+            return column == 0;
-                return true;
-            }else {
-                return false;
-            }
         }
     };
 }

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

@@ -4,7 +4,7 @@ import javax.swing.*;
 import java.awt.*;
 import burp.Config;
 
-/*
+/**
  * @author LinChen
  */
 

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

@@ -0,0 +1,165 @@
+package burp.yaml;
+
+import burp.Config;
+import burp.yaml.template.*;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ArrayList;
+
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.Constructor;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.representer.Representer;
+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 final String ConfigPath = "Config.yml";
+
+    public LoadConfig() {
+        // 构造函数，初始化配置
+        File yamlSetting = new File(SettingPath);
+        if (!(yamlSetting.exists() && yamlSetting.isFile())) {
+            initSetting();
+            initRules();
+        }
+        Config.ruleConfig = LoadConfig.getRules();
+    }
+
+    // 初始化设置信息
+    public void initSetting() {
+        Map<String, Object> r = new HashMap<>();
+        r.put("configPath", ConfigPath);
+        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 initRules() {
+        Rule rule = new Rule();
+        rule.setLoaded(true);
+        rule.setName("Email");
+        rule.setColor("yellow");
+        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,}))");
+        Rules rules = new Rules();
+        rules.setType("Basic Information");
+        ArrayList<Rule> rl = new ArrayList<>();
+        rl.add(rule);
+        rules.setRule(rl);
+        ArrayList<Rules> rls = new ArrayList<>();
+        rls.add(rules);
+        RulesConfig config = new RulesConfig();
+        config.setRules(rls);
+
+        DumperOptions dop = new DumperOptions();
+        dop.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+        Representer representer = new Representer();
+        representer.addClassTag(Config.class, Tag.MAP);
+
+        Yaml yaml = new Yaml(new Constructor(),representer,dop);
+        File f = new File(ConfigPath);
+        try{
+            Writer ws = new OutputStreamWriter(new FileOutputStream(f), StandardCharsets.UTF_8);
+            yaml.dump(config,ws);
+        }catch (Exception ex){
+            ex.printStackTrace();
+        }
+    }
+
+    // 获取配置路径
+    public static String getConfigPath(){
+        try {
+            InputStream inorder = new FileInputStream(SettingPath);
+            Map<String,Object> r = yaml.load(inorder);
+            return r.get("configPath").toString();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+            return ConfigPath;
+        }
+
+    }
+
+    // 获取不包含的后缀名
+    public String getExcludeSuffix(){
+        String excludeSuffix = "";
+        File yamlSetting = new File(SettingPath);
+        if (yamlSetting.exists() && yamlSetting.isFile()) {
+            try {
+                InputStream inorder = new FileInputStream(SettingPath);
+                Map<String,Object> r = yaml.load(inorder);
+                excludeSuffix = r.get("excludeSuffix").toString();
+            } catch (Exception e) {
+                // e.printStackTrace();
+                excludeSuffix = "";
+            }
+        } else {
+            excludeSuffix = Config.excludeSuffix;
+        }
+        return excludeSuffix;
+    }
+
+    // 获取规则配置
+    public static Map<String,Object[][]> getRules(){
+        InputStream inorder = null;
+        {
+            try {
+                inorder = new FileInputStream(getConfigPath());
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+            }
+        }
+        Yaml yaml = new Yaml(new Constructor(RulesConfig.class));
+        RulesConfig rulesConfig = yaml.loadAs(inorder, RulesConfig.class);
+        Map<String,Object[][]> resRule = new HashMap<>();
+        rulesConfig.rules.forEach(i->{
+            ArrayList<Object[]> data = new ArrayList<>();
+            i.rule.forEach(j->{
+                try {
+                    data.add(j.getRuleObject());
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+            });
+            resRule.put(i.getType(), data.toArray(new Object[data.size()][]));
+        });
+        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){
+        Map<String,Object> r = new HashMap<>();
+        r.put("configPath", getConfigPath());
+        r.put("excludeSuffix", excludeSuffix);
+        try{
+            Writer ws = new OutputStreamWriter(new FileOutputStream(SettingPath), StandardCharsets.UTF_8);
+            yaml.dump(r, ws);
+        }catch (Exception ex){
+            ex.printStackTrace();
+        }
+    }
+
+}

src/main/java/burp/yaml/LoadConfigFile.java

@@ -1,89 +0,0 @@
-package burp.yaml;
-
-import org.jetbrains.annotations.NotNull;
-import org.yaml.snakeyaml.Yaml;
-
-import burp.Config;
-
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
-
-/*
- * @author LinChen
- */
-
-public class LoadConfigFile {
-    private static final Yaml yaml = new Yaml();
-    private static final String SettingPath = "Setting.yml";
-    private static final String ConfigPath = "Config.yml";
-
-    public LoadConfigFile(){
-        init();
-    }
-
-    // 初始化配置
-    public void init(){
-        File yamlSetting = new File(SettingPath);
-        if (!(yamlSetting.exists() && yamlSetting.isFile())) {
-            Map<String,Object> r = new HashMap<>();
-            r.put("configPath", ConfigPath);
-            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 String getExcludeSuffix(){
-        try {
-            InputStream inorder = new FileInputStream(SettingPath);
-            Map<String,Object> r;
-            r = yaml.load(inorder);
-            return r.get("excludeSuffix").toString();
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-            return Config.excludeSuffix;
-        }
-    }
-
-    public static String getConfigPath(){
-        try {
-            InputStream inorder = new FileInputStream(SettingPath);
-            Map<String,Object> r;
-            r = yaml.load(inorder);
-            return r.get("configPath").toString();
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-            return ConfigPath;
-        }
-    }
-
-    public void setExcludeSuffix(@NotNull String excludeSuffix){
-        Map<String,Object> r = new HashMap<>();
-        r.put("excludeSuffix", excludeSuffix);
-        r.put("configPath", getConfigPath());
-        try{
-            Writer ws = new OutputStreamWriter(new FileOutputStream(SettingPath), StandardCharsets.UTF_8);
-            yaml.dump(r, ws);
-        }catch (Exception ex){
-            ex.printStackTrace();
-        }
-    }
-
-    public void setConfigPath(@NotNull 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();
-        }
-    }
-}

src/main/java/burp/yaml/LoadRule.java

@@ -1,89 +0,0 @@
-package burp.yaml;
-
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.constructor.Constructor;
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.representer.Representer;
-import org.yaml.snakeyaml.nodes.Tag;
-
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-/*
- * @author LinChen
- */
-
-public class LoadRule {
-    private static String filePath = "Config.yml";
-    public LoadRule(String configFile){
-        filePath = configFile;
-        init();
-    }
-
-    // 初始化配置
-    public void init(){
-        File yamlFile = new File(filePath);
-        if (!(yamlFile.exists() && yamlFile.isFile())){
-            Rule rule = new Rule();
-            rule.setLoaded(true);
-            rule.setName("Email");
-            rule.setColor("yellow");
-            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,}))");
-            Rules rules = new Rules();
-            rules.setType("Basic Information");
-            ArrayList<Rule> rl = new ArrayList<>();
-            rl.add(rule);
-            rules.setRule(rl);
-            ArrayList<Rules> rls = new ArrayList<>();
-            rls.add(rules);
-            Config config = new Config();
-            config.setRules(rls);
-
-            DumperOptions dop = new DumperOptions();
-            dop.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-            Representer representer = new Representer();
-            representer.addClassTag(Config.class, Tag.MAP);
-
-            Yaml yaml = new Yaml(new Constructor(),representer,dop);
-            new LoadConfigFile();
-            File f = new File(LoadConfigFile.getConfigPath());
-            try{
-                Writer ws = new OutputStreamWriter(new FileOutputStream(f), StandardCharsets.UTF_8);
-                yaml.dump(config,ws);
-            }catch (Exception ex){
-                ex.printStackTrace();
-            }
-        }
-    }
-
-    public static Map<String,Object[][]> getConfig(){
-        InputStream inorder = null;
-        {
-            try {
-                inorder = new FileInputStream(filePath);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-            }
-        }
-        Yaml yaml = new Yaml(new Constructor(Config.class));
-        Config plugin = yaml.loadAs(inorder, Config.class);
-        Map<String,Object[][]> config = new HashMap<>();
-        plugin.rules.forEach(i->{
-            ArrayList<Object[]> data = new ArrayList<>();
-            i.rule.forEach(j->{
-                try {
-                    data.add(j.getRuleObject());
-                }catch (Exception e){
-                    e.printStackTrace();
-                }
-            });
-            config.put(i.getType(), data.toArray(new Object[data.size()][]));
-        });
-        return config;
-    }
-}

src/main/java/burp/yaml/RulesConfig.java

@@ -1,18 +1,11 @@
 package burp.yaml;
 
 import java.util.List;
+import burp.yaml.template.Rules;
 
-/*
+public class RulesConfig {
- * @author LinChen
- */
-
-public class Config {
     public List<Rules> rules;
 
-    public List<Rules> getRules() {
-        return rules;
-    }
-
     public void setRules(List<Rules> rules) {
         this.rules = rules;
     }

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

@@ -0,0 +1,100 @@
+package burp.yaml;
+
+import burp.Config;
+import burp.yaml.template.Rule;
+import burp.yaml.template.Rules;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.Constructor;
+import org.yaml.snakeyaml.nodes.Tag;
+import org.yaml.snakeyaml.representer.Representer;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+
+public class SetConfig {
+
+    public void format() {
+        DumperOptions dop = new DumperOptions();
+        dop.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+        Representer representer = new Representer();
+        representer.addClassTag(RulesConfig.class, Tag.MAP);
+        Yaml yaml = new Yaml(new Constructor(), representer, dop);
+        RulesConfig con = new RulesConfig();
+        List<Rules> rls = new ArrayList<>();
+
+        Config.ruleConfig.keySet().forEach(i->
+        {
+            Rules rlsTmp = new Rules();
+            rlsTmp.setType(i);
+            List<Rule> rl = new ArrayList<>();
+            for (Object[] objects : Config.ruleConfig.get(i)) {
+                Rule rlTmp = new Rule();
+                rlTmp.setName((String) objects[1]);
+                rlTmp.setLoaded((Boolean) objects[0]);
+                rlTmp.setRegex((String) objects[2]);
+                rlTmp.setColor((String) objects[3]);
+                rlTmp.setScope((String) objects[4]);
+                rlTmp.setEngine((String) objects[5]);
+                rl.add(rlTmp);
+            }
+            rlsTmp.setRule(rl);
+            rls.add(rlsTmp);
+        });
+        con.setRules(rls);
+        File f = new File(LoadConfig.getConfigPath());
+        try{
+            Writer ws = new OutputStreamWriter(new FileOutputStream(f), StandardCharsets.UTF_8);
+            yaml.dump(con,ws);
+        }catch (Exception ex){
+            ex.printStackTrace();
+        }
+    }
+
+    public void edit(Vector data, int select, String type) {
+        Config.ruleConfig.get(type)[select] = data.toArray();
+        this.format();
+    }
+
+    public void add(Vector data, String type) {
+        ArrayList<Object[]> x = new ArrayList<>(Arrays.asList(Config.ruleConfig.get(type)));
+        x.add(data.toArray());
+        Config.ruleConfig.put(type,x.toArray(new Object[x.size()][]));
+        this.format();
+    }
+    public void remove(int select,String type) {
+        ArrayList<Object[]> x = new ArrayList<>(Arrays.asList(Config.ruleConfig.get(type)));
+        x.remove(select);
+        Config.ruleConfig.put(type,x.toArray(new Object[x.size()][]));
+        this.format();
+    }
+
+    public void rename(String oldName, String newName) {
+        Config.ruleConfig.put(newName, Config.ruleConfig.remove(oldName));
+        this.format();
+    }
+
+    public void deleteRules(String Rules) {
+        Config.ruleConfig.remove(Rules);
+        this.format();
+    }
+    public String newRules() {
+        int i = 0;
+        String name = "New ";
+        Object[][] data = new Object[][]{
+                {
+                    false, "New Name", "(New Regex)", "gray", "any", "nfa"
+                }
+        };
+        while (Config.ruleConfig.containsKey(name + i)) {
+            i++;
+        }
+        Config.ruleConfig.put(name + i, data);
+        this.format();
+        return name + i;
+    }
+}

src/main/java/burp/yaml/SetRuleConfig.java

@@ -1,109 +0,0 @@
-package burp.yaml;
-
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.constructor.Constructor;
-import org.yaml.snakeyaml.nodes.Tag;
-import org.yaml.snakeyaml.representer.Representer;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.*;
-
-public class SetRuleConfig {
-    private static Yaml yaml;
-    private static LoadConfigFile loadfile;
-    private static LoadRule lr;
-    private Map<String,Object[][]> config = lr.getConfig();
-    public void format(){
-        DumperOptions dop = new DumperOptions();
-        dop.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-        Representer representer = new Representer();
-        representer.addClassTag(Config.class, Tag.MAP);
-        yaml = new Yaml(new Constructor(),representer,dop);
-        Config con = new Config();
-        List<Rules> rls = new ArrayList<>();
-
-        config.keySet().forEach(i->
-        {
-            Rules rlstmp = new Rules();
-            rlstmp.setType(i);
-            List<Rule> rl = new ArrayList<>();
-            for (Object[] objects : config.get(i)) {
-                Rule rltmp = new Rule();
-                rltmp.setName((String) objects[1]);
-                rltmp.setLoaded((Boolean) objects[0]);
-                rltmp.setRegex((String) objects[2]);
-                rltmp.setColor((String) objects[3]);
-                rltmp.setScope((String) objects[4]);
-                rltmp.setEngine((String) objects[5]);
-                rl.add(rltmp);
-            }
-            rlstmp.setRule(rl);
-            rls.add(rlstmp);
-        });
-        con.setRules(rls);
-        File f = new File(loadfile.getConfigPath());
-        try{
-            Writer ws = new OutputStreamWriter(new FileOutputStream(f),"UTF-8");
-            yaml.dump(con,ws);
-        }catch (Exception ex){
-            ex.printStackTrace();
-        }
-    }
-    public void edit(Vector data,int select, String type){
-        loadfile = new LoadConfigFile();
-        lr = new LoadRule(loadfile.getConfigPath());
-        config = lr.getConfig();
-        config.get(type)[select] = data.toArray();
-        this.format();
-    }
-    public void add(Vector data,String type){
-        loadfile = new LoadConfigFile();
-        lr = new LoadRule(loadfile.getConfigPath());
-        config = lr.getConfig();
-        ArrayList<Object[]> x = new ArrayList<Object[]>(Arrays.asList(config.get(type)));
-        x.add(data.toArray());
-        config.put(type,x.toArray(new Object[x.size()][]));
-        this.format();
-    }
-    public void remove(int select,String type){
-        loadfile = new LoadConfigFile();
-        lr = new LoadRule(loadfile.getConfigPath());
-        config = lr.getConfig();
-        ArrayList<Object[]> x = new ArrayList<Object[]>(Arrays.asList(config.get(type)));
-        x.remove(select);
-        config.put(type,x.toArray(new Object[x.size()][]));
-        this.format();
-    }
-    public void rename(String oldname,String newname){
-        loadfile = new LoadConfigFile();
-        lr = new LoadRule(loadfile.getConfigPath());
-        config = lr.getConfig();
-        config.put(newname,config.remove(oldname));
-        this.format();
-    }
-    public void deleteRules(String Rules){
-        loadfile = new LoadConfigFile();
-        lr = new LoadRule(loadfile.getConfigPath());
-        config = lr.getConfig();
-        config.remove(Rules);
-        this.format();
-    }
-    public String newRules(){
-        int i = 0;
-        loadfile = new LoadConfigFile();
-        lr = new LoadRule(loadfile.getConfigPath());
-        config = lr.getConfig();
-        String name = "New ";
-        Object[][] data = new Object[][]{{false, "New Name", "(New Regex)", "gray", "any", "nfa"}};
-        while (config.containsKey(name+i)){
-            i++;
-        }
-        config.put(name+i,data);
-        this.format();
-        return name+i;
-    }
-}

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

@@ -1,9 +1,9 @@
-package burp.yaml;
+package burp.yaml.template;
 
 import java.util.HashMap;
 import java.util.Map;
 
-/*
+/**
  * @author LinChen
  */
 
@@ -62,9 +62,11 @@ public class Rule {
     public void setScope(String scope) {
         this.Scope = scope;
     }
+
     public Object[] getRuleObject() {
         return new Object[] { Loaded, Name, Regex, Color, Scope, Engine };
     }
+
     public Map<String, Object> getRuleObjMap(){
         Map<String,Object> r = new HashMap<>();
         r.put("Loaded", Loaded);
@@ -75,6 +77,7 @@ public class Rule {
         r.put("Engine", Engine);
         return r;
     }
+
     public String toString() {
         return "{ \nLoaded: " + Loaded + "\nName: " + Name + "\nRegex: " + Regex + "\nColor: " + Color + "\nScope: " + Scope + "\nEngine: " + Engine + "\n}";
     }

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

@@ -1,8 +1,10 @@
-package burp.yaml;
+package burp.yaml.template;
+
+import burp.yaml.template.Rule;
 
 import java.util.List;
 
-/*
+/**
  * @author LinChen
  */