upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-06-14 03:10:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

BUG/MINOR: h3: adjust error on PUSH_PROMISE frame reception

Browse source 
HTTP/3 PUSH_PROMISE frames are systematically rejected with H3 error
FRAME_UNEXPECTED. This is adapted on the server side as a client can
never emit them.

This patch adapts error reporting when haproxy runs as a client. In this
case, server is still forbidden to emit any PUSH_PROMISE as MAX_PUSH_ID
frames are never emitted. In this case, ID_ERROR must be used as an
error code.

This must be backported up to 3.3.
This commit is contained in:
Amaury Denoyelle 2026-05-26 10:53:48 +02:00
parent d8460a5339
commit 4a8bb2fe5f
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/h3.c
View file

@ -437,13 +437,15 @@ static int h3_check_frame_valid(struct h3c *h3c, struct qcs *qcs, uint64_t ftype
case H3_FT_PUSH_PROMISE: case H3_FT_PUSH_PROMISE:
/* RFC 9114 7.2.5. PUSH_PROMISE /* RFC 9114 7.2.5. PUSH_PROMISE
*
* If a PUSH_PROMISE frame is received on the control stream, the client
* MUST respond with a connection error of type H3_FRAME_UNEXPECTED.
* *
* A client MUST NOT send a PUSH_PROMISE frame. A server MUST treat the * A client MUST NOT send a PUSH_PROMISE frame. A server MUST treat the
* receipt of a PUSH_PROMISE frame as a connection error of type * receipt of a PUSH_PROMISE frame as a connection error of type
* H3_FRAME_UNEXPECTED. * H3_FRAME_UNEXPECTED.
*/ */
if (h3s->type == H3S_T_CTRL || !conn_is_back(qcs->qcc->conn))
/* TODO server-side only. */
ret = H3_ERR_FRAME_UNEXPECTED; ret = H3_ERR_FRAME_UNEXPECTED;
break; break;
@ -1982,7 +1984,6 @@ static ssize_t h3_rcv_buf(struct qcs *qcs, struct buffer *b, int fin)
goto err; goto err;
} }
break; break;
case H3_FT_PUSH_PROMISE:
case H3_FT_MAX_PUSH_ID: case H3_FT_MAX_PUSH_ID:
/* Not supported */ /* Not supported */
ret = flen; ret = flen;
@ -1996,6 +1997,18 @@ static ssize_t h3_rcv_buf(struct qcs *qcs, struct buffer *b, int fin)
} }
h3c->flags |= H3_CF_SETTINGS_RECV; h3c->flags |= H3_CF_SETTINGS_RECV;
break; break;
case H3_FT_PUSH_PROMISE:
/* h3_check_frame_valid() must reject on server side. */
BUG_ON(!conn_is_back(qcs->qcc->conn));
/* RFC 9114 7.2.5. PUSH_PROMISE
*
* A client MUST treat
* receipt of a PUSH_PROMISE frame that contains a larger push ID than
* the client has advertised as a connection error of H3_ID_ERROR.
*/
ret = H3_ERR_ID_ERROR;
break;
default: default:
/* RFC 9114 Section 9. Extensions to HTTP/3 /* RFC 9114 Section 9. Extensions to HTTP/3
* *