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

Merge branch 'develop' into firewall

Browse Source
This commit is contained in:
Markus Makela
2014-11-17 13:05:40 +02:00
parent ca13e18f53 a96f2fe57b
commit 1399a33944
18 changed files with 583 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -8,6 +8,9 @@ set_maxscale_version()
set(CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "Prefix prepended to install directories." FORCE) set(CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "Prefix prepended to install directories." FORCE)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/")
find_package(Valgrind)
project(MaxScale) project(MaxScale)
check_deps() check_deps()
@ -149,11 +152,13 @@ set(CPACK_RPM_USER_FILELIST "%ignore /etc/init.d")
set(CPACK_RPM_USER_FILELIST "%ignore /etc/ld.so.conf.d") set(CPACK_RPM_USER_FILELIST "%ignore /etc/ld.so.conf.d")
set(CPACK_RPM_USER_FILELIST "%ignore /etc") set(CPACK_RPM_USER_FILELIST "%ignore /etc")
include(CPack) include(CPack)
add_custom_target(buildtests add_custom_target(buildtests
COMMAND ${CMAKE_COMMAND} -DDEPS_OK=Y -DBUILD_TESTS=Y -DBUILD_TYPE=Debug -DINSTALL_DIR=${CMAKE_BINARY_DIR} -DINSTALL_SYSTEM_FILES=N ${CMAKE_SOURCE_DIR} COMMAND ${CMAKE_COMMAND} -DDEPS_OK=Y -DBUILD_TESTS=Y -DBUILD_TYPE=Debug -DINSTALL_DIR=${CMAKE_BINARY_DIR} -DINSTALL_SYSTEM_FILES=N ${CMAKE_SOURCE_DIR}
COMMAND make COMMAND make
COMMENT "Building test suite..." VERBATIM COMMENT "Building test suite..." VERBATIM
) )
add_custom_target(testall add_custom_target(testall
COMMAND ${CMAKE_COMMAND} -DDEPS_OK=Y -DBUILD_TESTS=Y -DBUILD_TYPE=Debug -DINSTALL_DIR=${CMAKE_BINARY_DIR} -DINSTALL_SYSTEM_FILES=N ${CMAKE_SOURCE_DIR} COMMAND ${CMAKE_COMMAND} -DDEPS_OK=Y -DBUILD_TESTS=Y -DBUILD_TYPE=Debug -DINSTALL_DIR=${CMAKE_BINARY_DIR} -DINSTALL_SYSTEM_FILES=N ${CMAKE_SOURCE_DIR}
COMMAND make install COMMAND make install
@ -185,3 +190,16 @@ if(DOXYGEN_FOUND)
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygate) COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygate)
endif() endif()
# Testall target with Valgrind
if(VALGRIND_FOUND)
add_custom_target(testall-valgrind
COMMAND ${CMAKE_COMMAND} -DDEPS_OK=Y -DBUILD_TESTS=Y -DBUILD_TYPE=Debug -DINSTALL_DIR=${CMAKE_BINARY_DIR} -DINSTALL_SYSTEM_FILES=N ${CMAKE_SOURCE_DIR}
COMMAND make install
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/server/test/MaxScale_test.cnf ${CMAKE_BINARY_DIR}/etc/MaxScale.cnf
COMMAND /bin/sh -c "valgrind --track-fds=yes --leak-check=full --show-leak-kinds=all --log-file=${CMAKE_BINARY_DIR}/valgrind.log ${CMAKE_BINARY_DIR}/bin/maxscale -c ${CMAKE_BINARY_DIR} &>/dev/null"
COMMAND /bin/sh -c "make test || echo \"Test results written to: ${CMAKE_BINARY_DIR}/Testing/Temporary/\""
COMMAND killall maxscale
COMMENT "Running full test suite with Valgrind..." VERBATIM)
endif()

13
FindValgrind.cmake Normal file
View File

@ -0,0 +1,13 @@
# This CMake file tries to find the Valgrind executable
# The following variables are set:
# VALGRIND_FOUND - System has Valgrind
# VALGRIND_EXECUTABLE - The Valgrind executable file
find_program(VALGRIND_EXECUTABLE valgrind)
if(VALGRIND_EXECUTABLE STREQUAL "VALGRIND_EXECUTABLE-NOTFOUND")
message(STATUS "Valgrind not found.")
set(VALGRIND_FOUND FALSE CACHE INTERNAL "")
unset(VALGRIND_EXECUTABLE)
else()
message(STATUS "Valgrind found: ${VALGRIND_EXECUTABLE}")
set(VALGRIND_FOUND TRUE CACHE INTERNAL "")
endif()

46
log_manager/log_manager.cc
View File

