Version: 4.0.2 Update

This commit is contained in:
gh0stkey
2025-01-08 13:49:12 +08:00
parent 7e53e250af
commit a06ef8e25e
6 changed files with 57 additions and 30 deletions

View File

@@ -61,6 +61,8 @@ public class Config {
"gray"
};
public static Boolean proVersionStatus = true;
public static Map<String, Object[][]> globalRules = new HashMap<>();
public static ConcurrentHashMap<String, Map<String, List<String>>> globalDataMap = new ConcurrentHashMap<>();

View File

@@ -10,6 +10,7 @@ import hae.component.board.message.MessageTableModel;
import hae.instances.editor.RequestEditor;
import hae.instances.editor.ResponseEditor;
import hae.instances.editor.WebSocketEditor;
import hae.instances.http.HttpMessagePassiveHandler;
import hae.instances.websocket.WebSocketMessageHandler;
import hae.utils.ConfigLoader;
import hae.utils.DataManager;
@@ -18,8 +19,8 @@ public class HaE implements BurpExtension {
@Override
public void initialize(MontoyaApi api) {
// 设置扩展名称
String version = "4.0.1";
api.extension().setName("HaE - Highlighter and Extractor");
String version = "4.0.2";
// 加载扩展后输出的项目信息
Logging logging = api.logging();
@@ -33,6 +34,9 @@ public class HaE implements BurpExtension {
MessageTableModel messageTableModel = new MessageTableModel(api, configLoader);
// 设置BurpSuite专业版状态
Config.proVersionStatus = getBurpSuiteProStatus(api, configLoader, messageTableModel);
// 注册Tab页用于查询数据
api.userInterface().registerSuiteTab("HaE", new Main(api, configLoader, messageTableModel));
@@ -48,6 +52,7 @@ public class HaE implements BurpExtension {
DataManager dataManager = new DataManager(api);
dataManager.loadData(messageTableModel);
api.extension().registerUnloadingHandler(new ExtensionUnloadingHandler() {
@Override
public void extensionUnloaded() {
@@ -57,4 +62,19 @@ public class HaE implements BurpExtension {
}
});
}
private Boolean getBurpSuiteProStatus(MontoyaApi api, ConfigLoader configLoader, MessageTableModel messageTableModel) {
boolean burpSuiteProStatus = false;
try {
burpSuiteProStatus = api.burpSuite().version().name().contains("Professional");
} catch (Exception e) {
try {
api.scanner().registerScanCheck(new HttpMessagePassiveHandler(api, configLoader, messageTableModel)).deregister();
burpSuiteProStatus = true;
} catch (Exception ignored) {
}
}
return burpSuiteProStatus;
}
}

View File

@@ -29,7 +29,6 @@ public class Config extends JPanel {
private final ConfigLoader configLoader;
private final MessageTableModel messageTableModel;
private final Rules rules;
private final boolean isProfessionalVersion;
private Registration activeHandler;
private Registration passiveHandler;
@@ -40,14 +39,8 @@ public class Config extends JPanel {
this.messageTableModel = messageTableModel;
this.rules = rules;
// 检查版本并记录日志
this.isProfessionalVersion = api.burpSuite().version().name().contains("Professional");
api.logging().logToOutput("Current Burp Suite Version: " + api.burpSuite().version().name());
this.activeHandler = api.http().registerHttpHandler(new HttpMessageActiveHandler(api, configLoader, messageTableModel));
if (isProfessionalVersion) {
this.passiveHandler = api.scanner().registerScanCheck(new HttpMessagePassiveHandler(api, configLoader, messageTableModel));
}
initComponents();
}
@@ -142,6 +135,7 @@ public class Config extends JPanel {
modePanel.setLayout(new BoxLayout(modePanel, BoxLayout.X_AXIS));
JCheckBox checkBox = new JCheckBox("Enable active http message handler");
checkBox.setEnabled(hae.Config.proVersionStatus);
modePanel.add(checkBox);
checkBox.addActionListener(e -> updateModeStatus(checkBox));
checkBox.setSelected(configLoader.getMode());
@@ -386,7 +380,7 @@ public class Config extends JPanel {
configLoader.setMode(selected ? "true" : "false");
if (checkBox.isSelected()) {
if (isProfessionalVersion && passiveHandler.isRegistered()) {
if (hae.Config.proVersionStatus && passiveHandler.isRegistered()) {
passiveHandler.deregister();
}
@@ -394,7 +388,7 @@ public class Config extends JPanel {
activeHandler = api.http().registerHttpHandler(new HttpMessageActiveHandler(api, configLoader, messageTableModel));
}
} else {
if (isProfessionalVersion && !passiveHandler.isRegistered()) {
if (hae.Config.proVersionStatus && !passiveHandler.isRegistered()) {
passiveHandler = api.scanner().registerScanCheck(new HttpMessagePassiveHandler(api, configLoader, messageTableModel));
}

View File

@@ -136,6 +136,7 @@ public class MessageTableModel extends AbstractTableModel {
if (!isDuplicate) {
if (flag) {
try {
DataManager dataManager = new DataManager(api);
// 数据存储在BurpSuite空间内
PersistedObject persistedObject = PersistedObject.persistedObject();
@@ -144,6 +145,9 @@ public class MessageTableModel extends AbstractTableModel {
persistedObject.setString("color", color);
String uuidIndex = StringProcessor.getRandomUUID();
dataManager.putData("message", uuidIndex, persistedObject);
} catch (Exception ignored) {
}
}
// 添加进日志

View File

@@ -125,6 +125,7 @@ public class RegularMatcher {
if (flag) {
// 数据存储在BurpSuite空间内
try {
DataManager dataManager = new DataManager(api);
PersistedObject persistedObject = PersistedObject.persistedObject();
gRuleMap.forEach((kName, vList) -> {
@@ -133,6 +134,8 @@ public class RegularMatcher {
persistedObject.setStringList(kName, persistedList);
});
dataManager.putData("data", host, persistedObject);
} catch (Exception ignored) {
}
}
return gRuleMap;

View File

@@ -57,9 +57,13 @@ public class DataManager {
if (dataIndex != null && !dataIndex.isEmpty()) {
dataIndex.parallelStream().forEach(index -> {
PersistedObject dataObj = persistence.extensionData().getChildObject(index);
try {
dataObj.stringListKeys().forEach(dataKey -> {
RegularMatcher.putDataToGlobalMap(api, index, dataKey, dataObj.getStringList(dataKey).stream().toList(), false);
});
} catch (Exception e) {
api.logging().logToOutput("loadHaEData:" + e.getMessage());
}
});
}
}