Fix support for httptest.ResponseRecorder (#584)

This commit is contained in:
Dmitry Zolotukhin 2021-04-25 13:30:31 +02:00 committed by GitHub
parent fd503d90dc
commit 248d06cc6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 7 deletions

View file

@ -2,10 +2,12 @@ package middleware
import (
"bufio"
"bytes"
"net"
"net/http"
"net/http/httptest"
"testing"
"time"
)
type testLoggerWriter struct {
@ -32,3 +34,18 @@ func TestRequestLogger(t *testing.T) {
handler := DefaultLogger(testHandler)
handler.ServeHTTP(w, r)
}
func TestRequestLoggerReadFrom(t *testing.T) {
data := []byte("file data")
testHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
http.ServeContent(w, r, "file", time.Time{}, bytes.NewReader(data))
})
r := httptest.NewRequest("GET", "/", nil)
w := httptest.NewRecorder()
handler := DefaultLogger(testHandler)
handler.ServeHTTP(w, r)
assertEqual(t, data, w.Body.Bytes())
}

View file

@ -19,14 +19,17 @@ func NewWrapResponseWriter(w http.ResponseWriter, protoMajor int) WrapResponseWr
if protoMajor == 2 {
_, ps := w.(http.Pusher)
if fl || ps {
if fl && ps {
return &http2FancyWriter{bw}
}
} else {
_, hj := w.(http.Hijacker)
_, rf := w.(io.ReaderFrom)
if fl || hj || rf {
return &httpFancyWriter{bw}
rf, _ := w.(io.ReaderFrom)
if fl && hj {
return &httpFancyWriter{
basicWriter: bw,
ReaderFrom: rf,
}
}
}
@ -113,6 +116,7 @@ func (b *basicWriter) Unwrap() http.ResponseWriter {
// make the proxied object support the full method set of the proxied object.
type httpFancyWriter struct {
basicWriter
io.ReaderFrom
}
func (f *httpFancyWriter) Flush() {
@ -132,9 +136,15 @@ func (f *httpFancyWriter) ReadFrom(r io.Reader) (int64, error) {
f.basicWriter.bytes += int(n)
return n, err
}
rf := f.basicWriter.ResponseWriter.(io.ReaderFrom)
f.basicWriter.maybeWriteHeader()
n, err := rf.ReadFrom(r)
var n int64
var err error
rf := f.ReaderFrom
if rf != nil {
n, err = rf.ReadFrom(r)
} else {
n, err = io.Copy(&f.basicWriter, r)
}
f.basicWriter.bytes += int(n)
return n, err
}

View file

@ -6,7 +6,7 @@ import (
)
func TestHttpFancyWriterRemembersWroteHeaderWhenFlushed(t *testing.T) {
f := &httpFancyWriter{basicWriter{ResponseWriter: httptest.NewRecorder()}}
f := &httpFancyWriter{basicWriter: basicWriter{ResponseWriter: httptest.NewRecorder()}}
f.Flush()
if !f.wroteHeader {