mirror of
https://github.com/gin-gonic/gin.git
synced 2026-11-20 01:04:46 +08:00
fix(render): don't modify caller's headers map in Reader.Render
Reader.Render wrote Content-Length into the caller-supplied Headers map, so DataFromReader leaked a stale Content-Length into later responses that reused the map and raced when the map was shared across requests. Set Content-Length on the response headers instead.
This commit is contained in:
parent
0f09c3a9b4
commit
50453fd62e
@ -21,11 +21,8 @@ type Reader struct {
|
||||
// Render (Reader) writes data with custom ContentType and headers.
|
||||
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{}
|
||||
}
|
||||
r.Headers["Content-Length"] = strconv.FormatInt(r.ContentLength, 10)
|
||||
if r.ContentLength >= 0 && w.Header().Get("Content-Length") == "" {
|
||||
w.Header().Set("Content-Length", strconv.FormatInt(r.ContentLength, 10))
|
||||
}
|
||||
r.writeHeaders(w)
|
||||
_, err = io.Copy(w, r.Reader)
|
||||
|
||||
@ -21,3 +21,30 @@ func TestReaderRenderNoHeaders(t *testing.T) {
|
||||
err := r.Render(httptest.NewRecorder())
|
||||
require.NoError(t, err)
|
||||
}
|
||||
|
||||
func TestReaderRenderDoesNotModifyHeaders(t *testing.T) {
|
||||
headers := map[string]string{"Cache-Control": "public"}
|
||||
|
||||
w := httptest.NewRecorder()
|
||||
r := Reader{
|
||||
ContentLength: 5,
|
||||
Reader: strings.NewReader("hello"),
|
||||
Headers: headers,
|
||||
}
|
||||
require.NoError(t, r.Render(w))
|
||||
require.Equal(t, map[string]string{"Cache-Control": "public"}, headers)
|
||||
require.Equal(t, "5", w.Header().Get("Content-Length"))
|
||||
|
||||
// Reusing the same map for a response of unknown length must not
|
||||
// carry over the Content-Length of the previous response.
|
||||
w = httptest.NewRecorder()
|
||||
r = Reader{
|
||||
ContentLength: -1,
|
||||
Reader: strings.NewReader("hello, world!"),
|
||||
Headers: headers,
|
||||
}
|
||||
require.NoError(t, r.Render(w))
|
||||
require.Empty(t, w.Header().Get("Content-Length"))
|
||||
require.Equal(t, "public", w.Header().Get("Cache-Control"))
|
||||
require.Equal(t, "hello, world!", w.Body.String())
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user