mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-20 21:31:28 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: spoe: Properly detect and skip empty NOTIFY frames

Browse Source 
Since the SPOE was refactored, the detection of empty NOTIFY frames is
broken. So it is possible to send a NOTIFY frames to an agent with no
message at all. The bug happens because the frame type is now added to the
buffer before the messages encoding. So the buffer is never really empty.

To fix the issue, the condition to detect empty frame was adapted.

This patch must be backported as far as 3.1.
This commit is contained in:
Christopher Faulet 2025-08-20 15:38:42 +02:00
parent 2c7e05f80e
commit dc6e8dde23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/flt_spoe.c
View File

@ -647,13 +647,14 @@ static int spoe_encode_messages(struct stream *s, struct spoe_context *ctx,
struct spoe_config *conf = FLT_CONF(ctx->filter);
struct spoe_agent *agent = conf->agent;
struct spoe_message *msg;
char *p, *end;
char *p, *start, *end;
p = b_head(&ctx->buffer);
end = p + agent->max_frame_size - SPOP_FRAME_HDR_SIZE;
/* Set Frame type */
*p++ = SPOP_FRM_T_HAPROXY_NOTIFY;
start = p;
if (type == SPOE_MSGS_BY_EVENT) { /* Loop on messages by event */
list_for_each_entry(msg, messages, by_evt) {
@ -673,7 +674,7 @@ static int spoe_encode_messages(struct stream *s, struct spoe_context *ctx,
/* nothing has been encoded */
if (p == b_head(&ctx->buffer))
if (p == start)
goto skip;
b_set_data(&ctx->buffer, p - b_head(&ctx->buffer));