MXS-1167: Skip permission checks for internal services
If a server points to a local MaxScale listener, the permission checks for that server are skipped. This allows permission checks to be used with a mix of external servers and internal services.
This commit is contained in:
@ -1341,3 +1341,22 @@ void server_clear_status(SERVER *server, int bit)
|
||||
}
|
||||
spinlock_release(&server->lock);
|
||||
}
|
||||
|
||||
bool server_is_mxs_service(const SERVER *server)
|
||||
{
|
||||
bool rval = false;
|
||||
|
||||
/** Do a coarse check for local server pointing to a MaxScale service */
|
||||
if (strcmp(server->name, "127.0.0.1") == 0 ||
|
||||
strcmp(server->name, "::1") == 0 ||
|
||||
strcmp(server->name, "localhost") == 0 ||
|
||||
strcmp(server->name, "localhost.localdomain") == 0)
|
||||
{
|
||||
if (service_port_is_used(server->port))
|
||||
{
|
||||
rval = true;
|
||||
}
|
||||
}
|
||||
|
||||
return rval;
|
||||
}
|
||||
|
@ -2296,3 +2296,29 @@ void service_print_users(DCB *dcb, const SERVICE *service)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool service_port_is_used(unsigned short port)
|
||||
{
|
||||
bool rval = false;
|
||||
spinlock_acquire(&service_spin);
|
||||
|
||||
for (SERVICE *service = allServices; service && !rval; service = service->next)
|
||||
{
|
||||
spinlock_acquire(&service->spin);
|
||||
|
||||
for (SERV_LISTENER *proto = service->ports; proto; proto = proto->next)
|
||||
{
|
||||
if (proto->port == port)
|
||||
{
|
||||
rval = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
spinlock_release(&service->spin);
|
||||
}
|
||||
|
||||
spinlock_release(&service_spin);
|
||||
|
||||
return rval;
|
||||
}
|
||||
|
Reference in New Issue
Block a user