Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
AnonymousUser committed Dec 18, 2022
1 parent b784aa1 commit 48e355a
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 30 deletions.
Binary file modified images/databoard.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions src/main/java/burp/BurpExtender.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public void registerExtenderCallbacks(final IBurpExtenderCallbacks callbacks)
this.callbacks = callbacks;
BurpExtender.helpers = callbacks.getHelpers();

String version = "2.4.4";
String version = "2.4.5";
callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
// 定义输出
stdout = new PrintWriter(callbacks.getStdout(), true);
Expand Down Expand Up @@ -104,7 +104,6 @@ public void processHttpMessage(int toolFlag, boolean messageIsRequest, IHttpRequ
messageInfo.setHighlight(color);

String addComment = String.join(", ", result.get(1).get("comment"));
stdout.println(addComment);
String resComment = !Objects.equals(originalComment, "") ? String.format("%s, %s", originalComment, addComment) : addComment;

messageInfo.setComment(resComment);
Expand Down
12 changes: 9 additions & 3 deletions src/main/java/burp/action/ExtractContent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,16 @@ public Map<String, Map<String, Object>> matchRegex(byte[] content, String header
map.keySet().forEach(i -> {
Map<String, Object> tmpMap = map.get(i);
List<String> dataList = Arrays.asList(tmpMap.get("data").toString().split("\n"));
// 组合通配符Host
String anyHost = host.replace(host.split("\\.")[0], "*");
// 判断Host是否存在，如存在则进行数据更新，反之则新增数据
if (Config.globalDataMap.containsKey(host)) {
Map<String, List<String>> gRuleMap = Config.globalDataMap.get(host);
// 判断匹配规则是否存在（逻辑同Host判断）
if (gRuleMap.containsKey(i)) {
List<String> gDataList = gRuleMap.get(i);
List<String> mergeDataList = new ArrayList<>();
List<String> mergeDataList = new ArrayList<>(gDataList);
// 合并两个List
mergeDataList.addAll(gDataList);
mergeDataList.addAll(dataList);
// 去重操作
HashSet tmpList = new HashSet(mergeDataList);
Expand All @@ -118,9 +119,14 @@ public Map<String, Map<String, Object>> matchRegex(byte[] content, String header
} else {
gRuleMap.put(i, dataList);
}
} else {
} else if (!Config.globalDataMap.containsKey(anyHost)) {
// 添加通配符Host
Config.globalDataMap.put(anyHost, new HashMap<>());
}
else {
Map<String, List<String>> ruleMap = new HashMap<>();
ruleMap.put(i, dataList);
// 添加单一Host
Config.globalDataMap.put(host, ruleMap);
}
});
Expand Down
68 changes: 61 additions & 7 deletions src/main/java/burp/ui/Databoard.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package burp.ui;

import burp.Config;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import javax.swing.table.DefaultTableModel;
import org.jetbrains.annotations.NotNull;
Expand All @@ -14,19 +16,41 @@
import javax.swing.event.DocumentListener;

/**
* @author LinChen
* @author LinChen && EvilChen
*/

public class Databoard extends JPanel {
public Databoard() {
initComponents();
}

/**
* 清空数据
*/
private void clearActionPerformed(ActionEvent e) {
// 清空页面
dataTabbedPane.removeAll();
// 判断通配符Host/单一Host
String host = hostTextField.getText();
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("*.", ""))) {
Config.globalDataMap.remove(i);
}
});
} else {
Config.globalDataMap.remove(host);
}
}

