From: Willy Tarreau <w@1wt.eu>
Date: Tue, 24 Aug 2021 12:57:28 +0000 (+0200)
Subject: BUG/MINOR: stick-table: fix the sc-set-gpt* parser when using expressions
X-Git-Tag: v2.3.14~16
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=01f6b58a67d9c7e81f91eb6437c4699fb10508b0;p=haproxy-2.3.git

BUG/MINOR: stick-table: fix the sc-set-gpt* parser when using expressions

The sc-set-gpt0() parser was extended in 2.1 by commit 0d7712dff ("MINOR:
stick-table: allow sc-set-gpt0 to set value from an expression") to support
sample expressions in addition to plain integers. However there is a
subtlety there, which is that while the arg position must be incremented
when parsing an integer, it must not be touched when calling an expression
since the expression parser already does it.

The effect is that rules making use of sc-set-gpt0() followed by an
expression always ignore one word after that expression, and will typically
fail to parse if followed by an "if" as the parser will restart after the
"if". With no condition it's different because an empty condition doesn't
result in trying to parse anything.

This patch moves the increment at the right place and adds a few
explanations for a code part that was far from being obvious.

This should be backported to branches having the commit above (2.1+).

(cherry picked from commit ece4c4a35265cbc28d25826205ee66dbf9ac6f7d)
Signed-off-by: Willy Tarreau <w@1wt.eu>
(cherry picked from commit f1e1c91953c28f48a5b0bfde8e616b16c33ebb26)
Signed-off-by: Willy Tarreau <w@1wt.eu>
---

diff --git a/src/stick_table.c b/src/stick_table.c
index b1288eb..71a40b0 100644
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -2121,9 +2121,13 @@ static enum act_parse_ret parse_set_gpt0(const char **args, int *arg, struct pro
 		}
 	}
 
+	/* value may be either an integer or an expression */
 	rule->arg.gpt.expr = NULL;
 	rule->arg.gpt.value = strtol(args[*arg], &error, 10);
-	if (*error != '\0') {
+	if (*error == '\0') {
+		/* valid integer, skip it */
+		(*arg)++;
+	} else {
 		rule->arg.gpt.expr = sample_parse_expr((char **)args, arg, px->conf.args.file,
 		                                       px->conf.args.line, err, &px->conf.args, NULL);
 		if (!rule->arg.gpt.expr)
@@ -2146,7 +2150,6 @@ static enum act_parse_ret parse_set_gpt0(const char **args, int *arg, struct pro
 			return ACT_RET_PRS_ERR;
 		}
 	}
-	(*arg)++;
 
 	rule->action = ACT_CUSTOM;
 	rule->action_ptr = action_set_gpt0;