mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 23:27:04 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: mworker/cli: fix set severity-output support

Browse Source 
"set severity-output" is one of these command that changes the appctx
state so the next commands are affected.

Unfortunately the master CLI works with pipelining and server close
mode, which means the connection between the master and the worker is
closed after each response, so for the next command this is a new appctx
state.

To fix the problem, 2 new flags are added ACCESS_MCLI_SEVERITY_STR and
ACCESS_MCLI_SEVERITY_NB which are used to prefix each command sent to
the worker with the right "set severity-output" command.

This patch fixes issue #2350.

It could be backported as far as 2.6.
This commit is contained in:
William Lallemand 2023-12-06 11:15:01 +01:00
parent 0338778c41
commit 1c1bb8ef2a
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/cli-t.h
View File

@ -37,6 +37,8 @@
#define ACCESS_EXPERT 0x0020 /* access to dangerous commands reserved to experts */
#define ACCESS_EXPERIMENTAL 0x0040
#define ACCESS_MCLI_DEBUG 0x0080 /* allow the master CLI to use any command without the flag ACCESS_MASTER */
#define ACCESS_MCLI_SEVERITY_NB 0x0100 /* 'set severity-output number' on master CLI */
#define ACCESS_MCLI_SEVERITY_STR 0x0200 /* 'set severity-output string' on master CLI */
/* flags for appctx->st1 */
#define APPCTX_CLI_ST1_PROMPT (1 << 0)

30
src/cli.c
View File

@ -1759,6 +1759,10 @@ static int set_severity_output(int *target, char *argument)
/* parse a "set severity-output" command. */
static int cli_parse_set_severity_output(char **args, char *payload, struct appctx *appctx, void *private)
{
/* this will ask the applet to not output a \n after the command */
if (strcmp(args[3], "-") == 0)
appctx->st1 |= APPCTX_CLI_ST1_NOLF;
if (*args[2] && set_severity_output(&appctx->cli_severity_output, args[2]))
return 0;
@ -2453,7 +2457,6 @@ static int pcli_prefix_to_pid(const char *prefix)
* >= 0 : number of words to escape
* = -1 : error
*/
int pcli_find_and_exec_kw(struct stream *s, char **args, int argl, char **errmsg, int *next_pid)
{
if (argl < 1)
@ -2533,6 +2536,21 @@ int pcli_find_and_exec_kw(struct stream *s, char **args, int argl, char **errmsg
if ((argl > 1) && (strcmp(args[1], "on") == 0))
s->pcli_flags |= ACCESS_MCLI_DEBUG;
return argl;
} else if (strcmp(args[0], "set") == 0) {
if ((argl > 1) && (strcmp(args[1], "severity-output") == 0)) {
if ((argl > 2) &&strcmp(args[2], "none") == 0) {
s->pcli_flags &= ~(ACCESS_MCLI_SEVERITY_NB|ACCESS_MCLI_SEVERITY_STR);
} else if ((argl > 2) && strcmp(args[2], "string") == 0) {
s->pcli_flags |= ACCESS_MCLI_SEVERITY_STR;
} else if ((argl > 2) && strcmp(args[2], "number") == 0) {
s->pcli_flags |= ACCESS_MCLI_SEVERITY_NB;
} else {
memprintf(errmsg, "one of 'none', 'number', 'string' is a required argument\n");
return -1;
}
/* only skip argl if we have "set severity-output" not only "set" */
return argl;
}
}
return 0;
@ -2711,6 +2729,16 @@ int pcli_parse_request(struct stream *s, struct channel *req, char **errmsg, int
ci_insert_line2(req, 0, "expert-mode on -", strlen("expert-mode on -"));
ret += strlen("expert-mode on -") + 2;
}
if (s->pcli_flags & ACCESS_MCLI_SEVERITY_STR) {
const char *cmd = "set severity-output string -";
ci_insert_line2(req, 0, cmd, strlen(cmd));
ret += strlen(cmd) + 2;
}
if (s->pcli_flags & ACCESS_MCLI_SEVERITY_NB) {
const char *cmd = "set severity-output number -";
ci_insert_line2(req, 0, cmd, strlen(cmd));
ret += strlen(cmd) + 2;
}
if (pcli_has_level(s, ACCESS_LVL_ADMIN)) {
goto end;