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

MINOR: cli: print the error message in the parser function itself

Browse Source 
By doing so we can report more accurate information about what's wrong.
As a first step, we already distinguish the case of expert-only commands
from other ones.
This commit is contained in:
Willy Tarreau 2021-03-12 15:57:47 +01:00
parent 91bc359571
commit f3697dde2b
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/cli.c
View File

@ -504,8 +504,9 @@ static int cli_get_severity_output(struct appctx *appctx)
} }
/* Processes the CLI interpreter on the stats socket. This function is called /* Processes the CLI interpreter on the stats socket. This function is called
* from the CLI's IO handler running in an appctx context. The function returns 1 * from the CLI's IO handler running in an appctx context. The function returns
* if the request was understood, otherwise zero. It is called with appctx->st0 * 1 if the request was understood, otherwise zero (in which case an error
* message will be displayed). It is called with appctx->st0
* set to CLI_ST_GETREQ and presets ->st2 to 0 so that parsers don't have to do * set to CLI_ST_GETREQ and presets ->st2 to 0 so that parsers don't have to do
* it. It will possilbly leave st0 to CLI_ST_CALLBACK if the keyword needs to * it. It will possilbly leave st0 to CLI_ST_CALLBACK if the keyword needs to
* have its own I/O handler called again. Most of the time, parsers will only * have its own I/O handler called again. Most of the time, parsers will only
@ -589,21 +590,19 @@ static int cli_parse_request(struct appctx *appctx)
args[i] = p; args[i] = p;
kw = cli_find_kw(args); kw = cli_find_kw(args);
if (!kw) if (!kw ||
(kw->level & ~appctx->cli_level & ACCESS_MASTER_ONLY) ||
(appctx->cli_level & ~kw->level & (ACCESS_MASTER_ONLY|ACCESS_MASTER)) == (ACCESS_MASTER_ONLY|ACCESS_MASTER)) {
/* keyword not found in this mode */
cli_gen_usage_msg(appctx);
return 0; return 0;
}
/* in a worker or normal process, don't handle master-only commands /* don't handle expert mode commands if not in this mode. */
* nor expert mode commands if not in this mode. if (kw->level & ~appctx->cli_level & ACCESS_EXPERT) {
*/ cli_err(appctx, "This command is restricted to expert mode only.\n");
if (kw->level & ~appctx->cli_level & (ACCESS_MASTER_ONLY|ACCESS_EXPERT))
return 0;
/* in master don't handle commands that have neither the master bit
* nor the master-only bit.
*/
if ((appctx->cli_level & ~kw->level & (ACCESS_MASTER_ONLY|ACCESS_MASTER)) ==
(ACCESS_MASTER_ONLY|ACCESS_MASTER))
return 0; return 0;
}
appctx->io_handler = kw->io_handler; appctx->io_handler = kw->io_handler;
appctx->io_release = kw->io_release; appctx->io_release = kw->io_release;
@ -779,10 +778,7 @@ static void cli_io_handler(struct appctx *appctx)
/* remove the last two \n */ /* remove the last two \n */
appctx->chunk->data -= 2; appctx->chunk->data -= 2;
appctx->chunk->area[appctx->chunk->data] = 0; appctx->chunk->area[appctx->chunk->data] = 0;
cli_parse_request(appctx);
if (!cli_parse_request(appctx))
cli_gen_usage_msg(appctx);
chunk_reset(appctx->chunk); chunk_reset(appctx->chunk);
/* NB: cli_sock_parse_request() may have put /* NB: cli_sock_parse_request() may have put
* another CLI_ST_O_* into appctx->st0. * another CLI_ST_O_* into appctx->st0.
@ -801,9 +797,7 @@ static void cli_io_handler(struct appctx *appctx)
appctx->st1 |= APPCTX_CLI_ST1_PAYLOAD; appctx->st1 |= APPCTX_CLI_ST1_PAYLOAD;
else { else {
/* no payload, the command is complete: parse the request */ /* no payload, the command is complete: parse the request */
if (!cli_parse_request(appctx)) cli_parse_request(appctx);
cli_gen_usage_msg(appctx);
chunk_reset(appctx->chunk); chunk_reset(appctx->chunk);
} }
} }