Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
df4496d4fd | ||
|
|
48e355ac54 | ||
|
|
b784aa1425 | ||
|
|
440b3b1504 | ||
|
|
a8f1798c7b | ||
|
|
225ee471ec | ||
|
|
5097124867 | ||
|
|
7e0e3054be | ||
|
|
17a84fc19e | ||
|
|
1573d563eb | ||
|
|
515f7b33f0 | ||
|
|
1dc510d576 |
10
README.md
10
README.md
@@ -7,13 +7,11 @@
|
|||||||
|
|
||||||
## 项目介绍
|
## 项目介绍
|
||||||
|
|
||||||
**HaE**是基于 `BurpSuite Java插件API` 开发的请求高亮标记与信息提取的辅助型框架式插件,该插件可以通过自定义正则的方式匹配响应报文或请求报文,并对满足正则匹配的请求进行信息高亮与提取。
|
**HaE**是基于 `BurpSuite Java插件API` 开发的请求高亮标记与信息提取的辅助型框架式插件,该插件可以通过自定义正则的方式匹配响应报文或请求报文,并对满足正则匹配的报文进行信息高亮与提取。
|
||||||
|
|
||||||

|
现代化Web应用走上前后端分离开发模式,这就导致在日常测试时候会有许多的流量,如果你想要尽可能全面的对一个Web应用进行测试评估,将花费大量精力浪费在无用的报文上;**HaE的出现正是为了解决这一类似场景**,借助HaE你可以**有效的减少**测试的时间,将更多的精力放在**有价值、有意义**的报文上,**提高漏洞挖掘效率**。
|
||||||
|
|
||||||
现代化Web应用走上前后端分离开发模式,这就导致在日常测试时候会有许多的请求流量,如果你想要尽可能全面的对一个Web应用进行测试评估,将花费大量精力浪费在无用的请求上;**HaE的出现正是为了解决这一类似场景**,借助HaE你可以有效的减少测试的时间,将更多的精力放在**有价值、有意义**的请求上,**大幅度**的减少无效测试时间,**提高漏洞挖掘效率**。
|
**注**: 要想灵活的使用`HaE`,你需要掌握正则表达式阅读、编写、修改能力;由于`Java`正则表达式的库并没有`Python`的优雅或方便,所以HaE要求使用者必须用`()`将所需提取的表达式内容包含;例如你要匹配一个**Shiro应用**的响应报文,正常匹配规则为`rememberMe=delete`,如果你要提取这段内容的话就需要变成`(rememberMe=delete)`。
|
||||||
|
|
||||||
**注**: 要想灵活的使用`HaE`,你需要掌握正则表达式阅读、编写、修改能力;由于`Java`正则表达式的库并没有`Python`的优雅或方便,在使用正则的,HaE要求使用者必须使用`()`将所需提取的表达式内容包含;例如你要匹配一个**Shiro应用**的响应报文,正常匹配规则为`rememberMe=delete`,如果你要提取这段内容的话就需要变成`(rememberMe=delete)`。
|
|
||||||
|
|
||||||
## 使用方法
|
## 使用方法
|
||||||
|
|
||||||
@@ -23,7 +21,7 @@
|
|||||||
|
|
||||||

|

