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

MXS-2159: Combine client capability bits

Browse Source 
If the client sends two different sets of capability bits during the
authentication phase of an SSL enabled connection, both sets need to be
combined. This prevents capabilities from degrading mid-connection which
is the case when Oracle Connector/J drops the SSL capability bit
mid-authentication.
This commit is contained in:
Markus Mäkelä
2018-11-12 12:38:34 +02:00
parent f7db955101
commit fb84b2690a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -596,7 +596,11 @@ static void store_client_information(DCB *dcb, GWBUF *buffer)
ss_dassert(MYSQL_GET_PAYLOAD_LEN(data) + MYSQL_HEADER_LEN == len ||
len == MYSQL_AUTH_PACKET_BASE_SIZE); // For SSL request packet
proto->client_capabilities = gw_mysql_get_byte4(data + MYSQL_CLIENT_CAP_OFFSET);
// We OR the capability bits in order to retain the starting bits sent
// when an SSL connection is opened. Oracle Connector/J 8.0 appears to drop
// the SSL capability bit mid-authentication which causes MaxScale to think
// that SSL is not used.
proto->client_capabilities |= gw_mysql_get_byte4(data + MYSQL_CLIENT_CAP_OFFSET);
proto->charset = data[MYSQL_CHARSET_OFFSET];
/** MariaDB 10.2 compatible clients don't set the first bit to signal that