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

MXS-3021: Make strictness of dbfwfilter configurable

Browse Source 
In some cases the dbfwfilter is too strict and SQL that would not match a
rule is blocked due to it not being fully parsed. To allow a more lenient
mode of operation, the requirement for full parsing must be made
configurable.
This commit is contained in:
Markus Mäkelä
2020-06-03 08:27:01 +03:00
parent ac1e2d4202
commit da5af75c1c
3 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/modules/filter/dbfwfilter/dbfwfilter.cc
View File

@ -635,6 +635,11 @@ MXS_MODULE* MXS_CREATE_MODULE()
MXS_MODULE_PARAM_BOOL,
"true"
},
{
"strict",
MXS_MODULE_PARAM_BOOL,
"true"
},
{MXS_END_MODULE_PARAMS}
}
};
@ -1254,6 +1259,7 @@ Dbfw::Dbfw(MXS_CONFIG_PARAMETER* params)
, m_treat_string_arg_as_field(params->get_bool("treat_string_arg_as_field"))
, m_filename(params->get_string("rules"))
, m_version(atomic_add(&global_version, 1))
, m_strict(params->get_bool("strict"))
{
if (params->get_bool("log_match"))
{
@ -1533,7 +1539,7 @@ int DbfwSession::routeQuery(GWBUF* buffer)
type = qc_get_type_mask(buffer);
}
if (modutil_is_SQL(buffer) && modutil_count_statements(buffer) > 1)
if (m_instance->strict() && modutil_is_SQL(buffer) && modutil_count_statements(buffer) > 1)
{
set_error("This filter does not support multi-statements.");
rval = send_error();
@ -1810,13 +1816,16 @@ bool rule_matches(Dbfw* my_instance,
{
qc_parse_result_t parse_result = qc_parse(queue, QC_COLLECT_ALL);
if (parse_result == QC_QUERY_INVALID)
if (my_instance->strict())
{
msg = create_parse_error(my_instance, "tokenized", query, &matches);
}
else if (parse_result != QC_QUERY_PARSED && rule->need_full_parsing(queue))
{
msg = create_parse_error(my_instance, "parsed completely", query, &matches);
if (parse_result == QC_QUERY_INVALID)
{
msg = create_parse_error(my_instance, "tokenized", query, &matches);
}
else if (parse_result != QC_QUERY_PARSED && rule->need_full_parsing(queue))
{
msg = create_parse_error(my_instance, "parsed completely", query, &matches);
}
}
}

11
server/modules/filter/dbfwfilter/dbfwfilter.hh
View File

@ -244,6 +244,16 @@ public:
return m_treat_string_arg_as_field;
}
/**
* Whether unsupported SQL is an error
*
* @return True if unsupported SQL is an error
*/
bool strict() const
{
return m_strict;
}
/**
* Get logging option bitmask
*
@ -292,6 +302,7 @@ private:
mutable std::mutex m_lock; /*< Instance spinlock */
std::string m_filename; /*< Path to the rule file */
int m_version; /*< Latest rule file version, incremented on reload */
bool m_strict;
Dbfw(MXS_CONFIG_PARAMETER* param);
bool do_reload_rules(std::string filename);