mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-29 06:40:59 +01:00
Code Issues Projects Releases Wiki Activity

MEDIUM: cli: disable some keywords in the master

Browse Source 
The master process does not need all the keywords of the cli, add 2
flags to chose which keyword to use.

It might be useful to activate some of them in a debug mode later...
This commit is contained in:
William Lallemand 2018-10-26 14:47:37 +02:00 committed by Willy Tarreau
parent e736115d3a
commit 14721be11f
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/types/cli.h
View File

@ -31,6 +31,7 @@ struct cli_kw {
int (*io_handler)(struct appctx *appctx); int (*io_handler)(struct appctx *appctx);
void (*io_release)(struct appctx *appctx); void (*io_release)(struct appctx *appctx);
void *private; void *private;
int level; /* this is the level needed to show the keyword usage and to use it */
}; };
struct cli_kw_list { struct cli_kw_list {

2
include/types/global.h
View File

@ -76,6 +76,8 @@
#define ACCESS_LVL_MASK 0x3 #define ACCESS_LVL_MASK 0x3
#define ACCESS_FD_LISTENERS 0x4 /* expose listeners FDs on stats socket */ #define ACCESS_FD_LISTENERS 0x4 /* expose listeners FDs on stats socket */
#define ACCESS_MASTER 0x8 /* works with the master (and every other processes) */
#define ACCESS_MASTER_ONLY 0x10 /* only works with the worker */
/* SSL server verify mode */ /* SSL server verify mode */
enum { enum {

22
src/cli.c
View File

@ -93,6 +93,8 @@ static struct cli_kw_list cli_keywords = {
extern const char *stat_status_codes[]; extern const char *stat_status_codes[];
extern int master;
static struct proxy *mworker_proxy; /* CLI proxy of the master */ static struct proxy *mworker_proxy; /* CLI proxy of the master */
static char *cli_gen_usage_msg(struct appctx *appctx) static char *cli_gen_usage_msg(struct appctx *appctx)
@ -113,8 +115,20 @@ static char *cli_gen_usage_msg(struct appctx *appctx)
list_for_each_entry(kw_list, &cli_keywords.list, list) { list_for_each_entry(kw_list, &cli_keywords.list, list) {
kw = &kw_list->kw[0]; kw = &kw_list->kw[0];
while (kw->str_kw[0]) { while (kw->str_kw[0]) {
/* in a worker or normal process, don't display master only commands */
if (master == 0 && (kw->level & ACCESS_MASTER_ONLY))
goto next_kw;
/* in master don't displays if we don't have the master bits */
if (master == 1 && !(kw->level & (ACCESS_MASTER_ONLY|ACCESS_MASTER)))
goto next_kw;
if (kw->usage) if (kw->usage)
chunk_appendf(tmp, " %s\n", kw->usage); chunk_appendf(tmp, " %s\n", kw->usage);
next_kw:
kw++; kw++;
} }
} }
@ -465,6 +479,14 @@ static int cli_parse_request(struct appctx *appctx)
if (!kw) if (!kw)
return 0; return 0;
/* in a worker or normal process, don't display master only commands */
if (master == 0 && (kw->level & ACCESS_MASTER_ONLY))
return 0;
/* in master don't displays if we don't have the master bits */
if (master == 1 && !(kw->level & (ACCESS_MASTER_ONLY|ACCESS_MASTER)))
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;
/* kw->parse could set its own io_handler or ip_release handler */ /* kw->parse could set its own io_handler or ip_release handler */