mirror of
https://github.com/nginx/nginx.git
synced 2026-10-24 14:47:45 -05:00
HTTP/3: kept the skipped frame length separate from data length
ngx_http_v3_parse_data() stored the remaining length of a skipped (unknown) frame in st->length -- the same field the request body filter uses for the number of DATA payload bytes to pass on as request body. When an unknown frame was split across parser invocations, the skip was interrupted with st->length holding the skip remainder; on the next buffer the body filter, which calls the parser only while st->length == 0, treated that remainder as request body. When proxying, this could result in sending unframed bytes, potentially allowing for bypass of client_max_body_size, which is enforced only on the DATA path, or an injection. The fix is to keep unknown frame payload in a separate st->skip counter. Reported by Hansol Lee of GOTROOT.
This commit is contained in:
1 parent
6adfc05ece
commit
1c173a2d87
2 files changed
+4
-1
No files matched your search
@@ -1861,6 +1861,8 @@ ngx_http_v3_parse_data(ngx_connection_t *c, ngx_http_v3_parse_data_t *st,
|
||||
st->type, st->length);
|
||||
|
||||
if (st->type != NGX_HTTP_V3_FRAME_DATA && st->length > 0) {
|
||||
st->skip = st->length;
|
||||
st->length = 0;
|
||||
st->state = sw_skip;
|
||||
break;
|
||||
}
|
||||
@@ -1870,7 +1872,7 @@ ngx_http_v3_parse_data(ngx_connection_t *c, ngx_http_v3_parse_data_t *st,
|
||||
|
||||
case sw_skip:
|
||||
|
||||
rc = ngx_http_v3_parse_skip(b, &st->length);
|
||||
rc = ngx_http_v3_parse_skip(b, &st->skip);
|
||||
if (rc != NGX_DONE) {
|
||||
return rc;
|
||||
}
|
||||
|
||||
@@ -122,6 +122,7 @@ typedef struct {
|
||||
ngx_uint_t state;
|
||||
ngx_uint_t type;
|
||||
ngx_uint_t length;
|
||||
ngx_uint_t skip;
|
||||
ngx_http_v3_parse_varlen_int_t vlint;
|
||||
} ngx_http_v3_parse_data_t;
|
||||
|
||||
|
||||
Reference in new issue
Block a user