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

MXS-1929: Prevent alterations to filters and servers

Browse Source 
These parameters must not be altered at runtime via the `alter service` or
`alter monitor` commands.
This commit is contained in:
Markus Mäkelä
2018-08-21 11:53:41 +03:00
parent 73401837fd
commit 276ff70506
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/core/config_runtime.cc
View File

@ -522,6 +522,11 @@ bool runtime_alter_monitor(MXS_MONITOR *monitor, const char *key, const char *va
{ {
return false; return false;
} }
else if (strcmp(key, "servers") == 0)
{
config_runtime_error("Parameter '%s' cannot be altered via this method", key);
return false;
}
mxs::SpinLockGuard guard(crt_lock); mxs::SpinLockGuard guard(crt_lock);
monitor_stop(monitor); monitor_stop(monitor);
@ -604,15 +609,20 @@ bool runtime_alter_monitor(MXS_MONITOR *monitor, const char *key, const char *va
bool runtime_alter_service(Service *service, const char* zKey, const char* zValue) bool runtime_alter_service(Service *service, const char* zKey, const char* zValue)
{ {
const MXS_MODULE* mod = get_module(service->routerModule, MODULE_ROUTER); const MXS_MODULE* mod = get_module(service->routerModule, MODULE_ROUTER);
std::string key(zKey);
std::string value(zValue);
if (!validate_param(config_service_params, mod->parameters, zKey, zValue)) if (!validate_param(config_service_params, mod->parameters, zKey, zValue))
{ {
return false; return false;
} }
else if (key == "filters" || key == "servers")
{
config_runtime_error("Parameter '%s' cannot be altered via this method", zKey);
return false;
}
mxs::SpinLockGuard guard(crt_lock); mxs::SpinLockGuard guard(crt_lock);
std::string key(zKey);
std::string value(zValue);
bool rval = true; bool rval = true;
if (service->is_basic_parameter(key)) if (service->is_basic_parameter(key))