@ -1042,21 +1042,46 @@ static char* blockbuf_get_writepos(
}else if(bb->bb_state == BB_CLEARED){ }else if(bb->bb_state == BB_CLEARED){
/** /**
*Move the full buffer to the end of the list *Move the cleared buffer to the end of the list if it is the first one in the list
*/ */
simple_mutex_unlock(&bb->bb_mutex); simple_mutex_unlock(&bb->bb_mutex);
simple_mutex_lock(&bb_list->mlist_mutex, true); simple_mutex_lock(&bb_list->mlist_mutex, true);
if(node->mlnode_next){ if(node == bb_list->mlist_first)
bb_list->mlist_first = node->mlnode_next; {
bb_list->mlist_last->mlnode_next = node;
node->mlnode_next = NULL; if(bb_list->mlist_nodecount > 1 &&
bb_list->mlist_last = node; node != bb_list->mlist_last){
node = bb_list->mlist_first; bb_list->mlist_last->mlnode_next = bb_list->mlist_first;
} bb_list->mlist_first = bb_list->mlist_first->mlnode_next;
bb_list->mlist_last->mlnode_next->mlnode_next = NULL;
bb_list->mlist_last = bb_list->mlist_last->mlnode_next;
}
ss_dassert(node == bb_list->mlist_last);
simple_mutex_unlock(&bb_list->mlist_mutex);
simple_mutex_lock(&bb->bb_mutex, true);
bb->bb_state = BB_READY;
simple_mutex_unlock(&bb->bb_mutex);
simple_mutex_lock(&bb_list->mlist_mutex, true);
}
else
{
if(node->mlnode_next){
node = node->mlnode_next;
}else{
node = bb_list->mlist_first;
}
continue;
}
bb->bb_state = BB_READY;
}else if (bb->bb_state == BB_READY){ }else if (bb->bb_state == BB_READY){
/** /**
@ -2701,7 +2726,8 @@ static void filewriter_done(
* by file writer which traverses the list and accesses block buffers * by file writer which traverses the list and accesses block buffers
* included in list nodes. * included in list nodes.
* List modifications are protected with version numbers. * List modifications are protected with version numbers.
* Before modification, version is increased by one to be odd. After the * Before
modification, version is increased by one to be odd. After the
* completion, it is increased again to even. List can be read only when * completion, it is increased again to even. List can be read only when
* version is even and read is consistent only if version hasn't changed * version is even and read is consistent only if version hasn't changed
* during the read. * during the read.

18
server/MaxScale_template.cnf
View File

@ -131,6 +131,24 @@ service=HTTPD Router
protocol=HTTPD protocol=HTTPD
port=6444 port=6444
# Enable the maxadmin interface to MaxScale
#
# Listen on the default port of 6603 and restrict
# to connections from localhost only.
# Remove the address=localhost entry to enable
# maxadmin connections from any host
[CLI]
type=service
router=cli
[CLI Listener]
type=listener
service=CLI
protocol=maxscaled
address=localhost
port=6603
# Definition of the servers # Definition of the servers
[server1] [server1]

62
server/core/dbusers.c
View File

@ -468,26 +468,56 @@ getUsers(SERVICE *service, USERS *users)
server = service->databases; server = service->databases;
dpwd = decryptPassword(service_passwd); dpwd = decryptPassword(service_passwd);
while (server != NULL && (mysql_real_connect(con, /* Select a server with Master bit, if available */
server->name, while (server != NULL && !(server->status & SERVER_MASTER)) {
service_user, server = server->nextdb;
dpwd,
NULL,
server->port,
NULL,
0) == NULL))
{
server = server->nextdb;
} }
/* Try loading data from master server */
if (server != NULL && (mysql_real_connect(con, server->name, service_user, dpwd, NULL, server->port, NULL, 0) != NULL)) {
LOGIF(LD, (skygw_log_write_flush(
LOGFILE_DEBUG,
"Dbusers : Loading data from backend database with Master role [%s:%i] "
"for service [%s]",
server->name,
server->port,
service->name)));
} else {
/* load data from other servers via loop */
server = service->databases;
while (server != NULL && (mysql_real_connect(con,
server->name,
service_user,
dpwd,
NULL,
server->port,
NULL,
0) == NULL))
{
server = server->nextdb;
}
if (server != NULL) {
LOGIF(LD, (skygw_log_write_flush(
LOGFILE_DEBUG,
"Dbusers : Loading data from backend database [%s:%i] "
"for service [%s]",
server->name,
server->port,
service->name)));
}
}
free(dpwd); free(dpwd);
if (server == NULL) if (server == NULL)
{ {
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"Error : Unable to get user data from backend database " "Error : Unable to get user data from backend database "
"for service [%s]. Missing server information.", "for service [%s]. Missing server information.",
service->name))); service->name)));
mysql_close(con); mysql_close(con);
return -1; return -1;
} }
@ -663,8 +693,8 @@ getUsers(SERVICE *service, USERS *users)
/* load all mysql database names */ /* load all mysql database names */
dbnames = getDatabases(service, con); dbnames = getDatabases(service, con);
LOGIF(LM, (skygw_log_write( LOGIF(LD, (skygw_log_write(
LOGFILE_MESSAGE, LOGFILE_DEBUG,
"Loaded %d MySQL Database Names for service [%s]", "Loaded %d MySQL Database Names for service [%s]",
dbnames, dbnames,
service->name))); service->name)));

4
server/core/dcb.c
View File

@ -1119,6 +1119,10 @@ dcb_close(DCB *dcb)
CHK_DCB(dcb); CHK_DCB(dcb);
LOGIF(LD, (skygw_log_write(LOGFILE_DEBUG,
"%lu [dcb_close]",
pthread_self())));
/*< /*<
* dcb_close may be called for freshly created dcb, in which case * dcb_close may be called for freshly created dcb, in which case
* it only needs to be freed. * it only needs to be freed.

2
server/core/gateway.c
View File

@ -1851,8 +1851,6 @@ static int write_pid_file(char *home_dir) {
/* close file */ /* close file */
close(fd); close(fd);
fprintf(stderr, "MaxScale PID %s in pidfile %s\n", pidstr, pidfile);
} }
/* success */ /* success */

2
server/core/service.c
View File

@ -227,7 +227,7 @@ GWPROTOCOL *funcs;
LOGFILE_ERROR, LOGFILE_ERROR,
"Error : Unable to load users from %s:%d for " "Error : Unable to load users from %s:%d for "
"service %s.", "service %s.",
port->address, (port->address == NULL ? "0.0.0.0" : port->address),
port->port, port->port,
service->name))); service->name)));
hashtable_free(service->users->data); hashtable_free(service->users->data);

7
server/modules/include/mysql_client_server_protocol.h
View File

