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

Extract shared session information in LocalClient constructor

Browse Source 
When the LocalClient is constructed, it is possible to extract all the
needed information at that time. The only obstacle is the fact that the
LocalClient is constructed at the same time the session is. Since the
client DCB is created before the session, it is safe to extract the shared
data directly from it.
This commit is contained in:
Markus Mäkelä
2017-09-27 14:51:36 +03:00
parent cd83aa40db
commit a7e610a70a
4 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/maxscale/protocol/mysql.h
View File

@ -487,14 +487,14 @@ int gw_decode_mysql_server_handshake(MySQLProtocol *conn, uint8_t *payload);
/** /**
* Create a response to the server handshake * Create a response to the server handshake
* *
* @param session Session object * @param client Shared session data
* @param conn MySQL Protocol object for this connection * @param conn MySQL Protocol object for this connection
* @param with_ssl Whether to create an SSL response or a normal response packet * @param with_ssl Whether to create an SSL response or a normal response packet
* @param ssl_established Set to true if the SSL response has been sent * @param ssl_established Set to true if the SSL response has been sent
* *
* @return Generated response packet * @return Generated response packet
*/ */
GWBUF* gw_generate_auth_response(MXS_SESSION* session, MySQLProtocol *conn, GWBUF* gw_generate_auth_response(MYSQL_session* client, MySQLProtocol *conn,
bool with_ssl, bool ssl_established); bool with_ssl, bool ssl_established);
/** Read the backend server's handshake */ /** Read the backend server's handshake */

9
server/modules/filter/tee/local_client.cc
View File

@ -30,14 +30,15 @@ LocalClient::LocalClient(MXS_SESSION* session, int fd):
m_state(VC_WAITING_HANDSHAKE), m_state(VC_WAITING_HANDSHAKE),
m_sock(fd), m_sock(fd),
m_expected_bytes(0), m_expected_bytes(0),
m_session(session) m_client({}),
m_protocol({})
{ {
MXS_POLL_DATA::handler = LocalClient::poll_handler; MXS_POLL_DATA::handler = LocalClient::poll_handler;
MySQLProtocol* client = (MySQLProtocol*)m_session->client_dcb->protocol; MySQLProtocol* client = (MySQLProtocol*)session->client_dcb->protocol;
m_protocol = {};
m_protocol.charset = client->charset; m_protocol.charset = client->charset;
m_protocol.client_capabilities = client->client_capabilities; m_protocol.client_capabilities = client->client_capabilities;
m_protocol.extra_capabilities = client->extra_capabilities; m_protocol.extra_capabilities = client->extra_capabilities;
gw_get_shared_session_auth_info(session->client_dcb, &m_client);
} }
LocalClient::~LocalClient() LocalClient::~LocalClient()
@ -95,7 +96,7 @@ void LocalClient::process(uint32_t events)
{ {
if (gw_decode_mysql_server_handshake(&m_protocol, GWBUF_DATA(buf) + MYSQL_HEADER_LEN) == 0) if (gw_decode_mysql_server_handshake(&m_protocol, GWBUF_DATA(buf) + MYSQL_HEADER_LEN) == 0)
{ {
GWBUF* response = gw_generate_auth_response(m_session, &m_protocol, false, false); GWBUF* response = gw_generate_auth_response(&m_client, &m_protocol, false, false);
m_queue.push_front(response); m_queue.push_front(response);
m_state = VC_RESPONSE_SENT; m_state = VC_RESPONSE_SENT;
} }

2
server/modules/filter/tee/local_client.hh
View File

@ -71,6 +71,6 @@ private:
mxs::Buffer m_partial; mxs::Buffer m_partial;
size_t m_expected_bytes; size_t m_expected_bytes;
std::deque<mxs::Buffer> m_queue; std::deque<mxs::Buffer> m_queue;
MXS_SESSION* m_session; MYSQL_session m_client;
MySQLProtocol m_protocol; MySQLProtocol m_protocol;
}; };

41
server/modules/protocol/MySQL/mysql_common.c
View File

