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

Merge branch '2.2' into 2.3

Browse Source
This commit is contained in:
Markus Mäkelä
2018-11-06 21:12:20 +02:00
parent c3c257719d a9041a74f1
commit 383b0b1989
16 changed files with 232 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
maxscale-system-test/change_user.cpp
View File

@ -12,101 +12,58 @@
* - try INSERT again expecting success (user should not be changed)
*/
#include <iostream>
#include "testconnections.h"
int main(int argc, char* argv[])
void run_test(TestConnections& test, MYSQL* conn)
{
TestConnections* Test = new TestConnections(argc, argv);
Test->set_timeout(60);
test.expect(mysql_change_user(conn, "user", "pass2", "test") == 0,
"changing user failed: %s", mysql_error(conn));
Test->repl->connect();
Test->maxscales->connect_maxscale(0);
test.expect(execute_query_silent(conn, "INSERT INTO t1 VALUES (77, 11);") != 0,
"INSERT query succeeded without INSERT privilege");
Test->tprintf("Creating user 'user' \n");
test.expect(mysql_change_user(conn, test.repl->user_name, test.repl->password, "test") == 0,
"changing user failed: %s", mysql_error(conn));
execute_query(Test->maxscales->conn_rwsplit[0], "DROP USER 'user'@'%%'");
Test->try_query(Test->maxscales->conn_rwsplit[0], (char*) "CREATE USER user@'%%' identified by 'pass2'");
Test->try_query(Test->maxscales->conn_rwsplit[0], (char*) "GRANT SELECT ON test.* TO user@'%%'");
Test->try_query(Test->maxscales->conn_rwsplit[0], (char*) "FLUSH PRIVILEGES;");
Test->try_query(Test->maxscales->conn_rwsplit[0], (char*) "DROP TABLE IF EXISTS t1");
Test->try_query(Test->maxscales->conn_rwsplit[0], (char*) "CREATE TABLE t1 (x1 int, fl int)");
test.expect(execute_query_silent(conn, "INSERT INTO t1 VALUES (77, 11);") == 0,
"INSERT query succeeded without INSERT privilege");
Test->maxscales->restart_maxscale();
sleep(2);
Test->maxscales->connect_maxscale(0);
Test->tprintf("Changing user... \n");
Test->add_result(mysql_change_user(Test->maxscales->conn_rwsplit[0],
(char*) "user",
(char*) "pass2",
(char*) "test"),
"changing user failed \n");
Test->tprintf("mysql_error is %s\n", mysql_error(Test->maxscales->conn_rwsplit[0]));
test.expect(mysql_change_user(conn, "user", "wrong_pass2", "test") != 0,
"changing user with wrong password successed!");
Test->tprintf("Trying INSERT (expecting access denied)... \n");
if (execute_query(Test->maxscales->conn_rwsplit[0], (char*) "INSERT INTO t1 VALUES (77, 11);") == 0)
{
Test->add_result(1, "INSERT query succedded to user which does not have INSERT PRIVILEGES\n");
}
test.expect(strstr(mysql_error(conn), "Access denied for user"),
"Wrong error message returned on failed authentication");
Test->tprintf("Changing user back... \n");
Test->add_result(mysql_change_user(Test->maxscales->conn_rwsplit[0],
Test->repl->user_name,
Test->repl->password,
(char*) "test"),
"changing user failed \n");
Test->tprintf("Trying INSERT (expecting success)... \n");
Test->try_query(Test->maxscales->conn_rwsplit[0], (char*) "INSERT INTO t1 VALUES (77, 12);");
Test->tprintf("Changing user with wrong password... \n");
if (mysql_change_user(Test->maxscales->conn_rwsplit[0],
(char*) "user",
(char*) "wrong_pass2",
(char*) "test") == 0)
{
Test->add_result(1, "changing user with wrong password successed! \n");
}
Test->tprintf("%s\n", mysql_error(Test->maxscales->conn_rwsplit[0]));
if ((strstr(mysql_error(Test->maxscales->conn_rwsplit[0]), "Access denied for user")) == NULL)
{
Test->add_result(1, "There is no proper error message\n");
}
Test->tprintf("Trying INSERT again (expecting failure - change user should have failed)...");
Test->add_result(!execute_query(Test->maxscales->conn_rwsplit[0],
(char*) "INSERT INTO t1 VALUES (77, 13);"),
"Query should fail, MaxScale should disconnect on auth failure");
Test->tprintf("Changing user with wrong password using ReadConn \n");
if (mysql_change_user(Test->maxscales->conn_slave[0],
(char*) "user",
(char*) "wrong_pass2",
(char*) "test") == 0)
{
Test->add_result(1, "FAILED: changing user with wrong password successed! \n");
}
Test->tprintf("%s\n", mysql_error(Test->maxscales->conn_slave[0]));
if ((strstr(mysql_error(Test->maxscales->conn_slave[0]), "Access denied for user")) == NULL)
{
Test->add_result(1, "There is no proper error message\n");
}
Test->tprintf("Changing user for ReadConn \n");
Test->add_result(mysql_change_user(Test->maxscales->conn_slave[0],
(char*) "user",
(char*) "pass2",
(char*) "test"),
"changing user failed \n");
Test->maxscales->connect_maxscale(0);
Test->try_query(Test->maxscales->conn_rwsplit[0], (char*) "DROP USER user@'%%';");
execute_query_silent(Test->maxscales->conn_rwsplit[0], "DROP TABLE test.t1");
Test->maxscales->close_maxscale_connections(0);
int rval = Test->global_result;
delete Test;
return rval;
test.expect(execute_query_silent(conn, "INSERT INTO t1 VALUES (77, 11);") != 0,
"Query should fail, MaxScale should disconnect on auth failure");
}
int main(int argc, char *argv[])
{
TestConnections test(argc, argv);
test.repl->connect();
execute_query(test.repl->nodes[0], "DROP USER 'user'@'%%'");
test.try_query(test.repl->nodes[0], "CREATE USER user@'%%' identified by 'pass2'");
test.try_query(test.repl->nodes[0], "GRANT SELECT ON test.* TO user@'%%'");
test.try_query(test.repl->nodes[0], "FLUSH PRIVILEGES;");
test.try_query(test.repl->nodes[0], "DROP TABLE IF EXISTS t1");
test.try_query(test.repl->nodes[0], "CREATE TABLE t1 (x1 int, fl int)");
test.repl->sync_slaves();
test.repl->disconnect();
test.maxscales->connect();
test.tprintf("Testing readwritesplit");
run_test(test, test.maxscales->conn_rwsplit[0]);
test.tprintf("Testing readconnroute");
run_test(test, test.maxscales->conn_master[0]);
test.maxscales->disconnect();
test.repl->connect();
execute_query_silent(test.repl->nodes[0], "DROP USER user@'%%';");
execute_query_silent(test.repl->nodes[0], "DROP TABLE test.t1");
test.repl->disconnect();
return test.global_result;
}