Version: 2.1.4 Update

src/main/java/burp/BurpExtender.java

@@ -29,23 +29,26 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
         this.callbacks = callbacks;
         BurpExtender.helpers = callbacks.getHelpers();
 
-        String version = "2.1.1";
+        String version = "2.1.4";
         callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
         // 定义输出
         stdout = new PrintWriter(callbacks.getStdout(), true);
         stdout.println("@Core Author: EvilChen");
-        stdout.println("@UI Author: 0chencc");
+        stdout.println("@Architecture Author: 0chencc");
         stdout.println("@Github: https://github.com/gh0stkey/HaE");
+        stdout.println("@Team: OverSpace Security Team");
         // UI
         SwingUtilities.invokeLater(this::initialize);
 
         callbacks.registerHttpListener(BurpExtender.this);
         callbacks.registerMessageEditorTabFactory(BurpExtender.this);
     }
+
     private void initialize(){
         callbacks.customizeUiComponent(main);
         callbacks.addSuiteTab(BurpExtender.this);
     }
+
     @Override
     public String getTabCaption(){
         return "HaE";
@@ -69,8 +72,9 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
             } else {
                 content = messageInfo.getResponse();
             }
+
             String c = new String(content, StandardCharsets.UTF_8).intern();
-            List<String> result = pm.processMessageByContent(helpers, messageInfo.getHttpService(), content, messageIsRequest, true);
+            List<String> result = pm.processMessageByContent(helpers, content, messageIsRequest, true);
             if (result != null && !result.isEmpty() && result.size() > 0) {
                 String originalColor = messageInfo.getHighlight();
                 String originalComment = messageInfo.getComment();
@@ -91,6 +95,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 
     }
 
+
     class MarkInfoTab implements IMessageEditorTab {
         private final ITextEditor markInfoText;
         private byte[] currentMessage;
@@ -100,8 +105,8 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 
         public MarkInfoTab(IMessageEditorController controller, boolean editable) {
             this.controller = controller;
-            markInfoText = callbacks.createTextEditor();
-            markInfoText.setEditable(editable);
+            this.markInfoText = callbacks.createTextEditor();
+            this.markInfoText.setEditable(editable);
         }
 
         @Override
@@ -111,40 +116,37 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 
         @Override
         public Component getUiComponent() {
-            return markInfoText.getComponent();
+            return this.markInfoText.getComponent();
         }
 
         @Override
         public boolean isEnabled(byte[] content, boolean isRequest) {
             String c = new String(content, StandardCharsets.UTF_8).intern();
-            List<String> result = pm.processMessageByContent(helpers, controller.getHttpService(), content, isRequest, false);
-
+            List<String> result = pm.processMessageByContent(helpers, content, isRequest, false);
             if (result != null && !result.isEmpty()) {
                 if (isRequest) {
-                    extractRequestContent = result.get(0).getBytes();
+                    this.extractRequestContent = result.get(0).getBytes();
                 } else {
-                    extractResponseContent = result.get(0).getBytes();
+                    this.extractResponseContent = result.get(0).getBytes();
                 }
                 return true;
             }
-
             return false;
-
         }
 
         @Override
         public byte[] getMessage() {
-            return currentMessage;
+            return this.currentMessage;
         }
 
         @Override
         public boolean isModified() {
-            return markInfoText.isTextModified();
+            return this.markInfoText.isTextModified();
         }
 
         @Override
         public byte[] getSelectedData() {
-            return markInfoText.getSelectedText();
+            return this.markInfoText.getSelectedText();
         }
 
         /*
@@ -155,12 +157,12 @@ 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);
+                    this.markInfoText.setText(this.extractRequestContent);
                 } else {
-                    markInfoText.setText(extractResponseContent);
+                    this.markInfoText.setText(this.extractResponseContent);
                 }
             }
-            currentMessage = content;
+            this.currentMessage = content;
         }
     }
 

src/main/java/burp/Config.java

@@ -4,6 +4,9 @@ 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";
 
@@ -35,4 +38,6 @@ public class Config {
             "magenta",
             "gray"
     };
+
+    public static Map<String,Object[][]> ruleConfig = LoadConfig.getRules();
 }

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,9 +12,6 @@ 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());
-        Map<String,Object[][]> rules = LoadRule.getConfig();
-        rules.keySet().forEach(i -> {
+        Config.ruleConfig.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/MatchHTTP.java

@@ -3,7 +3,7 @@ package burp.action;
 import jregex.Matcher;
 import jregex.Pattern;
 import jregex.REFlags;
-import burp.yaml.LoadConfigFile;
+import burp.yaml.LoadConfig;
 
 /*
  * @author EvilChen
@@ -11,7 +11,7 @@ import burp.yaml.LoadConfigFile;
 
 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

@@ -15,14 +15,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<String> processMessageByContent(IExtensionHelpers helpers, byte[] content, boolean isRequest, boolean messageInfo) {
         List<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,12 +37,10 @@ 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");

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

@@ -60,10 +60,8 @@ public class JTabbedPaneCloseButton extends JTabbedPane {
 
     /* 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);
@@ -79,7 +77,7 @@ public class JTabbedPaneCloseButton extends JTabbedPane {
     /* 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.yaml.LoadConfigFile;
-import burp.yaml.LoadRule;
-import burp.yaml.SetRuleConfig;
+import burp.Config;
+import burp.yaml.LoadConfig;
+import burp.yaml.SetConfig;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -20,19 +19,21 @@ import java.util.Map;
  */
 
 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();
-                setruleconfig.deleteRules(tabbedPane1.getTitleAt(tabbedPane1.getSelectedIndex()));
+                SetConfig setConn = new SetConfig();
+                setConn.deleteRules(tabbedPane1.getTitleAt(tabbedPane1.getSelectedIndex()));
                 tabbedPane1.remove(tabbedPane1.getSelectedIndex());
                 tabbedPane1.setSelectedIndex(tabbedPane1.getSelectedIndex()-1);
             }else{
-                SetRuleConfig setruleconfig = new SetRuleConfig();
-                setruleconfig.deleteRules(tabbedPane1.getTitleAt(tabbedPane1.getSelectedIndex()));
+                SetConfig setConn = new SetConfig();
+                setConn.deleteRules(tabbedPane1.getTitleAt(tabbedPane1.getSelectedIndex()));
                 tabbedPane1.remove(tabbedPane1.getSelectedIndex());
                 tabbedPane1.setSelectedIndex(tabbedPane1.getSelectedIndex());
             }
