79 строки
2.9 KiB
Diff
79 строки
2.9 KiB
Diff
From 301e711d4c300e9fb4f4610cb04275e43abca466 Mon Sep 17 00:00:00 2001
|
|
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
|
|
Date: Tue, 9 Jul 2024 20:06:05 +0530
|
|
Subject: [PATCH] http2: close connections when receiving too many headers
|
|
|
|
Maintaining HPACK state requires that we parse and process
|
|
all HEADERS and CONTINUATION frames on a connection.
|
|
When a request's headers exceed MaxHeaderBytes, we don't
|
|
allocate memory to store the excess headers but we do
|
|
parse them. This permits an attacker to cause an HTTP/2
|
|
endpoint to read arbitrary amounts of data, all associated
|
|
with a request which is going to be rejected.
|
|
|
|
Set a limit on the amount of excess header frames we
|
|
will process before closing a connection.
|
|
|
|
Thanks to Bartek Nowotarski for reporting this issue.
|
|
|
|
Fixes CVE-2023-45288
|
|
Fixes golang/go#65051
|
|
|
|
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
|
|
---
|
|
vendor/golang.org/x/net/http2/frame.go | 31 ++++++++++++++++++++++++++
|
|
1 file changed, 31 insertions(+)
|
|
|
|
diff --git a/vendor/golang.org/x/net/http2/frame.go b/vendor/golang.org/x/net/http2/frame.go
|
|
index c1f6b90..175c154 100644
|
|
--- a/vendor/golang.org/x/net/http2/frame.go
|
|
+++ b/vendor/golang.org/x/net/http2/frame.go
|
|
@@ -1565,6 +1565,7 @@ func (fr *Framer) readMetaFrame(hf *HeadersFrame) (*MetaHeadersFrame, error) {
|
|
if size > remainSize {
|
|
hdec.SetEmitEnabled(false)
|
|
mh.Truncated = true
|
|
+ remainSize = 0
|
|
return
|
|
}
|
|
remainSize -= size
|
|
@@ -1577,6 +1578,36 @@ func (fr *Framer) readMetaFrame(hf *HeadersFrame) (*MetaHeadersFrame, error) {
|
|
var hc headersOrContinuation = hf
|
|
for {
|
|
frag := hc.HeaderBlockFragment()
|
|
+
|
|
+ // Avoid parsing large amounts of headers that we will then discard.
|
|
+ // If the sender exceeds the max header list size by too much,
|
|
+ // skip parsing the fragment and close the connection.
|
|
+ //
|
|
+ // "Too much" is either any CONTINUATION frame after we've already
|
|
+ // exceeded the max header list size (in which case remainSize is 0),
|
|
+ // or a frame whose encoded size is more than twice the remaining
|
|
+ // header list bytes we're willing to accept.
|
|
+ if int64(len(frag)) > int64(2*remainSize) {
|
|
+ if VerboseLogs {
|
|
+ log.Printf("http2: header list too large")
|
|
+ }
|
|
+ // It would be nice to send a RST_STREAM before sending the GOAWAY,
|
|
+ // but the struture of the server's frame writer makes this difficult.
|
|
+ return nil, ConnectionError(ErrCodeProtocol)
|
|
+ }
|
|
+
|
|
+ // Also close the connection after any CONTINUATION frame following an
|
|
+ // invalid header, since we stop tracking the size of the headers after
|
|
+ // an invalid one.
|
|
+ if invalid != nil {
|
|
+ if VerboseLogs {
|
|
+ log.Printf("http2: invalid header: %v", invalid)
|
|
+ }
|
|
+ // It would be nice to send a RST_STREAM before sending the GOAWAY,
|
|
+ // but the struture of the server's frame writer makes this difficult.
|
|
+ return nil, ConnectionError(ErrCodeProtocol)
|
|
+ }
|
|
+
|
|
if _, err := hdec.Write(frag); err != nil {
|
|
return nil, ConnectionError(ErrCodeCompression)
|
|
}
|
|
--
|
|
2.40.1
|
|
|