Version: 2.2 Update

README.md

@@ -48,7 +48,7 @@ https://gh0st.cn/HaE/
 
 访问该地址，在`Proxy - HTTP History`中可以看见高亮请求，响应标签页中含有`MarkINFO`标签，其中将匹配到的信息提取了出来。
 
-![-w1047](images/16000720732854.jpg)
+![-w1047](images/16000720732854.png)
 
 
 ## 正则优化

src/main/java/burp/BurpExtender.java

@@ -3,6 +3,7 @@ package burp;
 import burp.action.*;
 import burp.ui.MainUI;
 
+import java.util.Map;
 import javax.swing.*;
 import java.awt.*;
 import java.nio.charset.StandardCharsets;
@@ -11,7 +12,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /*
- * @author EvilChen
+ * @author EvilChen & 0chencc
  */
 
 public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEditorTabFactory, ITab {
@@ -29,14 +30,13 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
         this.callbacks = callbacks;
         BurpExtender.helpers = callbacks.getHelpers();
 
-        String version = "2.1.3";
+        String version = "2.2";
         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);
 
@@ -74,7 +74,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
             }
 
             String c = new String(content, StandardCharsets.UTF_8).intern();
-            List<String> result = pm.processMessageByContent(helpers, content, messageIsRequest, true);
+            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();
@@ -82,31 +82,27 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
                 if (originalColor != null) {
                     colorList.add(originalColor);
                 }
-                colorList.add(result.get(0));
+                colorList.add(result.get(0).get("color"));
                 String color = uc.getEndColor(gck.getColorKeys(colorList));
 
                 messageInfo.setHighlight(color);
-                String addComment = String.join(", ", result.get(1));
+                String 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 final IMessageEditorController controller;
-        private byte[] extractRequestContent;
-        private byte[] extractResponseContent;
+        private Map<String, String> extractRequestMap;
+        private Map<String, String> extractResponseMap;
 
         public MarkInfoTab(IMessageEditorController controller, boolean editable) {
             this.controller = controller;
-            this.markInfoText = callbacks.createTextEditor();
-            this.markInfoText.setEditable(editable);
         }
 
         @Override
@@ -116,18 +112,19 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 
         @Override
         public Component getUiComponent() {
-            return this.markInfoText.getComponent();
+            return this.jTabbedPane;
         }
 
         @Override
         public boolean isEnabled(byte[] content, boolean isRequest) {
             String c = new String(content, StandardCharsets.UTF_8).intern();
-            List<String> result = pm.processMessageByContent(helpers, content, isRequest, false);
+            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) {
-                    this.extractRequestContent = result.get(0).getBytes();
+                    extractRequestMap = dataMap;
                 } else {
-                    this.extractResponseContent = result.get(0).getBytes();
+                    extractResponseMap = dataMap;
                 }
                 return true;
             }
