Merge branch '2.1' into 2.2

maxscale-system-test/CMakeLists.txt

@@ -490,6 +490,10 @@ add_test_executable(mxs1418.cpp mxs1418 replication LABELS maxscale REPL_BACKEND
 # https://jira.mariadb.org/browse/MXS-1295
 add_test_executable(mxs1295_sp_call.cpp mxs1295_sp_call mxs1295 LABELS maxscale REPL_BACKEND)
 
+# MXS-1451: Password is not stored with skip_authentication=true
+# https://jira.mariadb.org/browse/MXS-1451
+add_test_executable(mxs1451_skip_auth.cpp mxs1451_skip_auth mxs1451_skip_auth LABELS maxscale REPL_BACKEND)
+
 # 'namedserverfilter' test
 add_test_executable(namedserverfilter.cpp namedserverfilter namedserverfilter LABELS namedserverfilter LIGHT REPL_BACKEND)
 

maxscale-system-test/cnf/maxscale.cnf.template.mxs1451_skip_auth

@@ -0,0 +1,89 @@
+[maxscale]
+threads=###threads###
+
+[MySQL Monitor]
+type=monitor
+module=mysqlmon
+###repl51###
+servers=server1,server2,server3,server4
+user=maxskysql
+passwd=skysql
+monitor_interval=1000
+
+[RW Split Router]
+type=service
+router=readwritesplit
+servers=server1,server2,server3,server4
+user=maxskysql
+passwd=skysql
+
+[Read Connection Router Slave]
+type=service
+router=readconnroute
+router_options=slave
+servers=server1,server2,server3,server4
+user=maxskysql
+passwd=skysql
+
+[Read Connection Router Master]
+type=service
+router=readconnroute
+router_options=master
+servers=server1,server2,server3,server4
+user=maxskysql
+passwd=skysql
+
+[RW Split Listener]
+type=listener
+service=RW Split Router
+protocol=MySQLClient
+port=4006
+authenticator_options=skip_authentication=true
+
+[Read Connection Listener Slave]
+type=listener
+service=Read Connection Router Slave
+protocol=MySQLClient
+port=4009
+authenticator_options=skip_authentication=true
+
+[Read Connection Listener Master]
+type=listener
+service=Read Connection Router Master
+protocol=MySQLClient
+port=4008
+authenticator_options=skip_authentication=true
+
+[CLI]
+type=service
+router=cli
+
+[CLI Listener]
+type=listener
+service=CLI
+protocol=maxscaled
+socket=default
+
+[server1]
+type=server
+address=###node_server_IP_1###
+port=###node_server_port_1###
+protocol=MySQLBackend
+
+[server2]
+type=server
+address=###node_server_IP_2###
+port=###node_server_port_2###
+protocol=MySQLBackend
+
+[server3]
+type=server
+address=###node_server_IP_3###
+port=###node_server_port_3###
+protocol=MySQLBackend
+
+[server4]
+type=server
+address=###node_server_IP_4###
+port=###node_server_port_4###
+protocol=MySQLBackend

maxscale-system-test/mxs1451_skip_auth.cpp

@@ -0,0 +1,62 @@
+/**
+ * MXS-1451: Password is not stored with skip_authentication=true
+ *
+ * Check that connection through MaxScale work even if authentication is disabled
+ */
+
+#include "testconnections.h"
+
+int main(int argc, char *argv[])
+{
+    TestConnections test(argc, argv);
+
+    test.set_timeout(60);
+    test.tprintf("Creating users");
+    test.repl->connect();
+    execute_query(test.repl->nodes[0], "CREATE USER 'auth_test'@'%s' IDENTIFIED BY 'test'", test.maxscale_ip());
+    execute_query(test.repl->nodes[0], "GRANT ALL ON *.* to 'auth_test'@'%s'", test.maxscale_ip());
+    execute_query(test.repl->nodes[0], "CREATE USER 'auth_test_nopw'@'%s'", test.maxscale_ip());
+    execute_query(test.repl->nodes[0], "GRANT ALL ON *.* to 'auth_test_nopw'@'%s'", test.maxscale_ip());
+    test.repl->sync_slaves();
+    test.repl->close_connections();
+
+    test.tprintf("Trying to connect through MaxScale");
+
+    test.set_timeout(60);
+    test.tprintf("... with correct credentials");
+    MYSQL* conn = open_conn_db(test.rwsplit_port, test.maxscale_ip(), "test", "auth_test", "test", false);
+    test.try_query(conn, "SHOW DATABASES");
+    mysql_close(conn);
+
+    test.set_timeout(60);
+    test.tprintf("... without a password");
+    conn = open_conn_db(test.rwsplit_port, test.maxscale_ip(), "test", "auth_test_nopw", "", false);
+    test.try_query(conn, "SHOW DATABASES");
+    mysql_close(conn);
+
+    test.set_timeout(60);
+    test.tprintf("... with wrong password");
+    conn = open_conn_db(test.rwsplit_port, test.maxscale_ip(), "test", "auth_test", "wrong_password", false);
+    test.add_result(mysql_errno(conn) == 0, "Connection with wrong password should fail");
+    mysql_close(conn);
+
+    test.set_timeout(60);
+    test.tprintf("... with a password for user without a password");
+    conn = open_conn_db(test.rwsplit_port, test.maxscale_ip(), "test", "auth_test_nopw", "test", false);
+    test.add_result(mysql_errno(conn) == 0, "Connection with wrong password to user without a password should fail");
+    mysql_close(conn);
+
+    test.tprintf("... with bad credentials");
+    conn = open_conn_db(test.rwsplit_port, test.maxscale_ip(), "test", "wrong_user", "wrong_password", false);
+    test.add_result(mysql_errno(conn) == 0, "Connection with bad credentials should fail");
+    mysql_close(conn);
+
+    test.set_timeout(60);
+    test.tprintf("Dropping users");
+    test.repl->connect();
+    execute_query(test.repl->nodes[0], "DROP USER 'auth_test'@'%s'", test.maxscale_ip());
+    execute_query(test.repl->nodes[0], "DROP USER 'auth_test_nopw'@'%s'", test.maxscale_ip());
+    test.repl->close_connections();
+
+    return test.global_result;
+}