diff --git a/src/main/java/burp/BurpExtender.java b/src/main/java/burp/BurpExtender.java index 39b1750..29da5ad 100644 --- a/src/main/java/burp/BurpExtender.java +++ b/src/main/java/burp/BurpExtender.java @@ -34,7 +34,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito this.callbacks = callbacks; BurpExtender.helpers = callbacks.getHelpers(); - String version = "2.4.6"; + String version = "2.4.7"; callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version)); // 定义输出 stdout = new PrintWriter(callbacks.getStdout(), true); @@ -209,7 +209,10 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito data[x][0] = extractData[x]; // stdout.println(extractData[x]); } - JScrollPane jScrollPane = new JScrollPane(new JTable(data, new Object[]{"Information"})); + JTable infoTable = new JTable(data, new Object[]{"Information"}); + infoTable.setAutoCreateRowSorter(true); + JScrollPane jScrollPane = new JScrollPane(infoTable); + lTitleList.add(i); this.jTabbedPane.addTab(i, jScrollPane); }); diff --git a/src/main/java/burp/Config.java b/src/main/java/burp/Config.java index b867494..03b6545 100644 --- a/src/main/java/burp/Config.java +++ b/src/main/java/burp/Config.java @@ -9,7 +9,7 @@ import java.util.List; 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"; + public static String excludeSuffix = "3g2|3gp|7z|aac|abw|aif|aifc|aiff|apk|arc|au|avi|azw|bat|bin|bmp|bz|bz2|cmd|cmx|cod|com|csh|css|csv|dll|doc|docx|ear|eot|epub|exe|flac|flv|gif|gz|ico|ics|ief|jar|jfif|jpe|jpeg|jpg|less|m3u|mid|midi|mjs|mkv|mov|mp2|mp3|mp4|mpa|mpe|mpeg|mpg|mpkg|mpp|mpv2|odp|ods|odt|oga|ogg|ogv|ogx|otf|pbm|pdf|pgm|png|pnm|ppm|ppt|pptx|ra|ram|rar|ras|rgb|rmi|rtf|scss|sh|snd|svg|swf|tar|tif|tiff|ttf|vsd|war|wav|weba|webm|webp|wmv|woff|woff2|xbm|xls|xlsx|xpm|xul|xwd|zip"; public static String[] scopeArray = new String[] { "any", diff --git a/src/main/java/burp/action/ExtractContent.java b/src/main/java/burp/action/ExtractContent.java index bd8f786..19f5c6c 100644 --- a/src/main/java/burp/action/ExtractContent.java +++ b/src/main/java/burp/action/ExtractContent.java @@ -96,7 +96,8 @@ public class ExtractContent { // 添加到全局变量中，便于Databoard检索 if (!host.isEmpty()) { - String anyHost = host.replace(host.split("\\.")[0], "*"); + String[] splitHost = host.split("\\."); + String anyHost = splitHost.length > 2 ? host.replace(splitHost[0], "*") : ""; List dataList = Arrays.asList(dataStr.split("\n")); if (Config.globalDataMap.containsKey(host)) { Map> gRuleMap = Config.globalDataMap.get(host); @@ -115,9 +116,12 @@ public class ExtractContent { } else { gRuleMap.put(name, dataList); } - } else if (!Config.globalDataMap.containsKey(anyHost)) { - // 添加通配符Host + } else if (!Config.globalDataMap.containsKey(anyHost) && !anyHost.isEmpty()) { + // 添加通配符Host，实际数据从查询哪里将所有数据提取 Config.globalDataMap.put(anyHost, new HashMap<>()); + } else if (!Config.globalDataMap.containsKey("*")) { + // 添加通配符全匹配Host，同上 + Config.globalDataMap.put("*", new HashMap<>()); } else { Map> ruleMap = new HashMap<>(); ruleMap.put(name, dataList); diff --git a/src/main/java/burp/action/ProcessMessage.java b/src/main/java/burp/action/ProcessMessage.java index cee4d8d..b9f6b57 100644 --- a/src/main/java/burp/action/ProcessMessage.java +++ b/src/main/java/burp/action/ProcessMessage.java @@ -38,7 +38,6 @@ public class ProcessMessage { return result; } - // 获取报文主体 int requestBodyOffset = helpers.analyzeRequest(content).getBodyOffset(); byte[] requestBody = Arrays.copyOfRange(content, requestBodyOffset, content.length); @@ -63,7 +62,6 @@ public class ProcessMessage { // 获取报文主体 int responseBodyOffset = helpers.analyzeResponse(content).getBodyOffset(); byte[] responseBody = Arrays.copyOfRange(content, responseBodyOffset, content.length); - obj = ec.matchRegex(content, responseHeaders, responseBody, "response", host); } diff --git a/src/main/java/burp/ui/Databoard.java b/src/main/java/burp/ui/Databoard.java index d00dde5..1d0df0a 100644 --- a/src/main/java/burp/ui/Databoard.java +++ b/src/main/java/burp/ui/Databoard.java @@ -30,13 +30,11 @@ public class Databoard extends JPanel { private void clearActionPerformed(ActionEvent e) { // 清空页面 dataTabbedPane.removeAll(); - // 判断通配符Host/单一Host String host = hostTextField.getText(); - if(host.contains("*")){ + if (host.contains("*")) { Map>> ruleMap = Config.globalDataMap; - Map> selectHost = new HashMap<>(); ruleMap.keySet().forEach(i -> { - if (i.contains(host.replace("*.", ""))) { + if (i.contains(host.replace("*.", "")) || host.equals("*")) { Config.globalDataMap.remove(i); } }); @@ -196,7 +194,7 @@ public class Databoard extends JPanel { // 通配符数据 Map> finalSelectHost = selectHost; ruleMap.keySet().forEach(i -> { - if (i.contains(host.replace("*.", ""))) { + if (i.contains(host.replace("*.", "")) || host.equals("*")) { ruleMap.get(i).keySet().forEach(e -> { if (finalSelectHost.containsKey(e)) { // 合并操作 @@ -244,6 +242,7 @@ class HitRuleDataList extends JTable { data[x][0] = list.get(x); } model.setDataVector(data, new Object[]{"Information"}); + this.setAutoCreateRowSorter(true); this.setModel(model); } }