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

QUIC: make sure stream data size is lower than final size.

Browse Source 
As per quic-transport 34, FINAL_SIZE_ERROR is generated if an endpoint received
a STREAM frame or a RESET_STREAM frame containing a final size that was lower
than the size of stream data that was already received.
This commit is contained in:
Roman Arutyunyan 2021-05-25 16:41:59 +03:00
parent cd86cf34db
commit 1677503f98
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/event/quic/ngx_event_quic.h
View File

@ -79,6 +79,7 @@ struct ngx_quic_stream_s {
uint64_t send_max_data; uint64_t send_max_data;
uint64_t recv_max_data; uint64_t recv_max_data;
uint64_t recv_offset; uint64_t recv_offset;
uint64_t recv_last;
uint64_t final_size; uint64_t final_size;
ngx_chain_t *in; ngx_chain_t *in;
ngx_uint_t cancelable; /* unsigned cancelable:1; */ ngx_uint_t cancelable; /* unsigned cancelable:1; */

16
src/event/quic/ngx_event_quic_streams.c
View File

@ -857,6 +857,8 @@ ngx_quic_handle_stream_frame(ngx_connection_t *c, ngx_quic_header_t *pkt,
qs->final_size = last; qs->final_size = last;
} }
qs->recv_last = last;
if (f->offset == 0) { if (f->offset == 0) {
sc->read->ready = 1; sc->read->ready = 1;
} }
@ -884,6 +886,10 @@ ngx_quic_handle_stream_frame(ngx_connection_t *c, ngx_quic_header_t *pkt,
return NGX_OK; return NGX_OK;
} }
if (qs->recv_last < last) {
qs->recv_last = last;
}
if (f->offset < qs->recv_offset) { if (f->offset < qs->recv_offset) {
ngx_quic_trim_bufs(frame->data, qs->recv_offset - f->offset); ngx_quic_trim_bufs(frame->data, qs->recv_offset - f->offset);
f->offset = qs->recv_offset; f->offset = qs->recv_offset;
@ -899,6 +905,11 @@ ngx_quic_handle_stream_frame(ngx_connection_t *c, ngx_quic_header_t *pkt,
return NGX_ERROR; return NGX_ERROR;
} }
if (qs->recv_last > last) {
qc->error = NGX_QUIC_ERR_FINAL_SIZE_ERROR;
return NGX_ERROR;
}
qs->connection->read->pending_eof = 1; qs->connection->read->pending_eof = 1;
qs->final_size = last; qs->final_size = last;
} }
@ -1129,6 +1140,11 @@ ngx_quic_handle_reset_stream_frame(ngx_connection_t *c,
return NGX_ERROR; return NGX_ERROR;
} }
if (qs->recv_last > f->final_size) {
qc->error = NGX_QUIC_ERR_FINAL_SIZE_ERROR;
return NGX_ERROR;
}
qs->final_size = f->final_size; qs->final_size = f->final_size;
rev = qs->connection->read; rev = qs->connection->read;