From 134e28ae5abc997fe064995627b3ebe247a5d5d8 Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Fri, 23 Feb 2024 15:13:56 +0100 Subject: [PATCH] RESET stream after 100 failed incoming headers --- mod_http2/h2_session.c | 10 +++++++--- mod_http2/h2_stream.c | 1 + mod_http2/h2_stream.h | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/mod_http2/h2_session.c b/mod_http2/h2_session.c index a5cc306..4b38518 100644 --- a/mod_http2/h2_session.c +++ b/mod_http2/h2_session.c @@ -311,7 +311,12 @@ static int on_header_cb(nghttp2_session *ngh2, const nghttp2_frame *frame, status = h2_stream_add_header(stream, (const char *)name, namelen, (const char *)value, valuelen); - if (status != APR_SUCCESS && !h2_stream_is_ready(stream)) { + if (status != APR_SUCCESS + && (!h2_stream_is_ready(stream) || + /* We accept a certain amount of failures in order to reply + * with an informative HTTP error response like 413. But of the + * client is too wrong, we fail the request an RESET the stream */ + stream->request_headers_failed > 100)) { return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE; } return 0; diff --git a/mod_http2/h2_stream.c b/mod_http2/h2_stream.c index 6136baa..d3c4d99 100644 --- a/mod_http2/h2_stream.c +++ b/mod_http2/h2_stream.c @@ -733,6 +733,7 @@ apr_status_t h2_stream_add_header(h2_stream *stream, } if (error) { + ++stream->request_headers_failed; set_error_response(stream, error); return APR_EINVAL; } diff --git a/mod_http2/h2_stream.h b/mod_http2/h2_stream.h index 79cb39d..4ddf1a2 100644 --- a/mod_http2/h2_stream.h +++ b/mod_http2/h2_stream.h @@ -75,7 +75,8 @@ struct h2_stream { struct h2_request *rtmp; /* request being assembled */ apr_table_t *trailers; /* optional incoming trailers */ int request_headers_added; /* number of request headers added */ - + int request_headers_failed; /* number of request headers failed to add */ + struct h2_bucket_beam *input; apr_bucket_brigade *in_buffer; int in_window_size;