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

MXS-1929: Output const strings from serviceGetUser

Browse Source 
The values aren't meant to be modified by the caller.
This commit is contained in:
Markus Mäkelä
2018-08-02 23:01:44 +03:00
parent 7d6338d65b
commit b20decfe1c
10 changed files with 60 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/modules/authenticator/MySQLAuth/dbusers.cc
View File

@ -727,14 +727,10 @@ bool check_service_permissions(SERVICE* service)
return true;
}
char *user, *password;
const char* user;
const char* password;
if (serviceGetUser(service, &user, &password) == 0)
{
MXS_ERROR("[%s] Service is missing the user credentials for authentication.",
service->name);
return false;
}
serviceGetUser(service, &user, &password);
char *dpasswd = decrypt_password(password);
bool rval = false;
@ -919,14 +915,11 @@ int get_users_from_server(MYSQL *con, SERVER_REF *server_ref, SERVICE *service,
*/
static int get_users(SERV_LISTENER *listener, bool skip_local)
{
char *service_user = NULL;
char *service_passwd = NULL;
const char *service_user = NULL;
const char *service_passwd = NULL;
SERVICE *service = listener->service;
if (serviceGetUser(service, &service_user, &service_passwd) == 0)
{
return -1;
}
serviceGetUser(service, &service_user, &service_passwd);
char *dpwd = decrypt_password(service_passwd);

39
server/modules/authenticator/MySQLAuth/mysql_auth.cc
View File

@ -540,37 +540,32 @@ mysql_auth_free_client_data(DCB *dcb)
*/
static bool add_service_user(SERV_LISTENER *port)
{
char *user = NULL;
char *pw = NULL;
const char *user = NULL;
const char *password = NULL;
bool rval = false;
if (serviceGetUser(port->service, &user, &pw))
serviceGetUser(port->service, &user, &password);
char* pw;
if ((pw = decrypt_password(password)))
{
pw = decrypt_password(pw);
char *newpw = create_hex_sha1_sha1_passwd(pw);
if (pw)
if (newpw)
{
char *newpw = create_hex_sha1_sha1_passwd(pw);
if (newpw)
{
MYSQL_AUTH *inst = (MYSQL_AUTH*)port->auth_instance;
sqlite3* handle = get_handle(inst);
add_mysql_user(handle, user, "%", "", "Y", newpw);
add_mysql_user(handle, user, "localhost", "", "Y", newpw);
MXS_FREE(newpw);
rval = true;
}
MXS_FREE(pw);
}
else
{
MXS_ERROR("[%s] Failed to decrypt service user password.", port->service->name);
MYSQL_AUTH *inst = (MYSQL_AUTH*)port->auth_instance;
sqlite3* handle = get_handle(inst);
add_mysql_user(handle, user, "%", "", "Y", newpw);
add_mysql_user(handle, user, "localhost", "", "Y", newpw);
MXS_FREE(newpw);
rval = true;
}
MXS_FREE(pw);
}
else
{
MXS_ERROR("[%s] Failed to retrieve service credentials.", port->service->name);
MXS_ERROR("[%s] Failed to decrypt service user password.", port->service->name);
}
return rval;