mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-04-14 10:12:43 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: config: now reject configs with empty arguments

Browse Source 
As prepared during 3.2, we must error on empty arguments because they
mark the end of the line and cause subsequent arguments to be silently
ignored. It was too late in 3.2 to turn that into an error so it's a
warning, but for 3.3 it needed to be an alert.

This patch does that. It doesn't instantly break, instead it counts
one fatal error per violating line. This allows to emit several errors
at once, which can often be caused by the same variable being missed,
or a group of variables sharing a same misspelled prefix for example.
Tests show that it helps locate them better. It also explains what to
look for in the config manual for help with variables expansion.
This commit is contained in:
Willy Tarreau 2025-06-24 08:24:28 +02:00
parent 1968731765
commit d9d0721bc9
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/cfgparse.c
View File

@ -2072,6 +2072,7 @@ next_line:
/* Only print empty arg warning in normal mode to prevent double display. */
for (check_arg = 0; check_arg < arg; check_arg++) {
if (!*args[check_arg]) {
static int warned_empty;
size_t newpos;
/* if an empty arg was found, its pointer should be in <errptr>, except
@ -2088,10 +2089,16 @@ next_line:
/* sanitize input line in-place */
newpos = sanitize_for_printing(line, errptr - line, 80);
ha_warning("parsing [%s:%d]: argument number %d at position %d is empty and marks the end of the "
"argument list; all subsequent arguments will be ignored:\n %s\n %*s\n",
file, linenum, check_arg, (int)(errptr - thisline + 1), line, (int)(newpos + 1), "^");
break;
ha_alert("parsing [%s:%d]: argument number %d at position %d is empty and marks the end of the "
"argument list:\n %s\n %*s\n%s",
file, linenum, check_arg, (int)(errptr - thisline + 1), line, (int)(newpos + 1),
"^", (warned_empty++) ? "" :
("Aborting to prevent all subsequent arguments from being silently ignored. "
"If this is caused by an environment variable expansion, please have a look at section "
"2.3 of the configuration manual to find solutions to address this.\n"));
err_code |= ERR_ALERT | ERR_FATAL;
fatal++;
goto next_line;
}
}
}