@@ -40,33 +41,25 @@ public class MainUI extends JPanel{
     }
 
     private void SelectFileMouseClicked(MouseEvent e) {
-        JFileChooser chooseconfig = new JFileChooser();
-        chooseconfig.setFileSelectionMode(JFileChooser.FILES_ONLY);
+        JFileChooser selectFile = new JFileChooser();
+        selectFile.setFileSelectionMode(JFileChooser.FILES_ONLY);
         FileNameExtensionFilter filter = new FileNameExtensionFilter("Yaml File (.yml/.yaml)","yaml", "yml");
-        chooseconfig.setFileFilter(filter);
-        int selectframe = chooseconfig.showDialog(new JLabel(),"Select");
+        selectFile.setFileFilter(filter);
+        int selectframe = selectFile.showDialog(new JLabel(),"Select");
         if (selectframe == JFileChooser.APPROVE_OPTION){
-            String configpath = chooseconfig.getSelectedFile().toString();
-            reloadRule(configpath);
-            loadfile.setConfigPath(configpath);
+            String configpath = selectFile.getSelectedFile().toString();
+            reloadRule();
+            loadConn.setConfigPath(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);
+        configFilepathtext.setText(LoadConfig.getConfigPath());
+        reloadRule();
     }
+
     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(Config.ruleConfig.get(i),tabbedPane1))
         );
         tabbedPane1.addTab("...",new JLabel());
         ruleSwitch.setListen(true);