private void initComponents() {
// JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents
hostLabel = new JLabel();
hostTextField = new JTextField();
dataTabbedPane = new JTabbedPane();
clearButton = new JButton();

//======== this ========
setLayout(new GridBagLayout());
Expand All @@ -43,7 +67,11 @@ private void initComponents() {
add(hostTextField, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0,
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
new Insets(8, 0, 5, 5), 0, 0));

clearButton.setText("Clear");
clearButton.addActionListener(this::clearActionPerformed);
add(clearButton, new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0,
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
new Insets(8, 0, 5, 5), 0, 0));
add(dataTabbedPane, new GridBagConstraints(1, 1, 3, 2, 0.0, 0.0,
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
new Insets(8, 0, 0, 5), 0, 0));
Expand All @@ -56,9 +84,7 @@ private void initComponents() {
*/
private static List<String> getHostByList(){
List<String> hostList = new ArrayList<>();
Config.globalDataMap.keySet().forEach(i -> {
hostList.add(i);
});
hostList.addAll(Config.globalDataMap.keySet());
return hostList;
}

Expand Down Expand Up @@ -164,9 +190,36 @@ private void updateList() {
private static void getInfoByHost(@NotNull JComboBox hostComboBox, JTabbedPane tabbedPane, JTextField textField) {
if (hostComboBox.getSelectedItem() != null) {
Map<String, Map<String, List<String>>> ruleMap = Config.globalDataMap;
Map<String, List<String>> selectUrl = ruleMap.get(hostComboBox.getSelectedItem());
Map<String, List<String>> selectHost = new HashMap<>();
String host = hostComboBox.getSelectedItem().toString();
if (host.contains("*")) {
// 通配符数据
Map<String, List<String>> finalSelectHost = selectHost;
ruleMap.keySet().forEach(i -> {
if (i.contains(host.replace("*.", ""))) {
ruleMap.get(i).keySet().forEach(e -> {
if (finalSelectHost.containsKey(e)) {
// 合并操作
List<String> newList = new ArrayList<>(finalSelectHost.get(e));
newList.addAll(ruleMap.get(i).get(e));
// 去重操作
HashSet tmpList = new HashSet(newList);
newList.clear();
newList.addAll(tmpList);
// 添加操作
finalSelectHost.put(e, newList);
} else {
finalSelectHost.put(e, ruleMap.get(i).get(e));
}
});
}
});
} else {
selectHost = ruleMap.get(host);
}

tabbedPane.removeAll();
for(Map.Entry<String, List<String>> entry: selectUrl.entrySet()){
for(Map.Entry<String, List<String>> entry: selectHost.entrySet()){
tabbedPane.addTab(entry.getKey(), new JScrollPane(new HitRuleDataList(entry.getValue())));
}
textField.setText(hostComboBox.getSelectedItem().toString());
Expand All @@ -177,6 +230,7 @@ private static void getInfoByHost(@NotNull JComboBox hostComboBox, JTabbedPane t
private JLabel hostLabel;
private JTextField hostTextField;
private JTabbedPane dataTabbedPane;
private JButton clearButton;
// JFormDesigner - End of variables declaration //GEN-END:variables

// 是否自动匹配Host
Expand Down
41 changes: 23 additions & 18 deletions src/main/java/burp/ui/MainUI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import java.util.Map;

/**
* @author LinChen
* @author LinChen && EvilChen
*/

public class MainUI extends JPanel{
Expand All @@ -45,24 +45,29 @@ public void closeTabActionPerformed(ActionEvent e){
}

private void onlineUpdateActionPerformed(ActionEvent e) {
String url = "https://raw.githubusercontent.com/gh0stkey/HaE/gh-pages/Config.yml";
OkHttpClient httpClient = new OkHttpClient();
Request httpRequest = new Request.Builder().url(url).get().build();
try {
Response httpResponse = httpClient.newCall(httpRequest).execute();
// 获取官方规则文件，在线更新写入
String configFile = configTextField.getText();
FileOutputStream fileOutputStream = new FileOutputStream(configFile);
fileOutputStream.write(httpResponse.body().bytes());
JOptionPane.showMessageDialog(null, "Config file updated successfully!", "Error",
JOptionPane.INFORMATION_MESSAGE);
} catch (Exception ignored) {
JOptionPane.showMessageDialog(null, "Please check your network!", "Error",
JOptionPane.ERROR_MESSAGE);
}
// 添加提示框防止用户误触导致配置更新
int retCode = JOptionPane.showConfirmDialog(null, "Do you want to update config?", "Info",
JOptionPane.YES_NO_CANCEL_OPTION);
if (retCode == JOptionPane.YES_OPTION) {
String url = "https://raw.githubusercontent.com/gh0stkey/HaE/gh-pages/Config.yml";
OkHttpClient httpClient = new OkHttpClient();
Request httpRequest = new Request.Builder().url(url).get().build();
try {
Response httpResponse = httpClient.newCall(httpRequest).execute();
// 获取官方规则文件，在线更新写入
String configFile = configTextField.getText();
FileOutputStream fileOutputStream = new FileOutputStream(configFile);
fileOutputStream.write(httpResponse.body().bytes());
JOptionPane.showMessageDialog(null, "Config file updated successfully!", "Error",
JOptionPane.INFORMATION_MESSAGE);
} catch (Exception ignored) {
JOptionPane.showMessageDialog(null, "Please check your network!", "Error",
JOptionPane.ERROR_MESSAGE);
}

new LoadConfig();
reloadRule();
new LoadConfig();
reloadRule();
}
}

private void reloadRule(){
Expand Down

0 comments on commit 48e355a

Please sign in to comment.