gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

close the connection on unexpected frames when reading a HTTP/3 body

Browse Source
This commit is contained in:
Marten Seemann
2019-10-25 09:32:49 +07:00
parent 82873477ed
commit fe6cda98eb
5 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
http3/server.go
View File

@@ -180,7 +180,10 @@ func (s *Server) handleConn(sess quic.Session) {
}
go func() {
defer ginkgo.GinkgoRecover()
if rerr := s.handleRequest(str, decoder); rerr.err != nil || rerr.streamErr != 0 || rerr.connErr != 0 {
rerr := s.handleRequest(str, decoder, func() {
sess.CloseWithError(quic.ErrorCode(errorFrameUnexpected), "")
})
if rerr.err != nil || rerr.streamErr != 0 || rerr.connErr != 0 {
s.logger.Debugf("Handling request failed: %s", err)
if rerr.streamErr != 0 {
str.CancelWrite(quic.ErrorCode(rerr.streamErr))
@@ -206,7 +209,7 @@ func (s *Server) maxHeaderBytes() uint64 {
return uint64(s.Server.MaxHeaderBytes)
}
func (s *Server) handleRequest(str quic.Stream, decoder *qpack.Decoder) requestError {
func (s *Server) handleRequest(str quic.Stream, decoder *qpack.Decoder, onFrameError func()) requestError {
frame, err := parseNextFrame(str)
if err != nil {
return newStreamError(errorRequestIncomplete, err)
@@ -232,7 +235,7 @@ func (s *Server) handleRequest(str quic.Stream, decoder *qpack.Decoder) requestE
// TODO: use the right error code
return newStreamError(errorGeneralProtocolError, err)
}
req.Body = newRequestBody(str)
req.Body = newRequestBody(str, onFrameError)
if s.logger.Debug() {
s.logger.Infof("%s %s%s, on stream %d", req.Method, req.Host, req.RequestURI, str.StreamID())