@ -297,6 +297,7 @@ typedef struct {
#define MYSQL_GET_STMTOK_NATTR(payload) (gw_mysql_get_byte2(&payload[11])) #define MYSQL_GET_STMTOK_NATTR(payload) (gw_mysql_get_byte2(&payload[11]))
#define MYSQL_IS_ERROR_PACKET(payload) (MYSQL_GET_COMMAND(payload)==0xff) #define MYSQL_IS_ERROR_PACKET(payload) (MYSQL_GET_COMMAND(payload)==0xff)
#define MYSQL_IS_COM_QUIT(payload) (MYSQL_GET_COMMAND(payload)==0x01) #define MYSQL_IS_COM_QUIT(payload) (MYSQL_GET_COMMAND(payload)==0x01)
#define MYSQL_IS_CHANGE_USER(payload) (MYSQL_GET_COMMAND(payload)==0x11)
#define MYSQL_GET_NATTR(payload) ((int)payload[4]) #define MYSQL_GET_NATTR(payload) ((int)payload[4])
#endif /** _MYSQL_PROTOCOL_H */ #endif /** _MYSQL_PROTOCOL_H */
@ -314,6 +315,7 @@ int gw_send_authentication_to_backend(
char *user, char *user,
uint8_t *passwd, uint8_t *passwd,
MySQLProtocol *protocol); MySQLProtocol *protocol);
const char *gw_mysql_protocol_state2string(int state); const char *gw_mysql_protocol_state2string(int state);
int gw_do_connect_to_backend(char *host, int port, int* fd); int gw_do_connect_to_backend(char *host, int port, int* fd);
int mysql_send_com_quit(DCB* dcb, int packet_number, GWBUF* buf); int mysql_send_com_quit(DCB* dcb, int packet_number, GWBUF* buf);
@ -335,6 +337,11 @@ int gw_send_change_user_to_backend(
char *user, char *user,
uint8_t *passwd, uint8_t *passwd,
MySQLProtocol *protocol); MySQLProtocol *protocol);
GWBUF* gw_create_change_user_packet(
MYSQL_session* mses,
MySQLProtocol* protocol);
int gw_find_mysql_user_password_sha1( int gw_find_mysql_user_password_sha1(
char *username, char *username,
uint8_t *gateway_password, uint8_t *gateway_password,

6
server/modules/protocol/httpd.c
View File

@ -49,6 +49,8 @@ MODULE_INFO info = {
"An experimental HTTPD implementation for use in admnistration" "An experimental HTTPD implementation for use in admnistration"
}; };
extern int lm_enabled_logfiles_bitmask;
#define ISspace(x) isspace((int)(x)) #define ISspace(x) isspace((int)(x))
#define HTTP_SERVER_STRING "MaxScale(c) v.1.0.0" #define HTTP_SERVER_STRING "MaxScale(c) v.1.0.0"
static char *version_str = "V1.0.1"; static char *version_str = "V1.0.1";
@ -413,9 +415,7 @@ int syseno = 0;
rc = listen(listener->fd, SOMAXCONN); rc = listen(listener->fd, SOMAXCONN);
if (rc == 0) { if (rc == 0) {
fprintf(stderr, LOGIF(LM, (skygw_log_write_flush(LOGFILE_MESSAGE,"Listening httpd connections at %s", config)));
"Listening http connections at %s\n",
config);
} else { } else {
int eno = errno; int eno = errno;
errno = 0; errno = 0;

52
server/modules/protocol/mysql_backend.c
View File

@ -539,10 +539,13 @@ static int gw_read_backend_event(DCB *dcb) {
goto return_rc; goto return_rc;
} }
} }
/*< /**
* If dcb->session->client is freed already it may be NULL. * Check that session is operable, and that client DCB is
* still listening the socket for replies.
*/ */
if (dcb->session->client != NULL) if (dcb->session->state == SESSION_STATE_ROUTER_READY &&
dcb->session->client != NULL &&
dcb->session->client->state == DCB_STATE_POLLING)
{ {
client_protocol = SESSION_PROTOCOL(dcb->session, client_protocol = SESSION_PROTOCOL(dcb->session,
MySQLProtocol); MySQLProtocol);
@ -571,6 +574,10 @@ static int gw_read_backend_event(DCB *dcb) {
rc = 1; rc = 1;
} }
} }
else /*< session is closing; replying to client isn't possible */
{
gwbuf_free(read_buffer);
}
} }
return_rc: return_rc:
@ -1082,6 +1089,10 @@ gw_backend_close(DCB *dcb)
session = dcb->session; session = dcb->session;
CHK_SESSION(session); CHK_SESSION(session);
LOGIF(LD, (skygw_log_write(LOGFILE_DEBUG,
"%lu [gw_backend_close]",
pthread_self())));
quitbuf = mysql_create_com_quit(NULL, 0); quitbuf = mysql_create_com_quit(NULL, 0);
gwbuf_set_type(quitbuf, GWBUF_TYPE_MYSQL); gwbuf_set_type(quitbuf, GWBUF_TYPE_MYSQL);
@ -1157,7 +1168,24 @@ static int backend_write_delayqueue(DCB *dcb)
localq = dcb->delayq; localq = dcb->delayq;
dcb->delayq = NULL; dcb->delayq = NULL;
spinlock_release(&dcb->delayqlock); spinlock_release(&dcb->delayqlock);
rc = dcb_write(dcb, localq);
if (MYSQL_IS_CHANGE_USER(((uint8_t *)GWBUF_DATA(localq))))
{
MYSQL_session* mses;
GWBUF* new_packet;
mses = (MYSQL_session *)dcb->session->client->data;
new_packet = gw_create_change_user_packet(
mses,
(MySQLProtocol *)dcb->protocol);
/**
* Remove previous packet which lacks scramble
* and append the new.
*/
localq = gwbuf_consume(localq, GWBUF_LENGTH(localq));
localq = gwbuf_append(localq, new_packet);
}
rc = dcb_write(dcb, localq);
} }
if (rc == 0) if (rc == 0)
@ -1289,13 +1317,25 @@ static int gw_change_user(
* decode the token and check the password. * decode the token and check the password.
* Note: if auth_token_len == 0 && auth_token == NULL, user is without password * Note: if auth_token_len == 0 && auth_token == NULL, user is without password
*/ */
auth_ret = gw_check_mysql_scramble_data(backend->session->client, auth_token, auth_token_len, client_protocol->scramble, sizeof(client_protocol->scramble), username, client_sha1); auth_ret = gw_check_mysql_scramble_data(backend->session->client,
auth_token,
auth_token_len,
client_protocol->scramble,
sizeof(client_protocol->scramble),
username,
client_sha1);
if (auth_ret != 0) { if (auth_ret != 0) {
if (!service_refresh_users(backend->session->client->service)) { if (!service_refresh_users(backend->session->client->service)) {
/* Try authentication again with new repository data */ /* Try authentication again with new repository data */
/* Note: if no auth client authentication will fail */ /* Note: if no auth client authentication will fail */
auth_ret = gw_check_mysql_scramble_data(backend->session->client, auth_token, auth_token_len, client_protocol->scramble, sizeof(client_protocol->scramble), username, client_sha1); auth_ret = gw_check_mysql_scramble_data(
backend->session->client,
auth_token, auth_token_len,
client_protocol->scramble,
sizeof(client_protocol->scramble),
username,
client_sha1);
} }
} }

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

@ -479,7 +479,8 @@ static int gw_mysql_do_authentication(DCB *dcb, GWBUF *queue) {
auth_ret = gw_check_mysql_scramble_data(dcb, auth_ret = gw_check_mysql_scramble_data(dcb,
auth_token, auth_token,
auth_token_len, auth_token_len,
protocol->scramble, sizeof(protocol->scramble), protocol->scramble,
sizeof(protocol->scramble),
username, username,
stage1_hash); stage1_hash);
@ -491,7 +492,14 @@ static int gw_mysql_do_authentication(DCB *dcb, GWBUF *queue) {
if (!service_refresh_users(dcb->service)) { if (!service_refresh_users(dcb->service)) {
/* Try authentication again with new repository data */ /* Try authentication again with new repository data */
/* Note: if no auth client authentication will fail */ /* Note: if no auth client authentication will fail */
auth_ret = gw_check_mysql_scramble_data(dcb, auth_token, auth_token_len, protocol->scramble, sizeof(protocol->scramble), username, stage1_hash); auth_ret = gw_check_mysql_scramble_data(
dcb,
auth_token,
auth_token_len,
protocol->scramble,
sizeof(protocol->scramble),
username,
stage1_hash);
} }
} }
@ -1047,9 +1055,7 @@ int gw_MySQLListener(
rc = listen(l_so, 10 * SOMAXCONN); rc = listen(l_so, 10 * SOMAXCONN);
if (rc == 0) { if (rc == 0) {
fprintf(stderr, LOGIF(LM, (skygw_log_write_flush(LOGFILE_MESSAGE,"Listening MySQL connections at %s", config_bind)));
"Listening MySQL connections at %s\n",
config_bind);
} else { } else {
int eno = errno; int eno = errno;
errno = 0; errno = 0;
@ -1386,6 +1392,10 @@ gw_client_close(DCB *dcb)
CHK_PROTOCOL(protocol); CHK_PROTOCOL(protocol);
} }
#endif #endif
LOGIF(LD, (skygw_log_write(LOGFILE_DEBUG,
"%lu [gw_client_close]",
pthread_self())));
mysql_protocol_done(dcb); mysql_protocol_done(dcb);
session = dcb->session; session = dcb->session;

394
server/modules/protocol/mysql_common.c
View File

@ -275,8 +275,7 @@ int gw_read_backend_handshake(
payload += 4; payload += 4;
//Now decode mysql handshake //Now decode mysql handshake
success = gw_decode_mysql_server_handshake(conn, success = gw_decode_mysql_server_handshake(conn, payload);
payload);
if (success < 0) { if (success < 0) {
/* MySQL handshake has not been properly decoded /* MySQL handshake has not been properly decoded
@ -1054,197 +1053,226 @@ int mysql_send_custom_error (
return dcb->func.write(dcb, buf); return dcb->func.write(dcb, buf);
} }
/**
* Create COM_CHANGE_USER packet and store it to GWBUF
*
* @param mses MySQL session
* @param protocol protocol structure of the backend
*
* @return GWBUF buffer consisting of COM_CHANGE_USER packet
*
* @note the function doesn't fail
*/
GWBUF* gw_create_change_user_packet(
MYSQL_session* mses,
MySQLProtocol* protocol)
{
char* db;
char* user;
uint8_t* pwd;
GWBUF* buffer;
int compress = 0;
uint8_t* payload = NULL;
uint8_t* payload_start = NULL;
long bytes;
uint8_t client_scramble[GW_MYSQL_SCRAMBLE_SIZE];
uint32_t server_capabilities = 0;
uint32_t final_capabilities = 0;
char dbpass[MYSQL_USER_MAXLEN + 1]="";
char* curr_db = NULL;
uint8_t* curr_passwd = NULL;
unsigned int charset;
db = mses->db;
user = mses->user;
pwd = mses->client_sha1;
if (strlen(db) > 0)
{
curr_db = db;
}
if (strlen((char *)pwd) > 0)
{
curr_passwd = pwd;
}
final_capabilities = gw_mysql_get_byte4((uint8_t *)&server_capabilities);
/** Copy client's flags to backend */
final_capabilities |= protocol->client_capabilities;
/* get charset the client sent and use it for connection auth */
charset = protocol->charset;
if (compress)
{
final_capabilities |= GW_MYSQL_CAPABILITIES_COMPRESS;
#ifdef DEBUG_MYSQL_CONN
fprintf(stderr, ">>>> Backend Connection with compression\n");
#endif
}
if (curr_passwd != NULL)
{
uint8_t hash1[GW_MYSQL_SCRAMBLE_SIZE]="";
uint8_t hash2[GW_MYSQL_SCRAMBLE_SIZE]="";
uint8_t new_sha[GW_MYSQL_SCRAMBLE_SIZE]="";
/** hash1 is the function input, SHA1(real_password) */
memcpy(hash1, pwd, GW_MYSQL_SCRAMBLE_SIZE);
/**
* hash2 is the SHA1(input data), where
* input_data = SHA1(real_password)
*/
gw_sha1_str(hash1, GW_MYSQL_SCRAMBLE_SIZE, hash2);
/** dbpass is the HEX form of SHA1(SHA1(real_password)) */
gw_bin2hex(dbpass, hash2, GW_MYSQL_SCRAMBLE_SIZE);
/** new_sha is the SHA1(CONCAT(scramble, hash2) */
gw_sha1_2_str(protocol->scramble,
GW_MYSQL_SCRAMBLE_SIZE,
hash2,
GW_MYSQL_SCRAMBLE_SIZE,
new_sha);
/** compute the xor in client_scramble */
gw_str_xor(client_scramble,
new_sha, hash1,
GW_MYSQL_SCRAMBLE_SIZE);
}
if (curr_db == NULL)
{
final_capabilities &= ~GW_MYSQL_CAPABILITIES_CONNECT_WITH_DB;
}
else
{
final_capabilities |= GW_MYSQL_CAPABILITIES_CONNECT_WITH_DB;
}
final_capabilities |= GW_MYSQL_CAPABILITIES_PLUGIN_AUTH;
/**
* Protocol MySQL COM_CHANGE_USER for CLIENT_PROTOCOL_41
* 1 byte COMMAND
*/
bytes = 1;
/** add the user and a terminating char */
bytes += strlen(user);
bytes++;
/**
* next will be + 1 (scramble_len) + 20 (fixed_scramble) +
* (db + NULL term) + 2 bytes charset
*/
if (curr_passwd != NULL)
{
bytes += GW_MYSQL_SCRAMBLE_SIZE;
}
/** 1 byte for scramble_len */
bytes++;
/** db name and terminating char */
if (curr_db != NULL)
{
bytes += strlen(curr_db);
}
bytes++;
/** the charset */
bytes += 2;
bytes += strlen("mysql_native_password");
bytes++;
/** the packet header */
bytes += 4;
buffer = gwbuf_alloc(bytes);
/**
* Set correct type to GWBUF so that it will be handled like session
* commands
*/
buffer->gwbuf_type =
GWBUF_TYPE_MYSQL|GWBUF_TYPE_SINGLE_STMT|GWBUF_TYPE_SESCMD;
payload = GWBUF_DATA(buffer);
memset(payload, '\0', bytes);
payload_start = payload;
/** set packet number to 0 */
payload[3] = 0x00;
payload += 4;
/** set the command COM_CHANGE_USER 0x11 */
payload[0] = 0x11;
payload++;
memcpy(payload, user, strlen(user));
payload += strlen(user);
payload++;
if (curr_passwd != NULL)
{
/** set the auth-length */
*payload = GW_MYSQL_SCRAMBLE_SIZE;
payload++;
/**
* copy the 20 bytes scramble data after
* packet_buffer+36+user+NULL+1 (byte of auth-length)
*/
memcpy(payload, client_scramble, GW_MYSQL_SCRAMBLE_SIZE);
payload += GW_MYSQL_SCRAMBLE_SIZE;
}
else
{
/** skip the auth-length and write a NULL */
payload++;
}
/** if the db is not NULL append it */
if (curr_db != NULL)
{
memcpy(payload, curr_db, strlen(curr_db));
payload += strlen(curr_db);
}
payload++;
/** set the charset, 2 bytes */
*payload = charset;
payload++;
*payload = '\x00';
payload++;
memcpy(payload, "mysql_native_password", strlen("mysql_native_password"));
payload += strlen("mysql_native_password");
payload++;
/** put here the paylod size: bytes to write - 4 bytes packet header */
gw_mysql_set_byte3(payload_start, (bytes-4));
return buffer;
}
/** /**
* Write a MySQL CHANGE_USER packet to backend server * Write a MySQL CHANGE_USER packet to backend server
* *
* @param conn MySQL protocol structure * @param conn MySQL protocol structure
* @param dbname The selected database * @param dbname The selected database
* @param user The selected user * @param user The selected user
* @param passwd The SHA1(real_password): Note real_password is unknown * @param passwd The SHA1(real_password)
* @return 1 on success, 0 on failure * @return 1 on success, 0 on failure
*/ */
int gw_send_change_user_to_backend( int gw_send_change_user_to_backend(
char *dbname, char *dbname,
char *user, char *user,
uint8_t *passwd, uint8_t *passwd,
MySQLProtocol *conn) MySQLProtocol *conn)
{ {
int compress = 0; GWBUF *buffer;
int rv; int rc;
uint8_t *payload = NULL; MYSQL_session* mses;
uint8_t *payload_start = NULL;
long bytes;
uint8_t client_scramble[GW_MYSQL_SCRAMBLE_SIZE];
uint8_t client_capabilities[4];
uint32_t server_capabilities = 0;
uint32_t final_capabilities = 0;
char dbpass[MYSQL_USER_MAXLEN + 1]="";
GWBUF *buffer;
DCB *dcb;
char *curr_db = NULL; mses = (MYSQL_session*)conn->owner_dcb->session->client->data;
uint8_t *curr_passwd = NULL; buffer = gw_create_change_user_packet(mses, conn);
unsigned int charset; rc = conn->owner_dcb->func.write(conn->owner_dcb, buffer);
if (strlen(dbname)) if (rc != 0)
curr_db = dbname; {
rc = 1;
if (strlen((char *)passwd))
curr_passwd = passwd;
dcb = conn->owner_dcb;
final_capabilities = gw_mysql_get_byte4((uint8_t *)&server_capabilities);
/** Copy client's flags to backend */
final_capabilities |= conn->client_capabilities;
/* get charset the client sent and use it for connection auth */
charset = conn->charset;
if (compress) {
final_capabilities |= GW_MYSQL_CAPABILITIES_COMPRESS;
#ifdef DEBUG_MYSQL_CONN
fprintf(stderr, ">>>> Backend Connection with compression\n");
#endif
}
if (curr_passwd != NULL) {
uint8_t hash1[GW_MYSQL_SCRAMBLE_SIZE]="";
uint8_t hash2[GW_MYSQL_SCRAMBLE_SIZE]="";
uint8_t new_sha[GW_MYSQL_SCRAMBLE_SIZE]="";
// hash1 is the function input, SHA1(real_password)
memcpy(hash1, passwd, GW_MYSQL_SCRAMBLE_SIZE);
// hash2 is the SHA1(input data), where input_data = SHA1(real_password)
gw_sha1_str(hash1, GW_MYSQL_SCRAMBLE_SIZE, hash2);
// dbpass is the HEX form of SHA1(SHA1(real_password))
gw_bin2hex(dbpass, hash2, GW_MYSQL_SCRAMBLE_SIZE);
// new_sha is the SHA1(CONCAT(scramble, hash2)
gw_sha1_2_str(conn->scramble, GW_MYSQL_SCRAMBLE_SIZE, hash2, GW_MYSQL_SCRAMBLE_SIZE, new_sha);
// compute the xor in client_scramble
gw_str_xor(client_scramble, new_sha, hash1, GW_MYSQL_SCRAMBLE_SIZE);
}
if (curr_db == NULL) {
// without db
final_capabilities &= ~GW_MYSQL_CAPABILITIES_CONNECT_WITH_DB;
} else {
final_capabilities |= GW_MYSQL_CAPABILITIES_CONNECT_WITH_DB;
}
final_capabilities |= GW_MYSQL_CAPABILITIES_PLUGIN_AUTH;
gw_mysql_set_byte4(client_capabilities, final_capabilities);
// Protocol MySQL COM_CHANGE_USER for CLIENT_PROTOCOL_41
// 1 byte COMMAND
bytes = 1;
// add the user
bytes += strlen(user);
// NULL byte for user string
bytes++;
// next will be + 1 (scramble_len) + 20 (fixed_scramble) + (dbname + NULL term) + 2 bytes charset
if (curr_passwd != NULL) {
bytes += GW_MYSQL_SCRAMBLE_SIZE;
} }
// 1 byte for scramble_len return rc;
bytes++;
if (curr_db != NULL) {
bytes += strlen(curr_db);
}
// NULL byte for dbname string
bytes++;
// the charset
bytes += 2;
bytes += strlen("mysql_native_password");
bytes++;
// the packet header
bytes += 4;
// allocating the GWBUF
buffer = gwbuf_alloc(bytes);
/**
* Set correct type to GWBUF so that it will be handled like session
* commands should
*/
buffer->gwbuf_type = GWBUF_TYPE_MYSQL|GWBUF_TYPE_SINGLE_STMT|GWBUF_TYPE_SESCMD;
payload = GWBUF_DATA(buffer);
// clearing data
memset(payload, '\0', bytes);
// save the start pointer
payload_start = payload;
// set packet # = 1
payload[3] = 0x00;
payload += 4;
// set the command COM_CHANGE_USER \x11
payload[0] = 0x11;
payload++;
memcpy(payload, user, strlen(user));
payload += strlen(user);
payload++;
if (curr_passwd != NULL) {
// set the auth-length
*payload = GW_MYSQL_SCRAMBLE_SIZE;
payload++;
//copy the 20 bytes scramble data after packet_buffer+36+user+NULL+1 (byte of auth-length)
memcpy(payload, client_scramble, GW_MYSQL_SCRAMBLE_SIZE);
payload += GW_MYSQL_SCRAMBLE_SIZE;
} else {
// skip the auth-length and write a NULL
payload++;
}
// if the db is not NULL append it
if (curr_db != NULL) {
memcpy(payload, curr_db, strlen(curr_db));
payload += strlen(curr_db);
payload++;
} else {
// skip the NULL
payload++;
}
// set the charset, 2 bytes!!!!
*payload = charset;
payload++;
*payload = '\x00';
payload++;
memcpy(payload, "mysql_native_password", strlen("mysql_native_password"));
payload += strlen("mysql_native_password");
payload++;
// put here the paylod size: bytes to write - 4 bytes packet header
gw_mysql_set_byte3(payload_start, (bytes-4));
rv = dcb->func.write(dcb, buffer);
if (rv == 0)
return 0;
else
return 1;
} }
/** /**
@ -1762,13 +1790,13 @@ void protocol_archive_srv_command(
} }
s1 = &p->protocol_command; s1 = &p->protocol_command;
#if defined(EXTRA_SS_DEBUG)
LOGIF(LT, (skygw_log_write( LOGIF(LT, (skygw_log_write(
LOGFILE_TRACE, LOGFILE_TRACE,
"Move command %s from fd %d to command history.", "Move command %s from fd %d to command history.",
STRPACKETTYPE(s1->scom_cmd), STRPACKETTYPE(s1->scom_cmd),
p->owner_dcb->fd))); p->owner_dcb->fd)));
#endif
/** Copy to history list */ /** Copy to history list */
if ((h1 = p->protocol_cmd_history) == NULL) if ((h1 = p->protocol_cmd_history) == NULL)
{ {
@ -1846,7 +1874,7 @@ void protocol_add_srv_command(
STRPACKETTYPE(cmd), STRPACKETTYPE(cmd),
p->owner_dcb->fd))); p->owner_dcb->fd)));
#if defined(SS_DEBUG) #if defined(EXTRA_SS_DEBUG)
c = &p->protocol_command; c = &p->protocol_command;
while (c != NULL && c->scom_cmd != MYSQL_COM_UNDEFINED) while (c != NULL && c->scom_cmd != MYSQL_COM_UNDEFINED)

4
server/modules/protocol/telnetd.c
View File

@ -390,9 +390,7 @@ int syseno = 0;
rc = listen(listener->fd, SOMAXCONN); rc = listen(listener->fd, SOMAXCONN);
if (rc == 0) { if (rc == 0) {
fprintf(stderr, LOGIF(LM, (skygw_log_write_flush(LOGFILE_MESSAGE,"Listening telnet connections at %s", config)));
"Listening telnet connections at %s\n",
config);
} else { } else {
int eno = errno; int eno = errno;
errno = 0; errno = 0;

76
server/modules/routing/debugcmd.c
View File

@ -490,6 +490,81 @@ struct subcommand removeoptions[] = {
} }
}; };
/**
* User command to flush a single logfile
*
* @param pdcb The stream to write output to
* @param logname The name of the log
*/
static void
flushlog(DCB *pdcb, char *logname)
{
if (logname == NULL)
{
}
else if (!strcasecmp(logname, "error"))
{
skygw_log_rotate(LOGFILE_ERROR);
}
else if (!strcasecmp(logname, "message"))
{
skygw_log_rotate(LOGFILE_MESSAGE);
}
else if (!strcasecmp(logname, "trace"))
{
skygw_log_rotate(LOGFILE_TRACE);
}
else if (!strcasecmp(logname, "debug"))
{
skygw_log_rotate(LOGFILE_DEBUG);
}
else
{
dcb_printf(pdcb, "Unexpected logfile name, expected "
"error, message, trace oe debug.\n");
}
}
/**
* User command to flush all logfiles
*
* @param pdcb The stream to write output to
*/
static void
flushlogs(DCB *pdcb)
{
skygw_log_rotate(LOGFILE_ERROR);
skygw_log_rotate(LOGFILE_MESSAGE);
skygw_log_rotate(LOGFILE_TRACE);
skygw_log_rotate(LOGFILE_DEBUG);
}
/**
* The subcommands of the flush command
*/
struct subcommand flushoptions[] = {
{
"log",
1,
flushlog,
"Flush the content of a log file, close that log, rename it and open a new log file",
"Flush the content of a log file, close that log, rename it and open a new log file",
{ARG_TYPE_STRING, 0, 0}
},
{
"logs",
0,
flushlogs,
"Flush the content of all log files, close that logs, rename them and open a new log files",
"Flush the content of all log files, close that logs, rename them and open a new log files",
{0, 0, 0}
},
{
NULL, 0, NULL, NULL, NULL, {0, 0, 0}
}
};
/** /**
* The debug command table * The debug command table
@ -505,6 +580,7 @@ static struct {
#if defined(FAKE_CODE) #if defined(FAKE_CODE)
{ "fail", failoptions }, { "fail", failoptions },
#endif /* FAKE_CODE */ #endif /* FAKE_CODE */
{ "flush", flushoptions },
{ "list", listoptions }, { "list", listoptions },
{ "reload", reloadoptions }, { "reload", reloadoptions },
{ "remove", removeoptions }, { "remove", removeoptions },

159
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -267,7 +267,11 @@ static bool handle_error_new_connection(
ROUTER_CLIENT_SES* rses, ROUTER_CLIENT_SES* rses,
DCB* backend_dcb, DCB* backend_dcb,
GWBUF* errmsg); GWBUF* errmsg);
static void handle_error_reply_client(SESSION* ses, GWBUF* errmsg); static void handle_error_reply_client(
SESSION* ses,
ROUTER_CLIENT_SES* rses,
DCB* backend_dcb,
GWBUF* errmsg);
static backend_ref_t* get_root_master_bref(ROUTER_CLIENT_SES* rses); static backend_ref_t* get_root_master_bref(ROUTER_CLIENT_SES* rses);
@ -908,6 +912,10 @@ static void closeSession(
ROUTER_CLIENT_SES* router_cli_ses; ROUTER_CLIENT_SES* router_cli_ses;
backend_ref_t* backend_ref; backend_ref_t* backend_ref;
LOGIF(LD, (skygw_log_write(LOGFILE_DEBUG,
"%lu [RWSplit:closeSession]",
pthread_self())));
/** /**
* router session can be NULL if newSession failed and it is discarding * router session can be NULL if newSession failed and it is discarding
* its connections and DCB's. * its connections and DCB's.
@ -926,18 +934,7 @@ static void closeSession(
if (!router_cli_ses->rses_closed && if (!router_cli_ses->rses_closed &&
rses_begin_locked_router_action(router_cli_ses)) rses_begin_locked_router_action(router_cli_ses))
{ {
int i = 0; int i;
/**
* session must be moved to SESSION_STATE_STOPPING state before
* router session is closed.
*/
#if defined(SS_DEBUG)
SESSION* ses = get_session_by_router_ses((void*)router_cli_ses);
ss_dassert(ses != NULL);
ss_dassert(ses->state == SESSION_STATE_STOPPING);
#endif
/** /**
* This sets router closed. Nobody is allowed to use router * This sets router closed. Nobody is allowed to use router
* whithout checking this first. * whithout checking this first.
@ -948,12 +945,21 @@ static void closeSession(
{ {
backend_ref_t* bref = &backend_ref[i]; backend_ref_t* bref = &backend_ref[i];
DCB* dcb = bref->bref_dcb; DCB* dcb = bref->bref_dcb;
/** Close those which had been connected */ /** Close those which had been connected */
if (BREF_IS_IN_USE(bref)) if (BREF_IS_IN_USE(bref))
{ {
CHK_DCB(dcb); CHK_DCB(dcb);
/** Clean operation counter in bref and in SERVER */ #if defined(SS_DEBUG)
/**
* session must be moved to SESSION_STATE_STOPPING state before
* router session is closed.
*/
if (dcb->session != NULL)
{
ss_dassert(dcb->session->state == SESSION_STATE_STOPPING);
}
#endif
/** Clean operation counter in bref and in SERVER */
while (BREF_IS_WAITING_RESULT(bref)) while (BREF_IS_WAITING_RESULT(bref))
{ {
bref_clear_state(bref, BREF_WAITING_RESULT); bref_clear_state(bref, BREF_WAITING_RESULT);
@ -1172,37 +1178,14 @@ static bool get_dcb(
"for the service %s.", "for the service %s.",
rses->router->service->name))); rses->router->service->name)));
} }
LOGIF(LE, (skygw_log_write_flush(
btype = BE_MASTER; LOGFILE_ERROR,
"Warning : Using master %s:%d.",
if (BREF_IS_IN_USE(master_bref)) master_bref->bref_backend->backend_server->name,
{ master_bref->bref_backend->backend_server->port)));
*p_dcb = master_bref->bref_dcb; btype = BE_MASTER;
succp = true;
ss_dassert(master_bref->bref_dcb->state != DCB_STATE_ZOMBIE);
ss_dassert(
(master_bref->bref_backend &&
(master_bref->bref_backend->backend_server ==
master_bref->bref_backend->backend_server)) &&
smallest_nconn == -1);
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"Using master %s:%d instead.",
master_bref->bref_backend->backend_server->name,
master_bref->bref_backend->backend_server->port)));
}
else
{
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"Error : No master is availabe either. "
"Unable to find backend server for "
"routing.")));
}
} }
/** Found slave, correct the status flag */
else if (rses->router->available_slaves == false) else if (rses->router->available_slaves == false)
{ {
rses->router->available_slaves = true; rses->router->available_slaves = true;
@ -1211,26 +1194,31 @@ static bool get_dcb(
"At least one slave has become available for " "At least one slave has become available for "
"the service %s.", "the service %s.",
rses->router->service->name))); rses->router->service->name)));
goto return_succp;
} }
ss_dassert(succp);
} }
if (btype == BE_MASTER) if (btype == BE_MASTER)
{ {
for (i=0; i<rses->rses_nbackends; i++) if (BREF_IS_IN_USE(master_bref) &&
{ SERVER_IS_MASTER(master_bref->bref_backend->backend_server))
BACKEND* b = backend_ref[i].bref_backend; {
*p_dcb = master_bref->bref_dcb;
if (BREF_IS_IN_USE((&backend_ref[i])) && succp = true;
(master_bref->bref_backend && /** if bref is in use DCB should not be closed */
(b->backend_server == ss_dassert(master_bref->bref_dcb->state != DCB_STATE_ZOMBIE);
master_bref->bref_backend->backend_server))) }
{ else
*p_dcb = backend_ref[i].bref_dcb; {
succp = true; LOGIF(LE, (skygw_log_write_flush(
goto return_succp; LOGFILE_ERROR,
} "Error : Server at %s:%d should be master but "
} "is %s instead and can't be chosen to master.",
master_bref->bref_backend->backend_server->name,
master_bref->bref_backend->backend_server->port,
STRSRVSTATUS(master_bref->bref_backend->backend_server))));
succp = false;
}
} }
return_succp: return_succp:
@ -1685,9 +1673,9 @@ void check_create_tmp_table(
* for buffering the partial query, a later call to the query router will * for buffering the partial query, a later call to the query router will
* contain the remainder, or part thereof of the query. * contain the remainder, or part thereof of the query.
* *
* @param instance The query router instance * @param instance The query router instance
* @param session The session associated with the client * @param router_session The session associated with the client
* @param queue MaxScale buffer queue with the packets received * @param querybuf MaxScale buffer queue with received packet
* *
* @return if succeed 1, otherwise 0 * @return if succeed 1, otherwise 0
* If routeQuery fails, it means that router session has failed. * If routeQuery fails, it means that router session has failed.
@ -4133,24 +4121,28 @@ static void handleError (
"Session will be closed."))); "Session will be closed.")));
*succp = false; *succp = false;
rses_end_locked_router_action(rses);
return;
} }
/** else
* This is called in hope of getting replacement for {
* failed slave(s). /**
*/ * This is called in hope of getting replacement for
*succp = handle_error_new_connection(inst, * failed slave(s).
rses, */
backend_dcb, *succp = handle_error_new_connection(inst,
errmsgbuf); rses,
backend_dcb,
errmsgbuf);
}
rses_end_locked_router_action(rses); rses_end_locked_router_action(rses);
break; break;
} }
case ERRACT_REPLY_CLIENT: case ERRACT_REPLY_CLIENT:
{ {
handle_error_reply_client(session, errmsgbuf); handle_error_reply_client(session,
rses,
backend_dcb,
errmsgbuf);
*succp = false; /*< no new backend servers were made available */ *succp = false; /*< no new backend servers were made available */
break; break;
} }
@ -4163,17 +4155,30 @@ static void handleError (
static void handle_error_reply_client( static void handle_error_reply_client(
SESSION* ses, SESSION* ses,
GWBUF* errmsg) ROUTER_CLIENT_SES* rses,
DCB* backend_dcb,
GWBUF* errmsg)
{ {
session_state_t sesstate; session_state_t sesstate;
DCB* client_dcb; DCB* client_dcb;
backend_ref_t* bref;
spinlock_acquire(&ses->ses_lock); spinlock_acquire(&ses->ses_lock);
sesstate = ses->state; sesstate = ses->state;
client_dcb = ses->client; client_dcb = ses->client;
spinlock_release(&ses->ses_lock); spinlock_release(&ses->ses_lock);
/**
* If bref exists, mark it closed
*/
if ((bref = get_bref_from_dcb(rses, backend_dcb)) != NULL)
{
CHK_BACKEND_REF(bref);
bref_clear_state(bref, BREF_IN_USE);
bref_set_state(bref, BREF_CLOSED);
}
if (sesstate == SESSION_STATE_ROUTER_READY) if (sesstate == SESSION_STATE_ROUTER_READY)
{ {
CHK_DCB(client_dcb); CHK_DCB(client_dcb);
@ -4696,7 +4701,7 @@ static backend_ref_t* get_root_master_bref(
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"Error : Could not find master among the backend " "Error : Could not find master among the backend "
"servers. Previous master state : %s", "servers. Previous master's state : %s",
STRSRVSTATUS(BREFSRV(rses->rses_master_ref))))); STRSRVSTATUS(BREFSRV(rses->rses_master_ref)))));
} }
return candidate_bref; return candidate_bref;

