[net] http2: return unexpected eof on empty response with non-zero content length
36 views
Skip to first unread message
Alexander Rakoczy (Gerrit)
Oct 13, 2021, 11:35:00 AM10/13/21
to Gerrit Bot, goph...@pubsubhelper.golang.org, golang-...@googlegroups.com, Go Bot, Brad Fitzpatrick, Damien Neil, Alexander Yastrebov, Tom Bergan, golang-co...@googlegroups.com
Alexander Rakoczy submitted this change.
Approvals:
Damien Neil: Looks good to me, approved; Trusted
Alexander Rakoczy: Trusted; Run TryBots
Go Bot: TryBots succeeded
http2: return unexpected eof on empty response with non-zero content length
Fixes golang/go#46071
Change-Id: I8b8262ba8e28a129f6aacfca43b7b8d9e605a0ce
GitHub-Last-Rev: 11b92cc8ba6e1d08716aac816d33b659563a893f
GitHub-Pull-Request: golang/net#114
Reviewed-on: https://go-review.googlesource.com/c/net/+/354141
Reviewed-by: Damien Neil <dn...@google.com>
Trust: Damien Neil <dn...@google.com>
Trust: Alexander Rakoczy <al...@golang.org>
Run-TryBot: Alexander Rakoczy <al...@golang.org>
TryBot-Result: Go Bot <go...@golang.org>
---
M http2/transport_test.go
M http2/transport.go
2 files changed, 95 insertions(+), 13 deletions(-)
diff --git a/http2/transport.go b/http2/transport.go
index c88d227..a5ba742 100644
--- a/http2/transport.go
+++ b/http2/transport.go
@@ -2217,28 +2217,33 @@
return nil, nil
}
- streamEnded := f.StreamEnded()
- isHead := cs.req.Method == "HEAD"
- if !streamEnded || isHead {
- res.ContentLength = -1
- if clens := res.Header["Content-Length"]; len(clens) == 1 {
- if cl, err := strconv.ParseUint(clens[0], 10, 63); err == nil {
- res.ContentLength = int64(cl)
- } else {
- // TODO: care? unlike http/1, it won't mess up our framing, so it's
- // more safe smuggling-wise to ignore.
- }
- } else if len(clens) > 1 {
+ res.ContentLength = -1
+ if clens := res.Header["Content-Length"]; len(clens) == 1 {
+ if cl, err := strconv.ParseUint(clens[0], 10, 63); err == nil {
+ res.ContentLength = int64(cl)
+ } else {
// TODO: care? unlike http/1, it won't mess up our framing, so it's
// more safe smuggling-wise to ignore.
}
+ } else if len(clens) > 1 {
+ // TODO: care? unlike http/1, it won't mess up our framing, so it's
+ // more safe smuggling-wise to ignore.
}
- if streamEnded || isHead {
+ if cs.req.Method == "HEAD" {
res.Body = noBody
return res, nil
}
+ if f.StreamEnded() {
+ if res.ContentLength > 0 {
+ res.Body = missingBody{}
+ } else {
+ res.Body = noBody
+ }
+ return res, nil
+ }
+
cs.bufPipe.setBuffer(&dataBuffer{expected: res.ContentLength})
cs.bytesRemain = res.ContentLength
res.Body = transportResponseBody{cs}
@@ -2786,6 +2791,11 @@
var noBody io.ReadCloser = ioutil.NopCloser(bytes.NewReader(nil))
+type missingBody struct{}
+
+func (missingBody) Close() error { return nil }
+func (missingBody) Read([]byte) (int, error) { return 0, io.ErrUnexpectedEOF }
+
func strSliceContains(ss []string, s string) bool {
for _, v := range ss {
if v == s {
diff --git a/http2/transport_test.go b/http2/transport_test.go
index 3c02695..b250738 100644
--- a/http2/transport_test.go
+++ b/http2/transport_test.go
@@ -5623,3 +5623,56 @@
}
ct.run()
}
+
+func TestTransportContentLengthWithoutBody(t *testing.T) {
+ contentLength := ""
+ st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
+ w.Header().Set("Content-Length", contentLength)
+ }, optOnlyServer)
+ defer st.Close()
+ tr := &Transport{TLSClientConfig: tlsConfigInsecure}
+ defer tr.CloseIdleConnections()
+
+ for _, test := range []struct {
+ name string
+ contentLength string
+ wantBody string
+ wantErr error
+ wantContentLength int64
+ }{
+ {
+ name: "non-zero content length",
+ contentLength: "42",
+ wantErr: io.ErrUnexpectedEOF,
+ wantContentLength: 42,
+ },
+ {
+ name: "zero content length",
+ contentLength: "0",
+ wantErr: nil,
+ wantContentLength: 0,
+ },
+ } {
+ t.Run(test.name, func(t *testing.T) {
+ contentLength = test.contentLength
+
+ req, _ := http.NewRequest("GET", st.ts.URL, nil)
+ res, err := tr.RoundTrip(req)
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer res.Body.Close()
+ body, err := io.ReadAll(res.Body)
+
+ if err != test.wantErr {
+ t.Errorf("Expected error %v, got: %v", test.wantErr, err)
+ }
+ if len(body) > 0 {
+ t.Errorf("Expected empty body, got: %v", body)
+ }
+ if res.ContentLength != test.wantContentLength {
+ t.Errorf("Expected content length %d, got: %d", test.wantContentLength, res.ContentLength)
+ }
+ })
+ }
+}
To view, visit change 354141. To unsubscribe, or for help writing mail filters, visit settings.
Reply all
Reply to author
Forward
0 new messages