forked from rpms/nginx
71 lines
2.2 KiB
Diff
71 lines
2.2 KiB
Diff
|
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
|
||
|
|
index 12214e1..3b7f892 100644
|
||
|
|
--- a/src/http/v2/ngx_http_v2.c
|
||
|
|
+++ b/src/http/v2/ngx_http_v2.c
|
||
|
|
@@ -4335,6 +4335,8 @@ ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
|
||
|
|
*/
|
||
|
|
pool = stream->pool;
|
||
|
|
|
||
|
|
+ h2c->frames -= stream->frames;
|
||
|
|
+
|
||
|
|
ngx_http_free_request(stream->request, rc);
|
||
|
|
|
||
|
|
if (pool != h2c->state.pool) {
|
||
|
|
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
|
||
|
|
index bec2216..715b7d3 100644
|
||
|
|
--- a/src/http/v2/ngx_http_v2.h
|
||
|
|
+++ b/src/http/v2/ngx_http_v2.h
|
||
|
|
@@ -192,6 +192,8 @@ struct ngx_http_v2_stream_s {
|
||
|
|
|
||
|
|
ngx_buf_t *preread;
|
||
|
|
|
||
|
|
+ ngx_uint_t frames;
|
||
|
|
+
|
||
|
|
ngx_http_v2_out_frame_t *free_frames;
|
||
|
|
ngx_chain_t *free_frame_headers;
|
||
|
|
ngx_chain_t *free_bufs;
|
||
|
|
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
|
||
|
|
index 029e8ec..c7ee553 100644
|
||
|
|
--- a/src/http/v2/ngx_http_v2_filter_module.c
|
||
|
|
+++ b/src/http/v2/ngx_http_v2_filter_module.c
|
||
|
|
@@ -1661,22 +1661,34 @@ static ngx_http_v2_out_frame_t *
|
||
|
|
ngx_http_v2_filter_get_data_frame(ngx_http_v2_stream_t *stream,
|
||
|
|
size_t len, ngx_chain_t *first, ngx_chain_t *last)
|
||
|
|
{
|
||
|
|
- u_char flags;
|
||
|
|
- ngx_buf_t *buf;
|
||
|
|
- ngx_chain_t *cl;
|
||
|
|
- ngx_http_v2_out_frame_t *frame;
|
||
|
|
+ u_char flags;
|
||
|
|
+ ngx_buf_t *buf;
|
||
|
|
+ ngx_chain_t *cl;
|
||
|
|
+ ngx_http_v2_out_frame_t *frame;
|
||
|
|
+ ngx_http_v2_connection_t *h2c;
|
||
|
|
|
||
|
|
frame = stream->free_frames;
|
||
|
|
+ h2c = stream->connection;
|
||
|
|
|
||
|
|
if (frame) {
|
||
|
|
stream->free_frames = frame->next;
|
||
|
|
|
||
|
|
- } else {
|
||
|
|
+ } else if (h2c->frames < 10000) {
|
||
|
|
frame = ngx_palloc(stream->request->pool,
|
||
|
|
sizeof(ngx_http_v2_out_frame_t));
|
||
|
|
if (frame == NULL) {
|
||
|
|
return NULL;
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ stream->frames++;
|
||
|
|
+ h2c->frames++;
|
||
|
|
+
|
||
|
|
+ } else {
|
||
|
|
+ ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
|
||
|
|
+ "http2 flood detected");
|
||
|
|
+
|
||
|
|
+ h2c->connection->error = 1;
|
||
|
|
+ return NULL;
|
||
|
|
}
|
||
|
|
|
||
|
|
flags = last->buf->last_buf ? NGX_HTTP_V2_END_STREAM_FLAG : 0;
|