2
server/modules/routing/readwritesplit/test/CMakeLists.txt
View File

@ -1,7 +1,7 @@
add_test(NAME ReadWriteSplitTest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/rwsplit.sh testrwsplit.log ${TEST_HOST} ${TEST_PORT_RW} ${TEST_MASTER_ID} ${TEST_USER} ${TEST_PASSWORD} ${CMAKE_CURRENT_SOURCE_DIR}) add_test(NAME ReadWriteSplitTest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/rwsplit.sh testrwsplit.log ${TEST_HOST} ${TEST_PORT_RW} ${TEST_MASTER_ID} ${TEST_USER} ${TEST_PASSWORD} ${CMAKE_CURRENT_SOURCE_DIR})
if(MYSQLCLIENT_FOUND) if(MYSQLCLIENT_FOUND)
add_test(NAME ReadWriteSplitLoginTest COMMAND $<TARGET_FILE:testconnect> 10000 ${TEST_HOST} ${MASTER_PORT} ${TEST_HOST} ${TEST_PORT_RW} 1.10) add_test(NAME ReadWriteSplitAuthTest COMMAND $<TARGET_FILE:testconnect> 10000 ${TEST_HOST} ${MASTER_PORT} ${TEST_HOST} ${TEST_PORT_RW} 1.10)
endif() endif()
add_subdirectory(test_hints) add_subdirectory(test_hints)

2
server/modules/routing/test/CMakeLists.txt
View File

@ -2,5 +2,5 @@ if(MYSQLCLIENT_FOUND)
add_executable(testconnect testconnect.c) add_executable(testconnect testconnect.c)
message(STATUS "Linking against: ${MYSQLCLIENT_LIBRARIES}") message(STATUS "Linking against: ${MYSQLCLIENT_LIBRARIES}")
target_link_libraries(testconnect ${MYSQLCLIENT_LIBRARIES} ssl crypto dl z m rt pthread) target_link_libraries(testconnect ${MYSQLCLIENT_LIBRARIES} ssl crypto dl z m rt pthread)
add_test(NAME ReadConnRouterLoginTest COMMAND $<TARGET_FILE:testconnect> 10000 ${TEST_HOST} ${MASTER_PORT} ${TEST_HOST} ${TEST_PORT} 1.10) add_test(NAME ReadConnRouterAuthTest COMMAND $<TARGET_FILE:testconnect> 10000 ${TEST_HOST} ${MASTER_PORT} ${TEST_HOST} ${TEST_PORT} 1.10)
endif() endif()