BUG/MEDIUM: cfgparse: wrong argument offset after parsing server "sni" keyword
Owen Marshall reported an issue depending on the server keywords order in the
configuration.
Working line :
server dev1 <ip>:<port> check inter 5000 ssl verify none sni req.hdr(Host)
Non working line :
server dev1 <ip>:<port> check inter 5000 ssl sni req.hdr(Host) verify none
Indeed, both parse_server() and srv_parse_sni() modified the current argument
offset at the same time. To fix the issue, srv_parse_sni() can work on a local
copy ot the offset, leaving parse_server() responsible of the actual value.
This fix must be backported to 1.6.
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index bdd228f..264da0c 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -5641,6 +5641,7 @@
memprintf(err, "'%s' : the current SSL library doesn't support the SNI TLS extension", args[*cur_arg]);
return ERR_ALERT | ERR_FATAL;
#else
+ int idx;
struct sample_expr *expr;
if (!*args[*cur_arg + 1]) {
@@ -5648,10 +5649,10 @@
return ERR_ALERT | ERR_FATAL;
}
- (*cur_arg)++;
+ idx = (*cur_arg) + 1;
proxy->conf.args.ctx = ARGC_SRV;
- expr = sample_parse_expr((char **)args, cur_arg, px->conf.file, px->conf.line, err, &proxy->conf.args);
+ expr = sample_parse_expr((char **)args, &idx, px->conf.file, px->conf.line, err, &proxy->conf.args);
if (!expr) {
memprintf(err, "error detected while parsing sni expression : %s", *err);
return ERR_ALERT | ERR_FATAL;
@@ -5660,7 +5661,7 @@
if (!(expr->fetch->val & SMP_VAL_BE_SRV_CON)) {
memprintf(err, "error detected while parsing sni expression : "
" fetch method '%s' extracts information from '%s', none of which is available here.\n",
- args[*cur_arg-1], sample_src_names(expr->fetch->use));
+ args[idx-1], sample_src_names(expr->fetch->use));
return ERR_ALERT | ERR_FATAL;
}