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

Added option for controlling case sensitivity of dbfwfilter regex.

Browse Source
This commit is contained in:
Markus Makela
2015-04-02 16:31:34 +03:00
parent 10f97572de
commit 795a683c55
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/filters/Database-Firewall-Filter.md
View File

@ -16,7 +16,7 @@ rules=/home/user/rules.txt
### Filter Options ### Filter Options
The database firewall filter does not support any filter options. The database firewall filter supports a single option, `ignorecase`. This will set the regular expression matching to case-insensitive mode.
### Filter Parameters ### Filter Parameters

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

@ -221,6 +221,7 @@ typedef struct {
bool def_op;/*< Default operation mode, defaults to deny */ bool def_op;/*< Default operation mode, defaults to deny */
SPINLOCK* lock;/*< Instance spinlock */ SPINLOCK* lock;/*< Instance spinlock */
long idgen; /*< UID generator */ long idgen; /*< UID generator */
int regflags;
} FW_INSTANCE; } FW_INSTANCE;
/** /**
@ -1084,7 +1085,7 @@ bool parse_rule(char* rule, FW_INSTANCE* instance)
memcpy(str, start, (tok-start)); memcpy(str, start, (tok-start));
if(regcomp(re, str,REG_NOSUB|REG_ICASE)){ if(regcomp(re, str,REG_NOSUB|instance->regflags)){
skygw_log_write(LOGFILE_ERROR, "dbfwfilter: Invalid regular expression '%s'.", str); skygw_log_write(LOGFILE_ERROR, "dbfwfilter: Invalid regular expression '%s'.", str);
rval = false; rval = false;
free(re); free(re);
@ -1265,16 +1266,26 @@ createInstance(char **options, FILTER_PARAMETER **params)
my_instance->htable = ht; my_instance->htable = ht;
my_instance->def_op = true; my_instance->def_op = true;
my_instance->userstrings = NULL; my_instance->userstrings = NULL;
my_instance->regflags = 0;
for(i = 0;params[i];i++){ for(i = 0;params[i];i++){
if(strcmp(params[i]->name, "rules") == 0){ if(strcmp(params[i]->name, "rules") == 0){
if(filename)
if(filename) free(filename);
free(filename); filename = strdup(params[i]->value);
}
filename = strdup(params[i]->value); }
}
if(options)
{
for(i = 0;options[i];i++)
{
if(strcmp(options[i],"ignorecase") == 0)
{
my_instance->regflags |= REG_ICASE;
}
}
} }
if(filename == NULL) if(filename == NULL)
{ {