@@ -75,16 +68,16 @@ public class MainUI extends JPanel{
     private void reloadMouseClicked(MouseEvent e) {
         reloadRule();
     }
+
     private void ESSaveMouseClicked(MouseEvent e) {
-        // TODO add your code here
-        LoadConfigFile lcf = new LoadConfigFile();
-        lcf.setExcludeSuffix(EStext.getText());
+        LoadConfig loadCon = new LoadConfig();
+        loadCon.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 +104,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.setEditable(false);
-                panel3.add(configfilepathtext, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0,
+                //---- configFilepathtext ----
+                configFilepathtext.setEditable(false);
+                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 +168,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());
-        Map<String,Object[][]> config = loadRule.getConfig();
-        config.keySet().forEach(i->tabbedPane1.addTab(i,new RulePane(config.get(i),tabbedPane1)));
+        Config.ruleConfig.keySet().forEach(i->tabbedPane1.addTab(i,new RulePane(Config.ruleConfig.get(i),tabbedPane1)));
 
         tabbedPane1.addTab("...",new JLabel());
 
         //TabTitleEditListener ruleSwitch = new TabTitleEditListener(tabbedPane1);
-        configfilepathtext.setText(loadfile.getConfigPath());
-        LoadConfigFile lcf =new LoadConfigFile();
-        EStext.setText(lcf.getExcludeSuffix());
+        configFilepathtext.setText(LoadConfig.getConfigPath());
+        EStext.setText(loadConn.getExcludeSuffix());
         ruleSwitch = new TabTitleEditListener(tabbedPane1);
         tabbedPane1.addChangeListener(ruleSwitch);
         tabbedPane1.addMouseListener(ruleSwitch);
@@ -196,7 +186,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 +197,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 +207,14 @@ class TabTitleEditListener extends MouseAdapter implements ChangeListener, Docum
     protected Boolean listen = true;
     protected Dimension dim;
     protected Component tabComponent;
-    protected Boolean isRenamesucc = false;
-    protected LoadConfigFile loadfile = new LoadConfigFile();
-    protected LoadRule lr = new LoadRule(loadfile.getConfigPath());
-    protected SetRuleConfig setRuleConfig = new SetRuleConfig();
+    protected Boolean isRenameOk = false;
+    protected SetConfig setConfig = new SetConfig();
     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 +228,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);
         }
@@ -280,12 +267,12 @@ class TabTitleEditListener extends MouseAdapter implements ChangeListener, Docum
         editor.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) {
-                    JTabbedPane pane = (JTabbedPane) e.getSource();
-                    if (!isRenamesucc){
-                        if (pane.getSelectedIndex() == pane.getComponentCount()-1){
+    }
+    @Override public void stateChanged(ChangeEvent e) {
+        if (e.getSource() instanceof JTabbedPane && listen) {
+            JTabbedPane pane = (JTabbedPane) e.getSource();
+            if (!isRenameOk){
+                if (pane.getSelectedIndex() == pane.getComponentCount()-1){
                     newTab();
                 }
             }else{
@@ -298,9 +285,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;
@@ -20,7 +20,7 @@ public class RulePane extends JPanel {
     public RulePane(Object[][] data,JTabbedPane pane) {
         initComponents(data,pane);
     }
-    private SetRuleConfig setruleconfig = new SetRuleConfig();
+    private SetConfig setruleconfig = new SetConfig();
     private Boolean isEdit = false;
     private void RuleAddMouseClicked(MouseEvent e, JTabbedPane pane) {
         // TODO add your code here

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

@@ -0,0 +1,157 @@
+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();
+        }
+    }
+
+    // 初始化设置信息
+    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(){
+        try {
+            InputStream inorder = new FileInputStream(SettingPath);
+            Map<String,Object> r = yaml.load(inorder);
+            return r.get("excludeSuffix").toString();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+            return Config.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;
 
-/*
- * @author LinChen
- */
-
-public class Config {
+public class RulesConfig {
     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,4 +1,4 @@
-package burp.yaml;
+package burp.yaml.template;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -62,20 +62,23 @@ public class Rule {
     public void setScope(String scope) {
         this.Scope = scope;
     }
-    public Object[] getRuleObject(){
-        return new Object[]{Loaded, Name, Regex, Color, Scope, Engine};
+
+    public Object[] getRuleObject() {
+        return new Object[] { Loaded, Name, Regex, Color, Scope, Engine };
     }
-    public Map<String,Object> getRuleObjMap(){
+
+    public Map<String, Object> getRuleObjMap(){
         Map<String,Object> r = new HashMap<>();
-        r.put("Loaded",Loaded);
-        r.put("Name",Name);
-        r.put("Regex",Regex);
-        r.put("Color",Color);
-        r.put("Scope",Scope);
-        r.put("Engine",Engine);
+        r.put("Loaded", Loaded);
+        r.put("Name", Name);
+        r.put("Regex", Regex);
+        r.put("Color", Color);
+        r.put("Scope", Scope);
+        r.put("Engine", Engine);
         return r;
     }
-    public String toString(){
-        return "{ \nLoaded: "+Loaded+"\nName: "+Name+"\nRegex: "+Regex+"\nColor: "+Color+"\nScope: "+Scope+"\nEngine: "+Engine+"\n}";
+
+    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,4 +1,6 @@
-package burp.yaml;
+package burp.yaml.template;
+
+import burp.yaml.template.Rule;
 
 import java.util.List;