@ -978,9 +978,14 @@ bool gw_get_shared_session_auth_info(DCB* dcb, MYSQL_session* session)
CHK_DCB(dcb); CHK_DCB(dcb);
CHK_SESSION(dcb->session); CHK_SESSION(dcb->session);
if (dcb->dcb_role == DCB_ROLE_CLIENT_HANDLER)
if (dcb->session->state != SESSION_STATE_ALLOC && {
dcb->session->state != SESSION_STATE_DUMMY) // The shared session data can be extracted at any time if the client DCB is used.
ss_dassert(dcb->data);
memcpy(session, dcb->data, sizeof(MYSQL_session));
}
else if (dcb->session->state != SESSION_STATE_ALLOC &&
dcb->session->state != SESSION_STATE_DUMMY)
{ {
memcpy(session, dcb->session->client_dcb->data, sizeof(MYSQL_session)); memcpy(session, dcb->session->client_dcb->data, sizeof(MYSQL_session));
} }
@ -1239,21 +1244,18 @@ create_capabilities(MySQLProtocol *conn, bool with_ssl, bool db_specified, bool
return final_capabilities; return final_capabilities;
} }
GWBUF* gw_generate_auth_response(MXS_SESSION* session, MySQLProtocol *conn, GWBUF* gw_generate_auth_response(MYSQL_session* client, MySQLProtocol *conn,
bool with_ssl, bool ssl_established) bool with_ssl, bool ssl_established)
{ {
MYSQL_session client;
gw_get_shared_session_auth_info(session->client_dcb, &client);
uint8_t client_capabilities[4] = {0, 0, 0, 0}; uint8_t client_capabilities[4] = {0, 0, 0, 0};
uint8_t *curr_passwd = NULL; uint8_t *curr_passwd = NULL;
if (memcmp(client.client_sha1, null_client_sha1, MYSQL_SCRAMBLE_LEN) != 0) if (memcmp(client->client_sha1, null_client_sha1, MYSQL_SCRAMBLE_LEN) != 0)
{ {
curr_passwd = client.client_sha1; curr_passwd = client->client_sha1;
} }
uint32_t capabilities = create_capabilities(conn, with_ssl, client.db[0], false); uint32_t capabilities = create_capabilities(conn, with_ssl, client->db[0], false);
gw_mysql_set_byte4(client_capabilities, capabilities); gw_mysql_set_byte4(client_capabilities, capabilities);
/** /**
@ -1263,8 +1265,8 @@ GWBUF* gw_generate_auth_response(MXS_SESSION* session, MySQLProtocol *conn,
*/ */
const char* auth_plugin_name = DEFAULT_MYSQL_AUTH_PLUGIN; const char* auth_plugin_name = DEFAULT_MYSQL_AUTH_PLUGIN;
long bytes = response_length(with_ssl, ssl_established, client.user, long bytes = response_length(with_ssl, ssl_established, client->user,
curr_passwd, client.db, auth_plugin_name); curr_passwd, client->db, auth_plugin_name);
// allocating the GWBUF // allocating the GWBUF
GWBUF *buffer = gwbuf_alloc(bytes); GWBUF *buffer = gwbuf_alloc(bytes);
@ -1303,8 +1305,8 @@ GWBUF* gw_generate_auth_response(MXS_SESSION* session, MySQLProtocol *conn,
if (!with_ssl || ssl_established) if (!with_ssl || ssl_established)
{ {
// 4 + 4 + 4 + 1 + 23 = 36, this includes the 4 bytes packet header // 4 + 4 + 4 + 1 + 23 = 36, this includes the 4 bytes packet header
memcpy(payload, client.user, strlen(client.user)); memcpy(payload, client->user, strlen(client->user));
payload += strlen(client.user); payload += strlen(client->user);
payload++; payload++;
if (curr_passwd) if (curr_passwd)
@ -1317,10 +1319,10 @@ GWBUF* gw_generate_auth_response(MXS_SESSION* session, MySQLProtocol *conn,
} }
// if the db is not NULL append it // if the db is not NULL append it
if (client.db[0]) if (client->db[0])
{ {
memcpy(payload, client.db, strlen(client.db)); memcpy(payload, client->db, strlen(client->db));
payload += strlen(client.db); payload += strlen(client->db);
payload++; payload++;
} }
@ -1353,7 +1355,10 @@ mxs_auth_state_t gw_send_backend_auth(DCB *dcb)
bool with_ssl = dcb->server->server_ssl; bool with_ssl = dcb->server->server_ssl;
bool ssl_established = dcb->ssl_state == SSL_ESTABLISHED; bool ssl_established = dcb->ssl_state == SSL_ESTABLISHED;
GWBUF* buffer = gw_generate_auth_response(dcb->session, dcb->protocol, MYSQL_session client;
gw_get_shared_session_auth_info(dcb->session->client_dcb, &client);
GWBUF* buffer = gw_generate_auth_response(&client, dcb->protocol,
with_ssl, ssl_established); with_ssl, ssl_established);
ss_dassert(buffer); ss_dassert(buffer);