support for several list and reset commands
Pablo Neira Ayuso
maintainercover support for several list and reset commands
Hi Phil,
This is alternative proposal to address the issue reported in this patch:
https://patchwork.ozlabs.org/project/netfilter-devel/patch/[email protected]/
On top of this, it aims at addressing a longstanding issue, which is to allow users to add a list command in their .nft files.
Please, see 5/5 for details.
Comments welcome, thanks.
Pablo Neira Ayuso (5):
libnftables: report EPERM to non-root users with -f/--filename
libnftables: add nft_run_cmd_release() helper and use it
libnftables: consolidate evaluation and netlink run
libnftables: use nft_eval_run_cmds() in nft_run_cmd_from_filename()
libnftables: support for several list and reset commands
include/cmd.h | 10 ++++ src/cmd.c | 100 +++++++++++++++++++++++++++++++++- src/libnftables.c | 133 +++++++++++++++++++++++++++------------------ src/parser_bison.y | 12 +++- src/parser_json.c | 9 +-- 5 files changed, 203 insertions(+), 61 deletions(-)
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH 1/5 libnftables: report EPERM to non-root users with -f/--filename
Similar to 3cfb9e4b3e40 ("src: report EPERM for non-root users").
--- src/libnftables.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
src/libnftables.c +6 -1
@@ -767,8 +767,13 @@ static int __nft_run_cmd_from_filename(struct nft_ctx *nft, const char *filenamenft_optimize (nft, &cmds); rc =nft_evaluate (nft, &msgs, &cmds); -if (rc <0 ) +if (rc <0 ) { +if (errno ==EPERM ) { +fprintf (stderr,"%s (you must be root)\n" , +strerror (errno)); + } goto err; + }if (parser_rc) { rc = parser_rc;
Signature · 1 line
2.47.3
Florian Westphal
maintainerRe: [PATCH nft 1/5] libnftables: report EPERM to non-root users with -f/--filename
Quoted 13 lines · Pablo Neira Ayuso
Similar to
3cfb9e4b3e40("src: report EPERM for non-root users").Signed-off-by Pablo Neira Ayuso <[email protected]>--- src/libnftables.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)src/libnftables.c +0
-0@@ -767,8 +767,13 @@ static int __nft_run_cmd_from_filename(struct nft_ctx *nft, const char *filenamenft_optimize (nft, &cmds);
src/libnftables.c static int __nft_run_cmd_from_filename(struct nft_ctx *nft, const char *filename · line 776
Quoted 10 lines
src/libnftables.c +6
-1rc =nft_evaluate (nft, &msgs, &cmds); -if (rc <0 ) +if (rc <0 ) { +if (errno ==EPERM ) { +fprintf (stderr,"%s (you must be root)\n" , +strerror (errno)); + } goto err; + }
Hmm, should the library leave stderr alone?
Pablo Neira Ayuso
maintainerRe: [PATCH nft 1/5] libnftables: report EPERM to non-root users with -f/--filename
Quoted 15 lines · Florian Westphal
Quoted 14 lines · Pablo Neira Ayuso
Similar to
3cfb9e4b3e40("src: report EPERM for non-root users").Signed-off-by Pablo Neira Ayuso <[email protected]>--- src/libnftables.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)src/libnftables.c +0
-0@@ -767,8 +767,13 @@ static int __nft_run_cmd_from_filename(struct nft_ctx *nft, const char *filenamenft_optimize (nft, &cmds);
Quoted 11 lines
src/libnftables.c static int __nft_run_cmd_from_filename(struct nft_ctx *nft, const char *filename · line 776
Quoted 9 lines
src/libnftables.c +6
-1rc =nft_evaluate (nft, &msgs, &cmds); -if (rc <0 ) +if (rc <0 ) { +if (errno ==EPERM ) { +fprintf (stderr,"%s (you must be root)\n" , +strerror (errno)); + } goto err; + }Hmm, should the library leave stderr alone?
This can be handled instead from src/main.c
Pablo Neira Ayuso
maintainerPATCH 2/5 libnftables: add nft_run_cmd_release() helper and use it
In reply to Pablo Neira AyusoWrap the code to release the list of commands in a helper function, then use it to consolidate codebase.
--- src/libnftables.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)
src/libnftables.c +17 -12
@@ -605,11 +605,23 @@ static int nft_evaluate(struct nft_ctx *nft, struct list_head *msgs,return 0 ; } +static void nft_run_cmd_release (struct nft_ctx *nft, +struct list_head *msgs, +struct list_head *cmds) +{ +struct cmd *cmd, *next; + +erec_print_list (&nft->output, msgs, nft->debug_mask); +list_for_each_entry_safe (cmd, next, cmds, list) { +list_del (&cmd->list); +cmd_free (cmd); + } +} +EXPORT_SYMBOL (nft_run_cmd_from_buffer);int nft_run_cmd_from_buffer (struct nft_ctx *nft,const char *buf) {int rc = -EINVAL , parser_rc; -struct cmd *cmd, *next;LIST_HEAD (msgs);LIST_HEAD (cmds);char *nlbuf;
@@ -646,11 +658,8 @@ int nft_run_cmd_from_buffer(struct nft_ctx *nft, const char *buf)if (nft_netlink (nft, &cmds, &msgs) !=0 ) rc =-1 ; err: -erec_print_list (&nft->output, &msgs, nft->debug_mask); -list_for_each_entry_safe (cmd, next, &cmds, list) { -list_del (&cmd->list); -cmd_free (cmd); - } +nft_run_cmd_release (nft, &msgs, &cmds); +iface_cache_release ();if (nft->scanner) {scanner_destroy (nft);
@@ -739,7 +748,6 @@ static struct error_record *filename_is_useable(struct nft_ctx *nft, const charstatic int __nft_run_cmd_from_filename (struct nft_ctx *nft,const char *filename) {struct error_record *erec; -struct cmd *cmd, *next;int rc, parser_rc;LIST_HEAD (msgs);LIST_HEAD (cmds);
@@ -783,11 +791,8 @@ static int __nft_run_cmd_from_filename(struct nft_ctx *nft, const char *filenameif (nft_netlink (nft, &cmds, &msgs) !=0 ) rc =-1 ; err: -erec_print_list (&nft->output, &msgs, nft->debug_mask); -list_for_each_entry_safe (cmd, next, &cmds, list) { -list_del (&cmd->list); -cmd_free (cmd); - } +nft_run_cmd_release (nft, &msgs, &cmds); +iface_cache_release ();if (nft->scanner) {scanner_destroy (nft);
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH 3/5 libnftables: consolidate evaluation and netlink run
In reply to Pablo Neira AyusoAdd a helper function to wrap the code that evaluates the list of commands and serialize them into the netlink batch.
Add a first user: nft_run_cmd_from_buffer(), there is a follow up patch which will do the same for nft_run_cmd_from_filename().
No functional changes are intended, this comes in preparation to support several list/reset commands in a batch.
--- src/libnftables.c | 61 ++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 24 deletions(-)
src/libnftables.c +37 -24
@@ -618,22 +618,13 @@ static void nft_run_cmd_release(struct nft_ctx *nft, } } -EXPORT_SYMBOL (nft_run_cmd_from_buffer); -int nft_run_cmd_from_buffer (struct nft_ctx *nft,const char *buf) +static int nft_eval_run_cmds (struct nft_ctx *nft,struct list_head *msgs, +struct list_head *cmds,int rc) { -int rc = -EINVAL , parser_rc; -LIST_HEAD (msgs); -LIST_HEAD (cmds); -char *nlbuf; +int parser_rc; - nlbuf =xzalloc (strlen (buf) +2 ); -sprintf (nlbuf,"%s\n" , buf); - -if (nft_output_json (&nft->output) ||nft_input_json (&nft->input)) - rc =nft_parse_json_buffer (nft, nlbuf, &msgs, &cmds); -if (rc == -EINVAL ) - rc =nft_parse_bison_buffer (nft, nlbuf, &msgs, &cmds, - &indesc_cmdline); +if (rc <0 ) + goto err;#if HAVE_FUZZER_BUILD if (nft->afl_ctx_stage ==NFT_AFL_FUZZER_PARSER )
@@ -641,7 +632,7 @@ int nft_run_cmd_from_buffer(struct nft_ctx *nft, const char *buf)#endif parser_rc = rc; - rc =nft_evaluate (nft, &msgs, &cmds); + rc =nft_evaluate (nft, msgs, cmds);if (rc <0 ) {if (errno ==EPERM ) { fprintf(stderr, "%s (you must be root)\n",
@@ -655,17 +646,10 @@ int nft_run_cmd_from_buffer(struct nft_ctx *nft, const char *buf) goto err; } -if (nft_netlink (nft, &cmds, &msgs) !=0 ) +if (nft_netlink (nft, cmds, msgs) !=0 ) rc =-1 ; err: -nft_run_cmd_release (nft, &msgs, &cmds); - -iface_cache_release (); -if (nft->scanner) { -scanner_destroy (nft); - nft->scanner =NULL ; - } -free (nlbuf); +nft_run_cmd_release (nft, msgs, cmds); if (!rc && nft_output_json(&nft->output) &&
@@ -678,6 +662,35 @@ err:return rc; } +EXPORT_SYMBOL (nft_run_cmd_from_buffer); +int nft_run_cmd_from_buffer (struct nft_ctx *nft,const char *buf) +{ +int rc = -EINVAL ; +LIST_HEAD (msgs); +LIST_HEAD (cmds); +char *nlbuf; + + nlbuf =xzalloc (strlen (buf) +2 ); +sprintf (nlbuf,"%s\n" , buf); + +if (nft_output_json (&nft->output) ||nft_input_json (&nft->input)) + rc =nft_parse_json_buffer (nft, nlbuf, &msgs, &cmds); +if (rc == -EINVAL ) + rc =nft_parse_bison_buffer (nft, nlbuf, &msgs, &cmds, + &indesc_cmdline); + + rc =nft_eval_run_cmds (nft, &msgs, &cmds, rc); + +free (nlbuf); +iface_cache_release (); +if (nft->scanner) { +scanner_destroy (nft); + nft->scanner =NULL ; + } + +return rc; +} +static int load_cmdline_vars (struct nft_ctx *ctx,struct list_head *msgs) {unsigned int bufsize, ret, i, offset =0 ;
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH 4/5 libnftables: use nft_eval_run_cmds() in nft_run_cmd_from_filename()
In reply to Pablo Neira AyusoUpdate nft_run_cmd_from_filename() to use this new helper function.
Move err: tag to a later stage, which is run by the variables defined via --define option, this should be safe.
No functional changes are intended, this comes in preparation to support several list/reset commands in a batch.
--- src/libnftables.c | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-)
src/libnftables.c +4 -29
@@ -761,9 +761,9 @@ static struct error_record *filename_is_useable(struct nft_ctx *nft, const charstatic int __nft_run_cmd_from_filename (struct nft_ctx *nft,const char *filename) {struct error_record *erec; -int rc, parser_rc;LIST_HEAD (msgs);LIST_HEAD (cmds); +int rc; erec =filename_is_useable (nft, filename);if (erec) {
@@ -782,35 +782,17 @@ static int __nft_run_cmd_from_filename(struct nft_ctx *nft, const char *filenameif (rc == -EINVAL ) rc =nft_parse_bison_filename (nft, filename, &msgs, &cmds); - parser_rc = rc; -if (nft->optimize_flags)nft_optimize (nft, &cmds); - rc =nft_evaluate (nft, &msgs, &cmds); -if (rc <0 ) { -if (errno ==EPERM ) { -fprintf (stderr,"%s (you must be root)\n" , -strerror (errno)); - } - goto err; - } - -if (parser_rc) { - rc = parser_rc; - goto err; - } - -if (nft_netlink (nft, &cmds, &msgs) !=0 ) - rc =-1 ; -err: -nft_run_cmd_release (nft, &msgs, &cmds); + rc =nft_eval_run_cmds (nft, &msgs, &cmds, rc);iface_cache_release ();if (nft->scanner) {scanner_destroy (nft); nft->scanner =NULL ; } +err:if (!list_empty (&nft->vars_ctx.indesc_list)) {struct input_descriptor *indesc, *next;
@@ -821,15 +803,8 @@ err:free (indesc); } } -free_const (nft->vars_ctx.buf); - -if (!rc && -nft_output_json (&nft->output) && -nft_output_echo (&nft->output)) -json_print_echo (nft); -if (rc || nft->check) -nft_cache_release (&nft->cache); +free_const (nft->vars_ctx.buf);scope_release (nft->state->scopes[0 ]);
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH 5/5 libnftables: support for several list and reset commands
In reply to Pablo Neira AyusoThe cache logic woes with either more than one single list or reset command, e.g. list table x; list table y;
One possibility is to handle this from the cache logic itself through the existing netlink dump filter infrastructure, but it looks fragile because this needs to combine the different dump filtering requirements.
The list and reset commands have different semantics, these commands are not built into the batch that is delivered to the 2-phase commit protocol in nf_tables, instead these commands follow the netlink dump path to fetch (and reset) data from the kernel.
This patch updates the parser to create one cmd_batch object that stores the usual add/delete cmd object in a batch. The exception are CMD_LIST and CMD_RESET commands, which have a single cmd_batch object with a single command. Then, iterate over the cmd_batch to handle the commands sequentially.
The structure is a list of lists, collecting commands
.-----------.
| cmd_batch |-> add cmd -> add cmd -> add cmd
`-----------'
|
.-----------.
| cmd_batch |-> list cmd
`-----------'This is handled sequentially, first a batch for the 2-commit phase protocol is build and delivered, then the list command fetches the content in the kernel, so it shows the changes already applied by the previous batch.
In most case, there will be a single cmd_batch object, unless list and reset commands are used.
After this patch, list and reset commands result in an implicit end of batch/transaction when mixed with other existing commands. To the user, these commands are handled now sequentially.
Given list and reset commands trigger this implicit end of batch, this adds a restriction to disallow complicated mixes that could result in more than one single transaction. Currently this allows for a batch for the 2-phase commit protocol and commands to list/reset as long as they are not intertwined, eg.
.-----------.
| cmd_batch |-> add cmd -> add cmd -> add cmd
`-----------'
|
.-----------.
| cmd_batch |-> list cmd
`-----------'
|
.-----------.
| cmd_batch |-> add cmd -> add cmd -> add cmd
`-----------'This is not allowed, this reports "unsupported command mix" as an error.
There is also a bug in bugzilla that refers to users hitting issues when using the list command in a file, this patch should address this too.
--- include/cmd.h | 10 +++++ src/cmd.c | 100 ++++++++++++++++++++++++++++++++++++++++++++- src/libnftables.c | 39 +++++++++++++++--- src/parser_bison.y | 12 +++++- src/parser_json.c | 9 ++-- 5 files changed, 157 insertions(+), 13 deletions(-)
include/cmd.h +10 -0
@@ -1,6 +1,8 @@#ifndef _NFT_CMD_H_#define _NFT_CMD_H_ +#include <list.h> +void cmd_add_loc (struct cmd *cmd,const struct nlmsghdr *nlh,const struct location *loc);struct mnl_err ; void nft_cmd_error(struct netlink_ctx *ctx, struct cmd *cmd,
@@ -11,4 +13,12 @@ bool nft_cmd_collapse_elems(enum cmd_ops op, struct list_head *cmds,void nft_cmd_expand (struct cmd *cmd); +struct cmd_batch { +struct list_head list; +struct list_head sublist; +}; + +void __cmd_batch_add (struct cmd *cmd,struct list_head *cmds); +int cmd_batch_add (struct cmd *cmd,struct list_head *cmds); +#endif
src/cmd.c +99 -1
115 lines not on this page · raw message
src/libnftables.c +33 -6
@@ -665,7 +665,8 @@ err:EXPORT_SYMBOL (nft_run_cmd_from_buffer);int nft_run_cmd_from_buffer (struct nft_ctx *nft,const char *buf) { -int rc = -EINVAL ; +struct cmd_batch *cmd_batch, *next; +int rc = -EINVAL , rc_loop =0 ;LIST_HEAD (msgs);LIST_HEAD (cmds);char *nlbuf;
@@ -679,7 +680,19 @@ int nft_run_cmd_from_buffer(struct nft_ctx *nft, const char *buf) rc =nft_parse_bison_buffer (nft, nlbuf, &msgs, &cmds, &indesc_cmdline); - rc =nft_eval_run_cmds (nft, &msgs, &cmds, rc); +if (rc <0 &&list_empty (&cmds)) +erec_print_list (&nft->output, &msgs, nft->debug_mask); + +list_for_each_entry_safe (cmd_batch, next, &cmds, list) { + rc =nft_eval_run_cmds (nft, &msgs, &cmd_batch->sublist, rc); +assert (list_empty (&cmd_batch->sublist)); +list_del (&cmd_batch->list); +free (cmd_batch); +if (rc <0 ) + rc_loop = rc; + } +if (rc_loop) + rc = rc_loop;free (nlbuf);iface_cache_release ();
@@ -760,10 +773,11 @@ static struct error_record *filename_is_useable(struct nft_ctx *nft, const charstatic int __nft_run_cmd_from_filename (struct nft_ctx *nft,const char *filename) { +struct cmd_batch *cmd_batch, *next;struct error_record *erec; +int rc, rc_loop =0 ;LIST_HEAD (msgs);LIST_HEAD (cmds); -int rc; erec =filename_is_useable (nft, filename);if (erec) {
@@ -782,10 +796,23 @@ static int __nft_run_cmd_from_filename(struct nft_ctx *nft, const char *filenameif (rc == -EINVAL ) rc =nft_parse_bison_filename (nft, filename, &msgs, &cmds); -if (nft->optimize_flags) -nft_optimize (nft, &cmds); +if (rc <0 &&list_empty (&cmds)) +erec_print_list (&nft->output, &msgs, nft->debug_mask); + +list_for_each_entry_safe (cmd_batch, next, &cmds, list) { +if (nft->optimize_flags) +nft_optimize (nft, &cmd_batch->sublist); + + rc =nft_eval_run_cmds (nft, &msgs, &cmd_batch->sublist, rc); +assert (list_empty (&cmd_batch->sublist)); +list_del (&cmd_batch->list); +free (cmd_batch); +if (rc <0 ) + rc_loop = rc; + } - rc =nft_eval_run_cmds (nft, &msgs, &cmds, rc); +if (rc_loop) + rc = rc_loop;iface_cache_release ();if (nft->scanner) {
src/parser_bison.y +10 -2
@@ -1073,7 +1073,11 @@ input : /* empty */ { if ($2 != NULL) { $2->location = @2; - list_add_tail(&$2->list, state->cmds); + if (cmd_batch_add($2, state->cmds) < 0) { + erec_queue(error(&@2, "unsupported command mix"), + state->msgs); + YYERROR; + } } } ;
@@ -1210,7 +1214,11 @@ line : common_block { $$ = NULL; } */ if ($1 != NULL) { $1->location = @1; - list_add_tail(&$1->list, state->cmds); + if (cmd_batch_add($1, state->cmds) < 0) { + erec_queue(error(&@2, "unsupported command mix"), + state->msgs); + YYERROR; + } } $$ = NULL; YYACCEPT;
src/parser_json.c +5 -4
@@ -4492,7 +4492,6 @@ static int __json_parse(struct json_ctx *ctx) json_array_foreach(tmp, index, value) {/* this is more or less from parser_bison.y:716 */ -LIST_HEAD (list);struct cmd *cmd;json_t *tmp2;
@@ -4522,9 +4521,11 @@ static int __json_parse(struct json_ctx *ctx)return -1 ; } -list_add_tail (&cmd->list, &list); - -list_splice_tail (&list, ctx->cmds); +if (cmd_batch_add (cmd, ctx->cmds) <0 ) { +json_error (ctx,"unsupported command mix" ); +cmd_free (cmd); +return -1 ; + }if (nft_output_echo (&ctx->nft->output))json_cmd_assoc_add (value, cmd);
Signature · 1 line
2.47.3