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

reload users with db auth failed

Browse Source 
reload users with db auth failed
This commit is contained in:
MassimilianoPinto
2014-10-22 17:56:40 +02:00
parent 6dae7a3c01
commit 8dd20a10e6
1 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -477,29 +477,18 @@ static int gw_mysql_do_authentication(DCB *dcb, GWBUF *queue) {
username, username,
stage1_hash); stage1_hash);
/* On failed auth try to load users' table from backend database */
if (auth_ret != 0) {
if (!service_refresh_users(dcb->service)) {
/* Try authentication again with new repository data */
/* 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);
}
}
/* let's free the auth_token now */
if (auth_token)
free(auth_token);
/* check for dabase name and possible match in resource hashtable */
if (database && strlen(database)) { if (database && strlen(database)) {
/* if database names are loaded we can check if db name exists */ /* if database names are loaded we can check if db name exists */
if (dcb->service->resources) { if (dcb->service->resources != NULL) {
if (hashtable_fetch(dcb->service->resources, database)) { if (hashtable_fetch(dcb->service->resources, database)) {
db_exists = 1; db_exists = 1;
} else { } else {
db_exists = 0; db_exists = 0;
} }
} else { } else {
/* if database names are not loaded we don't allow connection */ /* if database names are not loaded we don't allow connection with db name*/
db_exists = -1; db_exists = -1;
} }
@ -512,10 +501,47 @@ static int gw_mysql_do_authentication(DCB *dcb, GWBUF *queue) {
} }
} }
if (auth_ret == 0) /* On failed auth try to load users' table from backend database */
{ if (auth_ret != 0) {
if (!service_refresh_users(dcb->service)) {
/* Try authentication again with new repository data */
/* 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);
}
}
/* Do again the database check */
/* check for dabase name and possible match in resource hashtable */
if (database && strlen(database)) {
/* if database names are loaded we can check if db name exists */
if (dcb->service->resources != NULL) {
if (hashtable_fetch(dcb->service->resources, database)) {
db_exists = 1;
} else {
db_exists = 0;
}
} else {
/* if database names are not loaded we don't allow connection with db name*/
db_exists = -1;
}
if (db_exists == 0 && auth_ret == 0) {
auth_ret = 2;
}
if (db_exists < 0 && auth_ret == 0) {
auth_ret = 1;
}
}
if (auth_ret == 0) {
dcb->user = strdup(client_data->user); dcb->user = strdup(client_data->user);
} }
/* let's free the auth_token now */
if (auth_token) {
free(auth_token);
}
return auth_ret; return auth_ret;
} }