Merge pull request #5807 from thc202/exim/fix-body

zaproxy · Oct 10, 2024 · a66fe85 · a66fe85
2 parents 3071f7c + 9e03961
commit a66fe85
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/addOns/exim/CHANGELOG.md b/addOns/exim/CHANGELOG.md
@@ -4,7 +4,8 @@ All notable changes to this add-on will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
-
+### Changed
+- Maintenance changes.
 
 ## [0.12.0] - 2024-10-07
 ### Changed

diff --git a/addOns/exim/src/main/java/org/zaproxy/addon/exim/har/HarUtils.java b/addOns/exim/src/main/java/org/zaproxy/addon/exim/har/HarUtils.java
@@ -194,10 +194,10 @@ public static HarRequest createHarRequest(HttpMessage httpMessage) {
                     text = requestBody.toString();
                 }
             }
-            HarPostData newPostData = new HarPostData();
-            newPostData.setMimeType(contentType);
-            newPostData.setParams(params);
-            newPostData.setText(text);
+            harPostData = new HarPostData();
+            harPostData.setMimeType(contentType);
+            harPostData.setParams(params);
+            harPostData.setText(text);
         }
 
         HttpMethod method = HttpMethod.valueOf(requestHeader.getMethod().toUpperCase(Locale.ROOT));

diff --git a/addOns/exim/src/test/java/org/zaproxy/addon/exim/har/HarImporterUnitTest.java b/addOns/exim/src/test/java/org/zaproxy/addon/exim/har/HarImporterUnitTest.java
@@ -152,21 +152,27 @@ void reset() throws URISyntaxException {
     @Test
     void serializedAndDeserializedShouldMatch() throws Exception {
         // Given
+        var requestHeader =
+                "POST http://example.com/path HTTP/1.1\r\nContent-Type: application/octet-stream\r\n\r\n";
+        var responseHeader = "HTTP/1.1 200 OK\r\nContent-Type: text/plain;charset=US-ASCII\r\n\r\n";
         byte[] requestBody = {0x01, 0x02};
         byte[] responseBody = {0x30, 0x31};
         HttpMessage httpMessage =
-                new HttpMessage(
-                        "POST /path HTTP/1.1\r\nContent-Type: application/octet-stream\r\n\r\n",
-                        requestBody,
-                        "HTTP/1.1 200 OK\r\nContent-Type: text/plain;charset=US-ASCII\r\n\r\n",
-                        responseBody);
+                new HttpMessage(requestHeader, requestBody, responseHeader, responseBody);
 
         HarLog harLog = createHarLog(httpMessage);
         // When
         List<HttpMessage> deserialized = HarImporter.getHttpMessages(harLog);
         // Then
         assertThat(deserialized, hasSize(1));
-        assertThat(deserialized.get(0), equalTo(httpMessage));
+        var deserializedHttpMessage = deserialized.get(0);
+        assertThat(
+                deserializedHttpMessage.getRequestHeader().toString(), is(equalTo(requestHeader)));
+        assertThat(deserializedHttpMessage.getRequestBody().getBytes(), is(equalTo(requestBody)));
+        assertThat(
+                deserializedHttpMessage.getResponseHeader().toString(),
+                is(equalTo(responseHeader)));
+        assertThat(deserializedHttpMessage.getResponseBody().getBytes(), is(equalTo(responseBody)));
     }
 
     @Test