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

Version: 2.0.6 Update

Browse Source
This commit is contained in:
AnonymousUser
2021-07-13 15:10:25 +08:00
parent 43fbc46b65
commit 3fc1869a7b
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
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.5"; String version = "2.0.6";
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);
@@ -73,9 +73,8 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
// 判断是否是响应，且该代码作用域为：REPEATER、INTRUDER、PROXY（分别对应toolFlag 64、32、4） // 判断是否是响应，且该代码作用域为：REPEATER、INTRUDER、PROXY（分别对应toolFlag 64、32、4）
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();
// 流量清洗 // 流量清洗
String urlString = helpers.analyzeRequest(messageInfo.getHttpService(), content).getUrl().toString(); String urlString = helpers.analyzeRequest(messageInfo.getHttpService(), messageInfo.getRequest()).getUrl().toString();
urlString = urlString.indexOf("?") > 0 ? urlString.substring(0, urlString.indexOf("?")) : urlString; urlString = urlString.indexOf("?") > 0 ? urlString.substring(0, urlString.indexOf("?")) : urlString;
// 正则判断 // 正则判断
@@ -84,28 +83,28 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
} }
if (messageIsRequest) { if (messageIsRequest) {
byte[] byteRequest = messageInfo.getRequest();
// 获取报文头 // 获取报文头
List<String> requestTmpHeaders = helpers.analyzeRequest(messageInfo.getHttpService(), content).getHeaders(); List<String> requestTmpHeaders = helpers.analyzeRequest(messageInfo.getHttpService(), byteRequest).getHeaders();
String requestHeaders = String.join("\n", requestTmpHeaders); String requestHeaders = String.join("\n", requestTmpHeaders);
// 获取报文主体 // 获取报文主体
int requestBodyOffset = helpers.analyzeRequest(messageInfo.getHttpService(), content).getBodyOffset(); int requestBodyOffset = helpers.analyzeRequest(messageInfo.getHttpService(), byteRequest).getBodyOffset();
byte[] byteRequest = messageInfo.getRequest();
byte[] requestBody = Arrays.copyOfRange(byteRequest, requestBodyOffset, byteRequest.length); byte[] requestBody = Arrays.copyOfRange(byteRequest, requestBodyOffset, byteRequest.length);
obj = ec.matchRegex(content, requestHeaders, requestBody, "request"); obj = ec.matchRegex(byteRequest, requestHeaders, requestBody, "request");
} else { } else {
byte[] byteResponse = messageInfo.getResponse();
// 获取报文头 // 获取报文头
List<String> responseTmpHeaders = helpers.analyzeRequest(messageInfo.getHttpService(), content).getHeaders(); List<String> responseTmpHeaders = helpers.analyzeRequest(messageInfo.getHttpService(), byteResponse).getHeaders();
String responseHeaders = String.join("\n", responseTmpHeaders); String responseHeaders = String.join("\n", responseTmpHeaders);
// 获取报文主体 // 获取报文主体
int responseBodyOffset = helpers.analyzeResponse(content).getBodyOffset(); int responseBodyOffset = helpers.analyzeResponse(byteResponse).getBodyOffset();
byte[] byteResponse = messageInfo.getResponse();
byte[] responseBody = Arrays.copyOfRange(byteResponse, responseBodyOffset, byteResponse.length); byte[] responseBody = Arrays.copyOfRange(byteResponse, responseBodyOffset, byteResponse.length);
content = messageInfo.getResponse(); obj = ec.matchRegex(byteResponse, responseHeaders, responseBody, "response");
obj = ec.matchRegex(content, responseHeaders, responseBody, "response");
} }
List<String> colorList = da.highlightList(obj); List<String> colorList = da.highlightList(obj);
@@ -156,14 +155,14 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
} catch (Exception e) { } catch (Exception e) {
return false; return false;
} }
IRequestInfo iRequestInfo = helpers.analyzeRequest(controller.getHttpService(), content);
// 获取报文头 // 获取报文头
List<String> requestTmpHeaders = helpers.analyzeRequest(controller.getHttpService(), content).getHeaders(); List<String> requestTmpHeaders = iRequestInfo.getHeaders();
String requestHeaders = String.join("\n", requestTmpHeaders); String requestHeaders = String.join("\n", requestTmpHeaders);
// 获取报文主体 // 获取报文主体
int requestBodyOffset = helpers.analyzeRequest(controller.getHttpService(), content).getBodyOffset(); int requestBodyOffset = iRequestInfo.getBodyOffset();
byte[] byteRequest = controller.getRequest(); byte[] requestBody = Arrays.copyOfRange(content, requestBodyOffset, content.length);
byte[] requestBody = Arrays.copyOfRange(byteRequest, requestBodyOffset, byteRequest.length);
obj = ec.matchRegex(content, requestHeaders, requestBody, "request"); obj = ec.matchRegex(content, requestHeaders, requestBody, "request");
if (obj.size() > 0) { if (obj.size() > 0) {
@@ -172,14 +171,13 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
return true; return true;
} }
} else { } else {
IResponseInfo iResponseInfo = helpers.analyzeResponse(content);
// 获取报文头 // 获取报文头
List<String> responseTmpHeaders = helpers.analyzeResponse(content).getHeaders(); List<String> responseTmpHeaders = iResponseInfo.getHeaders();
String responseHeaders = String.join("\n", responseTmpHeaders); String responseHeaders = String.join("\n", responseTmpHeaders);
// 获取报文主体 // 获取报文主体
int responseBodyOffset = helpers.analyzeResponse(content).getBodyOffset(); int responseBodyOffset = iResponseInfo.getBodyOffset();
byte[] byteResponse = controller.getResponse(); byte[] responseBody = Arrays.copyOfRange(content, responseBodyOffset, content.length);
byte[] responseBody = Arrays.copyOfRange(byteResponse, responseBodyOffset, byteResponse.length);
obj = ec.matchRegex(content, responseHeaders, responseBody, "response"); obj = ec.matchRegex(content, responseHeaders, responseBody, "response");
if (obj.size() > 0) { if (obj.size() > 0) {