mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-23 23:01:24 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: mux-spop: Add checks on received frames

Browse Source 
Some conformance checks on received frames are added with this patch. Idea
is to detect invalid frames and ignore unknown ones if possible. All checks
are performed on the frame metatdata, mainly on the stream and the frame
identifiers.

The related issue is #2502.
This commit is contained in:
Christopher Faulet 2024-07-09 19:23:38 +02:00
parent 7890d6b28d
commit 880c037bcf
1 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/mux_spop.c
View File

@ -2086,7 +2086,25 @@ static void spop_process_demux(struct spop_conn *spop_conn)
spop_conn->state = SPOP_CS_FRAME_P; spop_conn->state = SPOP_CS_FRAME_P;
TRACE_STATE("SPOP frame header rcvd, switching to FRAME_P", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR, spop_conn->conn); TRACE_STATE("SPOP frame header rcvd, switching to FRAME_P", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR, spop_conn->conn);
// TODO: Perform some check (flags & FIN) /* Perform sanity check on the frame header */
if (!(spop_conn->dff & SPOP_FRM_FL_FIN)) {
spop_conn_error(spop_conn, SPOP_ERR_FRAG_NOT_SUPPORTED);
TRACE_ERROR("frame fragmentation not supported", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
TRACE_STATE("switching to CLOSED", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
break;
}
if (!spop_conn->dsi && spop_conn->dft == SPOP_FRM_T_AGENT_ACK) {
spop_conn_error(spop_conn, SPOP_ERR_INVALID);
TRACE_ERROR("invalid SPOP frame (ACK && dsi == 0)", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
TRACE_STATE("switching to CLOSED", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
break;
}
if (spop_conn->dsi && !spop_conn->dfi) {
spop_conn_error(spop_conn, SPOP_ERR_INVALID);
TRACE_ERROR("invalid SPOP frame (dsi != 0 && dfi == 0)", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
TRACE_STATE("switching to CLOSED", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
break;
}
} }
@ -2103,7 +2121,42 @@ static void spop_process_demux(struct spop_conn *spop_conn)
} }
spop_strm = tmp_spop_strm; spop_strm = tmp_spop_strm;
// check stream for frame error ? /* Perform sanity checks on the SPOP stream */
if (spop_strm == spop_unknown_stream) {
if (spop_conn->dsi > spop_conn->max_id) {
spop_conn_error(spop_conn, SPOP_ERR_FRAMEID_NOTFOUND);
TRACE_ERROR("invalid SPOP frame (dsi > max_id)", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
TRACE_STATE("switching to CLOSED", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
break;
}
else {
/* stream not found, probably because it aborted */
goto ignore_frame;
}
}
else if (spop_strm == spop_closed_stream) {
if (spop_conn->dft != SPOP_FRM_T_AGENT_HELLO && spop_conn->dft != SPOP_FRM_T_AGENT_DISCON) {
spop_conn_error(spop_conn, SPOP_ERR_INVALID);
TRACE_ERROR("invalid SPOP frame (dsi == 0)", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
TRACE_STATE("switching to CLOSED", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
break;
}
}
else {
if (spop_conn->dfi == spop_strm->fid) {
// OK, no problem
}
else if (spop_conn->dfi > spop_strm->fid) {
spop_conn_error(spop_conn, SPOP_ERR_FRAMEID_NOTFOUND);
TRACE_ERROR("invalid SPOP frame (dfi > frame-id)", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
TRACE_STATE("switching to CLOSED", SPOP_EV_RX_FRAME|SPOP_EV_RX_FHDR|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
break;
}
else {
/* frame id not found, probably because it aborted */
goto ignore_frame;
}
}
switch (spop_conn->dft) { switch (spop_conn->dft) {
case SPOP_FRM_T_AGENT_HELLO: case SPOP_FRM_T_AGENT_HELLO:
@ -2119,6 +2172,7 @@ static void spop_process_demux(struct spop_conn *spop_conn)
ret = spop_conn_handle_ack(spop_conn, spop_strm); ret = spop_conn_handle_ack(spop_conn, spop_strm);
break; break;
default: default:
ignore_frame:
TRACE_PROTO("receiving SPOP ignored frame", SPOP_EV_RX_FRAME, spop_conn->conn, spop_strm); TRACE_PROTO("receiving SPOP ignored frame", SPOP_EV_RX_FRAME, spop_conn->conn, spop_strm);
/* drop frames that we ignore. */ /* drop frames that we ignore. */
ret = MIN(b_data(&spop_conn->dbuf), spop_conn->dfl); ret = MIN(b_data(&spop_conn->dbuf), spop_conn->dfl);