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

Fix current command tracking in MariaDBClient

Browse Source 
The debug assertion introduced by commit 3d1c2b421a fails when a
COM_CHANGE_USER was executed. This was caused by the fact that the
authentication data was being interpreted as a command when it should've
been ignored.

Added a debug assertion into the reauthentication code to make sure the
current command remains the same.
This commit is contained in:
Markus Mäkelä
2018-06-17 22:17:46 +03:00
parent ca155fbfe9
commit 2ad8b77f11
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
View File

@ -1012,9 +1012,17 @@ gw_read_normal_data(DCB *dcb, GWBUF *read_buffer, int nbytes_read)
return 0; return 0;
} }
// Update the current command, required by KILL command processing /**
* Update the current command, required by KILL command processing.
* If a COM_CHANGE_USER is in progress, this must not be done as the client
* is sending authentication data that does not have the command byte.
*/
MySQLProtocol *proto = (MySQLProtocol*)dcb->protocol; MySQLProtocol *proto = (MySQLProtocol*)dcb->protocol;
proto->current_command = (mxs_mysql_cmd_t)mxs_mysql_get_command(read_buffer);
if (!proto->changing_user)
{
proto->current_command = (mxs_mysql_cmd_t)mxs_mysql_get_command(read_buffer);
}
set_qc_mode(session, &read_buffer); set_qc_mode(session, &read_buffer);
@ -1696,6 +1704,7 @@ static int route_by_statement(MXS_SESSION* session, uint64_t capabilities, GWBUF
} }
else if (proto->changing_user) else if (proto->changing_user)
{ {
ss_dassert(proto->current_command == MXS_COM_CHANGE_USER);
proto->changing_user = false; proto->changing_user = false;
bool ok = reauthenticate_client(session, packetbuf); bool ok = reauthenticate_client(session, packetbuf);
gwbuf_free(packetbuf); gwbuf_free(packetbuf);