MXS-2274 Prevent dynamic creation of object with invalid name
Unfortunately there is not a single place where the name could be validated, but it has to be done separately for each object type.
This commit is contained in:
@ -210,12 +210,15 @@ bool runtime_create_server(const char* name,
|
|||||||
const char* port,
|
const char* port,
|
||||||
const char* protocol,
|
const char* protocol,
|
||||||
const char* authenticator,
|
const char* authenticator,
|
||||||
bool serialize)
|
bool external)
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> guard(crt_lock);
|
std::lock_guard<std::mutex> guard(crt_lock);
|
||||||
bool rval = false;
|
bool rval = false;
|
||||||
|
|
||||||
if (Server::find_by_unique_name(name) == NULL)
|
if (Server::find_by_unique_name(name) == NULL)
|
||||||
|
{
|
||||||
|
std::string reason;
|
||||||
|
if (!external || config_is_valid_name(name, &reason))
|
||||||
{
|
{
|
||||||
if (protocol == NULL)
|
if (protocol == NULL)
|
||||||
{
|
{
|
||||||
@ -245,7 +248,7 @@ bool runtime_create_server(const char* name,
|
|||||||
|
|
||||||
Server* server = Server::server_alloc(name, ctx.parameters);
|
Server* server = Server::server_alloc(name, ctx.parameters);
|
||||||
|
|
||||||
if (server && (!serialize || server->serialize()))
|
if (server && (!external || server->serialize()))
|
||||||
{
|
{
|
||||||
rval = true;
|
rval = true;
|
||||||
MXS_NOTICE("Created server '%s' at %s:%u",
|
MXS_NOTICE("Created server '%s' at %s:%u",
|
||||||
@ -255,7 +258,8 @@ bool runtime_create_server(const char* name,
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
config_runtime_error("Failed to create server '%s', see error log for more details", name);
|
config_runtime_error("Failed to create server '%s', see error log for more details",
|
||||||
|
name);
|
||||||
}
|
}
|
||||||
|
|
||||||
config_parameter_free(ctx.parameters);
|
config_parameter_free(ctx.parameters);
|
||||||
@ -266,6 +270,11 @@ bool runtime_create_server(const char* name,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
config_runtime_error("%s", reason.c_str());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
config_runtime_error("Server '%s' already exists", name);
|
config_runtime_error("Server '%s' already exists", name);
|
||||||
}
|
}
|
||||||
@ -1071,6 +1080,7 @@ bool runtime_create_listener(Service* service,
|
|||||||
bool rval = false;
|
bool rval = false;
|
||||||
|
|
||||||
std::lock_guard<std::mutex> guard(crt_lock);
|
std::lock_guard<std::mutex> guard(crt_lock);
|
||||||
|
std::string reason;
|
||||||
|
|
||||||
if (listener_find(name))
|
if (listener_find(name))
|
||||||
{
|
{
|
||||||
@ -1080,7 +1090,7 @@ bool runtime_create_listener(Service* service,
|
|||||||
{
|
{
|
||||||
config_runtime_error("Listener '%s' already listens on [%s]:%u", l->name(), addr, u_port);
|
config_runtime_error("Listener '%s' already listens on [%s]:%u", l->name(), addr, u_port);
|
||||||
}
|
}
|
||||||
else
|
else if (config_is_valid_name(name, &reason))
|
||||||
{
|
{
|
||||||
SSL_LISTENER* ssl = NULL;
|
SSL_LISTENER* ssl = NULL;
|
||||||
|
|
||||||
@ -1126,6 +1136,10 @@ bool runtime_create_listener(Service* service,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
config_runtime_error("%s", reason.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
return rval;
|
return rval;
|
||||||
}
|
}
|
||||||
@ -1180,14 +1194,14 @@ bool runtime_create_monitor(const char* name, const char* module)
|
|||||||
|
|
||||||
if (monitor_find(name) == NULL)
|
if (monitor_find(name) == NULL)
|
||||||
{
|
{
|
||||||
|
|
||||||
Monitor* monitor = monitor_repurpose_destroyed(name, module);
|
Monitor* monitor = monitor_repurpose_destroyed(name, module);
|
||||||
|
std::string reason;
|
||||||
|
|
||||||
if (monitor)
|
if (monitor)
|
||||||
{
|
{
|
||||||
MXS_DEBUG("Repurposed monitor '%s'", name);
|
MXS_DEBUG("Repurposed monitor '%s'", name);
|
||||||
}
|
}
|
||||||
else
|
else if (config_is_valid_name(name, &reason))
|
||||||
{
|
{
|
||||||
MXS_CONFIG_PARAMETER* params;
|
MXS_CONFIG_PARAMETER* params;
|
||||||
bool ok;
|
bool ok;
|
||||||
@ -1203,6 +1217,10 @@ bool runtime_create_monitor(const char* name, const char* module)
|
|||||||
config_parameter_free(params);
|
config_parameter_free(params);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
config_runtime_error("%s", reason.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
if (monitor)
|
if (monitor)
|
||||||
{
|
{
|
||||||
@ -1238,6 +1256,10 @@ bool runtime_create_filter(const char* name, const char* module, MXS_CONFIG_PARA
|
|||||||
tie(ok, ctx.parameters) = load_defaults(module, MODULE_FILTER, CN_FILTER);
|
tie(ok, ctx.parameters) = load_defaults(module, MODULE_FILTER, CN_FILTER);
|
||||||
|
|
||||||
if (ok)
|
if (ok)
|
||||||
|
{
|
||||||
|
std::string reason;
|
||||||
|
|
||||||
|
if (config_is_valid_name(name, &reason))
|
||||||
{
|
{
|
||||||
for (MXS_CONFIG_PARAMETER* p = params; p; p = p->next)
|
for (MXS_CONFIG_PARAMETER* p = params; p; p = p->next)
|
||||||
{
|
{
|
||||||
@ -1251,6 +1273,11 @@ bool runtime_create_filter(const char* name, const char* module, MXS_CONFIG_PARA
|
|||||||
|
|
||||||
config_parameter_free(ctx.parameters);
|
config_parameter_free(ctx.parameters);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
config_runtime_error("%s", reason.c_str());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (filter)
|
if (filter)
|
||||||
{
|
{
|
||||||
@ -1307,6 +1334,9 @@ static bool runtime_create_service(const char* name, const char* router, MXS_CON
|
|||||||
tie(ok, ctx.parameters) = load_defaults(router, MODULE_ROUTER, CN_SERVICE);
|
tie(ok, ctx.parameters) = load_defaults(router, MODULE_ROUTER, CN_SERVICE);
|
||||||
|
|
||||||
if (ok)
|
if (ok)
|
||||||
|
{
|
||||||
|
std::string reason;
|
||||||
|
if (config_is_valid_name(name, &reason))
|
||||||
{
|
{
|
||||||
for (MXS_CONFIG_PARAMETER* p = params; p; p = p->next)
|
for (MXS_CONFIG_PARAMETER* p = params; p; p = p->next)
|
||||||
{
|
{
|
||||||
@ -1320,6 +1350,11 @@ static bool runtime_create_service(const char* name, const char* router, MXS_CON
|
|||||||
|
|
||||||
config_parameter_free(ctx.parameters);
|
config_parameter_free(ctx.parameters);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
config_runtime_error("%s", reason.c_str());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (service)
|
if (service)
|
||||||
{
|
{
|
||||||
|
@ -51,6 +51,8 @@ void config_runtime_error(const char* fmt, ...) mxs_attribute((format (printf, 1
|
|||||||
* @param port Network port
|
* @param port Network port
|
||||||
* @param protocol Protocol module name
|
* @param protocol Protocol module name
|
||||||
* @param authenticator Authenticator module name
|
* @param authenticator Authenticator module name
|
||||||
|
* @param external If true, the name will be validated and the created server
|
||||||
|
* serialized.
|
||||||
* @return True on success, false if an error occurred
|
* @return True on success, false if an error occurred
|
||||||
*/
|
*/
|
||||||
bool runtime_create_server(const char* name,
|
bool runtime_create_server(const char* name,
|
||||||
@ -58,7 +60,7 @@ bool runtime_create_server(const char* name,
|
|||||||
const char* port,
|
const char* port,
|
||||||
const char* protocol,
|
const char* protocol,
|
||||||
const char* authenticator,
|
const char* authenticator,
|
||||||
bool serialize = true);
|
bool external = true);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Destroy a server
|
* @brief Destroy a server
|
||||||
|
Reference in New Issue
Block a user