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

Version: 2.0.5 Fixed Bug

Browse Source
This commit is contained in:
AnonymousUser
2021-07-06 18:33:11 +08:00
parent 00a4a835b2
commit 43fbc46b65
2 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
this.callbacks = callbacks; this.callbacks = callbacks;
BurpExtender.helpers = callbacks.getHelpers(); BurpExtender.helpers = callbacks.getHelpers();
String version = "2.0.4"; String version = "2.0.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);
@@ -74,15 +74,6 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
if (toolFlag == 64 || toolFlag == 32 || toolFlag == 4) { if (toolFlag == 64 || toolFlag == 32 || toolFlag == 4) {
Map<String, Map<String, Object>> obj; Map<String, Map<String, Object>> obj;
byte[] content = messageInfo.getRequest(); byte[] content = messageInfo.getRequest();
// 获取报文头
List<String> tmpHeaders = helpers.analyzeRequest(messageInfo.getHttpService(), content).getHeaders();
String headers = String.join("\n", tmpHeaders);
// 获取报文主体
int bodyOffset = helpers.analyzeRequest(messageInfo.getHttpService(), content).getBodyOffset();
byte[] byteRequest = messageInfo.getRequest();
byte[] body = Arrays.copyOfRange(byteRequest, bodyOffset, byteRequest.length);
// 流量清洗 // 流量清洗
String urlString = helpers.analyzeRequest(messageInfo.getHttpService(), content).getUrl().toString(); String urlString = helpers.analyzeRequest(messageInfo.getHttpService(), content).getUrl().toString();
urlString = urlString.indexOf("?") > 0 ? urlString.substring(0, urlString.indexOf("?")) : urlString; urlString = urlString.indexOf("?") > 0 ? urlString.substring(0, urlString.indexOf("?")) : urlString;
@@ -93,10 +84,28 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
} }
if (messageIsRequest) { if (messageIsRequest) {
obj = ec.matchRegex(content, headers, body, "request"); // 获取报文头
List<String> requestTmpHeaders = helpers.analyzeRequest(messageInfo.getHttpService(), content).getHeaders();
String requestHeaders = String.join("\n", requestTmpHeaders);
// 获取报文主体
int requestBodyOffset = helpers.analyzeRequest(messageInfo.getHttpService(), content).getBodyOffset();
byte[] byteRequest = messageInfo.getRequest();
byte[] requestBody = Arrays.copyOfRange(byteRequest, requestBodyOffset, byteRequest.length);
obj = ec.matchRegex(content, requestHeaders, requestBody, "request");
} else { } else {
// 获取报文头
List<String> responseTmpHeaders = helpers.analyzeRequest(messageInfo.getHttpService(), content).getHeaders();
String responseHeaders = String.join("\n", responseTmpHeaders);
// 获取报文主体
int responseBodyOffset = helpers.analyzeResponse(content).getBodyOffset();
byte[] byteResponse = messageInfo.getResponse();
byte[] responseBody = Arrays.copyOfRange(byteResponse, responseBodyOffset, byteResponse.length);
content = messageInfo.getResponse(); content = messageInfo.getResponse();
obj = ec.matchRegex(content, headers, body, "response"); obj = ec.matchRegex(content, responseHeaders, responseBody, "response");
} }
List<String> colorList = da.highlightList(obj); List<String> colorList = da.highlightList(obj);
@@ -149,14 +158,14 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
} }
// 获取报文头 // 获取报文头
List<String> tmpHeaders = helpers.analyzeRequest(controller.getHttpService(), content).getHeaders(); List<String> requestTmpHeaders = helpers.analyzeRequest(controller.getHttpService(), content).getHeaders();
String headers = String.join("\n", tmpHeaders); String requestHeaders = String.join("\n", requestTmpHeaders);
// 获取报文主体 // 获取报文主体
int bodyOffset = helpers.analyzeRequest(controller.getHttpService(), content).getBodyOffset(); int requestBodyOffset = helpers.analyzeRequest(controller.getHttpService(), content).getBodyOffset();
byte[] byteRequest = controller.getRequest(); byte[] byteRequest = controller.getRequest();
byte[] body = Arrays.copyOfRange(byteRequest, bodyOffset, byteRequest.length); byte[] requestBody = Arrays.copyOfRange(byteRequest, requestBodyOffset, byteRequest.length);
obj = ec.matchRegex(content, headers, body, "request"); obj = ec.matchRegex(content, requestHeaders, requestBody, "request");
if (obj.size() > 0) { if (obj.size() > 0) {
String result = da.extractString(obj); String result = da.extractString(obj);
extractRequestContent = result.getBytes(); extractRequestContent = result.getBytes();
@@ -165,14 +174,14 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
} else { } else {
// 获取报文头 // 获取报文头
List<String> tmpHeaders1 = helpers.analyzeResponse(content).getHeaders(); List<String> responseTmpHeaders = helpers.analyzeResponse(content).getHeaders();
String headers1 = String.join("\n", tmpHeaders1); String responseHeaders = String.join("\n", responseTmpHeaders);
// 获取报文主体 // 获取报文主体
int bodyOffset1 = helpers.analyzeResponse(content).getBodyOffset(); int responseBodyOffset = helpers.analyzeResponse(content).getBodyOffset();
byte[] byteRequest1 = controller.getResponse(); byte[] byteResponse = controller.getResponse();
byte[] body = Arrays.copyOfRange(byteRequest1, bodyOffset1, byteRequest1.length); byte[] responseBody = Arrays.copyOfRange(byteResponse, responseBodyOffset, byteResponse.length);
obj = ec.matchRegex(content, headers1, body, "response"); obj = ec.matchRegex(content, responseHeaders, responseBody, "response");
if (obj.size() > 0) { if (obj.size() > 0) {
String result = da.extractString(obj); String result = da.extractString(obj);
extractResponseContent = result.getBytes(); extractResponseContent = result.getBytes();

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

@@ -28,7 +28,7 @@ public class ExtractContent {
String matchContent = ""; String matchContent = "";
for (Object[] objects : rules.get(i)) { for (Object[] objects : rules.get(i)) {
// 遍历获取规则 // 遍历获取规则
List<String> result = new ArrayList<String>(); List<String> result = new ArrayList<>();
Map<String, Object> tmpMap = new HashMap<>(); Map<String, Object> tmpMap = new HashMap<>();
String name = objects[1].toString(); String name = objects[1].toString();