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

Reorder SQL statements when persisting users

Browse Source 
The statements are now executed in a more controlled order and a failure
of one will skip the others. The transaction is also rolled back if it
fails.
This commit is contained in:
Markus Mäkelä
2017-01-30 16:09:31 +02:00
parent 7ad7536b57
commit 9a80e1cd5b
1 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
server/modules/authenticator/MySQLAuth/dbusers.c
View File

@ -282,8 +282,9 @@ bool validate_mysql_user(sqlite3 *handle, DCB *dcb, MYSQL_session *session,
* *
* @param handle SQLite handle * @param handle SQLite handle
*/ */
static void delete_mysql_users(sqlite3 *handle) static bool delete_mysql_users(sqlite3 *handle)
{ {
bool rval = true;
char *err; char *err;
if (sqlite3_exec(handle, delete_users_query, NULL, NULL, &err) != SQLITE_OK || if (sqlite3_exec(handle, delete_users_query, NULL, NULL, &err) != SQLITE_OK ||
@ -291,7 +292,10 @@ static void delete_mysql_users(sqlite3 *handle)
{ {
MXS_ERROR("Failed to delete old users: %s", err); MXS_ERROR("Failed to delete old users: %s", err);
sqlite3_free(err); sqlite3_free(err);
rval = false;
} }
return rval;
} }
void add_mysql_user(sqlite3 *handle, const char *user, const char *host, void add_mysql_user(sqlite3 *handle, const char *user, const char *host,
@ -568,30 +572,45 @@ static bool transfer_table_contents(sqlite3 *src, sqlite3 *dest)
sqlite3_free(err); sqlite3_free(err);
rval = false; rval = false;
} }
else if (sqlite3_exec(dest, "BEGIN", NULL, NULL, &err) != SQLITE_OK)
if (sqlite3_exec(dest, "BEGIN", NULL, NULL, &err) != SQLITE_OK)
{ {
MXS_ERROR("Failed to start transaction: %s", err); MXS_ERROR("Failed to start transaction: %s", err);
sqlite3_free(err); sqlite3_free(err);
rval = false; rval = false;
} }
else
/** Replace the data */ {
if (sqlite3_exec(src, dump_users_query, dump_user_cb, dest, &err) != SQLITE_OK || /** Transaction is open */
if (!delete_mysql_users(dest))
{
rval = false;
}
else if (sqlite3_exec(src, dump_users_query, dump_user_cb, dest, &err) != SQLITE_OK ||
sqlite3_exec(src, dump_databases_query, dump_database_cb, dest, &err) != SQLITE_OK) sqlite3_exec(src, dump_databases_query, dump_database_cb, dest, &err) != SQLITE_OK)
{ {
MXS_ERROR("Failed to load database contents: %s", err); MXS_ERROR("Failed to load database contents: %s", err);
sqlite3_free(err); sqlite3_free(err);
rval = false; rval = false;
} }
if (rval)
{
if (sqlite3_exec(dest, "COMMIT", NULL, NULL, &err) != SQLITE_OK) if (sqlite3_exec(dest, "COMMIT", NULL, NULL, &err) != SQLITE_OK)
{ {
MXS_ERROR("Failed to commit transaction: %s", err); MXS_ERROR("Failed to commit transaction: %s", err);
sqlite3_free(err); sqlite3_free(err);
rval = false; rval = false;
} }
}
else
{
if (sqlite3_exec(dest, "ROLLBACK", NULL, NULL, &err) != SQLITE_OK)
{
MXS_ERROR("Failed to rollback transaction: %s", err);
sqlite3_free(err);
rval = false;
}
}
}
return rval; return rval;
} }