Merge pull request #1370 from semihbkgr/fix-request-body-nil-pointer

Check for nil body in http_helper.HttpDoOptions before reading

Author: denis256

modules/http-helper/http_helper.go

@@ -346,11 +346,15 @@ func HTTPDoWithRetryWithOptionsE(
 	t testing.TestingT, options HttpDoOptions, expectedStatus int,
 	retries int, sleepBetweenRetries time.Duration,
 ) (string, error) {
-	// The request body is closed after a request is complete.
-	// Extract the underlying data and cache it so we can reuse for retried requests
-	data, err := io.ReadAll(options.Body)
-	if err != nil {
-		return "", err
+	var data []byte
+	if options.Body != nil {
+		// The request body is closed after a request is complete.
+		// Read the underlying data and cache it, so we can reuse for retried requests.
+		b, err := io.ReadAll(options.Body)
+		if err != nil {
+			return "", err
+		}
+		data = b
 	}
 
 	options.Body = nil

modules/http-helper/http_helper_test.go

@@ -139,6 +139,21 @@ func TestErrorWithRetry(t *testing.T) {
 	}
 }
 
+func TestEmptyRequestBodyWithRetryWithOptions(t *testing.T) {
+	t.Parallel()
+	ts := getTestServerForFunction(bodyCopyHandler)
+	defer ts.Close()
+
+	options := HttpDoOptions{
+		Method: "GET",
+		Url:    ts.URL,
+		Body:   nil,
+	}
+
+	response := HTTPDoWithRetryWithOptions(t, options, 200, 0, time.Second)
+	require.Equal(t, "", response)
+}
+
 func bodyCopyHandler(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(http.StatusOK)
 	body, _ := io.ReadAll(r.Body)