Skip to content

Commit

Permalink
http2: handle server errors after sending GOAWAY
Browse files Browse the repository at this point in the history
The HTTP/2 server uses serverConn.goAwayCode to track whether a
connection has encountered a fatal error. If an error is encountered
after sending a ErrCodeNo GOAWAY, upgrade goAwayCode to reflect the
error status of the connection.

Fixes an issue where a server connection could hang forever waiting
for a clean shutdown that was preempted by a subsequent fatal error.

Fixes CVE-2022-27664
For golang/go#53977

Change-Id: I165b81ab53176c77a68c42976030499d57bb05d3
Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1413887
Reviewed-by: Damien Neil <dneil@google.com>
Reviewed-by: Roland Shoemaker <bracewell@google.com>
Reviewed-on: https://go-review.googlesource.com/c/net/+/428735
Run-TryBot: Damien Neil <dneil@google.com>
Reviewed-by: Carlos Amedee <carlos@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
  • Loading branch information
neild committed Sep 6, 2022
1 parent 83b083e commit f3363e0
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 0 deletions.
3 changes: 3 additions & 0 deletions http2/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -1371,6 +1371,9 @@ func (sc *serverConn) startGracefulShutdownInternal() {
func (sc *serverConn) goAway(code ErrCode) {
sc.serveG.check()
if sc.inGoAway {
if sc.goAwayCode == ErrCodeNo {
sc.goAwayCode = code
}
return
}
sc.inGoAway = true
Expand Down
43 changes: 43 additions & 0 deletions http2/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4366,3 +4366,46 @@ func TestServerSendsEarlyHints(t *testing.T) {
}
})
}

func TestProtocolErrorAfterGoAway(t *testing.T) {
st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
io.Copy(io.Discard, r.Body)
})
defer st.Close()

st.greet()
content := "some content"
st.writeHeaders(HeadersFrameParam{
StreamID: 1,
BlockFragment: st.encodeHeader(
":method", "POST",
"content-length", strconv.Itoa(len(content)),
),
EndStream: false,
EndHeaders: true,
})
st.writeData(1, false, []byte(content[:5]))

_, err := st.readFrame()
if err != nil {
st.t.Fatal(err)
}

// Send a GOAWAY with ErrCodeNo, followed by a bogus window update.
// The server should close the connection.
if err := st.fr.WriteGoAway(1, ErrCodeNo, nil); err != nil {
t.Fatal(err)
}
if err := st.fr.WriteWindowUpdate(0, 1<<31-1); err != nil {
t.Fatal(err)
}

for {
if _, err := st.readFrame(); err != nil {
if err != io.EOF {
t.Errorf("unexpected readFrame error: %v", err)
}
break
}
}
}

0 comments on commit f3363e0

Please sign in to comment.