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

MXS-585: Fixed buffer length instead of packet length being used in a calculation

Browse Source 
The usage of the buffer length in the authentication success checks causes
the authentication to fail with routers that don't require statement input.
This commit is contained in:
Markus Makela
2016-02-18 17:23:27 +02:00
parent c25ef2f72a
commit a947b33769
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/modules/protocol/mysql_client.c
View File

@ -771,7 +771,9 @@ int gw_read_client_event(DCB* dcb)
} }
} }
if (stmt_input) /** If the router requires statement input or we are still authenticating
* we need to make sure that a complete SQL packet is read before continuing */
if (stmt_input || protocol->protocol_auth_state == MYSQL_AUTH_SENT)
{ {
/** /**
@ -832,9 +834,8 @@ int gw_read_client_event(DCB* dcb)
{ {
case MYSQL_AUTH_SENT: case MYSQL_AUTH_SENT:
{ {
int auth_val; read_buffer = gwbuf_make_contiguous(read_buffer);
int auth_val = gw_mysql_do_authentication(dcb, &read_buffer);
auth_val = gw_mysql_do_authentication(dcb, &read_buffer);
if (protocol->protocol_auth_state == MYSQL_AUTH_SSL_REQ || if (protocol->protocol_auth_state == MYSQL_AUTH_SSL_REQ ||
protocol->protocol_auth_state == MYSQL_AUTH_SSL_HANDSHAKE_ONGOING || protocol->protocol_auth_state == MYSQL_AUTH_SSL_HANDSHAKE_ONGOING ||