Add support for table's persist flag
Phil Sutter
reviewercover Add support for table's persist flag
Support for kernel commit da5141bbe0c2 ("netfilter: nf_tables: Introduce NFT_TABLE_F_PERSIST") in user space.
Patch 1 is not a dependency, but trivial enough to go along with the second one.
Phil Sutter (2):
doc: nft.8: Two minor synopsis fixups
Add support for table's persist flag
doc/libnftables-json.adoc | 11 +++- doc/nft.txt | 13 +++- include/rule.h | 3 +- src/parser_bison.y | 42 +++++++++---- src/parser_json.c | 68 ++++++++++++++++++++- src/rule.c | 1 + tests/shell/features/table_flag_persist.nft | 3 + tests/shell/testcases/owner/0002-persist | 36 +++++++++++ 8 files changed, 158 insertions(+), 19 deletions(-) create mode 100644 tests/shell/features/table_flag_persist.nft create mode 100755 tests/shell/testcases/owner/0002-persist
Signature · 1 line
2.43.0
Phil Sutter
reviewerPATCH 1/2 doc: nft.8: Two minor synopsis fixups
The curly braces in 'add table' are to be put literally, so need to be bold. Also, they are optional unless either one (or both) of 'comment' and 'flags' are specified.
The 'add chain' synopsis contained a stray tick, messing up the following markup.
--- doc/nft.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
doc/nft.txt +2 -2
@@ -321,7 +321,7 @@ Effectively, this is the nft-equivalent of *iptables-save* and TABLES ------ [verse] -{*add* | *create*} *table* ['family'] 'table' [ {*comment* 'comment' *;*'} *{ flags* 'flags' *; }*] +{*add* | *create*} *table* ['family'] 'table' [*{* [*comment* 'comment' *;*] [*flags* 'flags' *;*] *}*] {*delete* | *destroy* | *list* | *flush*} *table* ['family'] 'table' *list tables* ['family'] *delete table* ['family'] *handle* 'handle'
@@ -376,7 +376,7 @@ add table inet mytable CHAINS ------ [verse] -{*add* | *create*} *chain* ['family'] 'table' 'chain' [*{ type* 'type' *hook* 'hook' [*device* 'device'] *priority* 'priority' *;* [*policy* 'policy' *;*] [*comment* 'comment' *;*'] *}*] +{*add* | *create*} *chain* ['family'] 'table' 'chain' [*{ type* 'type' *hook* 'hook' [*device* 'device'] *priority* 'priority' *;* [*policy* 'policy' *;*] [*comment* 'comment' *;*] *}*] {*delete* | *destroy* | *list* | *flush*} *chain* ['family'] 'table' 'chain' *list chains* ['family'] *delete chain* ['family'] 'table' *handle* 'handle'
Signature · 1 line
2.43.0
Phil Sutter
reviewerPATCH 2/2 Add support for table's persist flag
In reply to Phil SutterBison parser lacked support for passing multiple flags, JSON parser did not support table flags at all.
Document also 'owner' flag (and describe their relationship in nft.8.
--- doc/libnftables-json.adoc | 11 +++- doc/nft.txt | 9 +++ include/rule.h | 3 +- src/parser_bison.y | 42 +++++++++---- src/parser_json.c | 68 ++++++++++++++++++++- src/rule.c | 1 + tests/shell/features/table_flag_persist.nft | 3 + tests/shell/testcases/owner/0002-persist | 36 +++++++++++ 8 files changed, 156 insertions(+), 17 deletions(-) create mode 100644 tests/shell/features/table_flag_persist.nft create mode 100755 tests/shell/testcases/owner/0002-persist
doc/libnftables-json.adoc +10 -1
@@ -202,12 +202,19 @@ Rename a chain. The new name is expected in a dedicated property named === TABLE [verse] +____ *{ "table": { "family":* 'STRING'*, "name":* 'STRING'*, - "handle":* 'NUMBER' + "handle":* 'NUMBER'*, + "flags":* 'TABLE_FLAGS' *}}* +'TABLE_FLAGS' := 'TABLE_FLAG' | *[* 'TABLE_FLAG_LIST' *]* +'TABLE_FLAG_LIST' := 'TABLE_FLAG' [*,* 'TABLE_FLAG_LIST' ] +'TABLE_FLAG' := *"dormant"* | *"owner"* | *"persist"* +____ + This object describes a table. *family*::
@@ -217,6 +224,8 @@ This object describes a table. *handle*:: The table's handle. In input, it is used only in *delete* command as alternative to *name*. +*flags*:: + The table's flags. === CHAIN [verse]
doc/nft.txt +9 -0
@@ -343,8 +343,17 @@ return an error. |Flag | Description |dormant | table is not evaluated any more (base chains are unregistered). +|owner | +table is owned by the creating process. +|persist | +table shall outlive the owning process. |================= +Creating a table with flag *owner* excludes other processes from manipulating +it or its contents. By default, it will be removed when the process exits. +Setting flag *persist* will prevent this and the resulting orphaned table will +accept a new owner, e.g. a restarting daemon maintaining the table. + .*Add, change, delete a table* --------------------------------------- # start nft in interactive mode
include/rule.h +2 -1
@@ -130,8 +130,9 @@ struct symbol *symbol_get(const struct scope *scope, const char *identifier);enum table_flags {TABLE_F_DORMANT = (1 <<0 ),TABLE_F_OWNER = (1 <<1 ), +TABLE_F_PERSIST = (1 <<2 ), }; -#define TABLE_FLAGS_MAX 2 +#define TABLE_FLAGS_MAX 3const char *table_flag_name (uint32_t flag);
src/parser_bison.y +29 -13
61 lines not on this page · raw message
src/parser_json.c +66 -2
94 lines not on this page · raw message
src/rule.c +1 -0
@@ -1215,6 +1215,7 @@ struct table *table_lookup_fuzzy(const struct handle *h,static const char *table_flags_name[TABLE_FLAGS_MAX ] = {"dormant" ,"owner" , +"persist" , };const char *table_flag_name (uint32_t flag)
tests/shell/features/table_flag_persist.nft new file +3 -0
@@ -0,0 +1,3 @@ +table t { + flags persist; +}
tests/shell/testcases/owner/0002-persist new file +36 -0
@@ -0,0 +1,36 @@ +#!/bin/bash + +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_table_flag_owner) +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_table_flag_persist) + +die() { + echo "$@" + exit 1 +} + +$NFT -f - <<EOF +table ip t { + flags owner, persist +} +EOF +[[ $? -eq 0 ]] || { + die "table add failed" +} + +$NFT list ruleset | grep -q 'table ip t' || { + die "table does not persist" +} +$NFT list ruleset | grep -q 'flags persist$' || { + die "unexpected flags in orphaned table" +} + +$NFT -f - <<EOF +table ip t { + flags owner, persist +} +EOF +[[ $? -eq 0 ]] || { + die "retake ownership failed" +} + +exit 0
Signature · 1 line
2.43.0
Quoted 133 lines · Phil Sutter
Bison parser lacked support for passing multiple flags, JSON parser did not support table flags at all.
Document also 'owner' flag (and describe their relationship in nft.8.
Signed-off-by Phil Sutter <[email protected]>--- doc/libnftables-json.adoc | 11 +++- doc/nft.txt | 9 +++ include/rule.h | 3 +- src/parser_bison.y | 42 +++++++++---- src/parser_json.c | 68 ++++++++++++++++++++- src/rule.c | 1 + tests/shell/features/table_flag_persist.nft | 3 + tests/shell/testcases/owner/0002-persist | 36 +++++++++++ 8 files changed, 156 insertions(+), 17 deletions(-) create mode 100644 tests/shell/features/table_flag_persist.nft create mode 100755 tests/shell/testcases/owner/0002-persistdoc/libnftables-json.adoc +10
-1@@ -202,12 +202,19 @@ Rename a chain. The new name is expected in a dedicated property named === TABLE [verse] +____ *{ "table": { "family":* 'STRING'*, "name":* 'STRING'*, - "handle":* 'NUMBER' + "handle":* 'NUMBER'*, + "flags":* 'TABLE_FLAGS' *}}* +'TABLE_FLAGS' := 'TABLE_FLAG' | *[* 'TABLE_FLAG_LIST' *]* +'TABLE_FLAG_LIST' := 'TABLE_FLAG' [*,* 'TABLE_FLAG_LIST' ] +'TABLE_FLAG' := *"dormant"* | *"owner"* | *"persist"* +____ + This object describes a table. *family*::@@ -217,6 +224,8 @@ This object describes a table. *handle*:: The table's handle. In input, it is used only in *delete* command as alternative to *name*. +*flags*:: + The table's flags. === CHAIN [verse]doc/nft.txt +9
-0@@ -343,8 +343,17 @@ return an error. |Flag | Description |dormant | table is not evaluated any more (base chains are unregistered). +|owner | +table is owned by the creating process. +|persist | +table shall outlive the owning process. |================= +Creating a table with flag *owner* excludes other processes from manipulating +it or its contents. By default, it will be removed when the process exits. +Setting flag *persist* will prevent this and the resulting orphaned table will +accept a new owner, e.g. a restarting daemon maintaining the table. + .*Add, change, delete a table* --------------------------------------- # start nft in interactive modeinclude/rule.h +2
-1@@ -130,8 +130,9 @@ struct symbol *symbol_get(const struct scope *scope, const char *identifier);enum table_flags {TABLE_F_DORMANT = (1 <<0 ),TABLE_F_OWNER = (1 <<1 ), +TABLE_F_PERSIST = (1 <<2 ), }; -#define TABLE_FLAGS_MAX 2 +#define TABLE_FLAGS_MAX 3const char *table_flag_name (uint32_t flag);src/parser_bison.y +7
-13@@ -742,6 +742,8 @@ int nft_lex(void *, void *, void *); %type <rule> rule rule_alloc %destructor { rule_free($$); } rule +%type <val> table_flags table_flag + %type <val> set_flag_list set_flag %type <val> set_policy_spec@@ -1905,20 +1907,9 @@ table_block_alloc : /* empty */ } ; -table_options : FLAGS STRING +table_options : FLAGS table_flags { - if (strcmp($2, "dormant") == 0) { - $<table>0->flags |= TABLE_F_DORMANT; - free_const($2); - } else if (strcmp($2, "owner") == 0) { - $<table>0->flags |= TABLE_F_OWNER; - free_const($2); - } else { - erec_queue(error(&@2, "unknown table option %s", $2), - state->msgs); - free_const($2); - YYERROR; - } + $<table>0->flags |= $2; } | comment_spec {@@ -1930,6 +1921,31 @@ table_options : FLAGS STRING } ; +table_flags : table_flag + | table_flags COMMA table_flag + {
src/parser_bison.y table_options : FLAGS STRING · line 1936
Quoted 10 lines
src/parser_bison.y +10
-0+ $$ = $1 | $3; + } + ; +table_flag : STRING + { + if (strcmp($1, "dormant") == 0) { + $$ = TABLE_F_DORMANT; + free_const($1); + } else if (strcmp($1, "owner") == 0) { + $$ = TABLE_F_OWNER;
Don't you need to free_const($1) here too?
Quoted 180 lines
src/parser_bison.y +12
-0+ } else if (strcmp($1, "persist") == 0) { + $$ = TABLE_F_PERSIST; + free_const($1); + } else { + erec_queue(error(&@1, "unknown table option %s", $1), + state->msgs); + free_const($1); + YYERROR; + } + } + ; + table_block : /* empty */ { $$ = $<table>-1; } | table_block common_block | table_block stmt_separatorsrc/parser_json.c +66
-2@@ -2954,6 +2954,64 @@ static struct stmt *json_parse_stmt(struct json_ctx *ctx, json_t *root)return NULL ; } +static int string_to_table_flag (const char *str) +{ +const struct { +enum table_flags val; +const char *name; + } flag_tbl[] = { + {TABLE_F_DORMANT ,"dormant" }, + {TABLE_F_OWNER ,"owner" }, + {TABLE_F_PERSIST ,"persist" }, + }; +unsigned int i; + +for (i =0 ; i <array_size (flag_tbl); i++) { +if (!strcmp (str, flag_tbl[i].name)) +return flag_tbl[i].val; + } +return 0 ; +} + +static int json_parse_table_flags (struct json_ctx *ctx,json_t *root, +enum table_flags *flags) +{ +json_t *tmp, *tmp2; +size_t index; +int flag; + +if (json_unpack (root,"{s:o}" ,"flags" , &tmp)) +return 0 ; + +if (json_is_string (tmp)) { + flag =string_to_table_flag (json_string_value (tmp)); +if (flag) { + *flags = flag; +return 0 ; + } +json_error (ctx,"Invalid table flag '%s'." , +json_string_value (tmp)); +return 1 ; + } +if (!json_is_array (tmp)) { +json_error (ctx,"Unexpected table flags value." ); +return 1 ; + } + json_array_foreach(tmp, index, tmp2) { +if (json_is_string (tmp2)) { + flag =string_to_table_flag (json_string_value (tmp2)); + +if (flag) { + *flags |= flag; +continue ; + } + } +json_error (ctx,"Invalid table flag at index %zu." , index); +return 1 ; + } +return 0 ; +} +static struct cmd *json_parse_cmd_add_table (struct json_ctx *ctx,json_t *root,enum cmd_ops op,enum cmd_obj obj) {@@ -2962,6 +3020,7 @@ static struct cmd *json_parse_cmd_add_table(struct json_ctx *ctx, json_t *root, .table.location = *int_loc, };struct table *table =NULL ; +enum table_flags flags =0 ;if (json_unpack_err (ctx, root,"{s:s}" ,"family" , &family))@@ -2972,6 +3031,9 @@ static struct cmd *json_parse_cmd_add_table(struct json_ctx *ctx, json_t *root,return NULL ;json_unpack (root,"{s:s}" ,"comment" , &comment); +if (json_parse_table_flags (ctx, root, &flags)) +return NULL ; + }else if (op ==CMD_DELETE &&json_unpack (root,"{s:s}" ,"name" , &h.table.name) &&json_unpack (root,"{s:I}" ,"handle" , &h.handle.id)) {@@ -2985,10 +3047,12 @@ static struct cmd *json_parse_cmd_add_table(struct json_ctx *ctx, json_t *root,if (h.table.name) h.table.name =xstrdup (h.table.name); -if (comment) { +if (comment || flags) { table =table_alloc ();handle_merge (&table->handle, &h); - table->comment =xstrdup (comment); +if (comment) + table->comment =xstrdup (comment); + table->flags = flags; }if (op ==CMD_ADD )src/rule.c +1
-0@@ -1215,6 +1215,7 @@ struct table *table_lookup_fuzzy(const struct handle *h,static const char *table_flags_name[TABLE_FLAGS_MAX ] = {"dormant" ,"owner" , +"persist" , };const char *table_flag_name (uint32_t flag)tests/shell/features/table_flag_persist.nft new file +3
-0@@ -0,0 +1,3 @@ +table t { + flags persist; +}tests/shell/testcases/owner/0002-persist new file +36
-0@@ -0,0 +1,36 @@ +#!/bin/bash + +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_table_flag_owner) +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_table_flag_persist) + +die() { + echo "$@" + exit 1 +} + +$NFT -f - <<EOF +table ip t { + flags owner, persist +} +EOF +[[ $? -eq 0 ]] || { + die "table add failed" +} + +$NFT list ruleset | grep -q 'table ip t' || { + die "table does not persist" +} +$NFT list ruleset | grep -q 'flags persist$' || { + die "unexpected flags in orphaned table" +} + +$NFT -f - <<EOF +table ip t { + flags owner, persist +} +EOF +[[ $? -eq 0 ]] || { + die "retake ownership failed" +} + +exit 0
Phil Sutter
reviewerQuoted 1 line · Quentin Deslandes
On 2024-03-22 16:48, Phil Sutter wrote:
[...]
Quoted 4 lines
Quoted 4 lines
src/parser_bison.y +0
-0
[...]
Quoted 4 lines
Quoted 4 lines
src/parser_bison.y +0
-0@@ -1930,6 +1921,31 @@ table_options : FLAGS STRING } ;
Quoted 15 lines
src/parser_bison.y table_options : FLAGS STRING · line 1936
Quoted 13 lines
src/parser_bison.y +13
-0+table_flags : table_flag + | table_flags COMMA table_flag + { + $$ = $1 | $3; + } + ; +table_flag : STRING + { + if (strcmp($1, "dormant") == 0) { + $$ = TABLE_F_DORMANT; + free_const($1); + } else if (strcmp($1, "owner") == 0) { + $$ = TABLE_F_OWNER;Don't you need to
free_const($1)here too?
Oh yes, thanks for spotting it! Guess I messed up some c'n'p here, the code is really obvious.
Thanks, Phil