fix: use full response to check in tests

check/response_test.go

@@ -43,3 +43,14 @@ func TestAssertResponseTextFailOK(t *testing.T) {
 		assert.Falsef(t, c.AssertResponseContains(e.response), "response shouldn't contain text %v", e.response)
 	}
 }
+
+func TestAssertResponseTextChecksFullResponseOK(t *testing.T) {
+	cfg, err := config.NewConfigFromString(yamlApacheConfig)
+	assert.NoError(t, err)
+
+	c := NewCheck(cfg)
+	for _, e := range expectedResponseOKTests {
+		c.SetExpectResponse(e.expected)
+		assert.Truef(t, c.AssertResponseContains(e.response), "unexpected response: %v", e.response)
+	}
+}

config/config_test.go

@@ -14,7 +14,7 @@ var yamlConfig = `---
 logfile: 'tests/logs/modsec2-apache/apache2/error.log'
 testoverride:
   input:
-    dest_addr: 'httpbin.org'
+    dest_addr: 'httpbingo.org'
     port: '1234'
   ignore:
     '920400-1$': 'This test must be ignored'
@@ -63,7 +63,7 @@ func TestNewConfigConfig(t *testing.T) {
 
 	overrides := cfg.TestOverride.Overrides
 	assert.NotNil(t, overrides.DestAddr, "Looks like we are not overriding destination address")
-	assert.Equal(t, "httpbin.org", *overrides.DestAddr, "Looks like we are not overriding destination address")
+	assert.Equal(t, "httpbingo.org", *overrides.DestAddr, "Looks like we are not overriding destination address")
 }
 
 func TestNewConfigBadConfig(t *testing.T) {

ftwhttp/response.go

@@ -1,14 +1,6 @@
 package ftwhttp
 
-import (
-	"io"
-)
-
-// GetBodyAsString gives the response body as string, or nil if there was some error
-func (r *Response) GetBodyAsString() string {
-	body, err := io.ReadAll(r.Parsed.Body)
-	if err != nil {
-		return ""
-	}
-	return string(body)
+// GetFullResponse gives the full response as string, or nil if there was some error
+func (r *Response) GetFullResponse() string {
+	return string(r.RAW)
 }

ftwhttp/response_test.go

@@ -1,6 +1,7 @@
 package ftwhttp
 
 import (
+	"bytes"
 	"fmt"
 	"net/http"
 	"net/http/httptest"
@@ -67,6 +68,25 @@ func testServer() (server *httptest.Server) {
 	return ts
 }
 
+// Error checking omitted for brevity
+func testEchoServer(t *testing.T) (server *httptest.Server) {
+
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("X-Powered-By", "go-ftw")
+		w.WriteHeader(http.StatusOK)
+		resp := new(bytes.Buffer)
+		for key, value := range r.Header {
+			_, err := fmt.Fprintf(resp, "%s=%s,", key, value)
+			assert.NoError(t, err)
+		}
+
+		_, err := w.Write(resp.Bytes())
+		assert.NoError(t, err)
+	}))
+
+	return ts
+}
+
 func testServerWithCookies() (server *httptest.Server) {
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		expiration := time.Now().Add(365 * 24 * time.Hour)
@@ -96,7 +116,7 @@ func TestResponse(t *testing.T) {
 	response, err := client.Do(*req)
 	assert.NoError(t, err)
 
-	assert.Equal(t, "Hello, client\n", response.GetBodyAsString())
+	assert.Contains(t, response.GetFullResponse(), "Hello, client\n")
 }
 
 func TestResponseWithCookies(t *testing.T) {
@@ -118,11 +138,34 @@ func TestResponseWithCookies(t *testing.T) {
 
 	assert.NoError(t, err)
 
-	assert.Equal(t, "Setting Cookies!\n", response.GetBodyAsString())
+	assert.Contains(t, response.GetFullResponse(), "Setting Cookies!\n")
 
 	cookiereq := generateRequestWithCookiesForTesting()
 
 	_, err = client.Do(*cookiereq)
 
 	assert.NoError(t, err)
 }
+
+func TestResponseChecksFullResponse(t *testing.T) {
+	server := testEchoServer(t)
+
+	defer server.Close()
+
+	d, err := DestinationFromString(server.URL)
+	assert.NoError(t, err)
+	req := generateRequestForTesting(true)
+
+	client, err := NewClient(NewClientConfig())
+	assert.NoError(t, err)
+	err = client.NewConnection(*d)
+
+	assert.NoError(t, err)
+
+	response, err := client.Do(*req)
+
+	assert.NoError(t, err)
+
+	assert.Contains(t, response.GetFullResponse(), "X-Powered-By: go-ftw")
+	assert.Contains(t, response.GetFullResponse(), "User-Agent=[Go Tests]")
+}

runner/run.go

@@ -198,7 +198,7 @@ func RunStage(runContext *TestRunContext, ftwCheck *check.FTWCheck, testCase tes
 func markAndFlush(runContext *TestRunContext, dest *ftwhttp.Destination, stageID string) ([]byte, error) {
 	rline := &ftwhttp.RequestLine{
 		Method: "GET",
-		// Use the `/status` endpoint of `httpbin` (http://httpbin.org), if possible,
+		// Use the `/status` endpoint of `httpbin` (http://httpbingo.org), if possible,
 		// to minimize the amount of data transferred and in the log.
 		// `httpbin` is used by the CRS test setup.
 		URI:     "/status/200",
@@ -333,8 +333,8 @@ func checkResult(c *check.FTWCheck, response *ftwhttp.Response, responseError er
 		if c.StatusCodeRequired() && !c.AssertStatus(response.Parsed.StatusCode) {
 			return Failed
 		}
-		// Check response
-		if c.ResponseContainsRequired() && !c.AssertResponseContains(response.GetBodyAsString()) {
+		// Check if text is contained in the full raw response
+		if c.ResponseContainsRequired() && !c.AssertResponseContains(response.GetFullResponse()) {
 			return Failed
 		}
 	}