Server-side support for highlighting OOB reqs

forensant · Sep 27, 2023 · ab70493 · ab70493
1 parent 6cf0a6d
commit ab70493
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/pkg/project/request_model_api.go b/pkg/project/request_model_api.go
@@ -453,6 +453,12 @@ func GetRequestResponseContents(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	maxHighlightLength, err := strconv.Atoi(r.FormValue("max_highlight_length"))
+	if err != nil {
+		// default of 50KB
+		maxHighlightLength = 50 * 1024
+	}
+
 	if httpRequest.Protocol == "Websocket" || httpRequest.Protocol == "Out of Band" {
 		requestResponse.DataPackets = dataPackets
 
@@ -463,6 +469,15 @@ func GetRequestResponseContents(w http.ResponseWriter, r *http.Request) {
 			requestResponse.DataPackets[idx].IsUTF8 = utf8.Valid(dpkt.Data)
 		}
 
+		if httpRequest.Protocol == "Out of Band" {
+			for _, dpkt := range requestResponse.DataPackets {
+				if dpkt.Direction == "Request" && requestResponse.Request == "" {
+					requestResponse.Request = highlightAndEncode(dpkt.Data, shouldHighlight, maxHighlightLength, false)
+				} else if dpkt.Direction == "Response" && requestResponse.Response == "" {
+					requestResponse.Response = highlightAndEncode(dpkt.Data, shouldHighlight, maxHighlightLength, false)
+				}
+			}
+		}
 	} else {
 		var origReq []byte
 		var origResp []byte
@@ -500,12 +515,6 @@ func GetRequestResponseContents(w http.ResponseWriter, r *http.Request) {
 			shouldHighlight = false
 		}
 
-		maxHighlightLength, err := strconv.Atoi(r.FormValue("max_highlight_length"))
-		if err != nil {
-			// default of 50KB
-			maxHighlightLength = 50 * 1024
-		}
-
 		requestResponse.Request = highlightAndEncode(origReq, shouldHighlight, maxHighlightLength, false)
 		requestResponse.Response = highlightAndEncode(formatResponse(origResp, contentType), shouldHighlight, maxHighlightLength, false)
 		requestResponse.ModifiedRequest = highlightAndEncode(modReq, shouldHighlight, maxHighlightLength, false)