parser_bison: restore nft {import,export} ruleset
Pablo Neira Ayuso
maintainerPATCH 1/1 parser_bison: restore nft {import,export} ruleset
Restore original syntax for the yet experimental VM low-level json representation.
---
I asked for this change to make room for the high-level json representation, but we can use -j options for this instead. Given there are more users for the json representation that I expected, I'm fixing it myself by restoring the former behaviour.
src/parser_bison.y | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
src/parser_bison.y +2 -4
@@ -1186,7 +1186,7 @@ rename_cmd : CHAIN chain_spec identifier } ; -import_cmd : RULESET markup_format +import_cmd : RULESET markup_format { struct handle h = { .family = NFPROTO_UNSPEC }; struct markup *markup = markup_alloc($2);
@@ -1198,7 +1198,6 @@ import_cmd : RULESET markup_format struct markup *markup = markup_alloc($1); $$ = cmd_alloc(CMD_IMPORT, CMD_OBJ_MARKUP, &h, &@$, markup); } - | JSON { $$ = NULL; } ; export_cmd : RULESET markup_format
@@ -1213,7 +1212,6 @@ export_cmd : RULESET markup_format struct markup *markup = markup_alloc($1); $$ = cmd_alloc(CMD_EXPORT, CMD_OBJ_MARKUP, &h, &@$, markup); } - | JSON { $$ = NULL; } ; monitor_cmd : monitor_event monitor_object monitor_format
@@ -1241,10 +1239,10 @@ monitor_object : /* empty */ { $$ = CMD_MONITOR_OBJ_ANY; } monitor_format : /* empty */ { $$ = NFTNL_OUTPUT_DEFAULT; } | markup_format - | JSON { $$ = NFTNL_OUTPUT_JSON; } ; markup_format : XML { $$ = NFTNL_OUTPUT_XML; } + | JSON { $$ = NFTNL_OUTPUT_JSON; } | VM JSON { $$ = NFTNL_OUTPUT_JSON; } ;
Signature · 1 line
2.11.0
Hi Pablo,
Quoted 10 lines · Pablo Neira Ayuso
Restore original syntax for the yet experimental VM low-level json representation.
Signed-off-by Pablo Neira Ayuso <[email protected]>---
I asked for this change to make room for the high-level json representation, but we can use -j options for this instead. Given there are more users for the json representation that I expected, I'm fixing it myself by restoring the former behaviour.
Why would one use "nft export" without "nft import". if someone exports rules in json then they can't use those rules given the fact that "nft import" was not available earlier.
Am i missing something?
Thanks!!
Quoted 47 lines
src/parser_bison.y | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)src/parser_bison.y +2
-5@@ -1186,7 +1186,7 @@ rename_cmd : CHAIN chain_spec identifier } ; -import_cmd : RULESET markup_format +import_cmd : RULESET markup_format { struct handle h = { .family = NFPROTO_UNSPEC }; struct markup *markup = markup_alloc($2);@@ -1198,7 +1198,6 @@ import_cmd : RULESET markup_format struct markup *markup = markup_alloc($1); $$ = cmd_alloc(CMD_IMPORT, CMD_OBJ_MARKUP, &h, &@$, markup); } - | JSON { $$ = NULL; } ; export_cmd : RULESET markup_format@@ -1213,7 +1212,6 @@ export_cmd : RULESET markup_format struct markup *markup = markup_alloc($1); $$ = cmd_alloc(CMD_EXPORT, CMD_OBJ_MARKUP, &h, &@$, markup); } - | JSON { $$ = NULL; } ; monitor_cmd : monitor_event monitor_object monitor_format@@ -1241,10 +1239,10 @@ monitor_object : /* empty */ { $$ = CMD_MONITOR_OBJ_ANY; } monitor_format : /* empty */ { $$ = NFTNL_OUTPUT_DEFAULT; } | markup_format - | JSON { $$ = NFTNL_OUTPUT_JSON; } ; markup_format : XML { $$ = NFTNL_OUTPUT_XML; } + | JSON { $$ = NFTNL_OUTPUT_JSON; } | VM JSON { $$ = NFTNL_OUTPUT_JSON; } ; --2.11.0
Pablo Neira Ayuso
maintainerQuoted 14 lines · Shyam Saini
Hi Pablo,
Quoted 10 lines · Pablo Neira Ayuso
Restore original syntax for the yet experimental VM low-level json representation.
Signed-off-by Pablo Neira Ayuso <[email protected]>---
I asked for this change to make room for the high-level json representation, but we can use -j options for this instead. Given there are more users for the json representation that I expected, I'm fixing it myself by restoring the former behaviour.
Quoted 5 lines
Why would one use "nft export" without "nft import". if someone exports rules in json then they can't use those rules given the fact that "nft import" was not available earlier.
Am i missing something?
With this patch nft import and nft export works as expected, ie.
nft export ruleset json > file.json
nft import ruleset json < file.json
I'm just restoring 'nft export ruleset json' with this patch, it seems there are more users of this than I expected, so let's restore this before 0.8.3 is released, that's my proposal.
Pablo Neira Ayuso
maintainerQuoted 21 lines · Pablo Neira Ayuso
Quoted 14 lines · Shyam Saini
Hi Pablo,
Quoted 10 lines · Pablo Neira Ayuso
Restore original syntax for the yet experimental VM low-level json representation.
Signed-off-by Pablo Neira Ayuso <[email protected]>---
I asked for this change to make room for the high-level json representation, but we can use -j options for this instead. Given there are more users for the json representation that I expected, I'm fixing it myself by restoring the former behaviour.Quoted 5 lines
Why would one use "nft export" without "nft import". if someone exports rules in json then they can't use those rules given the fact that "nft import" was not available earlier.
Am i missing something?
Quoted 8 lines
With this patch nft import and nft export works as expected, ie.
nft export ruleset json > file.json
nft import ruleset json < file.jsonI'm just restoring 'nft export ruleset json' with this patch, it seems there are more users of this than I expected, so let's restore this before 0.8.3 is released, that's my proposal.
Oh, probably you got confused because the patch title refers to nft import when it should only refer to nft export ruleset json?
Quoted 27 lines · Pablo Neira Ayuso
Quoted 26 lines · Shyam Saini
Quoted 14 lines
Hi Pablo,
Quoted 10 lines · Pablo Neira Ayuso
Restore original syntax for the yet experimental VM low-level json representation.
Signed-off-by Pablo Neira Ayuso <[email protected]>---
I asked for this change to make room for the high-level json representation, but we can use -j options for this instead. Given there are more users for the json representation that I expected, I'm fixing it myself by restoring the former behaviour.Quoted 5 lines
Why would one use "nft export" without "nft import". if someone exports rules in json then they can't use those rules given the fact that "nft import" was not available earlier.
Am i missing something?
With this patch nft import and nft export works as expected, ie.
nft export ruleset json > file.json
nft import ruleset json < file.json
Quoted 6 lines
Quoted 3 lines
I'm just restoring 'nft export ruleset json' with this patch, it seems there are more users of this than I expected, so let's restore this before 0.8.3 is released, that's my proposal.
Oh, probably you got confused because the patch title refers to nft import when it should only refer to nft export ruleset json?
No, I mean in some previous mail Phil mentioned that it could break user's script.
I was thinking why one would use "nft export json" alone.
Earlier we didn't have nft import command.
So lets say if some user do "nft export json >file.json" then the rules in file.json
are of no use without "nft import json" because we had no way to import or use them again.
Sorry, I missed previous mail and couldn't follow up.
Thanks!
Phil Sutter
reviewerHi Shyam,
Quoted 39 lines · Shyam Saini
Quoted 27 lines · Pablo Neira Ayuso
Quoted 26 lines · Shyam Saini
Quoted 14 lines
Hi Pablo,
Quoted 10 lines · Pablo Neira Ayuso
Restore original syntax for the yet experimental VM low-level json representation.
Signed-off-by Pablo Neira Ayuso <[email protected]>---
I asked for this change to make room for the high-level json representation, but we can use -j options for this instead. Given there are more users for the json representation that I expected, I'm fixing it myself by restoring the former behaviour.Quoted 5 lines
Why would one use "nft export" without "nft import". if someone exports rules in json then they can't use those rules given the fact that "nft import" was not available earlier.
Am i missing something?
With this patch nft import and nft export works as expected, ie.
nft export ruleset json > file.json
nft import ruleset json < file.jsonQuoted 6 lines
Quoted 3 lines
I'm just restoring 'nft export ruleset json' with this patch, it seems there are more users of this than I expected, so let's restore this before 0.8.3 is released, that's my proposal.
Oh, probably you got confused because the patch title refers to nft import when it should only refer to nft export ruleset json?
No, I mean in some previous mail Phil mentioned that it could break user's script.
I was thinking why one would use "nft export json" alone.
Earlier we didn't have nft import command.
Quoted 6 lines
So lets say if some user do "nft export json >file.json" then the rules in file.json
are of no use without "nft import json" because we had no way to import or use them again.Sorry, I missed previous mail and couldn't follow up.
My point was that 'nft export json' might be in use for other things than restoring nftables rule set later on, e.g. to verify current system state against a known one. The problem I saw was not so much that 'nft export json' stopped working but that it returned 0 and hence did not allow for such scripts to detect a failure in execution. So this might lead to red lights turning on because a system may seem like it lost all previously installed nftables rules.
Yes, this case is pretty much constructed, but if something's possible, there's always at least one guy on the internet doing it. :)
Cheers, Phil