Merge 257049e4cbe3b82d42272f874542724e85d3d116 into 0f09c3a9b4626d9fe9979cf4d0521d6ae32ab646

This commit is contained in:
Suryakant Sahoo 2026-10-24 06:57:42 +05:30 committed by GitHub
commit dbdafaaeb1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 65 additions and 3 deletions

View File

@ -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)

View File

@ -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")
}