RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-05-01 23:39:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: cfgparse: reject incorrect 'timeout retry' keyword spelling in resolvers

Browse Source 
If for example it was written as 'timeout retri 1s' or 'timeout wrong 1s'
this would be used for the retry timeout value. Resolvers section only
timeout setting currently is 'retry', others are still parsed as before
this patch to not break existing configurations.

A less strict version will be backported to 1.6.
This commit is contained in:
Pieter Baauw 2016-02-13 15:51:58 +01:00 committed by Willy Tarreau
parent 1d54972789
commit 7a91a0e1e5
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/cfgparse.c
View File

@ -2438,23 +2438,37 @@ int cfg_parse_resolvers(const char *file, int linenum, char **args, int kwm)
curr_resolvers->resolve_retries = atoi(args[1]); curr_resolvers->resolve_retries = atoi(args[1]);
} }
else if (strcmp(args[0], "timeout") == 0) { else if (strcmp(args[0], "timeout") == 0) {
const char *res; if (!*args[1]) {
unsigned int timeout_retry;
if (!*args[2]) {
Alert("parsing [%s:%d] : '%s' expects 'retry' and <time> as arguments.\n", Alert("parsing [%s:%d] : '%s' expects 'retry' and <time> as arguments.\n",
file, linenum, args[0]); file, linenum, args[0]);
err_code |= ERR_ALERT | ERR_FATAL; err_code |= ERR_ALERT | ERR_FATAL;
goto out; goto out;
} }
else if (strcmp(args[1], "retry") == 0) {
const char *res;
unsigned int timeout_retry;
if (!*args[2]) {
Alert("parsing [%s:%d] : '%s %s' expects <time> as argument.\n",
file, linenum, args[0], args[1]);
err_code |= ERR_ALERT | ERR_FATAL;
goto out;
}
res = parse_time_err(args[2], &timeout_retry, TIME_UNIT_MS); res = parse_time_err(args[2], &timeout_retry, TIME_UNIT_MS);
if (res) { if (res) {
Alert("parsing [%s:%d]: unexpected character '%c' in argument to <%s>.\n", Alert("parsing [%s:%d]: unexpected character '%c' in argument to <%s %s>.\n",
file, linenum, *res, args[0]); file, linenum, *res, args[0], args[1]);
err_code |= ERR_ALERT | ERR_FATAL; err_code |= ERR_ALERT | ERR_FATAL;
goto out; goto out;
} }
curr_resolvers->timeout.retry = timeout_retry; curr_resolvers->timeout.retry = timeout_retry;
}
else {
Alert("parsing [%s:%d] : '%s' expects 'retry' and <time> as arguments got '%s'.\n",
file, linenum, args[0], args[1]);
err_code |= ERR_ALERT | ERR_FATAL;
goto out;
}
} /* neither "nameserver" nor "resolvers" */ } /* neither "nameserver" nor "resolvers" */
else if (*args[0] != 0) { else if (*args[0] != 0) {
Alert("parsing [%s:%d] : unknown keyword '%s' in '%s' section\n", file, linenum, args[0], cursection); Alert("parsing [%s:%d] : unknown keyword '%s' in '%s' section\n", file, linenum, args[0], cursection);