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

Added error message for multi-statements to dbfwfilter.

Browse Source
This commit is contained in:
Markus Makela
2015-04-02 16:47:19 +03:00
parent 795a683c55
commit fa7e0ea7c0
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/modutil.c
View File

@ -830,11 +830,17 @@ int modutil_count_statements(GWBUF* buffer)
char* end = ((char*)(buffer)->end); char* end = ((char*)(buffer)->end);
int num = 1; int num = 1;
while((ptr = strnchr_esc(ptr,';', end - ptr))) while(ptr < end && (ptr = strnchr_esc(ptr,';', end - ptr)))
{ {
num++; num++;
while(*ptr == ';')
ptr++; ptr++;
} }
if(*(end - 1) == ';')
{
num--;
}
return num; return num;
} }

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

@ -1983,6 +1983,15 @@ routeQuery(FILTER *instance, void *session, GWBUF *queue)
ipaddr = strdup(dcb->remote); ipaddr = strdup(dcb->remote);
sprintf(uname_addr,"%s@%s",dcb->user,ipaddr); sprintf(uname_addr,"%s@%s",dcb->user,ipaddr);
if(modutil_is_SQL(queue) && modutil_count_statements(queue) > 1)
{
if(my_session->errmsg)
free(my_session->errmsg);
my_session->errmsg = strdup("This filter does not support multi-statements.");
accept = false;
goto queryresolved;
}
if((user = (USER*)hashtable_fetch(my_instance->htable, uname_addr)) == NULL){ if((user = (USER*)hashtable_fetch(my_instance->htable, uname_addr)) == NULL){
while(user == NULL && next_ip_class(ipaddr)){ while(user == NULL && next_ip_class(ipaddr)){