mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-28 10:10:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

HTTP/3: reject HTTP/2 frames.

Browse Source 
As per HTTP/3 draft 30, section 7.2.8:

   Frame types that were used in HTTP/2 where there is no corresponding
   HTTP/3 frame have also been reserved (Section 11.2.1).  These frame
   types MUST NOT be sent, and their receipt MUST be treated as a
   connection error of type H3_FRAME_UNEXPECTED.
This commit is contained in:
Roman Arutyunyan 2020-09-16 12:27:23 +01:00
parent d294369915
commit 9fff3b7516
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/http/v3/ngx_http_v3_parse.c
View File

@ -10,6 +10,10 @@
#include <ngx_http.h> #include <ngx_http.h>
#define ngx_http_v3_is_v2_frame(type) \
((type) == 0x02 || (type) == 0x06 || (type) == 0x08 || (type) == 0x09)
static ngx_int_t ngx_http_v3_parse_lookup(ngx_connection_t *c, static ngx_int_t ngx_http_v3_parse_lookup(ngx_connection_t *c,
ngx_uint_t dynamic, ngx_uint_t index, ngx_str_t *name, ngx_str_t *value); ngx_uint_t dynamic, ngx_uint_t index, ngx_str_t *name, ngx_str_t *value);
@ -182,6 +186,11 @@ ngx_http_v3_parse_headers(ngx_connection_t *c, ngx_http_v3_parse_headers_t *st,
} }
st->type = st->vlint.value; st->type = st->vlint.value;
if (ngx_http_v3_is_v2_frame(st->type)) {
return NGX_HTTP_V3_ERR_FRAME_UNEXPECTED;
}
st->state = sw_length; st->state = sw_length;
break; break;
@ -986,6 +995,10 @@ ngx_http_v3_parse_control(ngx_connection_t *c, void *data, u_char ch)
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http3 parse frame type:%ui", st->type); "http3 parse frame type:%ui", st->type);
if (ngx_http_v3_is_v2_frame(st->type)) {
return NGX_HTTP_V3_ERR_FRAME_UNEXPECTED;
}
if (st->state == sw_first_type if (st->state == sw_first_type
&& st->type != NGX_HTTP_V3_FRAME_SETTINGS) && st->type != NGX_HTTP_V3_FRAME_SETTINGS)
{ {
@ -1581,6 +1594,10 @@ ngx_http_v3_parse_data(ngx_connection_t *c, ngx_http_v3_parse_data_t *st,
goto done; goto done;
} }
if (ngx_http_v3_is_v2_frame(st->type)) {
return NGX_HTTP_V3_ERR_FRAME_UNEXPECTED;
}
st->state = sw_length; st->state = sw_length;
break; break;