Version: 2.0.6 Update

close #18
感谢#18 问题已经修复

README.md

@@ -25,8 +25,6 @@ https://gh0st.cn/HaE/
 
 初次装载`HaE`会初始化配置文件，默认配置文件内置一个正则: `Email`，初始化的配置文件会放在与`BurpSuite Jar`包同级目录下。
 
-![-w330](images/16000708493657.jpg)
-
 除了初始化的配置文件外，还有`Setting.yml`，该文件用于存储配置文件路径；`HaE`支持自定义配置文件路径，你可以通过点击`Select File`按钮进行选择自定义配置文件。
 
 ![-w477](images/16000710069404.jpg)
@@ -82,13 +80,16 @@ https://gh0st.cn/HaE/
 
 ...还有诸多使用方法等待大家去发掘。
 
-## 使用视频
-
-123
-
 ## 文末
 
 随笔: 正义感是一个不可丢失的东西。
 
 Github项目地址（BUG、需求、正则欢迎提交）: https://github.com/gh0stkey/HaE
 
+## 404StarLink 2.0 - Galaxy
+
+![404StarLink Logo](https://github.com/knownsec/404StarLink-Project/raw/master/logo.png)
+
+`HaE` 是 404Team [星链计划2.0](https://github.com/knownsec/404StarLink2.0-Galaxy) 中的一环，如果对 `HaE` 有任何疑问又或是想要找小伙伴交流，可以参考星链计划的加群方式。
+
+- [https://github.com/knownsec/404StarLink2.0-Galaxy#community](https://github.com/knownsec/404StarLink2.0-Galaxy#community)

src/main/java/burp/BurpExtender.java

@@ -33,7 +33,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
         this.callbacks = callbacks;
         BurpExtender.helpers = callbacks.getHelpers();
 
-        String version = "2.0";
+        String version = "2.0.6";
         callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
         // 定义输出
         stdout = new PrintWriter(callbacks.getStdout(), true);
@@ -73,18 +73,8 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
         // 判断是否是响应，且该代码作用域为：REPEATER、INTRUDER、PROXY（分别对应toolFlag 64、32、4）
         if (toolFlag == 64 || toolFlag == 32 || toolFlag == 4) {
             Map<String, Map<String, Object>> obj;
-            byte[] content = messageInfo.getRequest();
-            // 获取报文头
-            List<String> tmpHeaders = helpers.analyzeRequest(messageInfo.getHttpService(), content).getHeaders();
-            String headers = String.join("\n", tmpHeaders);
-
-            // 获取报文主体
-            int bodyOffset = helpers.analyzeRequest(messageInfo.getHttpService(), content).getBodyOffset();
-            byte[] byteRequest = messageInfo.getRequest();
-            byte[] body = Arrays.copyOfRange(byteRequest, bodyOffset, byteRequest.length);
-
             // 流量清洗
-            String urlString = helpers.analyzeRequest(messageInfo.getHttpService(), content).getUrl().toString();
+            String urlString = helpers.analyzeRequest(messageInfo.getHttpService(), messageInfo.getRequest()).getUrl().toString();
             urlString = urlString.indexOf("?") > 0 ? urlString.substring(0, urlString.indexOf("?")) : urlString;
 
             // 正则判断
@@ -93,10 +83,28 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
             }
 
             if (messageIsRequest) {
-                obj = ec.matchRegex(content, headers, body, "request");
+                byte[] byteRequest = 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 {
-                content = messageInfo.getResponse();
+                byte[] byteResponse = messageInfo.getResponse();
-                obj = ec.matchRegex(content, headers, body, "response");
+
+                // 获取报文头
+                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);
@@ -133,6 +141,9 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 
         @Override
         public boolean isEnabled(byte[] content, boolean isRequest) {
+            Map<String, Map<String, Object>> obj;
+
+            if (isRequest) {
                 try {
                     // 流量清洗
                     String urlString = helpers.analyzeRequest(controller.getHttpService(), controller.getRequest()).getUrl().toString();
@@ -144,26 +155,32 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
                 } catch (Exception e) {
                     return false;
                 }
+                IRequestInfo iRequestInfo = helpers.analyzeRequest(controller.getHttpService(), content);
 
                 // 获取报文头
-            List<String> tmpHeaders = helpers.analyzeRequest(controller.getHttpService(), content).getHeaders();
+                List<String> requestTmpHeaders = iRequestInfo.getHeaders();
-            String headers = String.join("\n", tmpHeaders);
+                String requestHeaders = String.join("\n", requestTmpHeaders);
                 // 获取报文主体
-            int bodyOffset = helpers.analyzeRequest(controller.getHttpService(), content).getBodyOffset();
+                int requestBodyOffset = iRequestInfo.getBodyOffset();
-            byte[] byteRequest = controller.getRequest();
+                byte[] requestBody = Arrays.copyOfRange(content, requestBodyOffset, content.length);
-            byte[] body = Arrays.copyOfRange(byteRequest, bodyOffset, byteRequest.length);
 
-            Map<String, Map<String, Object>> obj;
+                obj = ec.matchRegex(content, requestHeaders, requestBody, "request");
-            if (isRequest) {
+                if (obj.size() > 0) {
-                obj = ec.matchRegex(content, headers, body, "request");
-                if (obj.size() != 0) {
                     String result = da.extractString(obj);
                     extractRequestContent = result.getBytes();
                     return true;
                 }
             } else {
-                obj = ec.matchRegex(content, headers, body, "response");
+                IResponseInfo iResponseInfo = helpers.analyzeResponse(content);
-                if (obj.size() != 0) {
+                // 获取报文头
+                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;

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

@@ -28,7 +28,7 @@ public class ExtractContent {
             String matchContent = "";
             for (Object[] objects : rules.get(i)) {
                 // 遍历获取规则
-                List<String> result = new ArrayList<String>();
+                List<String> result = new ArrayList<>();
                 Map<String, Object> tmpMap = new HashMap<>();
 
                 String name = objects[1].toString();
@@ -38,7 +38,7 @@ public class ExtractContent {
                 String scope = objects[4].toString();
                 String engine = objects[5].toString();
                 // 判断规则是否开启与作用域
-                if (loaded && (scopeString.contains(scope) || scope.equals("any"))) {
+                if (loaded && (scope.contains(scopeString) || scope.equals("any"))) {
                     switch (scope) {
                         case "any":
                         case "request":

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

@@ -221,7 +221,7 @@ class TabTitleEditListener extends MouseAdapter implements ChangeListener, Docum
     protected Boolean isRenamesucc = false;
     protected LoadConfigFile loadfile = new LoadConfigFile();
     protected LoadRule lr = new LoadRule(loadfile.getConfigPath());
-    protected SetRuleConfig setruleconfig = new SetRuleConfig();
+    protected SetRuleConfig setRuleConfig = new SetRuleConfig();
     protected final Action startEditing = new AbstractAction() {
         @Override public void actionPerformed(ActionEvent e) {
             editingIdx = tabbedPane.getSelectedIndex();
@@ -243,7 +243,7 @@ class TabTitleEditListener extends MouseAdapter implements ChangeListener, Docum
             if (editingIdx >= 0 && !title.isEmpty()) {
                 String oldname = tabbedPane.getTitleAt(editingIdx);
                 tabbedPane.setTitleAt(editingIdx, title);
-                setruleconfig.rename(oldname,title);
+                setRuleConfig.rename(oldname,title);
             }
             cancelEditing.actionPerformed(null);
         }
@@ -298,7 +298,7 @@ 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,setRuleConfig.newRules(),data);
     }
     public void insertTab(@NotNull JTabbedPane pane,String title,Object[][] data){
         pane.addTab(title,new RulePane(data,pane));

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

@@ -27,18 +27,19 @@ public class RulePane extends JPanel {
         RuleSetting add = new RuleSetting();
         int isOk = JOptionPane.showConfirmDialog(null,add,"RuleSetting - Add Rule",JOptionPane.OK_OPTION);
         if(isOk == 0){
-            model.addRow(new Object[0]);
+            Vector data = new Vector();
-            model.setValueAt(false,(model.getRowCount()-1),0);
+            data.add(false);
-            model.setValueAt(add.Name.getText(),(model.getRowCount()-1),1);
+            data.add(add.Name.getText());
-            model.setValueAt(add.Regex.getText(),(model.getRowCount()-1),2);
+            data.add(add.Regex.getText());
-            model.setValueAt(add.ColorSelect.getSelectedItem().toString(),(model.getRowCount()-1),3);
+            data.add(add.ColorSelect.getSelectedItem().toString());
-            model.setValueAt(add.ScopeSelect.getSelectedItem().toString(),(model.getRowCount()-1),4);
+            data.add(add.ScopeSelect.getSelectedItem().toString());
-            model.setValueAt(add.EngineSelect.getSelectedItem().toString(),(model.getRowCount()-1),5);
+            data.add(add.EngineSelect.getSelectedItem().toString());
+            model.insertRow(model.getRowCount(),data);
             model = (DefaultTableModel) table.getModel();
-            int select = table.convertRowIndexToModel(table.getSelectedRow());
+            setruleconfig.add(data,pane.getTitleAt(pane.getSelectedIndex()));
-            setruleconfig.add((Vector) model.getDataVector().get(select),pane.getTitleAt(pane.getSelectedIndex()));
         }
     }
+
     private void RuleEditMouseClicked(MouseEvent e,JTabbedPane pane){
         if (table.getSelectedRowCount()>=1){
             RuleSetting edit = new RuleSetting();
@@ -60,18 +61,19 @@ public class RulePane extends JPanel {
             }
         }
     }
+
     private void RuleRemoveMouseClicked(MouseEvent e,JTabbedPane pane){
         if (table.getSelectedRowCount()>=1){
             int isOk = JOptionPane.showConfirmDialog(null,"Are your sure?","RuleSetting - Delete Rule",JOptionPane.OK_OPTION);
             if (isOk==0){
-                model.removeRow(table.convertRowIndexToModel(table.getSelectedRow()));
-                table.remove(table.getSelectedRow());
-                model = (DefaultTableModel) table.getModel();
                 int select = table.convertRowIndexToModel(table.getSelectedRow());
+                model.removeRow(select);
+                model = (DefaultTableModel) table.getModel();
                 setruleconfig.remove(select,pane.getTitleAt(pane.getSelectedIndex()));
             }
         }
     }
+
     private void RuleTableChange(TableModelEvent e,JTabbedPane pane) {
         if (e.getColumn()==0&&table.getSelectedRow()!=-1&&!isEdit){
             model = (DefaultTableModel) table.getModel();

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

@@ -23,7 +23,7 @@ public class RuleSetting extends JPanel {
         Name = new JTextField();
         ScopeSelect = new JComboBox<>();
         EngineSelect = new JComboBox<>();
-        label7 = new JLabel();
+        label6 = new JLabel();
         ColorSelect = new JComboBox<>();
 
         //======== this ========
@@ -32,24 +32,24 @@ public class RuleSetting extends JPanel {
         //---- label5 ----
         label5.setText("Engine:");
         add(label5);
-        label5.setBounds(10, 175, 50, 17);
+        label5.setBounds(new Rectangle(new Point(10, 175), label5.getPreferredSize()));
 
         //---- label4 ----
         label4.setText("Scope:");
         add(label4);
-        label4.setBounds(10, 135, 50, 17);
+        label4.setBounds(new Rectangle(new Point(10, 135), label4.getPreferredSize()));
         add(Regex);
         Regex.setBounds(70, 50, 265, 30);
 
         //---- label3 ----
         label3.setText("Regex:");
         add(label3);
-        label3.setBounds(10, 55, 50, 17);
+        label3.setBounds(new Rectangle(new Point(10, 55), label3.getPreferredSize()));
 
         //---- label2 ----
         label2.setText("Name:");
         add(label2);
-        label2.setBounds(10, 15, 50, 17);
+        label2.setBounds(new Rectangle(new Point(10, 15), label2.getPreferredSize()));
         add(Name);
         Name.setBounds(70, 10, 265, 30);
 
@@ -64,9 +64,9 @@ public class RuleSetting extends JPanel {
         EngineSelect.setBounds(70, 170, 265, EngineSelect.getPreferredSize().height);
 
         //---- label7 ----
-        label7.setText("Color:");
+        label6.setText("Color:");
-        add(label7);
+        add(label6);
-        label7.setBounds(new Rectangle(new Point(10, 95), label7.getPreferredSize()));
+        label6.setBounds(new Rectangle(new Point(10, 95), label6.getPreferredSize()));
 
         //---- ColorSelect ----
         ColorSelect.setModel(new DefaultComboBoxModel<>(Config.colorArray));
@@ -99,7 +99,7 @@ public class RuleSetting extends JPanel {
     public JTextField Name;
     public JComboBox<String> ScopeSelect;
     public JComboBox<String> EngineSelect;
-    private JLabel label7;
+    private JLabel label6;
     public JComboBox<String> ColorSelect;
     // JFormDesigner - End of variables declaration  //GEN-END:variables
 }

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

@@ -18,8 +18,8 @@ import java.util.Map;
 public class LoadRule {
     private static String filePath = "Config.yml";
     public LoadRule(String configfile){
-        init();
         filePath = configfile;
+        init();
     }
 
     // 初始化配置

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

@@ -14,20 +14,10 @@ public class Rule {
     private String Color;
     private String Engine;
     private String Scope;
-    private String Action;
 
     public Boolean getLoaded() {
         return Loaded;
     }
-
-    public void setLoaded(Boolean loaded) {
-        this.Loaded = loaded;
-    }
-
-    public String getAction() {
-        return Action;
-    }
-
     public String getColor() {
         return Color;
     }
@@ -48,6 +38,11 @@ public class Rule {
         return Scope;
     }
 
+    public void setLoaded(Boolean loaded) {
+        this.Loaded = loaded;
+    }
+
+
     public void setColor(String color) {
         this.Color = color;
     }

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

@@ -98,7 +98,7 @@ public class SetRuleConfig {
         lr = new LoadRule(loadfile.getConfigPath());
         config = lr.getConfig();
         String name = "New ";
-        Object[][] data = new Object[][]{{false,"newName","newRegex","gray","any","nfa"}};
+        Object[][] data = new Object[][]{{false, "New Name", "(New Regex)", "gray", "any", "nfa"}};
         while (config.containsKey(name+i)){
             i++;
         }