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

Make rule matching stricter

Browse Source 
The rules are now matched even for trivial queries which don't target
actual tables.
This commit is contained in:
Markus Mäkelä 2017-01-13 17:37:28 +02:00
parent de07f1d69d
commit 1f1abbb37b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1996,7 +1996,6 @@ bool rule_matches(FW_INSTANCE* my_instance,
qc_query_op_t optype = QUERY_OP_UNDEFINED;
bool matches = false;
bool is_sql = modutil_is_SQL(queue) || modutil_is_SQL_prepare(queue);
bool is_real = false;
if (is_sql)
{
@ -2010,7 +2009,6 @@ bool rule_matches(FW_INSTANCE* my_instance,
else
{
optype = qc_get_operation(queue);
is_real = qc_is_real_query(queue);
if (parse_result != QC_QUERY_PARSED)
{
@ -2061,21 +2059,21 @@ bool rule_matches(FW_INSTANCE* my_instance,
break;
case RT_COLUMN:
if (is_sql && is_real)
if (is_sql)
{
match_column(rulebook, queue, &matches, &msg);
}
break;
case RT_FUNCTION:
if (is_sql && is_real)
if (is_sql)
{
match_function(rulebook, queue, &matches, &msg);
}
break;
case RT_WILDCARD:
if (is_sql && is_real)
if (is_sql)
{
match_wildcard(rulebook, queue, &matches, &msg);
}
@ -2086,7 +2084,7 @@ bool rule_matches(FW_INSTANCE* my_instance,
break;
case RT_CLAUSE:
if (is_sql && is_real && !qc_query_has_clause(queue))
if (is_sql && !qc_query_has_clause(queue))
{
matches = true;
msg = MXS_STRDUP_A("Required WHERE/HAVING clause is missing.");