hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected bugs introduced by refactoring of the dbfwfilter

Browse Source 
The limit_queries parsing used a bad initial value for the return value
which lead to a guaranteed failure. Other parts of the code used wrong values
for comparisons leading to sporadic parsing errors.
This commit is contained in:
Markus Makela
2015-11-26 09:59:39 +02:00
parent 443bbe73d2
commit 63da12e5b5
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/modules/filter/dbfwfilter.c
View File

@ -440,7 +440,7 @@ bool parse_querytypes(const char* str, RULE* rule)
const char *ptr = str; const char *ptr = str;
char *dest = buffer; char *dest = buffer;
while (ptr - buffer < 512) while (ptr - str < 512)
{ {
if (*ptr == '|' || *ptr == ' ' || (done = *ptr == '\0')) if (*ptr == '|' || *ptr == ' ' || (done = *ptr == '\0'))
{ {
@ -1164,7 +1164,7 @@ bool parse_rule(char* rulestr, FW_INSTANCE* instance)
rlist->rule = ruledef; rlist->rule = ruledef;
rlist->next = instance->rules; rlist->next = instance->rules;
instance->rules = rlist; instance->rules = rlist;
rval = parse_rule_definition(instance, ruledef, rule, &saveptr); rval = parse_rule_definition(instance, ruledef, rulestr, &saveptr);
} }
else else
{ {
@ -2203,7 +2203,6 @@ bool parse_limit_queries(FW_INSTANCE* instance, RULE* ruledef, const char* rule,
if (tok == NULL) if (tok == NULL)
{ {
MXS_ERROR("dbfwfilter: Missing parameter in limit_queries: '%s'.", rule); MXS_ERROR("dbfwfilter: Missing parameter in limit_queries: '%s'.", rule);
rval = false;
goto retblock; goto retblock;
} }
@ -2213,7 +2212,6 @@ bool parse_limit_queries(FW_INSTANCE* instance, RULE* ruledef, const char* rule,
{ {
MXS_ERROR("dbfwfilter: Memory allocation failed when parsing " MXS_ERROR("dbfwfilter: Memory allocation failed when parsing "
"'limit_queries' rule"); "'limit_queries' rule");
rval = false;
goto retblock; goto retblock;
} }
@ -2222,14 +2220,12 @@ bool parse_limit_queries(FW_INSTANCE* instance, RULE* ruledef, const char* rule,
if (errptr && *errptr != '\0') if (errptr && *errptr != '\0')
{ {
MXS_ERROR("dbfwfilter: Rule parsing failed, not a number: '%s'.", tok); MXS_ERROR("dbfwfilter: Rule parsing failed, not a number: '%s'.", tok);
rval = false;
goto retblock; goto retblock;
} }
if (qs->limit < 1) if (qs->limit < 1)
{ {
MXS_ERROR("dbfwfilter: Bad query amount: %s", tok); MXS_ERROR("dbfwfilter: Bad query amount: %s", tok);
rval = false;
goto retblock; goto retblock;
} }
@ -2239,7 +2235,6 @@ bool parse_limit_queries(FW_INSTANCE* instance, RULE* ruledef, const char* rule,
if (tok == NULL) if (tok == NULL)
{ {
MXS_ERROR("dbfwfilter: Missing parameter in limit_queries: '%s'.", rule); MXS_ERROR("dbfwfilter: Missing parameter in limit_queries: '%s'.", rule);
rval = false;
goto retblock; goto retblock;
} }
@ -2248,14 +2243,12 @@ bool parse_limit_queries(FW_INSTANCE* instance, RULE* ruledef, const char* rule,
if (errptr && *errptr != '\0') if (errptr && *errptr != '\0')
{ {
MXS_ERROR("dbfwfilter: Rule parsing failed, not a number: '%s'.", tok); MXS_ERROR("dbfwfilter: Rule parsing failed, not a number: '%s'.", tok);
rval = false;
goto retblock; goto retblock;
} }
if (qs->period < 1) if (qs->period < 1)
{ {
MXS_ERROR("dbfwfilter: Bad time period: %s", tok); MXS_ERROR("dbfwfilter: Bad time period: %s", tok);
rval = false;
goto retblock; goto retblock;
} }
@ -2265,7 +2258,6 @@ bool parse_limit_queries(FW_INSTANCE* instance, RULE* ruledef, const char* rule,
if (tok == NULL) if (tok == NULL)
{ {
MXS_ERROR("dbfwfilter: Missing parameter in limit_queries: '%s'.", rule); MXS_ERROR("dbfwfilter: Missing parameter in limit_queries: '%s'.", rule);
rval = false;
goto retblock; goto retblock;
} }
qs->cooldown = strtod(tok, &errptr); qs->cooldown = strtod(tok, &errptr);
@ -2273,15 +2265,14 @@ bool parse_limit_queries(FW_INSTANCE* instance, RULE* ruledef, const char* rule,
if (errptr && *errptr != '\0') if (errptr && *errptr != '\0')
{ {
MXS_ERROR("dbfwfilter: Rule parsing failed, not a number: '%s'.", tok); MXS_ERROR("dbfwfilter: Rule parsing failed, not a number: '%s'.", tok);
rval = false;
goto retblock; goto retblock;
} }
if (qs->cooldown < 1) if (qs->cooldown < 1)
{ {
MXS_ERROR("dbfwfilter: Bad blocking period: %s", tok); MXS_ERROR("dbfwfilter: Bad blocking period: %s", tok);
rval = false;
} }
rval = true;
retblock: retblock: