Uncrustify maxscale

See script directory for method. The script to run in the top level
MaxScale directory is called maxscale-uncrustify.sh, which uses
another script, list-src, from the same directory (so you need to set
your PATH). The uncrustify version was 0.66.
This commit is contained in:
Niclas Antti
2018-09-09 22:26:19 +03:00
parent fa7ec95069
commit c447e5cf15
849 changed files with 35002 additions and 27238 deletions

View File

@ -1,12 +1,14 @@
/**
* @file change_user.cpp mysql_change_user test
*
* - using RWSplit and user 'skysql': GRANT SELECT ON test.* TO user@'%' identified by 'pass2'; FLUSH PRIVILEGES;
* - using RWSplit and user 'skysql': GRANT SELECT ON test.* TO user@'%' identified by 'pass2'; FLUSH
*PRIVILEGES;
* - create a new connection to RSplit as 'user'
* - try INSERT expecting 'access denied'
* - call mysql_change_user() to change user to 'skysql'
* - try INSERT again expecting success
* - try to execute mysql_change_user() to switch to user 'user' but use rong password (expecting access denied)
* - try to execute mysql_change_user() to switch to user 'user' but use rong password (expecting access
*denied)
* - try INSERT again expecting success (user should not be changed)
*/
@ -14,9 +16,9 @@
#include <iostream>
#include "testconnections.h"
int main(int argc, char *argv[])
int main(int argc, char* argv[])
{
TestConnections * Test = new TestConnections(argc, argv);
TestConnections* Test = new TestConnections(argc, argv);
Test->set_timeout(60);
Test->repl->connect();
@ -25,36 +27,45 @@ int main(int argc, char *argv[])
Test->tprintf("Creating user 'user' \n");
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->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->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") ,
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->tprintf("Trying INSERT (expecting access denied)... \n");
if ( execute_query(Test->maxscales->conn_rwsplit[0], (char *) "INSERT INTO t1 VALUES (77, 11);") == 0)
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->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->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->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)
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");
}
@ -65,11 +76,15 @@ int main(int argc, char *argv[])
}
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);"),
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)
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");
}
@ -80,11 +95,14 @@ int main(int argc, char *argv[])
}
Test->tprintf("Changing user for ReadConn \n");
Test->add_result(mysql_change_user(Test->maxscales->conn_slave[0], (char *) "user", (char *) "pass2", (char *) "test") ,
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@'%%';");
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);
@ -92,4 +110,3 @@ int main(int argc, char *argv[])
delete Test;
return rval;
}