Version: 2.4.5 Update

gh0stkey · Dec 18, 2022 · df4496d · df4496d
1 parent 48e355a
commit df4496d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/burp/BurpExtender.java b/src/main/java/burp/BurpExtender.java
@@ -143,6 +143,7 @@ public void stateChanged(ChangeEvent arg0) {
         public boolean isEnabled(byte[] content, boolean isRequest) {
             String c = new String(content, StandardCharsets.UTF_8).intern();
             List<Map<String, String>> result = pm.processMessageByContent(helpers, content, isRequest, false, "");
+
             if (result != null && !result.isEmpty()) {
                 Map<String, String> dataMap = result.get(0);
                 if (isRequest) {

diff --git a/src/main/java/burp/Config.java b/src/main/java/burp/Config.java
@@ -13,6 +13,8 @@ public class Config {
 
     public static String[] scopeArray = new String[] {
             "any",
+            "any header",
+            "any body",
             "response",
             "response header",
             "response body",

diff --git a/src/main/java/burp/action/ExtractContent.java b/src/main/java/burp/action/ExtractContent.java
@@ -33,23 +33,25 @@ public Map<String, Map<String, Object>> matchRegex(byte[] content, String header
                 String engine = objects[5].toString();
                 boolean sensitive = (Boolean) objects[6];
                 // 判断规则是否开启与作用域
-                if (loaded && (scope.contains(scopeString) || "any".equals(scope))) {
+                if (loaded && (scope.contains(scopeString) || scope.contains("any"))) {
                     switch (scope) {
                         case "any":
                         case "request":
                         case "response":
                             matchContent = new String(content, StandardCharsets.UTF_8).intern();
                             break;
+                        case "any header":
                         case "request header":
                         case "response header":
                             matchContent = headers;
                             break;
+                        case "any body":
                         case "request body":
                         case "response body":
                             matchContent = new String(body, StandardCharsets.UTF_8).intern();
                             break;
                         default:
-                            break;
+                            return;
                     }
 
                     if ("nfa".equals(engine)) {

diff --git a/src/main/java/burp/action/ProcessMessage.java b/src/main/java/burp/action/ProcessMessage.java
@@ -1,5 +1,6 @@
 package burp.action;
 
+import burp.BurpExtender;
 import burp.IExtensionHelpers;
 import java.util.ArrayList;
 import java.util.Arrays;