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

MXS-1661 Now only the time affects the reloading of users

Browse Source 
Now the users will be reloaded at most once during each
USERS_REFRESH_TIME period. Earlier they could be reloaded at
at most USERS_REFRESH_MAX_PER_TIME times, which in practice meant
that with repeated unauthorized login attempts they were reloaded
N times in rapid succession, without the situation being likely to
change in between.
This commit is contained in:
Johan Wikman
2018-02-09 10:18:20 +02:00
parent b23ad6d2ef
commit ae160f3ff2
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/core/service.c
View File

@ -340,7 +340,6 @@ serviceStartPort(SERVICE *service, SERV_LISTENER *port)
* could try reloading users just after startup.
*/
service->rate_limit.last = time(NULL) - USERS_REFRESH_TIME;
service->rate_limit.nloads = 1;
service->rate_limit.warned = false;
if (port->listener->func.listen(port->listener, config_bind))
@ -1615,8 +1614,7 @@ int service_refresh_users(SERVICE *service)
time_t now = time(NULL);
/* Check if refresh rate limit has been exceeded */
if ((now < service->rate_limit.last + USERS_REFRESH_TIME) ||
(service->rate_limit.nloads > USERS_REFRESH_MAX_PER_TIME))
if (now < service->rate_limit.last + USERS_REFRESH_TIME)
{
if (!service->rate_limit.warned)
{
@ -1626,15 +1624,8 @@ int service_refresh_users(SERVICE *service)
}
else
{
service->rate_limit.nloads++;
/** If we have reached the limit on users refreshes, reset refresh time and count */
if (service->rate_limit.nloads > USERS_REFRESH_MAX_PER_TIME)
{
service->rate_limit.nloads = 1;
service->rate_limit.last = now;
service->rate_limit.warned = false;
}
service->rate_limit.last = now;
service->rate_limit.warned = false;
ret = 0;