middleware: preserve status after empty ReadFrom (#1213)

This commit is contained in:
Cheruku Sri Charan Reddy 2026-10-18 19:20:22 +05:30 committed by GitHub
parent 04f7f55a7b
commit 9f8adb1aab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 79 additions and 1 deletions

View file

@ -219,8 +219,11 @@ func (f *httpFancyWriter) ReadFrom(r io.Reader) (int64, error) {
return n, err
}
rf := f.basicWriter.ResponseWriter.(io.ReaderFrom)
f.basicWriter.maybeWriteHeader()
n, err := rf.ReadFrom(r)
if n > 0 && !f.basicWriter.wroteHeader {
f.basicWriter.code = http.StatusOK
f.basicWriter.wroteHeader = true
}
f.basicWriter.bytes += int(n)
return n, err
}

View file

@ -0,0 +1,75 @@
package middleware_test
import (
"errors"
"io"
"net/http"
"net/http/httptest"
"strings"
"testing"
"testing/iotest"
"github.com/go-chi/chi/v5/middleware"
)
func TestWrapResponseWriterReadFromStatus(t *testing.T) {
readErr := errors.New("upstream failed")
for _, tc := range []struct {
name string
reader io.Reader
initialStatus int
wantStatus int
wantBytes int
wantErr bool
}{
{name: "empty source", reader: strings.NewReader(""), wantStatus: http.StatusAccepted},
{name: "failed source", reader: iotest.ErrReader(readErr), wantStatus: http.StatusBadGateway, wantErr: true},
{name: "successful source", reader: strings.NewReader("ok"), wantStatus: http.StatusOK, wantBytes: 2},
{name: "partial source", reader: io.MultiReader(strings.NewReader("partial"), iotest.ErrReader(readErr)), wantStatus: http.StatusOK, wantBytes: 7, wantErr: true},
{name: "explicit status", reader: iotest.ErrReader(readErr), initialStatus: http.StatusCreated, wantStatus: http.StatusCreated, wantErr: true},
} {
t.Run(tc.name, func(t *testing.T) {
type result struct {
status, bytes int
copied int64
err error
}
results := make(chan result, 1)
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
wrapped := middleware.NewWrapResponseWriter(w, r.ProtoMajor)
if tc.initialStatus != 0 {
wrapped.WriteHeader(tc.initialStatus)
}
// Hide WriterTo so io.Copy exercises the response writer's ReaderFrom.
n, err := io.Copy(wrapped, struct{ io.Reader }{tc.reader})
if n == 0 {
if err != nil {
wrapped.WriteHeader(http.StatusBadGateway)
} else {
wrapped.WriteHeader(http.StatusAccepted)
}
}
results <- result{status: wrapped.Status(), bytes: wrapped.BytesWritten(), copied: n, err: err}
}))
defer server.Close()
resp, err := server.Client().Get(server.URL)
if err != nil {
t.Fatal(err)
}
defer resp.Body.Close()
if _, err := io.Copy(io.Discard, resp.Body); err != nil {
t.Fatal(err)
}
got := <-results
if resp.StatusCode != tc.wantStatus || got.status != tc.wantStatus {
t.Errorf("client status = %d, wrapper status = %d, want %d", resp.StatusCode, got.status, tc.wantStatus)
}
if got.bytes != tc.wantBytes || got.copied != int64(tc.wantBytes) {
t.Errorf("BytesWritten = %d, copied = %d, want %d", got.bytes, got.copied, tc.wantBytes)
}
if tc.wantErr && !errors.Is(got.err, readErr) || !tc.wantErr && got.err != nil {
t.Errorf("copy error = %v, want upstream error = %t", got.err, tc.wantErr)
}
})
}
}