tests: shell: chmod 755 testcases/chains/0030create_0
Pablo Neira Ayuso
maintainerPATCH 1/4 tests: shell: chmod 755 testcases/chains/0030create_0
Update permissions in this test script.
--- tests/shell/testcases/chains/0030create_0 | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tests/shell/testcases/chains/0030create_0
tests/shell/testcases/chains/0030create_0 +0 -0
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 2/4 src: allow to use variables in flowtable and chain devices
This patch adds support for using variables for devices in the chain and flowtable definitions, eg.
define if_main = lo
table netdev filter1 {
chain Main_Ingress1 {
type filter hook ingress device $if_main priority -500; policy accept;
}}
--- src/evaluate.c | 69 +++++++++++++++++++ src/parser_bison.y | 16 +++++ .../testcases/chains/0042chain_variable_0 | 37 ++++++++++ .../chains/dumps/0042chain_variable_0.nft | 15 ++++ .../flowtable/0012flowtable_variable_0 | 29 ++++++++ .../dumps/0012flowtable_variable_0.nft | 14 ++++ 6 files changed, 180 insertions(+) create mode 100755 tests/shell/testcases/chains/0042chain_variable_0 create mode 100644 tests/shell/testcases/chains/dumps/0042chain_variable_0.nft create mode 100755 tests/shell/testcases/flowtable/0012flowtable_variable_0 create mode 100644 tests/shell/testcases/flowtable/dumps/0012flowtable_variable_0.nft
src/evaluate.c +69 -0
@@ -3719,6 +3719,69 @@ static bool evaluate_priority(struct eval_ctx *ctx, struct prio_spec *prio,return true; } +static bool evaluate_expr_variable (struct eval_ctx *ctx,struct expr **exprp) +{ +struct expr *expr; + +if (expr_evaluate (ctx, exprp) <0 ) +return false; + + expr = *exprp; +if (expr->etype !=EXPR_VALUE && + expr->etype !=EXPR_SET ) { +expr_error (ctx->msgs, expr,"%s is not a valid " +"variable expression" ,expr_name (expr)); +return false; + } + +return true; +} + +static bool evaluate_device_expr (struct eval_ctx *ctx,struct expr **dev_expr) +{ +struct expr *expr, *next, *key; +LIST_HEAD (tmp); + +if ((*dev_expr)->etype ==EXPR_VARIABLE ) { +expr_set_context (&ctx->ectx, &ifname_type, +IFNAMSIZ *BITS_PER_BYTE ); +if (!evaluate_expr_variable (ctx, dev_expr)) +return false; + } + +if ((*dev_expr)->etype !=EXPR_SET && + (*dev_expr)->etype !=EXPR_LIST ) +return true; + +list_for_each_entry_safe (expr, next, &(*dev_expr)->expressions, list) { +list_del (&expr->list); + +switch (expr->etype) { +case EXPR_VARIABLE : +expr_set_context (&ctx->ectx, &ifname_type, +IFNAMSIZ *BITS_PER_BYTE ); +if (!evaluate_expr_variable (ctx, &expr)) +return false; +break ; +case EXPR_SET_ELEM : + key =expr_clone (expr->key); +expr_free (expr); + expr = key; +break ; +case EXPR_VALUE : +break ; +default : +BUG ("invalid expresion type %s\n" ,expr_name (expr)); +break ; + } + +list_add (&expr->list, &tmp); + } +list_splice_init (&tmp, &(*dev_expr)->expressions); + +return true; +} +static uint32_t str2hooknum (uint32_t family,const char *hook);static int flowtable_evaluate (struct eval_ctx *ctx,struct flowtable *ft)
@@ -3740,6 +3803,9 @@ static int flowtable_evaluate(struct eval_ctx *ctx, struct flowtable *ft) expr_name(ft->priority.expr)); } +if (ft->dev_expr && !evaluate_device_expr (ctx, &ft->dev_expr)) +return -1 ; +return 0 ; }
@@ -3965,6 +4031,9 @@ static int chain_evaluate(struct eval_ctx *ctx, struct chain *chain)if (!chain->dev_expr)return __stmt_binary_error (ctx, &chain->loc,NULL ,"Missing `device' in this chain definition" ); + +if (!evaluate_device_expr (ctx, &chain->dev_expr)) +return -1 ; }else if (chain->dev_expr) {return __stmt_binary_error (ctx, &chain->dev_expr->location,NULL ,"This chain type cannot be bound to device" );
src/parser_bison.y +16 -0
@@ -1945,6 +1945,11 @@ flowtable_expr : '{' flowtable_list_expr '}' $2->location = @$; $$ = $2; } + | variable_expr + { + $1->location = @$; + $$ = $1; + } ; flowtable_list_expr : flowtable_expr_member
@@ -1967,6 +1972,11 @@ flowtable_expr_member : STRING strlen($1) * BITS_PER_BYTE, $1); xfree($1); } + | variable_expr + { + datatype_set($1->sym->expr, &ifname_type); + $$ = $1; + } ; data_type_atom_expr : type_identifier
@@ -2206,6 +2216,12 @@ dev_spec : DEVICE string compound_expr_add($$, expr); } + | DEVICE variable_expr + { + datatype_set($2->sym->expr, &ifname_type); + $$ = compound_expr_alloc(&@$, EXPR_LIST); + compound_expr_add($$, $2); + } | DEVICES '=' flowtable_expr { $$ = $3;
tests/shell/testcases/chains/0042chain_variable_0 new file +37 -0
@@ -0,0 +1,37 @@ +#!/bin/bash + +set -e + +ip link add name dummy0 type dummy + +EXPECTED="define if_main = \"lo\" + +table netdev filter1 { + chain Main_Ingress1 { + type filter hook ingress device \$if_main priority -500; policy accept; + } +}" + +$NFT -f - <<< $EXPECTED + +EXPECTED="define if_main = \"lo\" + +table netdev filter2 { + chain Main_Ingress2 { + type filter hook ingress devices = { \$if_main, dummy0 } priority -500; policy accept; + } +}" + +$NFT -f - <<< $EXPECTED + +EXPECTED="define if_main = { lo, dummy0 } + +table netdev filter3 { + chain Main_Ingress3 { + type filter hook ingress devices = \$if_main priority -500; policy accept; + } +}" + +$NFT -f - <<< $EXPECTED + +
tests/shell/testcases/chains/dumps/0042chain_variable_0.nft new file +15 -0
@@ -0,0 +1,15 @@ +table netdev filter1 { + chain Main_Ingress1 { + type filter hook ingress device "lo" priority -500; policy accept; + } +} +table netdev filter2 { + chain Main_Ingress2 { + type filter hook ingress devices = { dummy0, lo } priority -500; policy accept; + } +} +table netdev filter3 { + chain Main_Ingress3 { + type filter hook ingress devices = { dummy0, lo } priority -500; policy accept; + } +}
tests/shell/testcases/flowtable/0012flowtable_variable_0 new file +29 -0
@@ -0,0 +1,29 @@ +#!/bin/bash + +set -e + +ip link add name dummy1 type dummy + +EXPECTED="define if_main = { lo, dummy1 } + +table filter1 { + flowtable Main_ft1 { + hook ingress priority filter + counter + devices = \$if_main + } +}" + +$NFT -f - <<< $EXPECTED + +EXPECTED="define if_main = \"lo\" + +table filter2 { + flowtable Main_ft2 { + hook ingress priority filter + counter + devices = { \$if_main, dummy1 } + } +}" + +$NFT -f - <<< $EXPECTED
tests/shell/testcases/flowtable/dumps/0012flowtable_variable_0.nft new file +14 -0
@@ -0,0 +1,14 @@ +table ip filter1 { + flowtable Main_ft1 { + hook ingress priority filter + devices = { dummy1, lo } + counter + } +} +table ip filter2 { + flowtable Main_ft2 { + hook ingress priority filter + devices = { dummy1, lo } + counter + } +}
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 3/4 evaluate: use evaluate_expr_variable() for chain policy evaluation
In reply to Pablo Neira Ayusoevaluate_policy() is very similar to evaluate_expr_variable(), replace it.
--- src/evaluate.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-)
src/evaluate.c +3 -20
@@ -3968,25 +3968,6 @@ static uint32_t str2hooknum(uint32_t family, const char *hook)return NF_INET_NUMHOOKS ; } -static bool evaluate_policy (struct eval_ctx *ctx,struct expr **exprp) -{ -struct expr *expr; - - ctx->ectx.dtype = &policy_type; - ctx->ectx.len =NFT_NAME_MAXLEN *BITS_PER_BYTE ; -if (expr_evaluate (ctx, exprp) <0 ) -return false; - - expr = *exprp; -if (expr->etype !=EXPR_VALUE ) { -expr_error (ctx->msgs, expr,"%s is not a valid " -"policy expression" ,expr_name (expr)); -return false; - } - -return true; -} -static int chain_evaluate (struct eval_ctx *ctx,struct chain *chain) {struct table *table;
@@ -4022,7 +4003,9 @@ static int chain_evaluate(struct eval_ctx *ctx, struct chain *chain)"invalid priority expression %s in this context." , expr_name(chain->priority.expr));if (chain->policy) { -if (!evaluate_policy (ctx, &chain->policy)) +expr_set_context (&ctx->ectx, &policy_type, +NFT_NAME_MAXLEN *BITS_PER_BYTE ); +if (!evaluate_expr_variable (ctx, &chain->policy))return chain_error (ctx, chain,"invalid policy expression %s" ,expr_name (chain->policy)); }
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 4/4 tests: shell: remove check for reject from prerouting
In reply to Pablo Neira AyusoIt reports a failure with the following kernel patch:
commit f53b9b0bdc59c0823679f2e3214e0d538f5951b9
Author: Laura Garcia Liebana <[email protected]>
Date: Sun May 31 22:26:23 2020 +0200
netfilter: introduce support for reject at prerouting stage
--- .../shell/testcases/chains/0012reject_in_prerouting_1 | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100755 tests/shell/testcases/chains/0012reject_in_prerouting_1
tests/shell/testcases/chains/0012reject_in_prerouting_1 deleted +0 -11
@@ -1,11 +0,0 @@ -#!/bin/bash - -set -e - -$NFT add table t -$NFT add chain t prerouting {type filter hook prerouting priority 0 \; } - -# wrong hook prerouting, only input/forward/output is valid -$NFT add rule t prerouting reject 2>/dev/null || exit 0 -echo "E: accepted reject in prerouting hook" >&2 -exit 1
Signature · 1 line
2.20.1