fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-09 07:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Log to syslog if max_completed_connections or max_connections_per_user are exceeded

Browse source 
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=86442
This commit is contained in:
Simon McVittie 2016-07-01 11:53:17 +01:00 • committed by Simon McVittie
parent 8415c2ab57
commit 338d28a847
3 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
bus/connection.c
View file

@ -1633,13 +1633,23 @@ bus_connection_get_name (DBusConnection *connection)
dbus_bool_t
bus_connections_check_limits (BusConnections *connections,
DBusConnection *requesting_completion,
const char **limit_name_out,
int *limit_out,
DBusError *error)
{
unsigned long uid;
int limit;
if (connections->n_completed >=
bus_context_get_max_completed_connections (connections->context))
limit = bus_context_get_max_completed_connections (connections->context);
if (connections->n_completed >= limit)
{
if (limit_name_out != NULL)
*limit_name_out = "max_completed_connections";
if (limit_out != NULL)
*limit_out = limit;
dbus_set_error (error, DBUS_ERROR_LIMITS_EXCEEDED,
"The maximum number of active connections has been reached");
return FALSE;
@ -1647,9 +1657,16 @@ bus_connections_check_limits (BusConnections *connections,
if (dbus_connection_get_unix_user (requesting_completion, &uid))
{
if (get_connections_for_uid (connections, uid) >=
bus_context_get_max_connections_per_user (connections->context))
limit = bus_context_get_max_connections_per_user (connections->context);
if (get_connections_for_uid (connections, uid) >= limit)
{
if (limit_name_out != NULL)
*limit_name_out = "max_connections_per_user";
if (limit_out != NULL)
*limit_out = limit;
dbus_set_error (error, DBUS_ERROR_LIMITS_EXCEEDED,
"The maximum number of active connections for UID %lu has been reached",
uid);

2
bus/connection.h
View file

@ -57,6 +57,8 @@ BusSELinuxID* bus_connection_get_selinux_id (DBusConnection
BusAppArmorConfinement* bus_connection_dup_apparmor_confinement (DBusConnection *connection);
dbus_bool_t bus_connections_check_limits (BusConnections *connections,
DBusConnection *requesting_completion,
const char **limit_name_out,
int *limit_out,
DBusError *error);
void bus_connections_expire_incomplete (BusConnections *connections);

15
bus/driver.c
View file

@ -428,6 +428,9 @@ bus_driver_handle_hello (DBusConnection *connection,
dbus_bool_t retval;
BusRegistry *registry;
BusConnections *connections;
DBusError tmp_error;
int limit;
const char *limit_name;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
@ -445,11 +448,19 @@ bus_driver_handle_hello (DBusConnection *connection,
* incomplete connections. It's even OK if the connection wants to
* retry the hello message, we support that.
*/
dbus_error_init (&tmp_error);
connections = bus_connection_get_connections (connection);
if (!bus_connections_check_limits (connections, connection,
error))
&limit_name, &limit,
&tmp_error))
{
_DBUS_ASSERT_ERROR_IS_SET (error);
BusContext *context;
_DBUS_ASSERT_ERROR_IS_SET (&tmp_error);
context = bus_connection_get_context (connection);
bus_context_log (context, DBUS_SYSTEM_LOG_WARNING, "%s (%s=%d)",
tmp_error.message, limit_name, limit);
dbus_move_error (&tmp_error, error);
return FALSE;
}