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

Fixed a bug with regex matching

Browse Source
This commit is contained in:
Markus Makela
2014-10-31 14:37:06 +02:00
parent 0f4fad5ec4
commit f8f6006314
1 changed files with 108 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/modules/filter/fwfilter.c
View File

@ -33,7 +33,7 @@
* *
* rule2="users John@% Jane@192.168.0.1 match any rules block_salary" * rule2="users John@% Jane@192.168.0.1 match any rules block_salary"
* *
* Rule syntax TODO: query type restrictions * Rule syntax TODO: query type restrictions, update the documentation
* *
* rule NAME deny|allow [wildcard | columns VALUE ... | regex REGEX] [at_times VALUE...] * rule NAME deny|allow [wildcard | columns VALUE ... | regex REGEX] [at_times VALUE...]
*/ */
@ -877,10 +877,9 @@ void parse_rule(char* rule, FW_INSTANCE* instance)
tok++; tok++;
} }
str = malloc(((tok - start) + 1)*sizeof(char)); str = calloc(((tok - start) + 1),sizeof(char));
memcpy(str, start, (tok-start)); memcpy(str, start, (tok-start));
memset((str + (tok-start) +1),0,1);
regex_t *re = malloc(sizeof(regex_t)); regex_t *re = malloc(sizeof(regex_t));
@ -920,7 +919,7 @@ createInstance(char **options, FILTER_PARAMETER **params)
int i,paramc; int i,paramc;
HASHTABLE* ht; HASHTABLE* ht;
STRLINK *ptr,*tmp; STRLINK *ptr,*tmp;
char *filename, *nl; char *filename = NULL, *nl;
char buffer[2048]; char buffer[2048];
FILE* file; FILE* file;
if ((my_instance = calloc(1, sizeof(FW_INSTANCE))) == NULL){ if ((my_instance = calloc(1, sizeof(FW_INSTANCE))) == NULL){
@ -939,7 +938,7 @@ createInstance(char **options, FILTER_PARAMETER **params)
my_instance->def_op = true; my_instance->def_op = true;
for(i = 0;params[i];i++){ for(i = 0;params[i];i++){
if(strcmp(params[i]->name, "rulelist") == 0){ if(strcmp(params[i]->name, "rules") == 0){
filename = strdup(params[i]->value); filename = strdup(params[i]->value);
} }
} }
@ -1378,14 +1377,19 @@ routeQuery(FILTER *instance, void *session, GWBUF *queue)
strln = (STRLINK*)rulelist->rule->data; strln = (STRLINK*)rulelist->rule->data;
where = skygw_get_affected_fields(queue); where = skygw_get_affected_fields(queue);
rule_match = false;
if(where != NULL){ if(where != NULL){
while(strln){ while(strln){
/**At least one value matched*/
if(strstr(where,strln->value)){ if(strstr(where,strln->value)){
rule_match = false; rule_match = true;
break; break;
} }
strln = strln->next; strln = strln->next;
} }
} }
@ -1395,13 +1399,12 @@ routeQuery(FILTER *instance, void *session, GWBUF *queue)
case RT_WILDCARD: case RT_WILDCARD:
if(is_sql && is_real){ if(is_sql && is_real){
where = skygw_get_affected_fields(queue); where = skygw_get_affected_fields(queue);
if(where != NULL){ if(where != NULL){
if(strchr(where,'*')){ if(strchr(where,'*') == NULL){
rule_match = false; rule_match = false;
} }
} }
@ -1414,9 +1417,10 @@ routeQuery(FILTER *instance, void *session, GWBUF *queue)
rulelist = rulelist->next; rulelist = rulelist->next;
} }
if(rule_match == true){ if(rule_match){
/**AND rules match TODO: add a way to control what happens if AND matches*/ /**AND rules match*/
accept = false; skygw_log_write(LOGFILE_TRACE, "fwfilter: all rules match, query is %s.",accept ? "allowed":"denied");
accept = !my_instance->def_op;
} }
queryresolved: queryresolved: