modify Match and Replace のContent-Length更新

raise-isayan · May 28, 2024 · 68cc5de · 68cc5de
1 parent eda40cf
commit 68cc5de
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/libs/BurpExtensionCommons-v3.2.0.0-all.jar b/libs/BurpExtensionCommons-v3.2.0.0-all.jar
diff --git a/release/YaguraExtension-v3.1.jar b/release/YaguraExtension-v3.1.jar
diff --git a/src/main/java/burp/BurpExtension.java b/src/main/java/burp/BurpExtension.java
@@ -1609,6 +1609,7 @@ private ProxyRequestReceivedAction processProxyMessage(InterceptedRequest interc
             // Match and Replace
             if (getProperty().getMatchReplaceProperty().isSelectedMatchReplace()) {
                 MatchReplaceGroup group = getProperty().getMatchReplaceProperty().getReplaceSelectedGroup(getProperty().getMatchReplaceProperty().getSelectedName());
+                BurpExtension.helpers().outPrintln("rbody:\r\n" + StringUtil.getBytesRawString(requestBytes) + "\r\n:rbody");
                 if (group != null && group.isInScopeOnly()) {
                     if (helpers().isInScope(interceptedHttpRequest.url())) {
                         resultBytes = this.replaceProxyMessage(true, requestBytes, interceptedHttpRequest.bodyOffset());
@@ -1618,9 +1619,9 @@ private ProxyRequestReceivedAction processProxyMessage(InterceptedRequest interc
                 }
             }
             if (requestBytes != resultBytes) {
-//                HttpRequest modifyRequest = HttpRequest.httpRequest(interceptedHttpRequest.httpService(), ByteArray.byteArray(resultBytes));
                 HttpRequest modifyRequest = ExtensionHelper.httpRequest(interceptedHttpRequest.httpService(), ByteArray.byteArray(resultBytes));
-                return ProxyRequestReceivedAction.continueWith(modifyRequest, annotations);
+                HttpRequestWapper wrapModifyRequest = new HttpRequestWapper(modifyRequest);
+                return ProxyRequestReceivedAction.continueWith(wrapModifyRequest.withUpdateContentLength(), annotations);
             } else {
                 return ProxyRequestReceivedAction.continueWith(interceptedHttpRequest, annotations);
             }
@@ -1749,7 +1750,7 @@ private HttpRequestResponse matchAlertMessage(ToolType toolType, boolean message
          * @param bodyOffset
          * @return 変換後メッセージ
          */
-        protected byte[] replaceProxyMessage(
+        protected synchronized byte[] replaceProxyMessage(
                 boolean messageIsRequest,
                 byte[] httpMessage,
                 int bodyOffset) {