fix(runtime): cap H2 client RST_STREAM churn against Rapid Reset (CVE-2023-44487)
H2Connection accepted an unbounded number of client-initiated HEADERS(END_HEADERS|END_STREAM)+RST_STREAM(NO_ERROR) pairs on one connection: kH2MaxConcurrentStreamsDefault never engages because each stream is torn down (dispatched and erased) before the next HEADERS arrives. Add caps::kH2MaxStreamResetsPerConnection (200) and a per-connection client_resets_ counter in OnRst; once a connection's lifetime count of client RST_STREAM frames exceeds the cap, close it with GOAWAY(ENHANCE_YOUR_CALM) via the existing Fatal() path, same as other protocol-limit violations in this file. The counter increments unconditionally for every valid RST_STREAM frame, not only ones matching a still-open stream: this server's coroutine dispatch runs synchronously inline (lazy Task resumed via EventLoop::post on the loop thread) for fast handlers, so the matching stream is frequently already completed and erased by the time the paired RST_STREAM is parsed, which would otherwise let the attack bypass a naively-scoped counter. audit/MOLO-H2-001 (Rapid Reset) now PASSes; audit/MOLO-H2-002 (MadeYouReset) continues to PASS via its separate existing flow-control-error path, unaffected by this change. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -36,6 +36,10 @@ inline constexpr std::size_t kMaxConnectionsCeiling = 65536;
|
||||
inline constexpr std::size_t kMaxRequestsPerH1Connection = 1000;
|
||||
inline constexpr std::size_t kH2MaxConcurrentStreamsDefault = 100;
|
||||
inline constexpr std::size_t kH2MaxConcurrentStreamsCeiling = 1000;
|
||||
// Rapid Reset (CVE-2023-44487 class) mitigation: a single connection may not
|
||||
// open-then-reset more streams than this over its lifetime. Exceeding it is
|
||||
// a fatal, GOAWAY-closed connection error (see H2Connection::OnRst).
|
||||
inline constexpr std::size_t kH2MaxStreamResetsPerConnection = 200;
|
||||
inline constexpr std::size_t kHeaderBlockMax = 65536;
|
||||
inline constexpr std::size_t kHeaderFieldMax = 100;
|
||||
inline constexpr std::size_t kHeaderLineMax = 16384;
|
||||
|
||||
@@ -39,6 +39,7 @@ constexpr uint32_t kFrameSizeError = 0x6;
|
||||
constexpr uint32_t kRefusedStream = 0x7;
|
||||
constexpr uint32_t kCancel = 0x8;
|
||||
constexpr uint32_t kCompressionError = 0x9;
|
||||
constexpr uint32_t kEnhanceYourCalm = 0xb;
|
||||
|
||||
bool IsH2HopHeader(std::string_view name) {
|
||||
return EqCaseInsensitive(name, "connection") ||
|
||||
@@ -541,6 +542,17 @@ bool H2Connection::OnRst(const Frame& fr, const char* payload) {
|
||||
Fatal(kFrameSizeError);
|
||||
return false;
|
||||
}
|
||||
// Rapid Reset (CVE-2023-44487 class): unbounded open-then-reset churn
|
||||
// never counts against max_concurrent_streams because the stream is
|
||||
// gone before the next HEADERS arrives (the dispatch already happened,
|
||||
// win or lose, whether or not the stream is still tracked here by the
|
||||
// time this RST_STREAM is parsed). Cap the lifetime count of client
|
||||
// RST_STREAM frames instead, and close the connection the same way
|
||||
// other protocol-limit violations in this file are closed.
|
||||
if (++client_resets_ > caps::kH2MaxStreamResetsPerConnection) {
|
||||
Fatal(kEnhanceYourCalm);
|
||||
return false;
|
||||
}
|
||||
auto it = streams_.find(fr.stream_id);
|
||||
if (it == streams_.end()) return true; // idle or closed: ignore
|
||||
uint32_t code = ((uint32_t)(unsigned char)payload[0] << 24) |
|
||||
|
||||
@@ -140,6 +140,9 @@ class H2Connection : public std::enable_shared_from_this<H2Connection> {
|
||||
bool fatal_ = false;
|
||||
uint32_t max_stream_id_ = 0;
|
||||
std::size_t requests_ = 0;
|
||||
// Rapid Reset guard: client-initiated RST_STREAM count over the
|
||||
// connection's lifetime (see caps::kH2MaxStreamResetsPerConnection).
|
||||
std::size_t client_resets_ = 0;
|
||||
// CONTINUATION reassembly state.
|
||||
bool cont_expected_ = false;
|
||||
uint32_t cont_stream_ = 0;
|
||||
|
||||
Reference in New Issue
Block a user