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

Added binary protocol prepared statements to fwfilter matching.

Browse Source
This commit is contained in:
Markus Makela
2015-03-04 00:07:44 +02:00
parent 16a1f8056c
commit 7ad8c25ab1
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1300,6 +1300,7 @@ bool rule_matches(FW_INSTANCE* my_instance, FW_SESSION* my_session, GWBUF *queue
char *ptr,*where,*msg = NULL; char *ptr,*where,*msg = NULL;
char emsg[512]; char emsg[512];
int qlen; int qlen;
unsigned char* memptr = (unsigned char*)queue->start;
bool is_sql, is_real, matches; bool is_sql, is_real, matches;
skygw_query_op_t optype = QUERY_OP_UNDEFINED; skygw_query_op_t optype = QUERY_OP_UNDEFINED;
STRLINK* strln = NULL; STRLINK* strln = NULL;
@ -1312,15 +1313,15 @@ bool rule_matches(FW_INSTANCE* my_instance, FW_SESSION* my_session, GWBUF *queue
tm_now = localtime(&time_now); tm_now = localtime(&time_now);
matches = false; matches = false;
is_sql = modutil_is_SQL(queue); is_sql = modutil_is_SQL(queue) || modutil_is_SQL_prepare(queue);
if(is_sql){ if(is_sql){
if(!query_is_parsed(queue)){ if(!query_is_parsed(queue)){
parse_query(queue); parse_query(queue);
} }
optype = query_classifier_get_operation(queue); optype = query_classifier_get_operation(queue);
modutil_extract_SQL(queue, &ptr, &qlen);
is_real = skygw_is_real_query(queue); is_real = skygw_is_real_query(queue);
qlen = gw_mysql_get_byte3(memptr) - 1;
} }
if(rulelist->rule->on_queries == QUERY_OP_UNDEFINED || rulelist->rule->on_queries & optype){ if(rulelist->rule->on_queries == QUERY_OP_UNDEFINED || rulelist->rule->on_queries & optype){
@ -1547,18 +1548,19 @@ bool check_match_any(FW_INSTANCE* my_instance, FW_SESSION* my_session, GWBUF *qu
bool is_sql, rval = false; bool is_sql, rval = false;
int qlen; int qlen;
char *fullquery = NULL,*ptr; char *fullquery = NULL,*ptr;
unsigned char* memptr = (unsigned char*)queue->start;
RULELIST* rulelist; RULELIST* rulelist;
is_sql = modutil_is_SQL(queue); is_sql = modutil_is_SQL(queue) || modutil_is_SQL_prepare(queue);
if(is_sql){ if(is_sql){
if(!query_is_parsed(queue)){ if(!query_is_parsed(queue)){
parse_query(queue); parse_query(queue);
} }
modutil_extract_SQL(queue, &ptr, &qlen);
fullquery = malloc((qlen + 1) * sizeof(char)); qlen = gw_mysql_get_byte3(memptr);
memcpy(fullquery,ptr,qlen); fullquery = malloc((qlen) * sizeof(char));
memset(fullquery + qlen,0,1); memcpy(fullquery,memptr + 5,qlen - 1);
memset(fullquery + qlen - 1,0,1);
} }
if((rulelist = user->rules_or) == NULL) if((rulelist = user->rules_or) == NULL)
@ -1598,21 +1600,21 @@ bool check_match_all(FW_INSTANCE* my_instance, FW_SESSION* my_session, GWBUF *qu
{ {
bool is_sql, rval = true; bool is_sql, rval = true;
int qlen; int qlen;
unsigned char* memptr = (unsigned char*)queue->start;
char *fullquery = NULL,*ptr; char *fullquery = NULL,*ptr;
RULELIST* rulelist; RULELIST* rulelist;
is_sql = modutil_is_SQL(queue); is_sql = modutil_is_SQL(queue) || modutil_is_SQL_prepare(queue);
if(is_sql){ if(is_sql){
if(!query_is_parsed(queue)){ if(!query_is_parsed(queue)){
parse_query(queue); parse_query(queue);
} }
modutil_extract_SQL(queue, &ptr, &qlen);
fullquery = malloc((qlen + 1) * sizeof(char));
memcpy(fullquery,ptr,qlen);
memset(fullquery + qlen,0,1);
qlen = gw_mysql_get_byte3(memptr);
fullquery = malloc((qlen) * sizeof(char));
memcpy(fullquery,memptr + 5,qlen - 1);
memset(fullquery + qlen - 1,0,1);
} }
if(strict_all) if(strict_all)