|
| 1 | +From 6e577d297aa8b47651c1a5c3ebfbf3f2d769be96 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Damien Neil <dneil@google.com> |
| 3 | +Date: Fri, 6 Oct 2023 09:51:19 -0700 |
| 4 | +Subject: [PATCH] http2: limit maximum handler goroutines to |
| 5 | + MaxConcurrentStreams |
| 6 | + |
| 7 | +When the peer opens a new stream while we have MaxConcurrentStreams |
| 8 | +handler goroutines running, defer starting a handler until one |
| 9 | +of the existing handlers exits. |
| 10 | + |
| 11 | +Fixes golang/go#63417 |
| 12 | +Fixes CVE-2023-39325 |
| 13 | + |
| 14 | +Change-Id: If0531e177b125700f3e24c5ebd24b1023098fa6d |
| 15 | +Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/2045854 |
| 16 | +TryBot-Result: Security TryBots <security-trybots@go-security-trybots.iam.gserviceaccount.com> |
| 17 | +Reviewed-by: Ian Cottrell <iancottrell@google.com> |
| 18 | +Reviewed-by: Tatiana Bradley <tatianabradley@google.com> |
| 19 | +Run-TryBot: Damien Neil <dneil@google.com> |
| 20 | +Reviewed-on: https://go-review.googlesource.com/c/net/+/534215 |
| 21 | +Reviewed-by: Michael Pratt <mpratt@google.com> |
| 22 | +Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> |
| 23 | +LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> |
| 24 | +Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org> |
| 25 | +Reviewed-by: Damien Neil <dneil@google.com> |
| 26 | + |
| 27 | +Modified to apply to vendored code by: Daniel McIlvaney <damcilva@microsoft.com> |
| 28 | + - Adjusted paths |
| 29 | + - Removed reference to server_test.go |
| 30 | + - Removed reference to upgradeRequest() which is not in old versions of the vendored code |
| 31 | + - Removed reference to countError() which is not in old versions of the vendored code |
| 32 | +--- |
| 33 | + vendor/golang.org/x/net/http2/server.go | 62 ++++++++++++++++++++++++- |
| 34 | + 1 file changed, 60 insertions(+), 2 deletions(-) |
| 35 | + |
| 36 | +diff --git a/vendor/golang.org/x/net/http2/server.go b/vendor/golang.org/x/net/http2/server.go |
| 37 | +index de31d72..daa01a7 100644 |
| 38 | +--- a/vendor/golang.org/x/net/http2/server.go |
| 39 | ++++ b/vendor/golang.org/x/net/http2/server.go |
| 40 | +@@ -521,9 +521,11 @@ type serverConn struct { |
| 41 | + advMaxStreams uint32 // our SETTINGS_MAX_CONCURRENT_STREAMS advertised the client |
| 42 | + curClientStreams uint32 // number of open streams initiated by the client |
| 43 | + curPushedStreams uint32 // number of open streams initiated by server push |
| 44 | ++ curHandlers uint32 // number of running handler goroutines |
| 45 | + maxClientStreamID uint32 // max ever seen from client (odd), or 0 if there have been no client requests |
| 46 | + maxPushPromiseID uint32 // ID of the last push promise (even), or 0 if there have been no pushes |
| 47 | + streams map[uint32]*stream |
| 48 | ++ unstartedHandlers []unstartedHandler |
| 49 | + initialStreamSendWindowSize int32 |
| 50 | + maxFrameSize int32 |
| 51 | + headerTableSize uint32 |
| 52 | +@@ -895,6 +897,8 @@ func (sc *serverConn) serve() { |
| 53 | + return |
| 54 | + case gracefulShutdownMsg: |
| 55 | + sc.startGracefulShutdownInternal() |
| 56 | ++ case handlerDoneMsg: |
| 57 | ++ sc.handlerDone() |
| 58 | + default: |
| 59 | + panic("unknown timer") |
| 60 | + } |
| 61 | +@@ -940,6 +944,7 @@ var ( |
| 62 | + idleTimerMsg = new(serverMessage) |
| 63 | + shutdownTimerMsg = new(serverMessage) |
| 64 | + gracefulShutdownMsg = new(serverMessage) |
| 65 | ++ handlerDoneMsg = new(serverMessage) |
| 66 | + ) |
| 67 | + |
| 68 | + func (sc *serverConn) onSettingsTimer() { sc.sendServeMsg(settingsTimerMsg) } |
| 69 | +@@ -1880,8 +1885,7 @@ func (sc *serverConn) processHeaders(f *MetaHeadersFrame) error { |
| 70 | + sc.conn.SetReadDeadline(time.Time{}) |
| 71 | + } |
| 72 | + |
| 73 | +- go sc.runHandler(rw, req, handler) |
| 74 | +- return nil |
| 75 | ++ return sc.scheduleHandler(id, rw, req, handler) |
| 76 | + } |
| 77 | + |
| 78 | + func (st *stream) processTrailerHeaders(f *MetaHeadersFrame) error { |
| 79 | +@@ -2124,8 +2128,62 @@ func (sc *serverConn) newWriterAndRequestNoBody(st *stream, rp requestParam) (*r |
| 80 | + return rw, req, nil |
| 81 | + } |
| 82 | + |
| 83 | ++type unstartedHandler struct { |
| 84 | ++ streamID uint32 |
| 85 | ++ rw *responseWriter |
| 86 | ++ req *http.Request |
| 87 | ++ handler func(http.ResponseWriter, *http.Request) |
| 88 | ++} |
| 89 | ++ |
| 90 | ++// scheduleHandler starts a handler goroutine, |
| 91 | ++// or schedules one to start as soon as an existing handler finishes. |
| 92 | ++func (sc *serverConn) scheduleHandler(streamID uint32, rw *responseWriter, req *http.Request, handler func(http.ResponseWriter, *http.Request)) error { |
| 93 | ++ sc.serveG.check() |
| 94 | ++ maxHandlers := sc.advMaxStreams |
| 95 | ++ if sc.curHandlers < maxHandlers { |
| 96 | ++ sc.curHandlers++ |
| 97 | ++ go sc.runHandler(rw, req, handler) |
| 98 | ++ return nil |
| 99 | ++ } |
| 100 | ++ if len(sc.unstartedHandlers) > int(4*sc.advMaxStreams) { |
| 101 | ++ return ConnectionError(ErrCodeEnhanceYourCalm) |
| 102 | ++ } |
| 103 | ++ sc.unstartedHandlers = append(sc.unstartedHandlers, unstartedHandler{ |
| 104 | ++ streamID: streamID, |
| 105 | ++ rw: rw, |
| 106 | ++ req: req, |
| 107 | ++ handler: handler, |
| 108 | ++ }) |
| 109 | ++ return nil |
| 110 | ++} |
| 111 | ++ |
| 112 | ++func (sc *serverConn) handlerDone() { |
| 113 | ++ sc.serveG.check() |
| 114 | ++ sc.curHandlers-- |
| 115 | ++ i := 0 |
| 116 | ++ maxHandlers := sc.advMaxStreams |
| 117 | ++ for ; i < len(sc.unstartedHandlers); i++ { |
| 118 | ++ u := sc.unstartedHandlers[i] |
| 119 | ++ if sc.streams[u.streamID] == nil { |
| 120 | ++ // This stream was reset before its goroutine had a chance to start. |
| 121 | ++ continue |
| 122 | ++ } |
| 123 | ++ if sc.curHandlers >= maxHandlers { |
| 124 | ++ break |
| 125 | ++ } |
| 126 | ++ sc.curHandlers++ |
| 127 | ++ go sc.runHandler(u.rw, u.req, u.handler) |
| 128 | ++ sc.unstartedHandlers[i] = unstartedHandler{} // don't retain references |
| 129 | ++ } |
| 130 | ++ sc.unstartedHandlers = sc.unstartedHandlers[i:] |
| 131 | ++ if len(sc.unstartedHandlers) == 0 { |
| 132 | ++ sc.unstartedHandlers = nil |
| 133 | ++ } |
| 134 | ++} |
| 135 | ++ |
| 136 | + // Run on its own goroutine. |
| 137 | + func (sc *serverConn) runHandler(rw *responseWriter, req *http.Request, handler func(http.ResponseWriter, *http.Request)) { |
| 138 | ++ defer sc.sendServeMsg(handlerDoneMsg) |
| 139 | + didPanic := true |
| 140 | + defer func() { |
| 141 | + rw.rws.stream.cancelCtx() |
| 142 | +-- |
| 143 | +2.33.8 |
0 commit comments