gamzinav/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG/MINOR: h2: properly check PRIORITY frames

Browse Source 
We don't use them right now but it's better to ensure they're properly
checked. This removes another 3 warnings in h2spec.

To backport to 1.8.
This commit is contained in:
Willy Tarreau 2017-12-03 19:46:19 +01:00
parent 18b86cd074
commit 92153fccd3
1 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/mux_h2.c
View File

@ -1422,6 +1422,40 @@ static int h2c_handle_goaway(struct h2c *h2c)
return 0; return 0;
} }
/* processes a PRIORITY frame, and either skips it or rejects if it is
* invalid. Returns > 0 on success or zero on missing data. It may return
* an error in h2c. Described in RFC7540#6.3.
*/
static int h2c_handle_priority(struct h2c *h2c)
{
int error;
if (h2c->dsi == 0) {
error = H2_ERR_PROTOCOL_ERROR;
goto conn_err;
}
if (h2c->dfl != 5) {
error = H2_ERR_FRAME_SIZE_ERROR;
goto conn_err;
}
/* process full frame only */
if (h2c->dbuf->i < h2c->dfl)
return 0;
if (h2_get_n32(h2c->dbuf, 0) == h2c->dsi) {
/* 7540#5.3 : can't depend on itself */
error = H2_ERR_PROTOCOL_ERROR;
goto conn_err;
}
return 1;
conn_err:
h2c_error(h2c, error);
return 0;
}
/* processes an RST_STREAM frame, and sets the 32-bit error code on the stream. /* processes an RST_STREAM frame, and sets the 32-bit error code on the stream.
* Returns > 0 on success or zero on missing data. It may return an error in * Returns > 0 on success or zero on missing data. It may return an error in
* h2c. Described in RFC7540#6.4. * h2c. Described in RFC7540#6.4.
@ -1809,6 +1843,11 @@ static void h2_process_demux(struct h2c *h2c)
ret = h2c_send_strm_wu(h2c); ret = h2c_send_strm_wu(h2c);
break; break;
case H2_FT_PRIORITY:
if (h2c->st0 == H2_CS_FRAME_P)
ret = h2c_handle_priority(h2c);
break;
case H2_FT_RST_STREAM: case H2_FT_RST_STREAM:
if (h2c->st0 == H2_CS_FRAME_P) if (h2c->st0 == H2_CS_FRAME_P)
ret = h2c_handle_rst_stream(h2c, h2s); ret = h2c_handle_rst_stream(h2c, h2s);