Provide the request for intercepted responses

forensant · Jul 29, 2023 · 3482b0f · 3482b0f
1 parent 07675aa
commit 3482b0f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/internal/proxy/http11webproxy.go b/internal/proxy/http11webproxy.go
@@ -96,7 +96,7 @@ func onHttp11RequestReceived(req *http.Request, ctx *goproxy.ProxyCtx) (*http.Re
 	}
 
 	if interceptSettings.BrowserToServer {
-		interceptedRequest := interceptRequest(request, "", "browser_to_server", requestBytes, hookRun)
+		interceptedRequest := interceptRequest(request, "", "browser_to_server", requestBytes, hookRun, nil)
 		<-interceptedRequest.ResponseReady
 
 		modifiedRequestData := request.GetRequestResponseData("Request", true)
@@ -212,7 +212,11 @@ func onHttp11ResponseReceived(resp *http.Response, ctx *goproxy.ProxyCtx) *http.
 			}
 
 			if shouldIntercept {
-				interceptedResponse := interceptRequest(request, "", "server_to_browser", responseBytes, hookRun)
+				reqBytes := request.GetRequestResponseData("Request", false)
+				if len(reqBytes) == 0 {
+					reqBytes = request.GetRequestResponseData("Request", false)
+				}
+				interceptedResponse := interceptRequest(request, "", "server_to_browser", responseBytes, hookRun, reqBytes)
 				<-interceptedResponse.ResponseReady
 
 				responseBytes = request.GetRequestResponseData("Response", true)
@@ -303,7 +307,7 @@ func onWebsocketPacketReceived(data []byte, direction goproxy.WebsocketDirection
 			interceptDirection = "server_to_browser"
 		}
 
-		interceptedRequest := interceptRequest(request, dataPacketGuid, interceptDirection, data, false)
+		interceptedRequest := interceptRequest(request, dataPacketGuid, interceptDirection, data, false, nil)
 		<-interceptedRequest.ResponseReady
 
 		for _, dataPacket := range request.DataPackets {

diff --git a/internal/proxy/intercept_api.go b/internal/proxy/intercept_api.go
@@ -28,11 +28,12 @@ type InterceptedRequestResponse struct {
 var interceptedRequests []*project.InterceptedRequest
 var interceptedRequestsLock sync.Mutex
 
-func interceptRequest(request *project.Request, guid string, direction string, requestData []byte, hookRun bool) *project.InterceptedRequest {
+func interceptRequest(request *project.Request, guid string, direction string, requestResponseData []byte, hookRun bool, requestData []byte) *project.InterceptedRequest {
 	interceptedRequest := &project.InterceptedRequest{
 		Request:       request,
 		GUID:          guid,
-		Body:          base64.StdEncoding.EncodeToString(requestData),
+		Body:          base64.StdEncoding.EncodeToString(requestResponseData),
+		RequestBody:   base64.StdEncoding.EncodeToString(requestData),
 		Direction:     direction,
 		ResponseReady: make(chan bool),
 		IsUTF8:        utf8.Valid(requestData),

diff --git a/pkg/project/intercepted_request_model.go b/pkg/project/intercepted_request_model.go
@@ -7,6 +7,7 @@ type InterceptedRequest struct {
 	Request       *Request
 	GUID          string
 	Body          string    `example:"<base64 encoded body>"`
+	RequestBody   string    `example:"<base64 encoded body> (for responses)"`
 	Direction     string    `example:"Either browser_to_server or server_to_browser"`
 	ResponseReady chan bool `json:"-"`
 	ObjectType    string