xtables-restore: Fix --table parameter check
Phil Sutter
reviewerPATCH v2 1/1 xtables-restore: Fix --table parameter check
Xtables-restore tries to reject rule commands in input which contain a --table parameter (since it is adding this itself based on the previous table line). The manual check was not perfect though as it caught any parameter starting with a dash and containing a 't' somewhere, even in rule comments:
| *filter | -A FORWARD -m comment --comment "- allow this one" -j ACCEPT | COMMIT
Instead of error-prone manual checking, go a much simpler route: All do_command callbacks are passed a boolean indicating they're called from *tables-restore. React upon this when handling a table parameter and error out if it's not the first one.
---
Changes since v1:
Completely rewritten: While simplifying v1 code, I noticed that even valid --table options may appear in comments without problem, so searched for a different approach than manual option parsing. This solution is much easier and fully backwards compatible.
--- iptables/iptables.c | 4 ++++ .../testcases/ipt-restore/0009-table-name-comment_0 | 13 +++++++++++++ iptables/xshared.c | 12 ------------ iptables/xtables-eb.c | 4 ++++ iptables/xtables.c | 4 ++++ 5 files changed, 25 insertions(+), 12 deletions(-) create mode 100755 iptables/tests/shell/testcases/ipt-restore/0009-table-name-comment_0
iptables/iptables.c +4 -0
@@ -1494,6 +1494,10 @@ int do_command4(int argc, char *argv[], char **table,if (cs.invert)xtables_error (PARAMETER_PROBLEM ,"unexpected ! flag before --table" ); +if (restore && *table) +xtables_error (PARAMETER_PROBLEM , +"The -t option (seen in line %u) cannot be used in %s.\n" , + line, xt_params->program_name); *table = optarg;break ;
iptables/tests/shell/testcases/ipt-restore/0009-table-name-comment_0 new file +13 -0
@@ -0,0 +1,13 @@ +#!/bin/bash + +# when restoring a ruleset, *tables-restore prefixes each rule with +# '-t <tablename>' so standard rule parsing routines may be used. This means +# that it has to detect and reject rules which already contain a table option. + +$XT_MULTI iptables-restore <<EOF +*filter +-t nat -A FORWARD -j ACCEPT +COMMIT +EOF + +[[ $? != 0 ]] || exit 1
iptables/xshared.c +0 -12
@@ -533,18 +533,6 @@ void add_param_to_argv(char *parsestart, int line) } param.buffer[param.len] ='\0' ; - -/* check if table name specified */ -if ((param.buffer[0 ] =='-' && - param.buffer[1 ] !='-' && -strchr (param.buffer,'t' )) || - (!strncmp (param.buffer,"--t" ,3 ) && - !strncmp (param.buffer,"--table" ,strlen (param.buffer)))) { -xtables_error (PARAMETER_PROBLEM , -"The -t option (seen in line %u) cannot be used in %s.\n" , - line, xt_params->program_name); - } -add_argv (param.buffer,0 ); param.len =0 ; }
iptables/xtables-eb.c +4 -0
@@ -947,6 +947,10 @@ print_zero:break ;case 't' :/* Table */ ebt_check_option2 (&flags,OPT_TABLE ); +if (restore && *table) +xtables_error (PARAMETER_PROBLEM , +"The -t option (seen in line %u) cannot be used in %s.\n" , + line, xt_params->program_name);if (strlen (optarg) >EBT_TABLE_MAXNAMELEN -1 ) xtables_error(PARAMETER_PROBLEM, "Table name length cannot exceed %d characters",
iptables/xtables.c +4 -0
@@ -879,6 +879,10 @@ void do_parse(struct nft_handle *h, int argc, char *argv[],if (cs->invert)xtables_error (PARAMETER_PROBLEM ,"unexpected ! flag before --table" ); +if (p->restore && p->table) +xtables_error (PARAMETER_PROBLEM , +"The -t option (seen in line %u) cannot be used in %s.\n" , + line, xt_params->program_name);if (!nft_table_builtin_find (h, optarg)) xtables_error(VERSION_PROBLEM, "table '%s' does not exist",
Signature · 1 line
2.23.0
Quoted 15 lines · Phil Sutter
Xtables-restore tries to reject rule commands in input which contain a --table parameter (since it is adding this itself based on the previous table line). The manual check was not perfect though as it caught any parameter starting with a dash and containing a 't' somewhere, even in rule comments:
| *filter | -A FORWARD -m comment --comment "- allow this one" -j ACCEPT | COMMITInstead of error-prone manual checking, go a much simpler route: All
do_commandcallbacks are passed a boolean indicating they're called from *tables-restore. React upon this when handling a table parameter and error out if it's not the first one.
iptables/iptables.c int do_command4(int argc, char *argv[], char **table, · line 1500
Quoted 7 lines
iptables/iptables.c +4
-0if (cs.invert)xtables_error (PARAMETER_PROBLEM ,"unexpected ! flag before --table" ); +if (restore && *table) +xtables_error (PARAMETER_PROBLEM , +"The -t option (seen in line %u) cannot be used in %s.\n" , + line, xt_params->program_name);
Oh, thats much better indeed.