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

@@ -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,15 +3,18 @@ package burp;
 import burp.action.*;
 import burp.ui.MainUI;
 
+import java.util.Map;
 import javax.swing.*;
 import java.awt.*;
 import java.nio.charset.StandardCharsets;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 
 /*
- * @author EvilChen
+ * @author EvilChen & 0chencc
  */
 
 public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEditorTabFactory, ITab {
@@ -29,14 +32,13 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
         this.callbacks = callbacks;
         BurpExtender.helpers = callbacks.getHelpers();
 
-        String version = "2.1.4";
+        String version = "2.2.1";
         callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
         // 定义输出
         stdout = new PrintWriter(callbacks.getStdout(), true);
         stdout.println("@Core Author: EvilChen");
         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 +76,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 +84,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 byte[] currentMessage;
+        private final JTabbedPane jTabbedPane = new JTabbedPane();
+        private JTable jTable = new JTable();
         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 +114,25 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 
         @Override
         public Component getUiComponent() {
-            return this.markInfoText.getComponent();
+            jTabbedPane.addChangeListener(new ChangeListener() {
+                @Override
+                public void stateChanged(ChangeEvent arg0) {
+                    jTable = (JTable) ((JScrollPane)jTabbedPane.getSelectedComponent()).getViewport().getView();
+                }
+            });
+            return this.jTabbedPane;
         }
 
         @Override
         public boolean isEnabled(byte[] content, boolean isRequest) {
             String c = new String(content, StandardCharsets.UTF_8).intern();
-            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;
             }
@@ -136,17 +141,22 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 
         @Override
         public byte[] getMessage() {
-            return this.currentMessage;
+            return null;
         }
 
         @Override
         public boolean isModified() {
-            return this.markInfoText.isTextModified();
+            return false;
         }
 
         @Override
         public byte[] getSelectedData() {
-            return this.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());
         }
 
         /*
@@ -157,15 +167,29 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
             String c = new String(content, StandardCharsets.UTF_8).intern();
             if (content.length > 0) {
                 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) {
+            this.jTabbedPane.removeAll();
+            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) {
         return new MarkInfoTab(controller, editable);

src/main/java/burp/Config.java

@@ -25,7 +25,6 @@ public class Config {
             "dfa"
     };
 
-    public static String outputTplString = "[%s]\n%s\n\n";
 
     public static String[] colorArray = new String[] {
             "red",
@@ -39,5 +38,5 @@ public class Config {
             "gray"
     };
 
-    public static Map<String,Object[][]> ruleConfig = LoadConfig.getRules();
+    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/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

@@ -45,23 +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();
+        int selectFrame = selectFile.showDialog(new JLabel(),"Select");
+        if (selectFrame == JFileChooser.APPROVE_OPTION){
+            String configPath = selectFile.getSelectedFile().toString();
             reloadRule();
-            loadConn.setConfigPath(configpath);
+            loadConn.setConfigPath(configPath);
+            configFilepathtext.setText(configPath);
         }
-        configFilepathtext.setText(LoadConfig.getConfigPath());
-        reloadRule();
     }
 
     private void reloadRule(){
         tabbedPane1.removeAll();
         ruleSwitch.setListen(false);
         Map<String,Object[][]> rules = LoadConfig.getRules();
-        rules.keySet().forEach(i->tabbedPane1.addTab(i,new RulePane(Config.ruleConfig.get(i),tabbedPane1))
+        rules.keySet().forEach(
+                i->tabbedPane1.addTab(
+                        i,
+                        new RulePane(rules.get(i), tabbedPane1)
+                )
         );
-        tabbedPane1.addTab("...",new JLabel());
+        tabbedPane1.addTab("...", new JLabel());
         ruleSwitch.setListen(true);
     }
 

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(){
-        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;
+        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;
     }
 
     // 获取规则配置