mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: cfgparse: warn about colliding names between defaults and proxies

Browse Source 
In order to complete the checks added in 303a66573d ("MEDIUM: cfgparse:
warn about proxies having the same names"), we also need to warn about
regular proxies having the same name as defaults sections as well as
defaults sections having the same name as proxies, since defaults
sections are inherently proxies, albeit stored in a separate list for
now.
This commit is contained in:
Willy Tarreau 2024-09-18 17:37:17 +02:00
parent 8df44eea6d
commit d8f4b07e40
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/cfgparse-listen.c
View File

@ -285,16 +285,6 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
curproxy->id, curproxy->conf.file, curproxy->conf.line); curproxy->id, curproxy->conf.file, curproxy->conf.line);
err_code |= ERR_ALERT | ERR_FATAL; err_code |= ERR_ALERT | ERR_FATAL;
} }
else {
curproxy = proxy_find_by_name(args[1], 0, 0);
if (curproxy) {
/* different capabilities but still same name: forbidden soon */
ha_warning("Parsing [%s:%d]: %s '%s' has the same name as %s '%s' declared at %s:%d. This is dangerous and will not be supported anymore in version 3.3.\n",
file, linenum, proxy_cap_str(rc), args[1], proxy_type_str(curproxy),
curproxy->id, curproxy->conf.file, curproxy->conf.line);
err_code |= ERR_WARN;
}
}
curproxy = log_forward_by_name(args[1]); curproxy = log_forward_by_name(args[1]);
if (curproxy) { if (curproxy) {
@ -316,6 +306,19 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
const char *name = args[1]; const char *name = args[1];
int arg = 2; int arg = 2;
curproxy = proxy_find_by_name(args[1], 0, 0);
if (!curproxy && !(rc & PR_CAP_DEF))
curproxy = proxy_find_by_name(args[1], PR_CAP_DEF, 0);
if (curproxy) {
/* different capabilities but still same name: forbidden soon */
ha_warning("Parsing [%s:%d]: %s '%s' has the same name as %s '%s' declared at %s:%d."
" This is dangerous and will not be supported anymore in version 3.3.\n",
file, linenum, proxy_cap_str(rc), args[1], proxy_type_str(curproxy),
curproxy->id, curproxy->conf.file, curproxy->conf.line);
err_code |= ERR_WARN;
}
if (rc & PR_CAP_DEF && strcmp(args[1], "from") == 0 && *args[2] && !*args[3]) { if (rc & PR_CAP_DEF && strcmp(args[1], "from") == 0 && *args[2] && !*args[3]) {
// also support "defaults from blah" (no name then) // also support "defaults from blah" (no name then)
arg = 1; arg = 1;