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

Fix monitor alteration and serialization

Browse Source 
When the monitor credentials were being written with snprintf, the source
and destination overlapped.

The serialization didn't add a 'type=monitor' line into the configuration.
This commit is contained in:
Markus Makela
2016-11-29 16:48:16 +02:00
parent 4c4bd24a40
commit 55f1bbfce6
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/core/monitor.c
View File

@ -397,8 +397,16 @@ void monitorRemoveServer(MONITOR *mon, SERVER *server)
void void
monitorAddUser(MONITOR *mon, char *user, char *passwd) monitorAddUser(MONITOR *mon, char *user, char *passwd)
{ {
snprintf(mon->user, sizeof(mon->user), "%s", user); /** If a pointer to mon->password or mon->user is passed as one of the
snprintf(mon->password, sizeof(mon->password), "%s", passwd); * parameters the destination and source would overlap. Copy the values to
* a local buffer to avoid this. */
char pwd[strlen(passwd) + 1];
char usr[strlen(user) + 1];
strcpy(usr, user);
strcpy(pwd, passwd);
snprintf(mon->user, sizeof(mon->user), "%s", usr);
snprintf(mon->password, sizeof(mon->password), "%s", pwd);
} }
/** /**
@ -1350,6 +1358,7 @@ static bool create_monitor_config(const MONITOR *monitor, const char *filename)
* TODO: Check for return values on all of the dprintf calls * TODO: Check for return values on all of the dprintf calls
*/ */
dprintf(file, "[%s]\n", monitor->name); dprintf(file, "[%s]\n", monitor->name);
dprintf(file, "type=monitor\n");
dprintf(file, "module=%s\n", monitor->module_name); dprintf(file, "module=%s\n", monitor->module_name);
dprintf(file, "user=%s\n", monitor->user); dprintf(file, "user=%s\n", monitor->user);
dprintf(file, "password=%s\n", monitor->password); dprintf(file, "password=%s\n", monitor->password);