@@ -141,12 +138,12 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 
         @Override
         public boolean isModified() {
-            return this.markInfoText.isTextModified();
+            return false;
         }
 
         @Override
         public byte[] getSelectedData() {
-            return this.markInfoText.getSelectedText();
+            return null;
         }
 
         /*
@@ -156,15 +153,29 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
         public void setMessage(byte[] content, boolean isRequest) {
             String c = new String(content, StandardCharsets.UTF_8).intern();
             if (content.length > 0) {
+                this.jTabbedPane.removeAll();
                 if (isRequest) {
-                    this.markInfoText.setText(this.extractRequestContent);
+                    makeTable(extractRequestMap);
                 } else {
-                    this.markInfoText.setText(this.extractResponseContent);
+                    makeTable(extractResponseMap);
                 }
             }
             this.currentMessage = content;
         }
+
+        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];
                 }
+                this.jTabbedPane.addTab(i, new JScrollPane(new JTable(data, new Object[] {"Information"})));
+            });
+        }
+    }
+
+
 
     @Override
     public IMessageEditorTab createNewInstance(IMessageEditorController controller, boolean editable) {

src/main/java/burp/Config.java

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

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

@@ -1,5 +1,6 @@
 package burp.action;
 
+import java.util.HashMap;
 import java.util.Map;
 import burp.Config;
 import java.util.ArrayList;
@@ -10,15 +11,14 @@ import java.util.List;
  */
 
 public class DoAction {
-    public String extractString(Map<String, Map<String, Object>> obj) {
-        String[] result = {""};
+    public Map<String, String> extractString(Map<String, Map<String, Object>> obj) {
+        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();
-            result[0] += tmpStr;
+            resultMap.put(i, String.format("%s\n", data).intern());
         });
-        return result[0];
+        return resultMap;
     }
 
     public List<List<String>> highlightAndComment(Map<String, Map<String, Object>> obj) {

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

@@ -3,6 +3,7 @@ package burp.action;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 
+import burp.Config;
 import burp.yaml.LoadConfig;
 import dk.brics.automaton.Automaton;
 import dk.brics.automaton.AutomatonMatcher;
@@ -19,10 +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<>(); // 最终返回的结果
-        Map<String,Object[][]> rules = LoadConfig.getRules();
-        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<>();
@@ -34,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":
@@ -49,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/ProcessMessage.java

@@ -5,6 +5,7 @@ import burp.IHttpService;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -15,8 +16,8 @@ public class ProcessMessage {
     GetColorKey gck = new GetColorKey();
     UpgradeColor uc = new UpgradeColor();
 
-    public List<String> processMessageByContent(IExtensionHelpers helpers, byte[] content, boolean isRequest, boolean messageInfo) {
-        List<String> result = new ArrayList<>();;
+    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) {
@@ -73,8 +74,14 @@ public class ProcessMessage {
             List<String> commentList = resultList.get(1);
             if (colorList.size() != 0 && commentList.size() != 0) {
                 String color = uc.getEndColor(gck.getColorKeys(colorList));
-                result.add(color);
-                result.add(String.join(", ", commentList));
+                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) {

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

@@ -1,5 +1,6 @@
 package burp.ui;
 
+import burp.Config;
 import burp.yaml.LoadConfig;
 import burp.yaml.SetConfig;
 
@@ -44,30 +45,26 @@ public class MainUI extends JPanel{
         selectFile.setFileSelectionMode(JFileChooser.FILES_ONLY);
         FileNameExtensionFilter filter = new FileNameExtensionFilter("Yaml File (.yml/.yaml)","yaml", "yml");
         selectFile.setFileFilter(filter);
-        int selectframe = selectFile.showDialog(new JLabel(),"Select");
-        if (selectframe == JFileChooser.APPROVE_OPTION){
-            String configpath = selectFile.getSelectedFile().toString();
-            reloadRule(configpath);
-            loadConn.setConfigPath(configpath);
-        }
-        configFilepathtext.setText(LoadConfig.getConfigPath());
+        int selectFrame = selectFile.showDialog(new JLabel(),"Select");
+        if (selectFrame == JFileChooser.APPROVE_OPTION){
+            String configPath = selectFile.getSelectedFile().toString();
             reloadRule();
+            loadConn.setConfigPath(configPath);
+            configFilepathtext.setText(configPath);
         }
-    private void reloadRule(String configFile){
-        tabbedPane1.removeAll();
-        Map<String,Object[][]> config = LoadConfig.getRules();
-        ruleSwitch.setListen(false);
-        config.keySet().forEach(i->tabbedPane1.addTab(i,new RulePane(config.get(i),tabbedPane1)));
-        tabbedPane1.addTab("...",new JLabel());
-        ruleSwitch.setListen(true);
     }
+
     private void reloadRule(){
         tabbedPane1.removeAll();
-        Map<String,Object[][]> config = LoadConfig.getRules();
         ruleSwitch.setListen(false);
-        config.keySet().forEach(i->tabbedPane1.addTab(i,new RulePane(config.get(i),tabbedPane1))
+        Map<String,Object[][]> rules = LoadConfig.getRules();
+        rules.keySet().forEach(
+                i->tabbedPane1.addTab(
+                        i,
+                        new RulePane(rules.get(i), tabbedPane1)
+                )
         );
-        tabbedPane1.addTab("...",new JLabel());
+        tabbedPane1.addTab("...", new JLabel());
         ruleSwitch.setListen(true);
     }
 
@@ -76,7 +73,6 @@ public class MainUI extends JPanel{
     }
 
     private void ESSaveMouseClicked(MouseEvent e) {
-        // TODO add your code here
         LoadConfig loadCon = new LoadConfig();
         loadCon.setExcludeSuffix(EStext.getText());
     }
@@ -175,8 +171,7 @@ public class MainUI extends JPanel{
                 new Insets(0, 0, 0, 0), 0, 0));
         // JFormDesigner - End of component initialization  //GEN-END:initComponents
 
-        Map<String,Object[][]> config = LoadConfig.getRules();
-        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());
 

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

@@ -23,7 +23,6 @@ public class RulePane extends JPanel {
     private SetConfig setruleconfig = new SetConfig();
     private Boolean isEdit = false;
     private void RuleAddMouseClicked(MouseEvent e, JTabbedPane pane) {
-        // TODO add your code here
         RuleSetting add = new RuleSetting();
         int isOk = JOptionPane.showConfirmDialog(null,add,"RuleSetting - Add Rule",JOptionPane.OK_OPTION);
         if(isOk == 0){
@@ -178,6 +177,7 @@ public class RulePane extends JPanel {
     // 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,6 +185,8 @@ public class RulePane extends JPanel {
                 return String.class;
             }
         }
+
+        @Override
         public boolean isCellEditable(int row,int column){
             if (column ==0){
                 return true;

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

@@ -27,6 +27,7 @@ public class LoadConfig {
             initSetting();
             initRules();
         }
+        Config.ruleConfig = LoadConfig.getRules();
     }
 
     // 初始化设置信息
@@ -91,14 +92,21 @@ public class LoadConfig {
 
     // 获取不包含的后缀名
     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);
-            return r.get("excludeSuffix").toString();
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-            return Config.excludeSuffix;
+                excludeSuffix = r.get("excludeSuffix").toString();
+            } catch (Exception e) {
+                // e.printStackTrace();
+                excludeSuffix = "";
             }
+        } else {
+            excludeSuffix = Config.excludeSuffix;
+        }
+        return excludeSuffix;
     }
 
     // 获取规则配置

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

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