Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
e1c05ba10d | ||
|
|
6a17064b3a | ||
|
|
e698bb1caa | ||
|
|
a69503ca3d |
Binary file not shown.
|
Before Width: | Height: | Size: 167 KiB After Width: | Height: | Size: 140 KiB |
@@ -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);
|
||||
});
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -89,45 +89,45 @@ public class ExtractContent {
|
||||
result.clear();
|
||||
result.addAll(tmpList);
|
||||
|
||||
String nameAndSize = String.format("%s (%s)", name, result.size());
|
||||
if (!result.isEmpty()) {
|
||||
tmpMap.put("color", color);
|
||||
String dataStr = String.join("\n", result);
|
||||
tmpMap.put("data", dataStr);
|
||||
map.put(nameAndSize, tmpMap);
|
||||
|
||||
// 添加到全局变量中，便于Databoard检索
|
||||
if (!host.isEmpty()) {
|
||||
String anyHost = host.replace(host.split("\\.")[0], "*");
|
||||
String[] splitHost = host.split("\\.");
|
||||
String anyHost = (splitHost.length > 2 && !host.matches("\\b(?:\\d{1,3}\\.){3}\\d{1,3}\\b")) ? host.replace(splitHost[0], "*") : "";
|
||||
List<String> dataList = Arrays.asList(dataStr.split("\n"));
|
||||
if (Config.globalDataMap.containsKey(host)) {
|
||||
Map<String, List<String>> gRuleMap = Config.globalDataMap.get(host);
|
||||
// 判断匹配规则是否存在（逻辑同Host判断）
|
||||
Map<String, List<String>> gRuleMap = new HashMap<>(Config.globalDataMap.get(host));
|
||||
if (gRuleMap.containsKey(name)) {
|
||||
List<String> gDataList = gRuleMap.get(name);
|
||||
List<String> mergeDataList = new ArrayList<>(gDataList);
|
||||
// 合并两个List
|
||||
mergeDataList.addAll(dataList);
|
||||
// 去重操作
|
||||
tmpList = new HashSet(mergeDataList);
|
||||
mergeDataList.clear();
|
||||
mergeDataList.addAll(tmpList);
|
||||
// 替换操作
|
||||
gRuleMap.replace(name, gDataList, mergeDataList);
|
||||
gDataList.addAll(dataList);
|
||||
gDataList = new ArrayList<>(new HashSet<>(gDataList));
|
||||
gRuleMap.replace(name, gDataList);
|
||||
} else {
|
||||
gRuleMap.put(name, dataList);
|
||||
}
|
||||
} else if (!Config.globalDataMap.containsKey(anyHost)) {
|
||||
// 添加通配符Host
|
||||
Config.globalDataMap.put(anyHost, new HashMap<>());
|
||||
Config.globalDataMap.remove(host);
|
||||
Config.globalDataMap.put(host, gRuleMap);
|
||||
} else {
|
||||
Map<String, List<String>> ruleMap = new HashMap<>();
|
||||
ruleMap.put(name, dataList);
|
||||
// 添加单一Host
|
||||
Config.globalDataMap.put(host, ruleMap);
|
||||
}
|
||||
|
||||
if (!Config.globalDataMap.containsKey(anyHost) && anyHost.length() > 0) {
|
||||
// 添加通配符Host，实际数据从查询哪里将所有数据提取
|
||||
Config.globalDataMap.put(anyHost, new HashMap<>());
|
||||
} else if (!Config.globalDataMap.containsKey("*")) {
|
||||
// 添加通配符全匹配，同上
|
||||
Config.globalDataMap.put("*", new HashMap<>());
|
||||
}
|
||||
}
|
||||
|
||||
map.put(name, tmpMap);
|
||||
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -135,7 +135,7 @@ public class ExtractContent {
|
||||
try {
|
||||
t.join();
|
||||
} catch (InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
BurpExtender.stdout.println(e);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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<String, Map<String, List<String>>> ruleMap = Config.globalDataMap;
|
||||
Map<String, List<String>> 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<String, List<String>> 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)) {
|
||||
// 合并操作
|
||||
@@ -220,7 +218,7 @@ public class Databoard extends JPanel {
|
||||
|
||||
tabbedPane.removeAll();
|
||||
for(Map.Entry<String, List<String>> entry: selectHost.entrySet()){
|
||||
tabbedPane.addTab(entry.getKey(), new JScrollPane(new HitRuleDataList(entry.getValue())));
|
||||
tabbedPane.addTab(String.format("%s (%s)", entry.getKey(), entry.getValue().size()), new JScrollPane(new HitRuleDataList(entry.getValue())));
|
||||
}
|
||||
textField.setText(hostComboBox.getSelectedItem().toString());
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user