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

MXS-1461 Implement not_function

Browse Source 
If the instance represents `not_function` then it is a match if the
used function is not found amongst the listed functions.
This commit is contained in:
Johan Wikman
2017-11-10 11:17:33 +02:00
parent 3993ece209
commit 3eba77f43e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/filter/dbfwfilter/rules.cc
View File

@ -190,7 +190,8 @@ bool FunctionRule::matches_query(DbfwSession* session, GWBUF* buffer, char** msg
std::transform(tok.begin(), tok.end(), tok.begin(), ::tolower); std::transform(tok.begin(), tok.end(), tok.begin(), ::tolower);
ValueList::const_iterator it = std::find(m_values.begin(), m_values.end(), tok); ValueList::const_iterator it = std::find(m_values.begin(), m_values.end(), tok);
if (it != m_values.end()) if ((!m_inverted && (it != m_values.end())) ||
(m_inverted && (it == m_values.end())))
{ {
MXS_NOTICE("rule '%s': query uses forbidden function: %s", MXS_NOTICE("rule '%s': query uses forbidden function: %s",
name().c_str(), tok.c_str()); name().c_str(), tok.c_str());
@ -251,7 +252,8 @@ bool ColumnFunctionRule::matches_query(DbfwSession* session, GWBUF* buffer, char
m_values.end(), m_values.end(),
func); func);
if (func_it != m_values.end()) if ((!m_inverted && (func_it != m_values.end())) ||
(m_inverted && (func_it == m_values.end())))
{ {
/** The function matches, now check if the column matches */ /** The function matches, now check if the column matches */