admin/HaE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version: 2.4.7 Update

Browse Source
This commit is contained in:
gh0stkey
2023-09-28 01:23:36 +08:00
parent a69503ca3d
commit e698bb1caa
2 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/burp/action/ExtractContent.java
View File

@@ -89,6 +89,7 @@ public class ExtractContent {
result.clear(); result.clear();
result.addAll(tmpList); result.addAll(tmpList);
String nameAndSize = String.format("%s (%s)", name, result.size());
if (!result.isEmpty()) { if (!result.isEmpty()) {
tmpMap.put("color", color); tmpMap.put("color", color);
String dataStr = String.join("\n", result); String dataStr = String.join("\n", result);
@@ -97,40 +98,37 @@ public class ExtractContent {
// 添加到全局变量中，便于Databoard检索 // 添加到全局变量中，便于Databoard检索
if (!host.isEmpty()) { if (!host.isEmpty()) {
String[] splitHost = host.split("\\."); String[] splitHost = host.split("\\.");
String anyHost = splitHost.length > 2 ? host.replace(splitHost[0], "*") : ""; 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")); List<String> dataList = Arrays.asList(dataStr.split("\n"));
if (Config.globalDataMap.containsKey(host)) { if (Config.globalDataMap.containsKey(host)) {
Map<String, List<String>> gRuleMap = Config.globalDataMap.get(host); Map<String, List<String>> gRuleMap = new HashMap<>(Config.globalDataMap.get(host));
// 判断匹配规则是否存在（逻辑同Host判断）
if (gRuleMap.containsKey(name)) { if (gRuleMap.containsKey(name)) {
List<String> gDataList = gRuleMap.get(name); List<String> gDataList = gRuleMap.get(name);
List<String> mergeDataList = new ArrayList<>(gDataList); gDataList.addAll(dataList);
// 合并两个List gDataList = new ArrayList<>(new HashSet<>(gDataList));
mergeDataList.addAll(dataList); gRuleMap.replace(name, gDataList);
// 去重操作
tmpList = new HashSet(mergeDataList);
mergeDataList.clear();
mergeDataList.addAll(tmpList);
// 替换操作
gRuleMap.replace(name, gDataList, mergeDataList);
} else { } else {
gRuleMap.put(name, dataList); gRuleMap.put(name, dataList);
} }
} else if (!Config.globalDataMap.containsKey(anyHost) && !anyHost.isEmpty()) { Config.globalDataMap.remove(host);
// 添加通配符Host，实际数据从查询哪里将所有数据提取 Config.globalDataMap.put(host, gRuleMap);
Config.globalDataMap.put(anyHost, new HashMap<>());
} else if (!Config.globalDataMap.containsKey("*")) {
// 添加通配符全匹配Host，同上
Config.globalDataMap.put("*", new HashMap<>());
} else { } else {
Map<String, List<String>> ruleMap = new HashMap<>(); Map<String, List<String>> ruleMap = new HashMap<>();
ruleMap.put(name, dataList); ruleMap.put(name, dataList);
// 添加单一Host // 添加单一Host
Config.globalDataMap.put(host, ruleMap); 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); map.put(nameAndSize, tmpMap);
} }
} }
@@ -139,7 +137,7 @@ public class ExtractContent {
try { try {
t.join(); t.join();
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); BurpExtender.stdout.println(e);
} }

2
src/main/java/burp/ui/Databoard.java
View File

@@ -218,7 +218,7 @@ public class Databoard extends JPanel {
tabbedPane.removeAll(); tabbedPane.removeAll();
for(Map.Entry<String, List<String>> entry: selectHost.entrySet()){ 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()); textField.setText(hostComboBox.getSelectedItem().toString());
} }