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

Version: 2.4 Update

Browse Source
This commit is contained in:
AnonymousUser
2022-06-23 15:34:22 +08:00
parent 7ebba02200
commit f401214524
17 changed files with 323 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/burp/BurpExtender.java
View File

@@ -19,7 +19,8 @@ import javax.swing.event.ChangeListener;
public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEditorTabFactory, ITab {
private final MainUI main = new MainUI();
private static PrintWriter stdout;
// stdout变成公开属性，便于其他类调用输出调试信息
public static PrintWriter stdout;
private IBurpExtenderCallbacks callbacks;
private static IExtensionHelpers helpers;
GetColorKey gck = new GetColorKey();
@@ -32,7 +33,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
this.callbacks = callbacks;
BurpExtender.helpers = callbacks.getHelpers();
String version = "2.3";
String version = "2.4";
callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
// 定义输出
stdout = new PrintWriter(callbacks.getStdout(), true);
@@ -75,15 +76,27 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
content = messageInfo.getResponse();
}
IHttpService iHttpService = null;
try {
iHttpService = messageInfo.getHttpService();
} catch (Exception ignored) {
}
// 获取请求主机信息
assert iHttpService != null;
String host = iHttpService.getHost();
String c = new String(content, StandardCharsets.UTF_8).intern();
List<Map<String, String>> result = pm.processMessageByContent(helpers, content, messageIsRequest, true);
List<Map<String, String>> result = pm.processMessageByContent(helpers, content, messageIsRequest, true, host);
if (result != null && !result.isEmpty() && result.size() > 0) {
String originalColor = messageInfo.getHighlight();
String originalComment = messageInfo.getComment();
List<String> colorList = new ArrayList<>();
if (originalColor != null) {
colorList.add(originalColor);
}
colorList.add(result.get(0).get("color"));
String color = uc.getEndColor(gck.getColorKeys(colorList));
@@ -126,7 +139,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
@Override
public boolean isEnabled(byte[] content, boolean isRequest) {
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()) {
Map<String, String> dataMap = result.get(0);
if (isRequest) {
@@ -189,7 +202,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
Object[][] data = new Object[extractData.length][1];
for (int x = 0; x < extractData.length; 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"}));
@@ -202,8 +215,6 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
}
}
@Override
public IMessageEditorTab createNewInstance(IMessageEditorController controller, boolean editable) {
return new MarkInfoTab(controller, editable);

4
src/main/java/burp/Config.java
View File

@@ -4,6 +4,8 @@ package burp;
* @author EvilChen
*/
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class Config {
@@ -37,4 +39,6 @@ public class Config {
};
public static Map<String,Object[][]> ruleConfig = null;
public static Map<String, Map<String, List<String>>> globalDataMap = new HashMap<>();
}

6
src/main/java/burp/action/DoAction.java
View File

@@ -1,8 +1,8 @@
package burp.action;
import burp.BurpExtender;
import java.util.HashMap;
import java.util.Map;
import burp.Config;
import java.util.ArrayList;
import java.util.List;
@@ -12,11 +12,11 @@ import java.util.List;
public class DoAction {
public Map<String, String> extractString(Map<String, Map<String, Object>> obj) {
Map<String, String> resultMap = new HashMap<String, String>();
Map<String, String> resultMap = new HashMap<>();
obj.keySet().forEach(i->{
Map<String, Object> tmpMap = obj.get(i);
String data = tmpMap.get("data").toString();
resultMap.put(i, String.format("%s\n", data).intern());
resultMap.put(i, data);
});
return resultMap;
}

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

@@ -2,7 +2,6 @@ package burp.action;
import java.nio.charset.StandardCharsets;
import java.util.*;
import burp.Config;
import dk.brics.automaton.Automaton;
import dk.brics.automaton.AutomatonMatcher;
@@ -17,7 +16,7 @@ import jregex.Pattern;
public class ExtractContent {
public Map<String, Map<String, Object>> matchRegex(byte[] content, String headers, byte[] body, String scopeString) {
public Map<String, Map<String, Object>> matchRegex(byte[] content, String headers, byte[] body, String scopeString, String host) {
Map<String, Map<String, Object>> map = new HashMap<>(); // 最终返回的结果
Config.ruleConfig.keySet().forEach(i -> {
String matchContent = "";
@@ -61,6 +60,7 @@ public class ExtractContent {
} else {
pattern = new Pattern(regex, Pattern.IGNORE_CASE);
}
Matcher matcher = pattern.matcher(matchContent);
while (matcher.find()) {
// 添加匹配数据至list
@@ -94,6 +94,38 @@ public class ExtractContent {
}
});
// host: {Name, List}
if (!host.isEmpty()) {
map.keySet().forEach(i -> {
Map<String, Object> tmpMap = map.get(i);
List<String> dataList = Arrays.asList(tmpMap.get("data").toString().split("\n"));
// 判断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
mergeDataList.addAll(gDataList);
mergeDataList.addAll(dataList);
// 去重操作
HashSet tmpList = new HashSet(mergeDataList);
mergeDataList.clear();
mergeDataList.addAll(tmpList);
// 替换操作
gRuleMap.replace(i, gDataList, mergeDataList);
} else {
gRuleMap.put(i, dataList);
}
} else {
Map<String, List<String>> ruleMap = new HashMap<>();
ruleMap.put(i, dataList);
Config.globalDataMap.put(host, ruleMap);
}
});
}
return map;
}
}

42
src/main/java/burp/action/ProcessMessage.java
View File

@@ -1,8 +1,6 @@
package burp.action;
import burp.IExtensionHelpers;
import burp.IHttpService;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -16,7 +14,7 @@ public class ProcessMessage {
GetColorKey gck = new GetColorKey();
UpgradeColor uc = new UpgradeColor();
public List<Map<String, String>> processMessageByContent(IExtensionHelpers helpers, byte[] content, boolean isRequest, boolean messageInfo) {
public List<Map<String, String>> processMessageByContent(IExtensionHelpers helpers, byte[] content, boolean isRequest, boolean messageInfo, String host) {
List<Map<String, String>> result = new ArrayList<>();;
Map<String, Map<String, Object>> obj;
@@ -44,7 +42,7 @@ public class ProcessMessage {
int requestBodyOffset = helpers.analyzeRequest(content).getBodyOffset();
byte[] requestBody = Arrays.copyOfRange(content, requestBodyOffset, content.length);
obj = ec.matchRegex(content, requestHeaders, requestBody, "request");
obj = ec.matchRegex(content, requestHeaders, requestBody, "request", host);
} else {
try {
// 流量清洗
@@ -65,26 +63,26 @@ public class ProcessMessage {
int responseBodyOffset = helpers.analyzeResponse(content).getBodyOffset();
byte[] responseBody = Arrays.copyOfRange(content, responseBodyOffset, content.length);
obj = ec.matchRegex(content, responseHeaders, responseBody, "response");
obj = ec.matchRegex(content, responseHeaders, responseBody, "response", host);
}
if (messageInfo) {
List<List<String>> resultList = da.highlightAndComment(obj);
List<String> colorList = resultList.get(0);
List<String> commentList = resultList.get(1);
if (colorList.size() != 0 && commentList.size() != 0) {
String color = uc.getEndColor(gck.getColorKeys(colorList));
Map<String, String> colorMap = new HashMap<String, String>(){{
put("color", color);
}};
Map<String, String> commentMap = new HashMap<String, String>(){{
put("comment", String.join(", ", commentList));
}};
result.add(colorMap);
result.add(commentMap);
}
} else {
if (obj.size() > 0) {
if (obj.size() > 0) {
if (messageInfo) {
List<List<String>> resultList = da.highlightAndComment(obj);
List<String> colorList = resultList.get(0);
List<String> commentList = resultList.get(1);
if (colorList.size() != 0 && commentList.size() != 0) {
String color = uc.getEndColor(gck.getColorKeys(colorList));
Map<String, String> colorMap = new HashMap<String, String>(){{
put("color", color);
}};
Map<String, String> commentMap = new HashMap<String, String>(){{
put("comment", String.join(", ", commentList));
}};
result.add(colorMap);
result.add(commentMap);
}
} else {
result.add(da.extractString(obj));
}
}

190
src/main/java/burp/ui/Databoard.java Normal file
View File

@@ -0,0 +1,190 @@
package burp.ui;
import burp.Config;
import java.util.List;
import javax.swing.table.DefaultTableModel;
import org.jetbrains.annotations.NotNull;
import java.awt.*;
import java.awt.event.*;
import java.util.ArrayList;
import java.util.Map;
import javax.swing.*;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
/**
* @author LinChen
*/
public class Databoard extends JPanel {
public Databoard() {
initComponents();
}
private void initComponents() {
// JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents
hostLabel = new JLabel();
hostTextField = new JTextField();
dataTabbedPane = new JTabbedPane();
//======== this ========
setLayout(new GridBagLayout());
((GridBagLayout)getLayout()).columnWidths = new int[] {25, 0, 0, 0, 20, 0};
((GridBagLayout)getLayout()).rowHeights = new int[] {0, 65, 20, 0};
((GridBagLayout)getLayout()).columnWeights = new double[] {0.0, 0.0, 1.0, 0.0, 0.0, 1.0E-4};
((GridBagLayout)getLayout()).rowWeights = new double[] {0.0, 1.0, 0.0, 1.0E-4};
//---- hostLabel ----
hostLabel.setText("Host:");
add(hostLabel, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0,
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
new Insets(8, 0, 5, 5), 0, 0));
add(hostTextField, new GridBagConstraints(2, 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));
setAutoMatch(hostTextField, dataTabbedPane);
}
/**
* 获取Host列表
*/
private static List<String> getHostByList(){
List<String> hostList = new ArrayList<>();
Config.globalDataMap.keySet().forEach(i -> {
hostList.add(i);
});
return hostList;
}
/**
* 设置输入自动匹配
*/
public static void setAutoMatch(JTextField textField, JTabbedPane tabbedPane) {
final DefaultComboBoxModel comboBoxModel = new DefaultComboBoxModel();
final JComboBox hostComboBox = new JComboBox(comboBoxModel) {
@Override
public Dimension getPreferredSize() {
return new Dimension(super.getPreferredSize().width, 0);
}
};
isMatchHost = false;
for (String host : getHostByList()) {
comboBoxModel.addElement(host);
}
hostComboBox.setSelectedItem(null);
hostComboBox.addActionListener(e -> {
if (!isMatchHost) {
if (hostComboBox.getSelectedItem() != null) {
textField.setText(hostComboBox.getSelectedItem().toString());
getInfoByHost(hostComboBox, tabbedPane, textField);
}
}
});
// 事件监听
textField.addKeyListener(new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) {
isMatchHost = true;
if (e.getKeyCode() == KeyEvent.VK_SPACE) {
if (hostComboBox.isPopupVisible()) {
e.setKeyCode(KeyEvent.VK_ENTER);
}
}
if (e.getKeyCode() == KeyEvent.VK_ENTER
|| e.getKeyCode() == KeyEvent.VK_UP
|| e.getKeyCode() == KeyEvent.VK_DOWN) {
e.setSource(hostComboBox);
hostComboBox.dispatchEvent(e);
if (e.getKeyCode() == KeyEvent.VK_ENTER) {
textField.setText(hostComboBox.getSelectedItem().toString());
getInfoByHost(hostComboBox, tabbedPane, textField);
hostComboBox.setPopupVisible(false);
}
}
if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
hostComboBox.setPopupVisible(false);
}
isMatchHost = false;
}
});
textField.getDocument().addDocumentListener(new DocumentListener() {
@Override
public void insertUpdate(DocumentEvent e) {
updateList();
}
@Override
public void removeUpdate(DocumentEvent e) {
updateList();
}
@Override
public void changedUpdate(DocumentEvent e) {
updateList();
}
private void updateList() {
isMatchHost = true;
comboBoxModel.removeAllElements();
String input = textField.getText();
if (!input.isEmpty()){
for (String host : getHostByList()) {
if (host.toLowerCase().contains(input.toLowerCase())) {
comboBoxModel.addElement(host);
}
}
}
hostComboBox.setPopupVisible(comboBoxModel.getSize() > 0);
isMatchHost = false;
}
});
textField.setLayout(new BorderLayout());
textField.add(hostComboBox, BorderLayout.SOUTH);
}
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());
tabbedPane.removeAll();
for(Map.Entry<String, List<String>> entry: selectUrl.entrySet()){
tabbedPane.addTab(entry.getKey(), new JScrollPane(new HitRuleDataList(entry.getValue())));
}
textField.setText(hostComboBox.getSelectedItem().toString());
}
}
// JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables
private JLabel hostLabel;
private JTextField hostTextField;
private JTabbedPane dataTabbedPane;
// JFormDesigner - End of variables declaration //GEN-END:variables
// 是否自动匹配Host
private static Boolean isMatchHost = false;
}
class HitRuleDataList extends JTable {
public HitRuleDataList(List<String> list){
DefaultTableModel model = new DefaultTableModel();
Object[][] data = new Object[list.size()][1];
for (int x = 0; x < list.size(); x++) {
data[x][0] = list.get(x);
}
model.setDataVector(data, new Object[]{"Information"});
this.setModel(model);
}
}

13
src/main/java/burp/ui/MainUI.java
View File

@@ -79,7 +79,7 @@ public class MainUI extends JPanel{
loadCon.setExcludeSuffix(excludeSuffixTextField.getText());
}
private void initComponents() {
rulesTabbedPane = new JTabbedPane();
mainTabbedPane = new JTabbedPane();
ruleTabbedPane = new JTabbedPane();
rulePanel = new JPanel();
configTextField = new JTextField();
@@ -97,7 +97,7 @@ public class MainUI extends JPanel{
((GridBagLayout)getLayout()).rowWeights = new double[] {1.0, 1.0E-4};
{
rulesTabbedPane.addTab("Rules", ruleTabbedPane);
mainTabbedPane.addTab("Rules", ruleTabbedPane);
{
rulePanel.setLayout(new GridBagLayout());
@@ -158,9 +158,10 @@ public class MainUI extends JPanel{
GridBagConstraints.SOUTH, GridBagConstraints.HORIZONTAL,
new Insets(0, 0, 0, 5), 0, 0));
}
rulesTabbedPane.addTab("Config", rulePanel);
mainTabbedPane.addTab("Config", rulePanel);
mainTabbedPane.addTab("Databoard", databoardPanel);
}
add(rulesTabbedPane, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
add(mainTabbedPane, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
new Insets(0, 0, 0, 0), 0, 0));
@@ -178,7 +179,7 @@ public class MainUI extends JPanel{
tabMenu.add(closeTabMenuItem);
}
private JTabbedPane rulesTabbedPane;
private JTabbedPane mainTabbedPane;
private JTabbedPane ruleTabbedPane;
private JPanel rulePanel;
private JTextField configTextField;
@@ -188,7 +189,7 @@ public class MainUI extends JPanel{
private JLabel excludeSuffixLabel;
private JTextField excludeSuffixTextField;
private JButton excludeSuffixSaveButton;
private Databoard databoardPanel = new Databoard();
protected static JPopupMenu tabMenu = new JPopupMenu();
private JMenuItem closeTabMenuItem = new JMenuItem("Delete");
private TabTitleEditListener ruleSwitch;

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

@@ -50,7 +50,7 @@ public class RulePane extends JPanel {
ruleSettingPanel.colorComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 3).toString());
ruleSettingPanel.scopeComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 4).toString());
ruleSettingPanel.engineComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 5).toString());
ruleSettingPanel.sensitiveComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(),6).toString());
ruleSettingPanel.sensitiveComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(),6));
ruleSettingPanel.sensitiveComboBox.setEnabled(
ruleSettingPanel.engineComboBox.getSelectedItem().toString().equals("nfa")

16
src/main/java/burp/yaml/LoadConfig.java
View File

@@ -17,19 +17,27 @@ import org.yaml.snakeyaml.nodes.Tag;
public class LoadConfig {
private static final Yaml yaml = new Yaml();
private static final String SettingPath = "Setting.yml";
private static final String ConfigPath = "Config.yml";
private static String HaEConfigPath = String.format("%s/.config/HaE", System.getProperty("user.home"));
private static String SettingPath = String.format("%s/%s", HaEConfigPath, "Setting.yml");
private static String ConfigPath = String.format("%s/%s", HaEConfigPath, "Config.yml");
public LoadConfig() {
// 构造函数，初始化配置
File yamlSetting = new File(SettingPath);
if (!(yamlSetting.exists() && yamlSetting.isFile())) {
File HaEConfigPathFile = new File(HaEConfigPath);
if (!(HaEConfigPathFile.exists() && HaEConfigPathFile.isDirectory())) {
HaEConfigPathFile.mkdirs();
}
File settingPathFile = new File(SettingPath);
if (!(settingPathFile.exists() && settingPathFile.isFile())) {
initSetting();
initRules();
}
Config.ruleConfig = LoadConfig.getRules();
}
// 初始化设置信息
public void initSetting() {
Map<String, Object> r = new HashMap<>();