iptables-nft: allow removal of empty builtin chains
Florian Westphal
maintainerPATCH 1/1 iptables-nft: allow removal of empty builtin chains
The only reason why this is prohibited is that you cannot do it in iptables-legacy.
This removes the artifical limitation.
"iptables-nft -X" will leave the builtin chains alone; Also, deletion is only permitted if the chain is empty.
---
Conservative change:
iptables-nft -X will not remove empty builtin chains. OTOH, maybe it would be better to auto-remove those too, if empty. Comments?
iptables/iptables.8.in | 10 ++++-- iptables/nft-cmd.c | 8 ++--- iptables/nft-cmd.h | 4 +-- iptables/nft.c | 69 +++++++++++++++++++++++++++--------------- iptables/nft.h | 4 +-- iptables/xtables-arp.c | 4 +-- iptables/xtables-eb.c | 2 +- iptables/xtables.c | 4 +-- 8 files changed, 64 insertions(+), 41 deletions(-)
iptables/iptables.8.in +7 -3
@@ -25,10 +25,10 @@ .SH NAME iptables/ip6tables \(em administration tool for IPv4/IPv6 packet filtering and NAT .SH SYNOPSIS -\fBiptables\fP [\fB\-t\fP \fItable\fP] {\fB\-A\fP|\fB\-C\fP|\fB\-D\fP} +\fBiptables\fP [\fB\-t\fP \fItable\fP] {\fB\-A\fP|\fB\-C\fP|\fB\-D\fP|\fB-V\fP} \fIchain\fP \fIrule-specification\fP .P -\fBip6tables\fP [\fB\-t\fP \fItable\fP] {\fB\-A\fP|\fB\-C\fP|\fB\-D\fP} +\fBip6tables\fP [\fB\-t\fP \fItable\fP] {\fB\-A\fP|\fB\-C\fP|\fB\-D\fP|\fB-V\fP} \fIchain rule-specification\fP .PP \fBiptables\fP [\fB\-t\fP \fItable\fP] \fB\-I\fP \fIchain\fP [\fIrulenum\fP] \fIrule-specification\fP
@@ -220,11 +220,12 @@ Create a new user-defined chain by the given name. There must be no target of that name already. .TP \fB\-X\fP, \fB\-\-delete\-chain\fP [\fIchain\fP] -Delete the optional user-defined chain specified. There must be no references +Delete the chain specified. There must be no references to the chain. If there are, you must delete or replace the referring rules before the chain can be deleted. The chain must be empty, i.e. not contain any rules. If no argument is given, it will attempt to delete every non-builtin chain in the table. +Note that empty builtin chains can only be deleted with \fBiptables-nft\fP. .TP \fB\-P\fP, \fB\-\-policy\fP \fIchain target\fP Set the policy for the built-in (non-user-defined) chain to the given target.
@@ -362,6 +363,9 @@ For appending, insertion, deletion and replacement, this causes detailed information on the rule or rules to be printed. \fB\-v\fP may be specified multiple times to possibly emit more detailed debug statements. .TP +\fB\-V\fP, \fB\-\-version\fP +Show program version and the kernel API used. +.TP \fB\-w\fP, \fB\-\-wait\fP [\fIseconds\fP] Wait for the xtables lock. To prevent multiple instances of the program from running concurrently,
iptables/nft-cmd.c +4 -4
@@ -208,12 +208,12 @@ int nft_cmd_chain_user_add(struct nft_handle *h, const char *chain,return 1 ; } -int nft_cmd_chain_user_del (struct nft_handle *h,const char *chain, -const char *table,bool verbose) +int nft_cmd_chain_del (struct nft_handle *h,const char *chain, +const char *table,bool verbose) {struct nft_cmd *cmd; - cmd =nft_cmd_new (h,NFT_COMPAT_CHAIN_USER_DEL , table, chain,NULL ,-1 , + cmd =nft_cmd_new (h,NFT_COMPAT_CHAIN_DEL , table, chain,NULL ,-1 , verbose);if (!cmd)return 0 ;
@@ -320,7 +320,7 @@ int nft_cmd_table_flush(struct nft_handle *h, const char *table, bool verbose)if (verbose) {return nft_cmd_rule_flush (h,NULL , table, verbose) && -nft_cmd_chain_user_del (h,NULL , table, verbose); +nft_cmd_chain_del (h,NULL , table, verbose); } cmd = nft_cmd_new(h, NFT_COMPAT_TABLE_FLUSH, table, NULL, NULL, -1,
iptables/nft-cmd.h +2 -2
@@ -49,8 +49,8 @@ int nft_cmd_zero_counters(struct nft_handle *h, const char *chain, const char *table, bool verbose);int nft_cmd_chain_user_add (struct nft_handle *h,const char *chain,const char *table); -int nft_cmd_chain_user_del (struct nft_handle *h,const char *chain, -const char *table,bool verbose); +int nft_cmd_chain_del (struct nft_handle *h,const char *chain, +const char *table,bool verbose);int nft_cmd_chain_zero_counters (struct nft_handle *h,const char *chain,const char *table,bool verbose); int nft_cmd_rule_list(struct nft_handle *h, const char *chain,
iptables/nft.c +44 -25
160 lines not on this page · raw message
iptables/nft.h +2 -2
@@ -53,7 +53,7 @@ enum obj_update_type {NFT_COMPAT_TABLE_FLUSH ,NFT_COMPAT_CHAIN_ADD ,NFT_COMPAT_CHAIN_USER_ADD , -NFT_COMPAT_CHAIN_USER_DEL , +NFT_COMPAT_CHAIN_DEL ,NFT_COMPAT_CHAIN_USER_FLUSH ,NFT_COMPAT_CHAIN_UPDATE , NFT_COMPAT_CHAIN_RENAME,
@@ -147,7 +147,7 @@ struct nftnl_chain;int nft_chain_set (struct nft_handle *h,const char *table,const char *chain,const char *policy,const struct xt_counters *counters);int nft_chain_save (struct nft_chain *c,void *data);int nft_chain_user_add (struct nft_handle *h,const char *chain,const char *table); -int nft_chain_user_del (struct nft_handle *h,const char *chain,const char *table,bool verbose); +int nft_chain_del (struct nft_handle *h,const char *chain,const char *table,bool verbose);int nft_chain_restore (struct nft_handle *h,const char *chain,const char *table);int nft_chain_user_rename (struct nft_handle *h,const char *chain,const char *table,const char *newname);int nft_chain_zero_counters (struct nft_handle *h,const char *chain,const char *table,bool verbose);
iptables/xtables-arp.c +2 -2
@@ -893,8 +893,8 @@ int do_commandarp(struct nft_handle *h, int argc, char *argv[], char **table, ret =nft_cmd_chain_user_add (h, chain, *table);break ;case CMD_DELETE_CHAIN : - ret =nft_cmd_chain_user_del (h, chain, *table, - options &OPT_VERBOSE ); + ret =nft_cmd_chain_del (h, chain, *table, + options &OPT_VERBOSE );break ;case CMD_RENAME_CHAIN : ret =nft_cmd_chain_user_rename (h, chain, *table, newname);
iptables/xtables-eb.c +1 -1
@@ -779,7 +779,7 @@ int do_commandeb(struct nft_handle *h, int argc, char *argv[], char **table, chain = argv[optind]; optind++; } - ret =nft_cmd_chain_user_del (h, chain, *table,0 ); + ret =nft_cmd_chain_del (h, chain, *table,0 );break ; }
iptables/xtables.c +2 -2
@@ -998,8 +998,8 @@ int do_commandx(struct nft_handle *h, int argc, char *argv[], char **table, ret =nft_cmd_chain_user_add (h, p.chain, p.table);break ;case CMD_DELETE_CHAIN : - ret =nft_cmd_chain_user_del (h, p.chain, p.table, - cs.options &OPT_VERBOSE ); + ret =nft_cmd_chain_del (h, p.chain, p.table, + cs.options &OPT_VERBOSE );break ;case CMD_RENAME_CHAIN : ret =nft_cmd_chain_user_rename (h, p.chain, p.table, p.newname);
Signature · 1 line
2.31.1
Quoted 4 lines · Florian Westphal
Conservative change:
iptables-nft -X will not remove empty builtin chains. OTOH, maybe it would be better to auto-remove those too, if empty. Comments?
How are chain policies expressed in nft, as a property on the chain (like legacy), or as a separate rule?
That is significant when removing "empty" chains.
Florian Westphal
maintainerQuoted 10 lines · Jan Engelhardt
Quoted 4 lines · Florian Westphal
Conservative change:
iptables-nft -X will not remove empty builtin chains. OTOH, maybe it would be better to auto-remove those too, if empty. Comments?How are chain policies expressed in nft, as a property on the chain (like legacy), or as a separate rule?
That is significant when removing "empty" chains.
Indeed. Since this removes the base chain, it implicitly reverts a DROP policy too.
I wish that iptables-nft would do drop policy by DROP rule (then the deletion would fail), but it does not.
As it stands, the only way to get rid of an iptables-nft added table is via nft. For -legacy its not even possible unless you can rmmod the module, which is not always possible.
Sucks. Any suggestions/idea?
Pablo Neira Ayuso
maintainerQuoted 8 lines · Florian Westphal
Quoted 7 lines · Jan Engelhardt
Quoted 4 lines · Florian Westphal
Conservative change:
iptables-nft -X will not remove empty builtin chains. OTOH, maybe it would be better to auto-remove those too, if empty. Comments?
Quoted 6 lines
Quoted 3 lines
How are chain policies expressed in nft, as a property on the chain (like legacy), or as a separate rule?
That is significant when removing "empty" chains.Indeed. Since this removes the base chain, it implicitly reverts a DROP policy too.
User still has to iptables -F on that given chain before deleting, right?
If NLM_F_NONREC is used, the EBUSY is reported when trying to delete a chain with rules.
My assumption is that the user will perform:
iptables-nft -F -t filter
iptables-nft -D -t filter
to follow the classic iptables-like approach (which requires usual -F
+ -X on every table).
I mean, by when the user has an empty basechain with default policy to DROP, if they remove the chain, then they are really meaning to remove the chain and this default policy to DROP.
Or am I missing anything else?
Florian Westphal
maintainerQuoted 6 lines · Pablo Neira Ayuso
Quoted 2 lines · Florian Westphal
Indeed. Since this removes the base chain, it implicitly reverts a DROP policy too.
User still has to iptables -F on that given chain before deleting, right?
Yes, -X fails if the chain has rules.
Quoted 2 lines
If
NLM_F_NONRECis used, the EBUSY is reported when trying to delete a chain with rules.
Yes.
Quoted 4 lines
My assumption is that the user will perform:
iptables-nft -F -t filter
iptables-nft -D -t filter
Yes, assuminy you meant -X instead of -D.
This behaves just like before, it deletes all rules (-F) and all user-defined chains (-X).
Quoted 3 lines
I mean, by when the user has an empty basechain with default policy to DROP, if they remove the chain, then they are really meaning to remove the chain and this default policy to DROP.
ATM iptables -X $BUILTIN will always fail.
In -legecy there is no kernel API to allow for its removal, for -nft there is an extra check that throws an error.
Quoted 1 line
Or am I missing anything else?
No, I don't think so. I would prefer if
iptables-nft -F -t filter
iptables-nft -X -t filter
... would result in an empty "filter" table.
I could also add a patch that requests removal
of the table as well for the -X case; but unlike base chain the presence of the table alone has no impact on dataplane.
Pablo Neira Ayuso
maintainerQuoted 8 lines · Florian Westphal
Quoted 6 lines · Pablo Neira Ayuso
Quoted 2 lines · Florian Westphal
Indeed. Since this removes the base chain, it implicitly reverts a DROP policy too.
User still has to iptables -F on that given chain before deleting, right?
Quoted 6 lines
Yes, -X fails if the chain has rules.
Quoted 2 lines
If
NLM_F_NONRECis used, the EBUSY is reported when trying to delete a chain with rules.Yes.
But we really do not need NLM_F_NONREC for this new feature, right? I mean, a quick shortcut to remove the basechain and its content should be fine.
Quoted 6 lines
Quoted 4 lines
My assumption is that the user will perform:
iptables-nft -F -t filter
iptables-nft -D -t filterYes, assuminy you meant -X instead of -D.
Oh well, embarrasing, yes.
Quoted 11 lines
This behaves just like before, it deletes all rules (-F) and all user-defined chains (-X).
Quoted 3 lines
I mean, by when the user has an empty basechain with default policy to DROP, if they remove the chain, then they are really meaning to remove the chain and this default policy to DROP.
ATM iptables -X $BUILTIN will always fail.
In -legecy there is no kernel API to allow for its removal, for -nft there is an extra check that throws an error.
Quoted 7 lines
Quoted 1 line
Or am I missing anything else?
No, I don't think so. I would prefer if
iptables-nft -F -t filter
iptables-nft -X -t filter... would result in an empty "filter" table.
Your concern is that this would change the default behaviour?
Quoted 3 lines
I could also add a patch that requests removal
of the table as well for the -X case; but unlike base chain the presence of the table alone has no impact on dataplane.
Then, probably add a new command for this?
iptables-nft -K INPUT -t filter => to remove the INPUT/filter basechain.
Then:
iptables-nft -N INPUT -t filter
to bring it back (if it was removed).
Florian Westphal
maintainerQuoted 3 lines · Pablo Neira Ayuso
But we really do not need
NLM_F_NONRECfor this new feature, right? I mean, a quick shortcut to remove the basechain and its content should be fine.
Would deviate a lot from iptables behaviour.
Quoted 7 lines
Quoted 5 lines
No, I don't think so. I would prefer if
iptables-nft -F -t filter
iptables-nft -X -t filter... would result in an empty "filter" table.
Your concern is that this would change the default behaviour?
Yes, maybe ok to change it though. After all, a "iptables-nft -A INPUT ..." will continue to work just fine (its auto-created again).
We could check if policy is still set to accept before implicit removal in the "iptables-nft -X" case.
Pablo Neira Ayuso
maintainerQuoted 6 lines · Florian Westphal
Quoted 3 lines · Pablo Neira Ayuso
But we really do not need
NLM_F_NONRECfor this new feature, right? I mean, a quick shortcut to remove the basechain and its content should be fine.Would deviate a lot from iptables behaviour.
It's a new feature: you could still keep NLM_F_NONREC in place, and only allow to remove one chain (with no rules) at a time if you prefer, ie.
iptables-nft -K INPUT -t filter
or -X if you prefer to overload the existing command.
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
No, I don't think so. I would prefer if
iptables-nft -F -t filter
iptables-nft -X -t filter... would result in an empty "filter" table.
Quoted 7 lines
Quoted 1 line
Your concern is that this would change the default behaviour?
Yes, maybe ok to change it though. After all, a "iptables-nft -A INPUT ..." will continue to work just fine (its auto-created again).
We could check if policy is still set to accept before implicit removal in the "iptables-nft -X" case.
That's possible yes, but why force the user to change the policy from DROP to ACCEPT to delete an empty basechain right thereafter?
Florian Westphal
maintainerQuoted 5 lines · Pablo Neira Ayuso
Quoted 2 lines
We could check if policy is still set to accept before implicit removal in the "iptables-nft -X" case.
That's possible yes, but why force the user to change the policy from DROP to ACCEPT to delete an empty basechain right thereafter?
Ok, so I will just send a simplified version of this patch that will remove all empty basechains for -X too.
Thanks!
Phil Sutter
reviewerHi,
Sorry to jump late onto this discussion, I missed it entirely and just noticed the new commit. /o\
Quoted 32 lines · Pablo Neira Ayuso
Quoted 6 lines · Florian Westphal
Quoted 3 lines · Pablo Neira Ayuso
But we really do not need
NLM_F_NONRECfor this new feature, right? I mean, a quick shortcut to remove the basechain and its content should be fine.Would deviate a lot from iptables behaviour.
It's a new feature: you could still keep
NLM_F_NONRECin place, and only allow to remove one chain (with no rules) at a time if you prefer, ie.iptables-nft -K INPUT -t filter
or -X if you prefer to overload the existing command.
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
No, I don't think so. I would prefer if
iptables-nft -F -t filter
iptables-nft -X -t filter... would result in an empty "filter" table.
Quoted 7 lines
Quoted 1 line
Your concern is that this would change the default behaviour?
Yes, maybe ok to change it though. After all, a "iptables-nft -A INPUT ..." will continue to work just fine (its auto-created again).
We could check if policy is still set to accept before implicit removal in the "iptables-nft -X" case.
That's possible yes, but why force the user to change the policy from DROP to ACCEPT to delete an empty basechain right thereafter?
Quoted 9 lines · Florian Westphal
Quoted 5 lines · Pablo Neira Ayuso
Quoted 2 lines
We could check if policy is still set to accept before implicit removal in the "iptables-nft -X" case.
That's possible yes, but why force the user to change the policy from DROP to ACCEPT to delete an empty basechain right thereafter?
Ok, so I will just send a simplified version of this patch that will remove all empty basechains for -X too.
I believe there was a misunderstanding: How I read Pablo's comments, he was walking about '-X' with base-chain name explicitly given. If a user calls e.g. 'iptables-nft -X FORWARD', it is clear that the new behaviour is intended and dropping any non-standard policy is not a surprise. The code right now though behaves unexpectedly:
| # nft flush ruleset
| # ./install/sbin/iptables-nft -P FORWARD DROP
| # ./install/sbin/iptables-nft -X
| # nft list ruleset
| table ip filter {
| }So forward DROP policy is lost even though the user just wanted to make sure any user-defined chains are gone. But things are worse in practice:
| # iptables -A FORWARD -d 10.0.0.1 -j ACCEPT | # iptables -P FORWARD DROP | # iptables -X
With iptables-nft, the last command above fails (EBUSY). I expect users to be pedantic when it comes to unexpected firewall openings or bogus errors in iptables-wrapping scripts.
IMHO we're fine if chains with non-standard policy stay in place. Yet this might be racey because IIRC we don't have a "delete chain only if policy is accept" command flavour in kernel. This would be interesting, because we could drop a base chain also when it's flushed - just ignoring a rejected delete if it happens to be non-standard policy.
The safe option should be to delete base chains only if given explicitly, as suggested by Pablo already I suppose.
Cheers, Phil
Florian Westphal
maintainerQuoted 27 lines · Phil Sutter
Quoted 2 lines
Ok, so I will just send a simplified version of this patch that will remove all empty basechains for -X too.
I believe there was a misunderstanding: How I read Pablo's comments, he was walking about '-X' with base-chain name explicitly given. If a user calls e.g. 'iptables-nft -X FORWARD', it is clear that the new behaviour is intended and dropping any non-standard policy is not a surprise. The code right now though behaves unexpectedly:
| # nft flush ruleset | # ./install/sbin/iptables-nft -P FORWARD DROP | # ./install/sbin/iptables-nft -X | # nft list ruleset | table ip filter { | }So forward DROP policy is lost even though the user just wanted to make sure any user-defined chains are gone. But things are worse in practice:
| # iptables -A FORWARD -d 10.0.0.1 -j ACCEPT | # iptables -P FORWARD DROP | # iptables -XWith iptables-nft, the last command above fails (EBUSY). I expect users to be pedantic when it comes to unexpected firewall openings or bogus errors in iptables-wrapping scripts.
Quoted 8 lines
IMHO we're fine if chains with non-standard policy stay in place. Yet this might be racey because IIRC we don't have a "delete chain only if policy is accept" command flavour in kernel. This would be interesting, because we could drop a base chain also when it's flushed - just ignoring a rejected delete if it happens to be non-standard policy.
The safe option should be to delete base chains only if given explicitly, as suggested by Pablo already I suppose.
No idea, I won't change anything. V1 kept '-X' behaviour as-is:
https://patchwork.ozlabs.org/project/netfilter-devel/patch/[email protected]/
see the "don't delete built-in chain" comment, the reject-check was kept in place for the case where iptables-nft is iterating over all the chains; explict '-X $NAME' was required.
So I don't know what I should change now. Feel free to update as you see fit, including a revert.