mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-12 02:09:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

HTTP/3: skip unknown frames on request stream.

Browse Source 
As per HTTP/3 draft 29, section 4.1:

   Frames of unknown types (Section 9), including reserved frames
   (Section 7.2.8) MAY be sent on a request or push stream before,
   after, or interleaved with other frames described in this section.

Also, trailers frame is now used as an indication of the request body end.
This commit is contained in:
Roman Arutyunyan 2020-08-24 09:56:36 +03:00
parent 46173bd4b4
commit d294369915
3 changed files with 60 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,7 +155,9 @@ ngx_http_v3_parse_headers(ngx_connection_t *c, ngx_http_v3_parse_headers_t *st,
ngx_int_t rc;
enum {
sw_start = 0,
sw_type,
sw_length,
sw_skip,
sw_prefix,
sw_verify,
sw_header_rep,
@ -168,10 +170,18 @@ ngx_http_v3_parse_headers(ngx_connection_t *c, ngx_http_v3_parse_headers_t *st,
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 parse headers");
if (ch != NGX_HTTP_V3_FRAME_HEADERS) {
return NGX_HTTP_V3_ERR_FRAME_UNEXPECTED;
st->state = sw_type;
/* fall through */
case sw_type:
rc = ngx_http_v3_parse_varlen_int(c, &st->vlint, ch);
if (rc != NGX_DONE) {
return rc;
}
st->type = st->vlint.value;
st->state = sw_length;
break;
@ -184,12 +194,26 @@ ngx_http_v3_parse_headers(ngx_connection_t *c, ngx_http_v3_parse_headers_t *st,
st->length = st->vlint.value;
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http3 parse headers len:%ui", st->length);
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http3 parse headers type:%ui, len:%ui",
st->type, st->length);
if (st->type != NGX_HTTP_V3_FRAME_HEADERS) {
st->state = st->length > 0 ? sw_skip : sw_type;
break;
}
st->state = sw_prefix;
break;
case sw_skip:
if (--st->length == 0) {
st->state = sw_type;
}
break;
case sw_prefix:
if (st->length-- == 0) {
@ -1529,7 +1553,8 @@ ngx_http_v3_parse_data(ngx_connection_t *c, ngx_http_v3_parse_data_t *st,
enum {
sw_start = 0,
sw_type,
sw_length
sw_length,
sw_skip
};
switch (st->state) {
@ -1549,8 +1574,11 @@ ngx_http_v3_parse_data(ngx_connection_t *c, ngx_http_v3_parse_data_t *st,
return rc;
}
if (st->vlint.value != NGX_HTTP_V3_FRAME_DATA) {
return NGX_HTTP_V3_ERR_FRAME_UNEXPECTED;
st->type = st->vlint.value;
if (st->type == NGX_HTTP_V3_FRAME_HEADERS) {
/* trailers */
goto done;
}
st->state = sw_length;
@ -1565,10 +1593,25 @@ ngx_http_v3_parse_data(ngx_connection_t *c, ngx_http_v3_parse_data_t *st,
st->length = st->vlint.value;
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http3 parse data frame len:%ui", st->length);
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http3 parse data type:%ui, len:%ui",
st->type, st->length);
goto done;
if (st->type != NGX_HTTP_V3_FRAME_DATA && st->length > 0) {
st->state = sw_skip;
break;
}
st->state = sw_type;
return NGX_OK;
case sw_skip:
if (--st->length == 0) {
st->state = sw_type;
}
break;
}
return NGX_AGAIN;

2
src/http/v3/ngx_http_v3_parse.h
View File

@ -76,6 +76,7 @@ typedef struct {
typedef struct {
ngx_uint_t state;
ngx_uint_t type;
ngx_uint_t length;
ngx_http_v3_parse_varlen_int_t vlint;
ngx_http_v3_parse_header_block_prefix_t prefix;
@ -107,6 +108,7 @@ typedef struct {
typedef struct {
ngx_uint_t state;
ngx_uint_t type;
ngx_uint_t length;
ngx_http_v3_parse_varlen_int_t vlint;
} ngx_http_v3_parse_data_t;

6
src/http/v3/ngx_http_v3_request.c
View File

@ -418,7 +418,11 @@ ngx_http_v3_parse_request_body(ngx_http_request_t *r, ngx_buf_t *b,
continue;
}
/* rc == NGX_DONE */
if (rc == NGX_DONE) {
return NGX_DONE;
}
/* rc == NGX_OK */
ctx->size = st->length;
ctx->state = sw_start;