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

MXS-1461 Introduce 'not_function' rule

Browse Source 
Using 'not_function' it is possible to match functions other than
a specific set of ones. That will make it significantly easier to
allow certain functions to be used with certain columns.

The special handling of no arguments to `function` in conjunction
with an allowing filter has been removed. The same effect can now
be achieved, without special handling, using `not_function`, no
arguments and a blocking filter.

Implementation will follow in a subsequent commit.
This commit is contained in:
Johan Wikman
2017-11-10 09:25:09 +02:00
parent ced93acc20
commit 3215458b30
6 changed files with 77 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -870,11 +870,11 @@ void define_columns_rule(void* scanner)
*
* @param scanner Current scanner
*/
void define_function_rule(void* scanner)
void define_function_rule(void* scanner, bool inverted)
{
struct parser_stack* rstack = (struct parser_stack*)dbfw_yyget_extra((yyscan_t) scanner);
ss_dassert(rstack);
rstack->add(new FunctionRule(rstack->name, rstack->values));
rstack->add(new FunctionRule(rstack->name, rstack->values, inverted));
}
/**
@ -894,11 +894,11 @@ void define_function_usage_rule(void* scanner)
*
* @param scanner Current scanner
*/
void define_column_function_rule(void* scanner)
void define_column_function_rule(void* scanner, bool inverted)
{
struct parser_stack* rstack = (struct parser_stack*)dbfw_yyget_extra((yyscan_t) scanner);
ss_dassert(rstack);
rstack->add(new ColumnFunctionRule(rstack->name, rstack->values, rstack->auxiliary_values));
rstack->add(new ColumnFunctionRule(rstack->name, rstack->values, rstack->auxiliary_values, inverted));
}
/**

4
server/modules/filter/dbfwfilter/dbfwfilter.h
View File

@ -43,9 +43,9 @@ void define_wildcard_rule(void* scanner);
void define_where_clause_rule(void* scanner);
bool define_regex_rule(void* scanner, char* pattern);
void define_columns_rule(void* scanner);
void define_function_rule(void* scanner);
void define_function_rule(void* scanner, bool inverted);
void define_function_usage_rule(void* scanner);
void define_column_function_rule(void* scanner);
void define_column_function_rule(void* scanner, bool inverted);
void define_limit_queries_rule(void* scanner, int max, int timeperiod, int holdoff);
bool add_at_times_rule(void* scanner, const char* range);
void add_on_queries_rule(void* scanner, const char* sql);

14
server/modules/filter/dbfwfilter/ruleparser.y
View File

@ -37,7 +37,7 @@
%token FWTOK_RULE FWTOK_USERS FWTOK_RULES FWTOK_ANY FWTOK_ALL
%token FWTOK_STRICT_ALL FWTOK_MATCH FWTOK_WILDCARD FWTOK_COLUMNS FWTOK_REGEX
%token FWTOK_LIMIT_QUERIES FWTOK_WHERE_CLAUSE FWTOK_AT_TIMES FWTOK_ON_QUERIES
%token FWTOK_FUNCTION FWTOK_USES_FUNCTION FWTOK_COMMENT FWTOK_PIPE
%token FWTOK_FUNCTION FWTOK_USES_FUNCTION FWTOK_COMMENT FWTOK_PIPE FWTOK_NOT_FUNCTION
/** Terminal typed symbols */
%token <floatval>FWTOK_FLOAT <strval>FWTOK_TIME <strval>FWTOK_BTSTR
@ -124,9 +124,15 @@ mandatory
{define_limit_queries_rule(scanner, $2, $3, $4);}
| FWTOK_REGEX FWTOK_QUOTEDSTR {define_regex_rule(scanner, $2);}
| FWTOK_COLUMNS valuelist {define_columns_rule(scanner);}
| FWTOK_FUNCTION valuelist {define_function_rule(scanner);}
| FWTOK_FUNCTION {define_function_rule(scanner);}
| FWTOK_FUNCTION valuelist FWTOK_COLUMNS auxiliaryvaluelist {define_column_function_rule(scanner);}
| FWTOK_FUNCTION valuelist {define_function_rule(scanner, false);}
| FWTOK_NOT_FUNCTION valuelist {define_function_rule(scanner, true);}
| FWTOK_NOT_FUNCTION {define_function_rule(scanner, true);}
| FWTOK_FUNCTION valuelist FWTOK_COLUMNS auxiliaryvaluelist
{define_column_function_rule(scanner, false);}
| FWTOK_NOT_FUNCTION valuelist FWTOK_COLUMNS auxiliaryvaluelist
{define_column_function_rule(scanner, true);}
| FWTOK_NOT_FUNCTION FWTOK_COLUMNS auxiliaryvaluelist
{define_column_function_rule(scanner, true);}
| FWTOK_USES_FUNCTION valuelist {define_function_usage_rule(scanner);}
;

18
server/modules/filter/dbfwfilter/rules.hh
View File

@ -180,12 +180,16 @@ class FunctionRule: public ValueListRule
FunctionRule& operator=(const FunctionRule&);
public:
FunctionRule(std::string name, const ValueList& values):
ValueListRule(name, "FUNCTION", values)
FunctionRule(std::string name, const ValueList& values, bool inverted):
ValueListRule(name, inverted ? "NOT_FUNCTION" : "FUNCTION", values),
m_inverted(inverted)
{
}
bool matches_query(DbfwSession* session, GWBUF* buffer, char** msg) const;
private:
bool m_inverted; /*< Should the match be inverted. */
};
/**
@ -214,16 +218,18 @@ class ColumnFunctionRule: public ValueListRule
ColumnFunctionRule& operator=(const ColumnFunctionRule&);
public:
ColumnFunctionRule(std::string name, const ValueList& values, const ValueList& columns):
ValueListRule(name, "COLUMN_FUNCTION", values),
m_columns(columns)
ColumnFunctionRule(std::string name, const ValueList& values, const ValueList& columns, bool inverted):
ValueListRule(name, inverted ? "NOT_COLUMN_FUNCTION" : "COLUMN_FUNCTION", values),
m_columns(columns),
m_inverted(inverted)
{
}
bool matches_query(DbfwSession* session, GWBUF* buffer, char** msg) const;
private:
ValueList m_columns; /*< List of columns to match */
ValueList m_columns; /*< List of columns to match */
bool m_inverted; /*< Should the match be inverted. */
};
/**

1
server/modules/filter/dbfwfilter/token.l
View File

@ -40,6 +40,7 @@ CMP [=<>!]+
deny|allow MXS_WARNING("Use of '%s' is deprecated, use 'match' instead", yytext);return FWTOK_MATCH;
rule return FWTOK_RULE;
function return FWTOK_FUNCTION;
not_function return FWTOK_NOT_FUNCTION;
uses_function return FWTOK_USES_FUNCTION;
no_where_clause return FWTOK_WHERE_CLAUSE;
wildcard return FWTOK_WILDCARD;