limit error in response body to 1024 bytes

Author: Leo Diaz Sanchez

swift.go

@@ -25,14 +25,15 @@ import (
 )
 
 const (
-	DefaultUserAgent    = "goswift/1.0"         // Default user agent
-	DefaultRetries      = 3                     // Default number of retries on token expiry
-	TimeFormat          = "2006-01-02T15:04:05" // Python date format for json replies parsed as UTC
-	UploadTar           = "tar"                 // Data format specifier for Connection.BulkUpload().
-	UploadTarGzip       = "tar.gz"              // Data format specifier for Connection.BulkUpload().
-	UploadTarBzip2      = "tar.bz2"             // Data format specifier for Connection.BulkUpload().
-	allContainersLimit  = 10000                 // Number of containers to fetch at once
-	allObjectsChanLimit = 1000                  // Number objects to fetch when fetching to a channel
+	DefaultUserAgent     = "goswift/1.0"         // Default user agent
+	DefaultRetries       = 3                     // Default number of retries on token expiry
+	TimeFormat           = "2006-01-02T15:04:05" // Python date format for json replies parsed as UTC
+	UploadTar            = "tar"                 // Data format specifier for Connection.BulkUpload().
+	UploadTarGzip        = "tar.gz"              // Data format specifier for Connection.BulkUpload().
+	UploadTarBzip2       = "tar.bz2"             // Data format specifier for Connection.BulkUpload().
+	allContainersLimit   = 10000                 // Number of containers to fetch at once
+	allObjectsChanLimit  = 1000                  // Number objects to fetch when fetching to a channel
+	respBodyErrSizeLimit = 1024                  // Maximum size of response body to read when appending to error messages
 )
 
 // ObjectType is the type of the swift object, regular, static large,
@@ -417,12 +418,14 @@ func appendResponseBodyToError(resp *http.Response, err error) error {
 		return err
 	}
 
-	body, readErr := io.ReadAll(resp.Body)
-	if readErr != nil || len(body) == 0 {
+	buf := make([]byte, respBodyErrSizeLimit)
+	limitedReader := io.LimitReader(resp.Body, respBodyErrSizeLimit)
+	n, readErr := limitedReader.Read(buf)
+	if readErr != nil || n == 0 {
 		return err
 	}
 
-	trimmed := strings.TrimSpace(string(body))
+	trimmed := strings.TrimSpace(string(buf[:n]))
 	if trimmed == "" {
 		return err
 	}

swift_internal_test.go

@@ -14,6 +14,7 @@ import (
 	"net/http"
 	"os"
 	"reflect"
+	"strings"
 	"testing"
 	"time"
 )
@@ -285,6 +286,84 @@ func TestInternalParseHeaders(t *testing.T) {
 	}
 }
 
+func TestInternalParseHeadersWithErrorMessageInBody(t *testing.T) {
+	testCases := []struct {
+		name     string
+		resp     *http.Response
+		errMap   map[int]error
+		expected string
+	}{
+		{
+			name: "Container error with body",
+			resp: &http.Response{
+				StatusCode: 400,
+				Header: http.Header{
+					"Content-Type": []string{"text/plain"},
+				},
+				ContentLength: 15,
+				Body:          io.NopCloser(strings.NewReader("Body message")),
+				Status:        "Status message",
+			},
+			errMap:   ContainerErrorMap,
+			expected: "Bad Request: Body message",
+		},
+		{
+			name: "Error with body",
+			resp: &http.Response{
+				StatusCode: 400,
+				Header: http.Header{
+					"Content-Type": []string{"text/plain"},
+				},
+				ContentLength: 15,
+				Body:          io.NopCloser(strings.NewReader("Body message")),
+				Status:        "Status message",
+			},
+			errMap:   nil,
+			expected: "HTTP Error: 400: Status message: Body message",
+		},
+		{
+			name: "Object error with body",
+			resp: &http.Response{
+				StatusCode: 400,
+				Header: http.Header{
+					"Content-Type": []string{"text/plain"},
+				},
+				ContentLength: 15,
+				Body:          io.NopCloser(strings.NewReader("Body message")),
+				Status:        "Status message",
+			},
+			errMap:   objectErrorMap,
+			expected: "Bad Request: Body message",
+		},
+		{
+			name: "Object error with body over 1024 bytes",
+			resp: &http.Response{
+				StatusCode: 400,
+				Header: http.Header{
+					"Content-Type": []string{"text/plain"},
+				},
+				ContentLength: 1025,
+				Body:          io.NopCloser(strings.NewReader(strings.Repeat("a", 1025))),
+				Status:        "Status message",
+			},
+			errMap:   objectErrorMap,
+			expected: fmt.Sprintf("%s: %s", "Bad Request", strings.Repeat("a", 1024)),
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			err := c.parseHeaders(tc.resp, tc.errMap)
+			if err == nil {
+				t.Fatalf("Expected error, got nil")
+			}
+			if err.Error() != tc.expected {
+				t.Errorf("Expected error %q, got %q", tc.expected, err.Error())
+			}
+		})
+	}
+}
+
 func TestInternalReadHeaders(t *testing.T) {
 	resp := &http.Response{Header: http.Header{}}
 	compareMaps(t, readHeaders(resp), Headers{})