From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 24 Sep 2024 15:50:09 +0000 (+0200)
Subject: BUG/MEDIUM: cli: Be sure to catch immediate client abort
X-Git-Tag: v3.1-dev9~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=14a413033c15aa4622368348ac6b142e7ec2c989;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: cli: Be sure to catch immediate client abort

A client abort while nothing was sent is properly handled except when this
immediately happens after the connection was accepted. The read0 event is
caught before the CLI applet is created. In that case, the shutdown is not
handled and the applet is no longer wakeup. In that case, the stream remains
blocked and no timeout are armed.

The bug was due to the fact that when the applet I/O handler was called for
the first time, the applet context was initialized and nothing more was
performed. A shutdown, if any, would be handled on the next call. In that
case, it was too late.

Now, afet the init step, we loop to eval the first command. There is no
command here but the shutdown will be tested.

This patch should fix the issue #2727. It must be backported to 3.0.
---

diff --git a/src/cli.c b/src/cli.c
index 01a7216f09..c1cbe76bee 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -1070,7 +1070,6 @@ static void cli_io_handler(struct appctx *appctx)
 		if (appctx->st0 == CLI_ST_INIT) {
 			/* reset severity to default at init */
 			cli_init(appctx);
-			break;
 		}
 		else if (appctx->st0 == CLI_ST_END) {
 			applet_set_eos(appctx);