Version: 2.5.1 Update

gh0stkey · Oct 18, 2023 · 8b79c71 · 8b79c71
1 parent 9ea0e4b
commit 8b79c71
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/main/java/burp/BurpExtender.java b/src/main/java/burp/BurpExtender.java
@@ -126,7 +126,7 @@ public void processHttpMessage(int toolFlag, boolean messageIsRequest, IHttpRequ
                 String addComment = String.join(", ", result.get(1).get("comment"));
                 String allComment = !Objects.equals(originalComment, "") ? String.format("%s, %s", originalComment, addComment) : addComment;
                 resComment = mergeComment(allComment);
-                messageInfo.setComment(allComment);
+                messageInfo.setComment(resComment);
             }
 
             String endComment = resComment.isEmpty() ? originalComment : resComment;
@@ -139,19 +139,23 @@ public void processHttpMessage(int toolFlag, boolean messageIsRequest, IHttpRequ
     }
 
     private String mergeComment(String comment) {
+        if (!comment.contains(",")) {
+            return comment;
+        }
+
         Map<String, Integer> itemCounts = new HashMap<>();
         String[] items = comment.split(", ");
 
         for (String item : items) {
-            if (!item.contains("(") || !item.contains(")") || !item.contains(",")) {
-                // 没有括号的情况，直接返回原始Comment
-                itemCounts.put(item, 0);
-            } else {
+            if (item.contains("(") && item.contains(")")) {
                 int openParenIndex = item.lastIndexOf("(");
                 int closeParenIndex = item.lastIndexOf(")");
                 String itemName = item.substring(0, openParenIndex).trim();
                 int count = Integer.parseInt(item.substring(openParenIndex + 1, closeParenIndex).trim());
                 itemCounts.put(itemName, itemCounts.getOrDefault(itemName, 0) + count);
+            } else {
+                itemCounts.put(item, 0);
+                BurpExtender.stdout.println(String.format("%s: %s", "A", item));
             }
         }
 
@@ -160,9 +164,7 @@ private String mergeComment(String comment) {
         for (Map.Entry<String, Integer> entry : itemCounts.entrySet()) {
             String itemName = entry.getKey();
             int count = entry.getValue();
-            if (count == 0) {
-                mergedItems.append(itemName);
-            } else {
+            if (count != 0) {
                 mergedItems.append(itemName).append(" (").append(count).append("), ");
             }
         }