diff --git a/render/reader.go b/render/reader.go index ae1a7b5e..61f72ea2 100644 --- a/render/reader.go +++ b/render/reader.go @@ -22,10 +22,16 @@ type Reader struct { func (r Reader) Render(w http.ResponseWriter) (err error) { r.WriteContentType(w) if r.ContentLength >= 0 { - if r.Headers == nil { - r.Headers = map[string]string{} + // Copy the caller's headers map before adding Content-Length so the + // map passed via DataFromReader is never mutated. Mutating it leaks a + // stale Content-Length into later responses that reuse the map and + // races when concurrent requests share it. See #4899. + headers := make(map[string]string, len(r.Headers)+1) + for k, v := range r.Headers { + headers[k] = v } - r.Headers["Content-Length"] = strconv.FormatInt(r.ContentLength, 10) + headers["Content-Length"] = strconv.FormatInt(r.ContentLength, 10) + r.Headers = headers } r.writeHeaders(w) _, err = io.Copy(w, r.Reader) diff --git a/render/reader_test.go b/render/reader_test.go index aaceb9ea..c90c77fd 100644 --- a/render/reader_test.go +++ b/render/reader_test.go @@ -7,6 +7,7 @@ package render import ( "net/http/httptest" "strings" + "sync" "testing" "github.com/stretchr/testify/require" @@ -21,3 +22,58 @@ func TestReaderRenderNoHeaders(t *testing.T) { err := r.Render(httptest.NewRecorder()) require.NoError(t, err) } + +func TestReaderRenderDoesNotMutateHeaders(t *testing.T) { + headers := map[string]string{"Cache-Control": "public"} + r := Reader{ + ContentType: "text/plain", + ContentLength: 5, + Reader: strings.NewReader("hello"), + Headers: headers, + } + w := httptest.NewRecorder() + require.NoError(t, r.Render(w)) + require.Equal(t, "5", w.Header().Get("Content-Length")) + require.NotContains(t, headers, "Content-Length", "caller's headers map must stay read-only") +} + +func TestReaderRenderNoStaleContentLengthOnMapReuse(t *testing.T) { + headers := map[string]string{"Cache-Control": "public"} + r1 := Reader{ + ContentType: "text/plain", + ContentLength: 5, + Reader: strings.NewReader("hello"), + Headers: headers, + } + require.NoError(t, r1.Render(httptest.NewRecorder())) + + r2 := Reader{ + ContentType: "text/plain", + ContentLength: -1, + Reader: strings.NewReader("hello, world!"), + Headers: headers, + } + w2 := httptest.NewRecorder() + require.NoError(t, r2.Render(w2)) + require.Empty(t, w2.Header().Get("Content-Length"), "stale Content-Length must not leak into later responses") +} + +func TestReaderRenderConcurrentSharedHeaders(t *testing.T) { + headers := map[string]string{"Cache-Control": "public"} + var wg sync.WaitGroup + for i := 0; i < 50; i++ { + wg.Add(1) + go func() { + defer wg.Done() + r := Reader{ + ContentType: "text/plain", + ContentLength: 5, + Reader: strings.NewReader("hello"), + Headers: headers, + } + _ = r.Render(httptest.NewRecorder()) + }() + } + wg.Wait() + require.NotContains(t, headers, "Content-Length") +}