|
||||||
|
|
||||||
除了初始化的配置文件外,还有`Setting.yml`,该文件用于存储配置文件路径与排除后缀名;`HaE`支持自定义配置文件路径,你可以通过点击`Select File`按钮进行选择自定义配置文件。
|
除了初始化的配置文件外,还有`Setting.yml`,该文件用于存储配置文件路径与排除后缀名;`HaE`支持在线更新配置文件,你可以通过点击`Online Update`按钮进行更新(部分网络需要挂代理)。
|
||||||
|
|
||||||
## 优势特点
|
## 优势特点
|
||||||
|
|
||||||
|
|||||||
@@ -30,4 +30,5 @@ dependencies {
|
|||||||
compile group: 'org.yaml', name: 'snakeyaml', version: '1.28'
|
compile group: 'org.yaml', name: 'snakeyaml', version: '1.28'
|
||||||
compile 'net.sourceforge.jregex:jregex:1.2_01'
|
compile 'net.sourceforge.jregex:jregex:1.2_01'
|
||||||
compile 'dk.brics.automaton:automaton:1.11-8'
|
compile 'dk.brics.automaton:automaton:1.11-8'
|
||||||
|
compile 'com.squareup.okhttp:okhttp:2.7.5'
|
||||||
}
|
}
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 188 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 57 KiB After Width: | Height: | Size: 56 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 82 KiB After Width: | Height: | Size: 55 KiB |
@@ -4,6 +4,7 @@ import burp.action.*;
|
|||||||
import burp.ui.MainUI;
|
import burp.ui.MainUI;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Objects;
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
@@ -33,12 +34,12 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
|
|||||||
this.callbacks = callbacks;
|
this.callbacks = callbacks;
|
||||||
BurpExtender.helpers = callbacks.getHelpers();
|
BurpExtender.helpers = callbacks.getHelpers();
|
||||||
|
|
||||||
String version = "2.4";
|
String version = "2.4.5";
|
||||||
callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
|
callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
|
||||||
// 定义输出
|
// 定义输出
|
||||||
stdout = new PrintWriter(callbacks.getStdout(), true);
|
stdout = new PrintWriter(callbacks.getStdout(), true);
|
||||||
stdout.println("@Core Author: EvilChen");
|
stdout.println("@First Author: EvilChen");
|
||||||
stdout.println("@Architecture Author: 0chencc");
|
stdout.println("@Second Author: 0chencc");
|
||||||
stdout.println("@Github: https://github.com/gh0stkey/HaE");
|
stdout.println("@Github: https://github.com/gh0stkey/HaE");
|
||||||
// UI
|
// UI
|
||||||
SwingUtilities.invokeLater(this::initialize);
|
SwingUtilities.invokeLater(this::initialize);
|
||||||
@@ -101,8 +102,9 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
|
|||||||
String color = uc.getEndColor(gck.getColorKeys(colorList));
|
String color = uc.getEndColor(gck.getColorKeys(colorList));
|
||||||
|
|
||||||
messageInfo.setHighlight(color);
|
messageInfo.setHighlight(color);
|
||||||
|
|
||||||
String addComment = String.join(", ", result.get(1).get("comment"));
|
String addComment = String.join(", ", result.get(1).get("comment"));
|
||||||
String resComment = originalComment != null ? String.format("%s, %s", originalComment, addComment) : addComment;
|
String resComment = !Objects.equals(originalComment, "") ? String.format("%s, %s", originalComment, addComment) : addComment;
|
||||||
|
|
||||||
messageInfo.setComment(resComment);
|
messageInfo.setComment(resComment);
|
||||||
}
|
}
|
||||||
@@ -115,6 +117,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
|
|||||||
private final IMessageEditorController controller;
|
private final IMessageEditorController controller;
|
||||||
private Map<String, String> extractRequestMap;
|
private Map<String, String> extractRequestMap;
|
||||||
private Map<String, String> extractResponseMap;
|
private Map<String, String> extractResponseMap;
|
||||||
|
private ArrayList<String> titleList = new ArrayList<>();
|
||||||
|
|
||||||
public MarkInfoTab(IMessageEditorController controller, boolean editable) {
|
public MarkInfoTab(IMessageEditorController controller, boolean editable) {
|
||||||
this.controller = controller;
|
this.controller = controller;
|
||||||
@@ -140,6 +143,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
|
|||||||
public boolean isEnabled(byte[] content, boolean isRequest) {
|
public boolean isEnabled(byte[] content, boolean isRequest) {
|
||||||
String c = new String(content, StandardCharsets.UTF_8).intern();
|
String c = new String(content, StandardCharsets.UTF_8).intern();
|
||||||
List<Map<String, String>> result = pm.processMessageByContent(helpers, content, isRequest, false, "");
|
List<Map<String, String>> result = pm.processMessageByContent(helpers, content, isRequest, false, "");
|
||||||
|
|
||||||
if (result != null && !result.isEmpty()) {
|
if (result != null && !result.isEmpty()) {
|
||||||
Map<String, String> dataMap = result.get(0);
|
Map<String, String> dataMap = result.get(0);
|
||||||
if (isRequest) {
|
if (isRequest) {
|
||||||
@@ -197,6 +201,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
|
|||||||
* 创建MarkInfo表单
|
* 创建MarkInfo表单
|
||||||
*/
|
*/
|
||||||
public void makeTable(Map<String, String> dataMap) {
|
public void makeTable(Map<String, String> dataMap) {
|
||||||
|
ArrayList<String> lTitleList = new ArrayList<>();
|
||||||
dataMap.keySet().forEach(i->{
|
dataMap.keySet().forEach(i->{
|
||||||
String[] extractData = dataMap.get(i).split("\n");
|
String[] extractData = dataMap.get(i).split("\n");
|
||||||
Object[][] data = new Object[extractData.length][1];
|
Object[][] data = new Object[extractData.length][1];
|
||||||
@@ -204,14 +209,23 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
|
|||||||
data[x][0] = extractData[x];
|
data[x][0] = extractData[x];
|
||||||
// stdout.println(extractData[x]);
|
// stdout.println(extractData[x]);
|
||||||
}
|
}
|
||||||
int indexOfTab = this.jTabbedPane.indexOfTab(i);
|
|
||||||
JScrollPane jScrollPane = new JScrollPane(new JTable(data, new Object[]{"Information"}));
|
JScrollPane jScrollPane = new JScrollPane(new JTable(data, new Object[]{"Information"}));
|
||||||
|
lTitleList.add(i);
|
||||||
this.jTabbedPane.addTab(i, jScrollPane);
|
this.jTabbedPane.addTab(i, jScrollPane);
|
||||||
// 使用removeAll会导致UI出现空白的情况,为了改善用户侧体验,采用remove的方式进行删除
|
});
|
||||||
|
|
||||||
|
/*
|
||||||
|
* 使用removeAll会导致MarkInfo UI出现空白的情况,为了改善用户侧体验,采用remove的方式进行删除;
|
||||||
|
* 采用全局ArrayList的方式遍历删除Tab,以此应对BurpSuite缓存机制导致的MarkInfo UI错误展示。
|
||||||
|
*/
|
||||||
|
titleList.forEach(t->{
|
||||||
|
int indexOfTab = this.jTabbedPane.indexOfTab(t);
|
||||||
if (indexOfTab != -1) {
|
if (indexOfTab != -1) {
|
||||||
this.jTabbedPane.remove(indexOfTab);
|
this.jTabbedPane.removeTabAt(indexOfTab);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
titleList = lTitleList;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ public class Config {
|
|||||||
|
|
||||||
public static String[] scopeArray = new String[] {
|
public static String[] scopeArray = new String[] {
|
||||||
"any",
|
"any",
|
||||||
|
"any header",
|
||||||
|
"any body",
|
||||||
"response",
|
"response",
|
||||||
"response header",
|
"response header",
|
||||||
"response body",
|
"response body",
|
||||||
|
|||||||
@@ -33,23 +33,25 @@ public class ExtractContent {
|
|||||||
String engine = objects[5].toString();
|
String engine = objects[5].toString();
|
||||||
boolean sensitive = (Boolean) objects[6];
|
boolean sensitive = (Boolean) objects[6];
|
||||||
// 判断规则是否开启与作用域
|
// 判断规则是否开启与作用域
|
||||||
if (loaded && (scope.contains(scopeString) || "any".equals(scope))) {
|
if (loaded && (scope.contains(scopeString) || scope.contains("any"))) {
|
||||||
switch (scope) {
|
switch (scope) {
|
||||||
case "any":
|
case "any":
|
||||||
case "request":
|
case "request":
|
||||||
case "response":
|
case "response":
|
||||||
matchContent = new String(content, StandardCharsets.UTF_8).intern();
|
matchContent = new String(content, StandardCharsets.UTF_8).intern();
|
||||||
break;
|
break;
|
||||||
|
case "any header":
|
||||||
case "request header":
|
case "request header":
|
||||||
case "response header":
|
case "response header":
|
||||||
matchContent = headers;
|
matchContent = headers;
|
||||||
break;
|
break;
|
||||||
|
case "any body":
|
||||||
case "request body":
|
case "request body":
|
||||||
case "response body":
|
case "response body":
|
||||||
matchContent = new String(body, StandardCharsets.UTF_8).intern();
|
matchContent = new String(body, StandardCharsets.UTF_8).intern();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ("nfa".equals(engine)) {
|
if ("nfa".equals(engine)) {
|
||||||
@@ -94,20 +96,21 @@ public class ExtractContent {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// host: {Name, List}
|
// 将提取的数据存放到全局变量中
|
||||||
if (!host.isEmpty()) {
|
if (!host.isEmpty()) {
|
||||||
map.keySet().forEach(i -> {
|
map.keySet().forEach(i -> {
|
||||||
Map<String, Object> tmpMap = map.get(i);
|
Map<String, Object> tmpMap = map.get(i);
|
||||||
List<String> dataList = Arrays.asList(tmpMap.get("data").toString().split("\n"));
|
List<String> dataList = Arrays.asList(tmpMap.get("data").toString().split("\n"));
|
||||||
|
// 组合通配符Host
|
||||||
|
String anyHost = host.replace(host.split("\\.")[0], "*");
|
||||||
// 判断Host是否存在,如存在则进行数据更新,反之则新增数据
|
// 判断Host是否存在,如存在则进行数据更新,反之则新增数据
|
||||||
if (Config.globalDataMap.containsKey(host)) {
|
if (Config.globalDataMap.containsKey(host)) {
|
||||||
Map<String, List<String>> gRuleMap = Config.globalDataMap.get(host);
|
Map<String, List<String>> gRuleMap = Config.globalDataMap.get(host);
|
||||||
// 判断匹配规则是否存在(逻辑同Host判断)
|
// 判断匹配规则是否存在(逻辑同Host判断)
|
||||||
if (gRuleMap.containsKey(i)) {
|
if (gRuleMap.containsKey(i)) {
|
||||||
List<String> gDataList = gRuleMap.get(i);
|
List<String> gDataList = gRuleMap.get(i);
|
||||||
List<String> mergeDataList = new ArrayList<>();
|
List<String> mergeDataList = new ArrayList<>(gDataList);
|
||||||
// 合并两个List
|
// 合并两个List
|
||||||
mergeDataList.addAll(gDataList);
|
|
||||||
mergeDataList.addAll(dataList);
|
mergeDataList.addAll(dataList);
|
||||||
// 去重操作
|
// 去重操作
|
||||||
HashSet tmpList = new HashSet(mergeDataList);
|
HashSet tmpList = new HashSet(mergeDataList);
|
||||||
@@ -118,9 +121,14 @@ public class ExtractContent {
|
|||||||
} else {
|
} else {
|
||||||
gRuleMap.put(i, dataList);
|
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<>();
|
Map<String, List<String>> ruleMap = new HashMap<>();
|
||||||
ruleMap.put(i, dataList);
|
ruleMap.put(i, dataList);
|
||||||
|
// 添加单一Host
|
||||||
Config.globalDataMap.put(host, ruleMap);
|
Config.globalDataMap.put(host, ruleMap);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package burp.action;
|
package burp.action;
|
||||||
|
|
||||||
|
import burp.BurpExtender;
|
||||||
import burp.IExtensionHelpers;
|
import burp.IExtensionHelpers;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
package burp.ui;
|
package burp.ui;
|
||||||
|
|
||||||
import burp.Config;
|
import burp.Config;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import javax.swing.table.DefaultTableModel;
|
import javax.swing.table.DefaultTableModel;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
@@ -14,7 +16,7 @@ import javax.swing.event.DocumentEvent;
|
|||||||
import javax.swing.event.DocumentListener;
|
import javax.swing.event.DocumentListener;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author LinChen
|
* @author LinChen && EvilChen
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public class Databoard extends JPanel {
|
public class Databoard extends JPanel {
|
||||||
@@ -22,11 +24,33 @@ public class Databoard extends JPanel {
|
|||||||
initComponents();
|
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() {
|
private void initComponents() {
|
||||||
// JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents
|
// JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents
|
||||||
hostLabel = new JLabel();
|
hostLabel = new JLabel();
|
||||||
hostTextField = new JTextField();
|
hostTextField = new JTextField();
|
||||||
dataTabbedPane = new JTabbedPane();
|
dataTabbedPane = new JTabbedPane();
|
||||||
|
clearButton = new JButton();
|
||||||
|
|
||||||
//======== this ========
|
//======== this ========
|
||||||
setLayout(new GridBagLayout());
|
setLayout(new GridBagLayout());
|
||||||
@@ -43,7 +67,11 @@ public class Databoard extends JPanel {
|
|||||||
add(hostTextField, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0,
|
add(hostTextField, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0,
|
||||||
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
|
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
|
||||||
new Insets(8, 0, 5, 5), 0, 0));
|
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,
|
add(dataTabbedPane, new GridBagConstraints(1, 1, 3, 2, 0.0, 0.0,
|
||||||
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
|
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
|
||||||
new Insets(8, 0, 0, 5), 0, 0));
|
new Insets(8, 0, 0, 5), 0, 0));
|
||||||
@@ -56,9 +84,7 @@ public class Databoard extends JPanel {
|
|||||||
*/
|
*/
|
||||||
private static List<String> getHostByList(){
|
private static List<String> getHostByList(){
|
||||||
List<String> hostList = new ArrayList<>();
|
List<String> hostList = new ArrayList<>();
|
||||||
Config.globalDataMap.keySet().forEach(i -> {
|
hostList.addAll(Config.globalDataMap.keySet());
|
||||||
hostList.add(i);
|
|
||||||
});
|
|
||||||
return hostList;
|
return hostList;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -143,10 +169,15 @@ public class Databoard extends JPanel {
|
|||||||
if (!input.isEmpty()){
|
if (!input.isEmpty()){
|
||||||
for (String host : getHostByList()) {
|
for (String host : getHostByList()) {
|
||||||
if (host.toLowerCase().contains(input.toLowerCase())) {
|
if (host.toLowerCase().contains(input.toLowerCase())) {
|
||||||
|
if (host.length() == input.length()){
|
||||||
|
comboBoxModel.insertElementAt(host,0);
|
||||||
|
comboBoxModel.setSelectedItem(host);
|
||||||
|
}else{
|
||||||
comboBoxModel.addElement(host);
|
comboBoxModel.addElement(host);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
hostComboBox.setPopupVisible(comboBoxModel.getSize() > 0);
|
hostComboBox.setPopupVisible(comboBoxModel.getSize() > 0);
|
||||||
isMatchHost = false;
|
isMatchHost = false;
|
||||||
}
|
}
|
||||||
@@ -159,9 +190,36 @@ public class Databoard extends JPanel {
|
|||||||
private static void getInfoByHost(@NotNull JComboBox hostComboBox, JTabbedPane tabbedPane, JTextField textField) {
|
private static void getInfoByHost(@NotNull JComboBox hostComboBox, JTabbedPane tabbedPane, JTextField textField) {
|
||||||
if (hostComboBox.getSelectedItem() != null) {
|
if (hostComboBox.getSelectedItem() != null) {
|
||||||
Map<String, Map<String, List<String>>> ruleMap = Config.globalDataMap;
|
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();
|
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())));
|
tabbedPane.addTab(entry.getKey(), new JScrollPane(new HitRuleDataList(entry.getValue())));
|
||||||
}
|
}
|
||||||
textField.setText(hostComboBox.getSelectedItem().toString());
|
textField.setText(hostComboBox.getSelectedItem().toString());
|
||||||
@@ -172,6 +230,7 @@ public class Databoard extends JPanel {
|
|||||||
private JLabel hostLabel;
|
private JLabel hostLabel;
|
||||||
private JTextField hostTextField;
|
private JTextField hostTextField;
|
||||||
private JTabbedPane dataTabbedPane;
|
private JTabbedPane dataTabbedPane;
|
||||||
|
private JButton clearButton;
|
||||||
// JFormDesigner - End of variables declaration //GEN-END:variables
|
// JFormDesigner - End of variables declaration //GEN-END:variables
|
||||||
|
|
||||||
// 是否自动匹配Host
|
// 是否自动匹配Host
|
||||||
|
|||||||
@@ -60,7 +60,6 @@ public class JTabbedPaneCloseButton extends JTabbedPane {
|
|||||||
|
|
||||||
/** Button */
|
/** Button */
|
||||||
public class CloseButtonTab extends JPanel {
|
public class CloseButtonTab extends JPanel {
|
||||||
|
|
||||||
public CloseButtonTab(final Component tab, String title, Icon icon) {
|
public CloseButtonTab(final Component tab, String title, Icon icon) {
|
||||||
setOpaque(false);
|
setOpaque(false);
|
||||||
FlowLayout flowLayout = new FlowLayout(FlowLayout.CENTER, 3, 3);
|
FlowLayout flowLayout = new FlowLayout(FlowLayout.CENTER, 3, 3);
|
||||||
|
|||||||
@@ -4,18 +4,21 @@ import burp.Config;
|
|||||||
import burp.yaml.LoadConfig;
|
import burp.yaml.LoadConfig;
|
||||||
import burp.yaml.SetConfig;
|
import burp.yaml.SetConfig;
|
||||||
|
|
||||||
|
import com.squareup.okhttp.OkHttpClient;
|
||||||
|
import com.squareup.okhttp.Request;
|
||||||
|
import com.squareup.okhttp.Response;
|
||||||
|
import java.io.FileOutputStream;
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import javax.swing.event.ChangeEvent;
|
import javax.swing.event.ChangeEvent;
|
||||||
import javax.swing.event.ChangeListener;
|
import javax.swing.event.ChangeListener;
|
||||||
import javax.swing.event.DocumentEvent;
|
import javax.swing.event.DocumentEvent;
|
||||||
import javax.swing.event.DocumentListener;
|
import javax.swing.event.DocumentListener;
|
||||||
import javax.swing.filechooser.FileNameExtensionFilter;
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.awt.event.*;
|
import java.awt.event.*;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author LinChen
|
* @author LinChen && EvilChen
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public class MainUI extends JPanel{
|
public class MainUI extends JPanel{
|
||||||
@@ -41,19 +44,30 @@ public class MainUI extends JPanel{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void selectFileMouseClicked(MouseEvent e) {
|
private void onlineUpdateActionPerformed(ActionEvent e) {
|
||||||
JFileChooser selectFile = new JFileChooser();
|
// 添加提示框防止用户误触导致配置更新
|
||||||
selectFile.setFileSelectionMode(JFileChooser.FILES_ONLY);
|
int retCode = JOptionPane.showConfirmDialog(null, "Do you want to update config?", "Info",
|
||||||
FileNameExtensionFilter filter = new FileNameExtensionFilter("Yaml File (.yml/.yaml)","yaml", "yml");
|
JOptionPane.YES_NO_CANCEL_OPTION);
|
||||||
selectFile.setFileFilter(filter);
|
if (retCode == JOptionPane.YES_OPTION) {
|
||||||
int selectFrame = selectFile.showDialog(new JLabel(),"Select");
|
String url = "https://raw.githubusercontent.com/gh0stkey/HaE/gh-pages/Config.yml";
|
||||||
if (selectFrame == JFileChooser.APPROVE_OPTION){
|
OkHttpClient httpClient = new OkHttpClient();
|
||||||
String configPath = selectFile.getSelectedFile().toString();
|
Request httpRequest = new Request.Builder().url(url).get().build();
|
||||||
reloadRule();
|
try {
|
||||||
loadConn.setConfigPath(configPath);
|
Response httpResponse = httpClient.newCall(httpRequest).execute();
|
||||||
configTextField.setText(configPath);
|
// 获取官方规则文件,在线更新写入
|
||||||
|
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();
|
new LoadConfig();
|
||||||
|
reloadRule();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void reloadRule(){
|
private void reloadRule(){
|
||||||
@@ -70,11 +84,11 @@ public class MainUI extends JPanel{
|
|||||||
ruleSwitch.setListen(true);
|
ruleSwitch.setListen(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void reloadMouseClicked(MouseEvent e) {
|
private void reloadActionPerformed(ActionEvent e) {
|
||||||
reloadRule();
|
reloadRule();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void excludeSuffixSaveMouseClicked(MouseEvent e) {
|
private void excludeSuffixSaveActionPerformed(ActionEvent e) {
|
||||||
LoadConfig loadCon = new LoadConfig();
|
LoadConfig loadCon = new LoadConfig();
|
||||||
loadCon.setExcludeSuffix(excludeSuffixTextField.getText());
|
loadCon.setExcludeSuffix(excludeSuffixTextField.getText());
|
||||||
}
|
}
|
||||||
@@ -84,7 +98,7 @@ public class MainUI extends JPanel{
|
|||||||
rulePanel = new JPanel();
|
rulePanel = new JPanel();
|
||||||
configTextField = new JTextField();
|
configTextField = new JTextField();
|
||||||
configLabel = new JLabel();
|
configLabel = new JLabel();
|
||||||
selectFileButton = new JButton();
|
onlineUpdateButton = new JButton();
|
||||||
reloadButton = new JButton();
|
reloadButton = new JButton();
|
||||||
excludeSuffixLabel = new JLabel();
|
excludeSuffixLabel = new JLabel();
|
||||||
excludeSuffixTextField = new JTextField();
|
excludeSuffixTextField = new JTextField();
|
||||||
@@ -111,29 +125,19 @@ public class MainUI extends JPanel{
|
|||||||
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
|
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
|
||||||
new Insets(5, 0, 5, 5), 0, 0));
|
new Insets(5, 0, 5, 5), 0, 0));
|
||||||
|
|
||||||
configLabel.setText("Config File Path:");
|
configLabel.setText("Config Path:");
|
||||||
rulePanel.add(configLabel, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
|
rulePanel.add(configLabel, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
|
||||||
GridBagConstraints.WEST, GridBagConstraints.VERTICAL,
|
GridBagConstraints.WEST, GridBagConstraints.VERTICAL,
|
||||||
new Insets(5, 5, 5, 5), 0, 0));
|
new Insets(5, 5, 5, 5), 0, 0));
|
||||||
|
|
||||||
selectFileButton.setText("Select File ...");
|
onlineUpdateButton.setText("Online Update");
|
||||||
selectFileButton.addMouseListener(new MouseAdapter() {
|
onlineUpdateButton.addActionListener(this::onlineUpdateActionPerformed);
|
||||||
@Override
|
rulePanel.add(onlineUpdateButton, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0,
|
||||||
public void mouseClicked(MouseEvent e) {
|
|
||||||
selectFileMouseClicked(e);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
rulePanel.add(selectFileButton, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0,
|
|
||||||
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
|
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
|
||||||
new Insets(5, 0, 5, 5), 0, 0));
|
new Insets(5, 0, 5, 5), 0, 0));
|
||||||
|
|
||||||
reloadButton.setText("Reload");
|
reloadButton.setText("Reload");
|
||||||
reloadButton.addMouseListener(new MouseAdapter() {
|
reloadButton.addActionListener(this::reloadActionPerformed);
|
||||||
@Override
|
|
||||||
public void mouseClicked(MouseEvent e) {
|
|
||||||
reloadMouseClicked(e);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
rulePanel.add(reloadButton, new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0,
|
rulePanel.add(reloadButton, new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0,
|
||||||
|
|
||||||
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
|
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
|
||||||
@@ -148,12 +152,7 @@ public class MainUI extends JPanel{
|
|||||||
new Insets(0, 0, 0, 5), 0, 0));
|
new Insets(0, 0, 0, 5), 0, 0));
|
||||||
|
|
||||||
excludeSuffixSaveButton.setText("Save");
|
excludeSuffixSaveButton.setText("Save");
|
||||||
excludeSuffixSaveButton.addMouseListener(new MouseAdapter() {
|
excludeSuffixSaveButton.addActionListener(this::excludeSuffixSaveActionPerformed);
|
||||||
@Override
|
|
||||||
public void mouseClicked(MouseEvent e) {
|
|
||||||
excludeSuffixSaveMouseClicked(e);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
rulePanel.add(excludeSuffixSaveButton, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0,
|
rulePanel.add(excludeSuffixSaveButton, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0,
|
||||||
GridBagConstraints.SOUTH, GridBagConstraints.HORIZONTAL,
|
GridBagConstraints.SOUTH, GridBagConstraints.HORIZONTAL,
|
||||||
new Insets(0, 0, 0, 5), 0, 0));
|
new Insets(0, 0, 0, 5), 0, 0));
|
||||||
@@ -175,7 +174,7 @@ public class MainUI extends JPanel{
|
|||||||
ruleSwitch = new TabTitleEditListener(ruleTabbedPane);
|
ruleSwitch = new TabTitleEditListener(ruleTabbedPane);
|
||||||
ruleTabbedPane.addChangeListener(ruleSwitch);
|
ruleTabbedPane.addChangeListener(ruleSwitch);
|
||||||
ruleTabbedPane.addMouseListener(ruleSwitch);
|
ruleTabbedPane.addMouseListener(ruleSwitch);
|
||||||
closeTabMenuItem.addActionListener(e -> closeTabActionPerformed(e));
|
closeTabMenuItem.addActionListener(this::closeTabActionPerformed);
|
||||||
tabMenu.add(closeTabMenuItem);
|
tabMenu.add(closeTabMenuItem);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -184,7 +183,7 @@ public class MainUI extends JPanel{
|
|||||||
private JPanel rulePanel;
|
private JPanel rulePanel;
|
||||||
private JTextField configTextField;
|
private JTextField configTextField;
|
||||||
private JLabel configLabel;
|
private JLabel configLabel;
|
||||||
private JButton selectFileButton;
|
private JButton onlineUpdateButton;
|
||||||
private JButton reloadButton;
|
private JButton reloadButton;
|
||||||
private JLabel excludeSuffixLabel;
|
private JLabel excludeSuffixLabel;
|
||||||
private JTextField excludeSuffixTextField;
|
private JTextField excludeSuffixTextField;
|
||||||
|
|||||||
@@ -2,15 +2,14 @@ package burp.ui;
|
|||||||
|
|
||||||
import burp.yaml.SetConfig;
|
import burp.yaml.SetConfig;
|
||||||
|
|
||||||
import java.awt.event.ComponentListener;
|
import java.awt.event.ActionEvent;
|
||||||
|
import java.awt.event.ActionListener;
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import javax.swing.event.TableModelEvent;
|
import javax.swing.event.TableModelEvent;
|
||||||
import javax.swing.event.TableModelListener;
|
import javax.swing.event.TableModelListener;
|
||||||
import javax.swing.table.DefaultTableModel;
|
import javax.swing.table.DefaultTableModel;
|
||||||
import javax.swing.table.TableRowSorter;
|
import javax.swing.table.TableRowSorter;
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.awt.event.MouseAdapter;
|
|
||||||
import java.awt.event.MouseEvent;
|
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -24,7 +23,7 @@ public class RulePane extends JPanel {
|
|||||||
private SetConfig setConfig = new SetConfig();
|
private SetConfig setConfig = new SetConfig();
|
||||||
private Boolean isEdit = false;
|
private Boolean isEdit = false;
|
||||||
|
|
||||||
private void ruleAddMouseClicked(MouseEvent e, JTabbedPane pane) {
|
private void ruleAddActionPerformed(ActionEvent e, JTabbedPane pane) {
|
||||||
RuleSetting ruleSettingPanel = new RuleSetting();
|
RuleSetting ruleSettingPanel = new RuleSetting();
|
||||||
int showState = JOptionPane.showConfirmDialog(null, ruleSettingPanel, "RuleSetting - Add Rule", JOptionPane.OK_OPTION);
|
int showState = JOptionPane.showConfirmDialog(null, ruleSettingPanel, "RuleSetting - Add Rule", JOptionPane.OK_OPTION);
|
||||||
if(showState == 0){
|
if(showState == 0){
|
||||||
@@ -42,7 +41,7 @@ public class RulePane extends JPanel {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ruleEditMouseClicked(MouseEvent e, JTabbedPane pane){
|
private void ruleEditActionPerformed(ActionEvent e, JTabbedPane pane){
|
||||||
if (ruleTable.getSelectedRowCount() >= 1){
|
if (ruleTable.getSelectedRowCount() >= 1){
|
||||||
RuleSetting ruleSettingPanel = new RuleSetting();
|
RuleSetting ruleSettingPanel = new RuleSetting();
|
||||||
ruleSettingPanel.ruleNameTextField.setText(ruleTable.getValueAt(ruleTable.getSelectedRow(), 1).toString());
|
ruleSettingPanel.ruleNameTextField.setText(ruleTable.getValueAt(ruleTable.getSelectedRow(), 1).toString());
|
||||||
@@ -71,7 +70,7 @@ public class RulePane extends JPanel {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ruleRemoveMouseClicked(MouseEvent e, JTabbedPane pane){
|
private void ruleRemoveActionPerformed(ActionEvent e, JTabbedPane pane){
|
||||||
if (ruleTable.getSelectedRowCount() >= 1){
|
if (ruleTable.getSelectedRowCount() >= 1){
|
||||||
int isOk = JOptionPane.showConfirmDialog(null, "Are your sure?", "RuleSetting - Delete Rule", JOptionPane.OK_OPTION);
|
int isOk = JOptionPane.showConfirmDialog(null, "Are your sure?", "RuleSetting - Delete Rule", JOptionPane.OK_OPTION);
|
||||||
if (isOk == 0){
|
if (isOk == 0){
|
||||||
@@ -109,11 +108,11 @@ public class RulePane extends JPanel {
|
|||||||
//---- addButton ----
|
//---- addButton ----
|
||||||
addButton.setText("Add");
|
addButton.setText("Add");
|
||||||
|
|
||||||
addButton.addMouseListener(new MouseAdapter() {
|
addButton.addActionListener(new ActionListener() {
|
||||||
@Override
|
@Override
|
||||||
public void mouseClicked(MouseEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
isEdit = true;
|
isEdit = true;
|
||||||
ruleAddMouseClicked(e, pane);
|
ruleAddActionPerformed(e, pane);
|
||||||
model = (DefaultTableModel) ruleTable.getModel();
|
model = (DefaultTableModel) ruleTable.getModel();
|
||||||
isEdit = false;
|
isEdit = false;
|
||||||
}
|
}
|
||||||
@@ -125,11 +124,11 @@ public class RulePane extends JPanel {
|
|||||||
|
|
||||||
//---- editButton ----
|
//---- editButton ----
|
||||||
editButton.setText("Edit");
|
editButton.setText("Edit");
|
||||||
editButton.addMouseListener(new MouseAdapter() {
|
editButton.addActionListener(new ActionListener() {
|
||||||
@Override
|
@Override
|
||||||
public void mouseClicked(MouseEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
isEdit = true;
|
isEdit = true;
|
||||||
ruleEditMouseClicked(e, pane);
|
ruleEditActionPerformed(e, pane);
|
||||||
model = (DefaultTableModel) ruleTable.getModel();
|
model = (DefaultTableModel) ruleTable.getModel();
|
||||||
isEdit = false;
|
isEdit = false;
|
||||||
}
|
}
|
||||||
@@ -158,11 +157,11 @@ public class RulePane extends JPanel {
|
|||||||
//---- removeButton ----
|
//---- removeButton ----
|
||||||
removeButton.setText("Remove");
|
removeButton.setText("Remove");
|
||||||
|
|
||||||
removeButton.addMouseListener(new MouseAdapter() {
|
removeButton.addActionListener(new ActionListener() {
|
||||||
@Override
|
@Override
|
||||||
public void mouseClicked(MouseEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
isEdit = true;
|
isEdit = true;
|
||||||
ruleRemoveMouseClicked(e, pane);
|
ruleRemoveActionPerformed(e, pane);
|
||||||
model = (DefaultTableModel) ruleTable.getModel();
|
model = (DefaultTableModel) ruleTable.getModel();
|
||||||
isEdit = false;
|
isEdit = false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ public class LoadConfig {
|
|||||||
|
|
||||||
public LoadConfig() {
|
public LoadConfig() {
|
||||||
// 构造函数,初始化配置
|
// 构造函数,初始化配置
|
||||||
|
|
||||||
File HaEConfigPathFile = new File(HaEConfigPath);
|
File HaEConfigPathFile = new File(HaEConfigPath);
|
||||||
if (!(HaEConfigPathFile.exists() && HaEConfigPathFile.isDirectory())) {
|
if (!(HaEConfigPathFile.exists() && HaEConfigPathFile.isDirectory())) {
|
||||||
HaEConfigPathFile.mkdirs();
|
HaEConfigPathFile.mkdirs();
|
||||||
@@ -146,18 +145,6 @@ public class LoadConfig {
|
|||||||
return resRule;
|
return resRule;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 设置配置路径
|
|
||||||
public void setConfigPath(String filePath){
|
|
||||||
Map<String,Object> r = new HashMap<>();
|
|
||||||
r.put("configPath", filePath);
|
|
||||||
r.put("excludeSuffix", getExcludeSuffix());
|
|
||||||
try{
|
|
||||||
Writer ws = new OutputStreamWriter(new FileOutputStream(SettingPath), StandardCharsets.UTF_8);
|
|
||||||
yaml.dump(r, ws);
|
|
||||||
}catch (Exception ex){
|
|
||||||
ex.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 设置不包含的后缀名
|
// 设置不包含的后缀名
|
||||||
public void setExcludeSuffix(String excludeSuffix){
|
public void setExcludeSuffix(String excludeSuffix){
|
||||||
|
|||||||
Reference in New Issue
Block a user