Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

http2: improve error when server sends HTTP/1 #224

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions http2/frame.go
Original file line number Diff line number Diff line change
@@ -225,6 +225,11 @@ var fhBytes = sync.Pool{
},
}

func invalidHTTP1LookingFrameHeader() FrameHeader {
fh, _ := readFrameHeader(make([]byte, frameHeaderLen), strings.NewReader("HTTP/1.1 "))
return fh
}

// ReadFrameHeader reads 9 bytes from r and returns a FrameHeader.
// Most users should use Framer.ReadFrame instead.
func ReadFrameHeader(r io.Reader) (FrameHeader, error) {
@@ -503,10 +508,16 @@ func (fr *Framer) ReadFrame() (Frame, error) {
return nil, err
}
if fh.Length > fr.maxReadSize {
if fh == invalidHTTP1LookingFrameHeader() {
return nil, fmt.Errorf("http2: failed reading the frame payload: %w, note that the frame header looked like an HTTP/1.1 header", err)
}
return nil, ErrFrameTooLarge
}
payload := fr.getReadBuf(fh.Length)
if _, err := io.ReadFull(fr.r, payload); err != nil {
if fh == invalidHTTP1LookingFrameHeader() {
return nil, fmt.Errorf("http2: failed reading the frame payload: %w, note that the frame header looked like an HTTP/1.1 header", err)
}
return nil, err
}
f, err := typeFrameParser(fh.Type)(fr.frameCache, fh, fr.countError, payload)
42 changes: 42 additions & 0 deletions http2/transport_test.go
Original file line number Diff line number Diff line change
@@ -272,6 +272,48 @@ func TestTransport(t *testing.T) {
}
}

func TestTransportFailureErrorForHTTP1Response(t *testing.T) {
const expectedHTTP1PayloadHint = "frame header looked like an HTTP/1.1 header"

ts := httptest.NewServer(http.NewServeMux())
t.Cleanup(ts.Close)

for _, tc := range []struct {
name string
maxFrameSize uint32
expectedErrorIs error
}{
{
name: "with default max frame size",
maxFrameSize: 0,
},
{
name: "with enough frame size to start reading",
maxFrameSize: invalidHTTP1LookingFrameHeader.Length + 1,
},
} {
t.Run(tc.name, func(t *testing.T) {
tr := &Transport{
DialTLSContext: func(ctx context.Context, network, addr string, cfg *tls.Config) (net.Conn, error) {
return net.Dial(network, addr)
},
MaxReadFrameSize: tc.maxFrameSize,
AllowHTTP: true,
}

req, err := http.NewRequest("GET", ts.URL, nil)
if err != nil {
t.Fatal(err)
}

_, err = tr.RoundTrip(req)
if !strings.Contains(err.Error(), expectedHTTP1PayloadHint) {
t.Errorf("expected error to contain %q, got %v", expectedHTTP1PayloadHint, err)
}
})
}
}

func testTransportReusesConns(t *testing.T, useClient, wantSame bool, modReq func(*http.Request)) {
ts := newTestServer(t, func(w http.ResponseWriter, r *http.Request) {
io.WriteString(w, r.RemoteAddr)