evaluate: Fix for 'meta hour' ranges spanning date boundaries
Phil Sutter
reviewerv3 cover evaluate: Fix for 'meta hour' ranges spanning date boundaries
Kernel's timezone is UTC, so 'meta hour' returns seconds since UTC start of day. To mach against this, user space has to convert the RHS value given in local timezone into UTC. With ranges (e.g. 9:00-17:00), depending on the local timezone, these may span midnight in UTC (e.g. 23:00-7:00) and thus need to be converted into a proper range again (e.g. 7:00-23:00, inverted). Since nftables commit 347039f64509e ("src:
add symbol range expression to further compact intervals"), this conversion was broken.
Changes since v2:
- Must continue handling for EXPR_RANGE type, it is still in use
Changes since v1:
- Apply the parser changes of commit 347039f64509e to JSON parser as well (new patches 1 and 2)
- Misc fixes in patch 3
Phil Sutter (3):
expression: Introduce is_symbol_value_expr() macro
parser_json: Parse into symbol range expression if possible
evaluate: Fix for 'meta hour' ranges spanning date boundaries
doc/primary-expression.txt | 3 +- include/expression.h | 2 + src/evaluate.c | 25 +++- src/parser_bison.y | 6 +- src/parser_json.c | 12 +- tests/py/any/meta.t | 9 ++ tests/py/any/meta.t.json | 182 ++++++++++++++++++++++++ tests/py/any/meta.t.json.output | 18 +++ tests/py/any/meta.t.payload | 51 +++++++ tests/shell/testcases/listing/meta_time | 30 ++++ 10 files changed, 327 insertions(+), 11 deletions(-)
Signature · 1 line
2.49.0
Phil Sutter
reviewerPATCH v3 1/3 expression: Introduce is_symbol_value_expr() macro
Annotate and combine the 'etype' and 'symtype' checks done in bison parser for readability and because JSON parser will start doing the same in a follow-up patch.
--- include/expression.h | 2 ++ src/parser_bison.y | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-)
include/expression.h +2 -0
@@ -470,6 +470,8 @@ extern struct expr *verdict_expr_alloc(const struct location *loc,extern struct expr *symbol_expr_alloc (const struct location *loc,enum symbol_types type,struct scope *scope,const char *identifier); +#define is_symbol_value_expr (expr) \ + ((expr)->etype == EXPR_SYMBOL && (expr)->symtype == SYMBOL_VALUE)const char *expr_name (const struct expr *e);
src/parser_bison.y +2 -4
@@ -4486,10 +4486,8 @@ prefix_rhs_expr : basic_rhs_expr SLASH NUM range_rhs_expr : basic_rhs_expr DASH basic_rhs_expr { - if ($1->etype == EXPR_SYMBOL && - $1->symtype == SYMBOL_VALUE && - $3->etype == EXPR_SYMBOL && - $3->symtype == SYMBOL_VALUE) { + if (is_symbol_value_expr($1) && + is_symbol_value_expr($3)) { $$ = symbol_range_expr_alloc(&@$, $1->symtype, $1->scope, $1->identifier, $3->identifier); expr_free($1); expr_free($3);
Signature · 1 line
2.49.0
Phil Sutter
reviewerPATCH v3 2/3 parser_json: Parse into symbol range expression if possible
In reply to Phil SutterApply the bison parser changes in commit 347039f64509e ("src: add symbol range expression to further compact intervals") to JSON parser as well.
--- src/parser_json.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
src/parser_json.c +11 -1
@@ -1353,7 +1353,7 @@ static struct expr *json_parse_prefix_expr(struct json_ctx *ctx,static struct expr *json_parse_range_expr (struct json_ctx *ctx,const char *type,json_t *root) { -struct expr *expr_low, *expr_high; +struct expr *expr_low, *expr_high, *tmp;json_t *low, *high;if (json_unpack_err (ctx, root,"[o, o!]" , &low, &high))
@@ -1370,6 +1370,16 @@ static struct expr *json_parse_range_expr(struct json_ctx *ctx,expr_free (expr_low);return NULL ; } +if (is_symbol_value_expr (expr_low) &&is_symbol_value_expr (expr_high)) { + tmp =symbol_range_expr_alloc (int_loc, +SYMBOL_VALUE , + expr_low->scope, + expr_low->identifier, + expr_high->identifier); +expr_free (expr_low); +expr_free (expr_high); +return tmp; + }return range_expr_alloc (int_loc, expr_low, expr_high); }
Signature · 1 line
2.49.0
Phil Sutter
reviewerPATCH v3 3/3 evaluate: Fix for 'meta hour' ranges spanning date boundaries
In reply to Phil SutterIntroduction of EXPR_RANGE_SYMBOL type inadvertently disabled sanitizing of meta hour ranges where the lower boundary has a higher value than the upper boundary. This may happen outside of user control due to the fact that given ranges are converted to UTC which is the kernel's native timezone.
Perform the conditional match and op inversion with the new RHS expression type as well after expanding it so values are comparable. Since this replaces the whole range expression, make it replace the relational's RHS entirely.
While at it extend testsuites to cover these corner-cases.
---
Changes since v2:
- Retain range adjustment for EXPR_RANGE type RHS as seen when using variables in nft input
- Extend shell test case to cover for the above
Changes since v1:
- Add BZ link
- Describe expected values in nft.8
- Add test cases for "24:00", "23:59:60" and a range where upper boundary becomes 0:00 after conversion
- Fix JSON equivalents in py testsuite and shell testsuite expected results - these were leftovers from an earlier attempt at a fix
--- doc/primary-expression.txt | 3 +- src/evaluate.c | 25 +++- tests/py/any/meta.t | 9 ++ tests/py/any/meta.t.json | 182 ++++++++++++++++++++++++ tests/py/any/meta.t.json.output | 18 +++ tests/py/any/meta.t.payload | 51 +++++++ tests/shell/testcases/listing/meta_time | 30 ++++ 7 files changed, 312 insertions(+), 6 deletions(-)
doc/primary-expression.txt +2 -1
@@ -137,7 +137,8 @@ Day of week| Integer (8 bit) or string |hour| Hour of day| -String +String value in the form HH:MM or HH:MM:SS. Values are expected to be less than +24:00, although for technical reasons, 23:59:60 is accepted, too. |==================== .Meta expression specific types
src/evaluate.c +20 -5
@@ -2421,10 +2421,9 @@ static int expr_evaluate_mapping(struct eval_ctx *ctx, struct expr **expr)return 0 ; } -static int expr_evaluate_symbol_range (struct eval_ctx *ctx,struct expr **exprp) +static struct expr *symbol_range_expand (struct expr *expr) { -struct expr *left, *right, *range, *constant_range; -struct expr *expr = *exprp; +struct expr *left, *right;/* expand to symbol and range expressions to consolidate evaluation. */ left = symbol_expr_alloc(&expr->location, expr->symtype,
@@ -2433,7 +2432,16 @@ static int expr_evaluate_symbol_range(struct eval_ctx *ctx, struct expr **exprp) right =symbol_expr_alloc (&expr->location, expr->symtype, (struct scope *)expr->scope, expr->identifier_range[1 ]); - range =range_expr_alloc (&expr->location, left, right); +return range_expr_alloc (&expr->location, left, right); +} + +static int expr_evaluate_symbol_range (struct eval_ctx *ctx,struct expr **exprp) +{ +struct expr *left, *right, *range, *constant_range; +struct expr *expr = *exprp; + +/* expand to symbol and range expressions to consolidate evaluation. */ + range =symbol_range_expand (expr);if (expr_evaluate (ctx, &range) <0 ) {expr_free (range);
@@ -2772,7 +2780,14 @@ static int expr_evaluate_relational(struct eval_ctx *ctx, struct expr **expr) pctx =eval_proto_ctx (ctx); -if (rel->right->etype ==EXPR_RANGE &&lhs_is_meta_hour (rel->left)) { +if (lhs_is_meta_hour (rel->left) && + (rel->right->etype ==EXPR_RANGE || + rel->right->etype ==EXPR_RANGE_SYMBOL )) { +if (rel->right->etype ==EXPR_RANGE_SYMBOL ) { + range =symbol_range_expand (rel->right); +expr_free (rel->right); + rel->right = range; + } ret =__expr_evaluate_range (ctx, &rel->right);if (ret)return ret;
tests/py/any/meta.t +9 -0
@@ -218,6 +218,15 @@ meta hour "17:00:00" drop;ok;meta hour "17:00" drop meta hour "17:00:01" drop;ok meta hour "00:00" drop;ok meta hour "00:01" drop;ok +meta hour "01:01" drop;ok +meta hour "02:02" drop;ok +meta hour "03:03" drop;ok +meta hour "24:00" drop;fail +meta hour "23:59:60" drop;ok;meta hour "00:00" drop +meta hour "00:00"-"02:02" drop;ok +meta hour "01:01"-"03:03" drop;ok +meta hour "02:02"-"04:04" drop;ok +meta hour "21:00"-"02:00" drop;ok time < "2022-07-01 11:00:00" accept;ok;meta time < "2022-07-01 11:00:00" accept time > "2022-07-01 11:00:00" accept;ok;meta time > "2022-07-01 11:00:00" accept
tests/py/any/meta.t.json +182 -0
188 lines not on this page · raw message
tests/py/any/meta.t.json.output +18 -0
@@ -646,3 +646,21 @@ } ] +# meta hour "23:59:60" drop +[ + { + "match": { + "left": { + "meta": { + "key": "hour" + } + }, + "op": "==", + "right": "00:00" + } + }, + { + "drop": null + } +] +
tests/py/any/meta.t.payload +51 -0
57 lines not on this page · raw message
tests/shell/testcases/listing/meta_time +30 -0
@@ -65,3 +65,33 @@ printf "\t\tmeta hour \"%02d:%02d\"-\"%02d:%02d\"\n" 5 0 16 0 >> "$TMP1" printf "\t\tmeta hour \"%02d:%02d\"-\"%02d:%02d\"\n" 6 0 17 0 >> "$TMP1" check_decode EADT + +$NFT flush chain t c +TZ=UTC-2 $NFT add rule t c meta hour "00:00"-"01:00" +TZ=UTC-2 $NFT add rule t c meta hour "00:00"-"03:00" +TZ=UTC-2 $NFT add rule t c meta hour "01:00"-"04:00" + +printf "\t\tmeta hour \"%02d:%02d\"-\"%02d:%02d\"\n" 0 0 1 0 > "$TMP1" +printf "\t\tmeta hour \"%02d:%02d\"-\"%02d:%02d\"\n" 0 0 3 0 >> "$TMP1" +printf "\t\tmeta hour \"%02d:%02d\"-\"%02d:%02d\"\n" 1 0 4 0 >> "$TMP1" + +check_decode UTC-2 + +$NFT flush chain t c +TZ=UTC-2 $NFT --debug=eval -f - <<EOF +define midnight="00:00" +define threeam="03:00" +table t { + chain c { + meta hour \$midnight - "03:00" + meta hour 00:00 - \$threeam + meta hour \$midnight - \$threeam + } +} +EOF + +printf "\t\tmeta hour \"%02d:%02d\"-\"%02d:%02d\"\n" 0 0 3 0 > "$TMP1" +printf "\t\tmeta hour \"%02d:%02d\"-\"%02d:%02d\"\n" 0 0 3 0 >> "$TMP1" +printf "\t\tmeta hour \"%02d:%02d\"-\"%02d:%02d\"\n" 0 0 3 0 >> "$TMP1" + +check_decode UTC-2
Signature · 1 line
2.49.0
Quoted 8 lines · Phil Sutter
Kernel's timezone is UTC, so 'meta hour' returns seconds since UTC start of day. To mach against this, user space has to convert the RHS value given in local timezone into UTC. With ranges (e.g. 9:00-17:00), depending on the local timezone, these may span midnight in UTC (e.g. 23:00-7:00) and thus need to be converted into a proper range again (e.g. 7:00-23:00, inverted). Since nftables commit
347039f64509e("src:
add symbol range expression to further compact intervals"), this conversion was broken.
Thanks for fixing my bugs.
Phil Sutter
reviewerQuoted 11 lines · Pablo Neira Ayuso
Quoted 8 lines · Phil Sutter
Kernel's timezone is UTC, so 'meta hour' returns seconds since UTC start of day. To mach against this, user space has to convert the RHS value given in local timezone into UTC. With ranges (e.g. 9:00-17:00), depending on the local timezone, these may span midnight in UTC (e.g. 23:00-7:00) and thus need to be converted into a proper range again (e.g. 7:00-23:00, inverted). Since nftables commit
347039f64509e("src:
add symbol range expression to further compact intervals"), this conversion was broken.Thanks for fixing my bugs.
Thanks for your review!
Quoted 1 line
Reviewed-by Pablo Neira Ayuso <[email protected]>
Patches applied.