2003-03-13 03:52:58 +00:00
|
|
|
/* -*- mode: C; c-file-style: "gnu" -*- */
|
|
|
|
|
/* bus.c message bus context object
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 2003 Red Hat, Inc.
|
|
|
|
|
*
|
|
|
|
|
* Licensed under the Academic Free License version 1.2
|
|
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "bus.h"
|
|
|
|
|
#include "loop.h"
|
|
|
|
|
#include "activation.h"
|
|
|
|
|
#include "connection.h"
|
|
|
|
|
#include "services.h"
|
|
|
|
|
#include "utils.h"
|
2003-03-21 02:38:40 +00:00
|
|
|
#include "policy.h"
|
|
|
|
|
#include <dbus/dbus-list.h>
|
|
|
|
|
#include <dbus/dbus-hash.h>
|
2003-03-13 03:52:58 +00:00
|
|
|
#include <dbus/dbus-internals.h>
|
|
|
|
|
|
|
|
|
|
struct BusContext
|
|
|
|
|
{
|
|
|
|
|
int refcount;
|
2003-03-21 02:38:40 +00:00
|
|
|
char *address;
|
2003-03-13 03:52:58 +00:00
|
|
|
DBusServer *server;
|
|
|
|
|
BusConnections *connections;
|
|
|
|
|
BusActivation *activation;
|
|
|
|
|
BusRegistry *registry;
|
2003-03-21 02:38:40 +00:00
|
|
|
DBusList *default_rules; /**< Default policy rules */
|
2003-03-23 07:41:54 +00:00
|
|
|
DBusList *mandatory_rules; /**< Mandatory policy rules */
|
2003-03-21 02:38:40 +00:00
|
|
|
DBusHashTable *rules_by_uid; /**< per-UID policy rules */
|
|
|
|
|
DBusHashTable *rules_by_gid; /**< per-GID policy rules */
|
2003-03-13 03:52:58 +00:00
|
|
|
};
|
|
|
|
|
|
2003-03-17 01:54:37 +00:00
|
|
|
static dbus_bool_t
|
2003-03-13 03:52:58 +00:00
|
|
|
server_watch_callback (DBusWatch *watch,
|
|
|
|
|
unsigned int condition,
|
|
|
|
|
void *data)
|
|
|
|
|
{
|
|
|
|
|
BusContext *context = data;
|
|
|
|
|
|
2003-03-17 01:54:37 +00:00
|
|
|
return dbus_server_handle_watch (context->server, watch, condition);
|
2003-03-13 03:52:58 +00:00
|
|
|
}
|
|
|
|
|
|
2003-03-14 01:27:58 +00:00
|
|
|
static dbus_bool_t
|
2003-03-13 03:52:58 +00:00
|
|
|
add_server_watch (DBusWatch *watch,
|
|
|
|
|
BusContext *context)
|
|
|
|
|
{
|
2003-03-14 01:27:58 +00:00
|
|
|
return bus_loop_add_watch (watch, server_watch_callback, context,
|
|
|
|
|
NULL);
|
2003-03-13 03:52:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
remove_server_watch (DBusWatch *watch,
|
|
|
|
|
BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
bus_loop_remove_watch (watch, server_watch_callback, context);
|
|
|
|
|
}
|
|
|
|
|
|
2003-03-15 02:19:02 +00:00
|
|
|
|
2003-03-14 01:27:58 +00:00
|
|
|
static void
|
|
|
|
|
server_timeout_callback (DBusTimeout *timeout,
|
|
|
|
|
void *data)
|
|
|
|
|
{
|
2003-03-17 01:54:37 +00:00
|
|
|
/* can return FALSE on OOM but we just let it fire again later */
|
2003-03-14 01:27:58 +00:00
|
|
|
dbus_timeout_handle (timeout);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static dbus_bool_t
|
|
|
|
|
add_server_timeout (DBusTimeout *timeout,
|
|
|
|
|
BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
return bus_loop_add_timeout (timeout, server_timeout_callback, context, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
remove_server_timeout (DBusTimeout *timeout,
|
|
|
|
|
BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
bus_loop_remove_timeout (timeout, server_timeout_callback, context);
|
|
|
|
|
}
|
|
|
|
|
|
2003-03-13 03:52:58 +00:00
|
|
|
static void
|
|
|
|
|
new_connection_callback (DBusServer *server,
|
|
|
|
|
DBusConnection *new_connection,
|
|
|
|
|
void *data)
|
|
|
|
|
{
|
|
|
|
|
BusContext *context = data;
|
|
|
|
|
|
|
|
|
|
if (!bus_connections_setup_connection (context->connections, new_connection))
|
2003-03-16 Havoc Pennington <hp@pobox.com>
Oops - test code was only testing failure of around 30 of the
mallocs in the test path, but it turns out there are 500+
mallocs. I believe this was due to misguided linking setup such
that there was one copy of dbus_malloc etc. in the daemon and one
in the shared lib, and only daemon mallocs were tested. In any
case, the test case now tests all 500+ mallocs, and doesn't pass
yet, though there are lots of fixes in this patch.
* dbus/dbus-connection.c (dbus_connection_dispatch_message): fix
this so that it doesn't need to allocate memory, since it
has no way of indicating failure due to OOM (and would be
annoying if it did).
* dbus/dbus-list.c (_dbus_list_pop_first_link): new function
* bus/Makefile.am: rearrange to create two self-contained
libraries, to avoid having libraries with overlapping symbols.
that was resulting in weirdness, e.g. I'm pretty sure there
were two copies of global static variables.
* dbus/dbus-internals.c: move the malloc debug stuff to
dbus-memory.c
* dbus/dbus-list.c (free_link): free list mempool if it becomes
empty.
* dbus/dbus-memory.c (_dbus_disable_mem_pools): new function
* dbus/dbus-address.c (dbus_parse_address): free list nodes
on failure.
* bus/dispatch.c (bus_dispatch_add_connection): free
message_handler_slot when no longer using it, so
memory leak checkers are happy for the test suite.
* dbus/dbus-server-debug-pipe.c (debug_finalize): free server name
* bus/bus.c (new_connection_callback): disconnect in here if
bus_connections_setup_connection fails.
* bus/connection.c (bus_connections_unref): fix to free the
connections
(bus_connections_setup_connection): if this fails, don't
disconnect the connection, just be sure there are no side
effects.
* dbus/dbus-string.c (undo_alignment): unbreak this
* dbus/dbus-auth.c (_dbus_auth_unref): free some stuff we were
leaking
(_dbus_auth_new): fix the order in which we free strings
on OOM failure
* bus/connection.c (bus_connection_disconnected): fix to
not send ServiceDeleted multiple times in case of memory
allocation failure
* dbus/dbus-bus.c (dbus_bus_get_base_service): new function to
get the base service name
(dbus_bus_register_client): don't return base service name,
instead store it on the DBusConnection and have an accessor
function for it.
(dbus_bus_register_client): rename dbus_bus_register()
* bus/dispatch.c (check_hello_message): verify that other
connections on the bus also got the correct results, not
just the one sending hello
2003-03-16 08:08:21 +00:00
|
|
|
{
|
|
|
|
|
_dbus_verbose ("No memory to setup new connection\n");
|
2003-03-13 03:52:58 +00:00
|
|
|
|
2003-03-16 Havoc Pennington <hp@pobox.com>
Oops - test code was only testing failure of around 30 of the
mallocs in the test path, but it turns out there are 500+
mallocs. I believe this was due to misguided linking setup such
that there was one copy of dbus_malloc etc. in the daemon and one
in the shared lib, and only daemon mallocs were tested. In any
case, the test case now tests all 500+ mallocs, and doesn't pass
yet, though there are lots of fixes in this patch.
* dbus/dbus-connection.c (dbus_connection_dispatch_message): fix
this so that it doesn't need to allocate memory, since it
has no way of indicating failure due to OOM (and would be
annoying if it did).
* dbus/dbus-list.c (_dbus_list_pop_first_link): new function
* bus/Makefile.am: rearrange to create two self-contained
libraries, to avoid having libraries with overlapping symbols.
that was resulting in weirdness, e.g. I'm pretty sure there
were two copies of global static variables.
* dbus/dbus-internals.c: move the malloc debug stuff to
dbus-memory.c
* dbus/dbus-list.c (free_link): free list mempool if it becomes
empty.
* dbus/dbus-memory.c (_dbus_disable_mem_pools): new function
* dbus/dbus-address.c (dbus_parse_address): free list nodes
on failure.
* bus/dispatch.c (bus_dispatch_add_connection): free
message_handler_slot when no longer using it, so
memory leak checkers are happy for the test suite.
* dbus/dbus-server-debug-pipe.c (debug_finalize): free server name
* bus/bus.c (new_connection_callback): disconnect in here if
bus_connections_setup_connection fails.
* bus/connection.c (bus_connections_unref): fix to free the
connections
(bus_connections_setup_connection): if this fails, don't
disconnect the connection, just be sure there are no side
effects.
* dbus/dbus-string.c (undo_alignment): unbreak this
* dbus/dbus-auth.c (_dbus_auth_unref): free some stuff we were
leaking
(_dbus_auth_new): fix the order in which we free strings
on OOM failure
* bus/connection.c (bus_connection_disconnected): fix to
not send ServiceDeleted multiple times in case of memory
allocation failure
* dbus/dbus-bus.c (dbus_bus_get_base_service): new function to
get the base service name
(dbus_bus_register_client): don't return base service name,
instead store it on the DBusConnection and have an accessor
function for it.
(dbus_bus_register_client): rename dbus_bus_register()
* bus/dispatch.c (check_hello_message): verify that other
connections on the bus also got the correct results, not
just the one sending hello
2003-03-16 08:08:21 +00:00
|
|
|
/* if we don't do this, it will get unref'd without
|
|
|
|
|
* being disconnected... kind of strange really
|
|
|
|
|
* that we have to do this, people won't get it right
|
|
|
|
|
* in general.
|
|
|
|
|
*/
|
|
|
|
|
dbus_connection_disconnect (new_connection);
|
|
|
|
|
}
|
|
|
|
|
|
2003-03-15 02:19:02 +00:00
|
|
|
/* on OOM, we won't have ref'd the connection so it will die. */
|
2003-03-13 03:52:58 +00:00
|
|
|
}
|
|
|
|
|
|
2003-03-21 02:38:40 +00:00
|
|
|
static void
|
2003-03-23 07:41:54 +00:00
|
|
|
free_rule_func (void *data,
|
|
|
|
|
void *user_data)
|
2003-03-21 02:38:40 +00:00
|
|
|
{
|
|
|
|
|
BusPolicyRule *rule = data;
|
|
|
|
|
|
|
|
|
|
bus_policy_rule_unref (rule);
|
|
|
|
|
}
|
|
|
|
|
|
2003-03-23 07:41:54 +00:00
|
|
|
static void
|
|
|
|
|
free_rule_list_func (void *data)
|
|
|
|
|
{
|
|
|
|
|
DBusList **list = data;
|
|
|
|
|
|
|
|
|
|
_dbus_list_foreach (list, free_rule_func, NULL);
|
|
|
|
|
|
|
|
|
|
_dbus_list_clear (list);
|
|
|
|
|
|
|
|
|
|
dbus_free (list);
|
|
|
|
|
}
|
|
|
|
|
|
2003-03-13 03:52:58 +00:00
|
|
|
BusContext*
|
|
|
|
|
bus_context_new (const char *address,
|
|
|
|
|
const char **service_dirs,
|
|
|
|
|
DBusError *error)
|
|
|
|
|
{
|
|
|
|
|
BusContext *context;
|
|
|
|
|
|
|
|
|
|
context = dbus_new0 (BusContext, 1);
|
|
|
|
|
if (context == NULL)
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
context->refcount = 1;
|
|
|
|
|
|
|
|
|
|
context->address = _dbus_strdup (address);
|
|
|
|
|
if (context->address == NULL)
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
2003-03-25 04:37:08 +00:00
|
|
|
context->server = dbus_server_listen (address, error);
|
2003-03-13 03:52:58 +00:00
|
|
|
if (context->server == NULL)
|
2003-03-25 04:37:08 +00:00
|
|
|
goto failed;
|
2003-03-13 03:52:58 +00:00
|
|
|
|
2003-03-16 22:25:18 +00:00
|
|
|
context->activation = bus_activation_new (context, address, service_dirs,
|
2003-03-13 03:52:58 +00:00
|
|
|
error);
|
|
|
|
|
if (context->activation == NULL)
|
|
|
|
|
{
|
|
|
|
|
_DBUS_ASSERT_ERROR_IS_SET (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
context->connections = bus_connections_new (context);
|
|
|
|
|
if (context->connections == NULL)
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
2003-03-16 22:25:18 +00:00
|
|
|
context->registry = bus_registry_new (context);
|
2003-03-13 03:52:58 +00:00
|
|
|
if (context->registry == NULL)
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
2003-03-23 07:41:54 +00:00
|
|
|
context->rules_by_uid = _dbus_hash_table_new (DBUS_HASH_ULONG,
|
2003-03-21 02:38:40 +00:00
|
|
|
NULL,
|
2003-03-23 07:41:54 +00:00
|
|
|
free_rule_list_func);
|
2003-03-21 02:38:40 +00:00
|
|
|
if (context->rules_by_uid == NULL)
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
2003-03-23 07:41:54 +00:00
|
|
|
context->rules_by_gid = _dbus_hash_table_new (DBUS_HASH_ULONG,
|
2003-03-21 02:38:40 +00:00
|
|
|
NULL,
|
2003-03-23 07:41:54 +00:00
|
|
|
free_rule_list_func);
|
2003-03-21 02:38:40 +00:00
|
|
|
if (context->rules_by_gid == NULL)
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
2003-03-13 03:52:58 +00:00
|
|
|
dbus_server_set_new_connection_function (context->server,
|
|
|
|
|
new_connection_callback,
|
|
|
|
|
context, NULL);
|
|
|
|
|
|
2003-03-14 01:27:58 +00:00
|
|
|
if (!dbus_server_set_watch_functions (context->server,
|
|
|
|
|
(DBusAddWatchFunction) add_server_watch,
|
|
|
|
|
(DBusRemoveWatchFunction) remove_server_watch,
|
2003-03-15 20:47:16 +00:00
|
|
|
NULL,
|
2003-03-14 01:27:58 +00:00
|
|
|
context,
|
|
|
|
|
NULL))
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!dbus_server_set_timeout_functions (context->server,
|
|
|
|
|
(DBusAddTimeoutFunction) add_server_timeout,
|
|
|
|
|
(DBusRemoveTimeoutFunction) remove_server_timeout,
|
2003-03-15 20:47:16 +00:00
|
|
|
NULL,
|
2003-03-14 01:27:58 +00:00
|
|
|
context, NULL))
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
2003-03-13 03:52:58 +00:00
|
|
|
|
|
|
|
|
return context;
|
|
|
|
|
|
|
|
|
|
failed:
|
|
|
|
|
bus_context_unref (context);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
bus_context_shutdown (BusContext *context)
|
|
|
|
|
{
|
2003-03-14 01:27:58 +00:00
|
|
|
if (context->server == NULL ||
|
|
|
|
|
!dbus_server_get_is_connected (context->server))
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (!dbus_server_set_watch_functions (context->server,
|
2003-03-15 20:47:16 +00:00
|
|
|
NULL, NULL, NULL,
|
2003-03-14 01:27:58 +00:00
|
|
|
context,
|
|
|
|
|
NULL))
|
|
|
|
|
_dbus_assert_not_reached ("setting watch functions to NULL failed");
|
|
|
|
|
|
|
|
|
|
if (!dbus_server_set_timeout_functions (context->server,
|
2003-03-15 20:47:16 +00:00
|
|
|
NULL, NULL, NULL,
|
2003-03-14 01:27:58 +00:00
|
|
|
context,
|
|
|
|
|
NULL))
|
|
|
|
|
_dbus_assert_not_reached ("setting timeout functions to NULL failed");
|
|
|
|
|
|
2003-03-13 03:52:58 +00:00
|
|
|
dbus_server_disconnect (context->server);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
bus_context_ref (BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
_dbus_assert (context->refcount > 0);
|
|
|
|
|
context->refcount += 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
bus_context_unref (BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
_dbus_assert (context->refcount > 0);
|
|
|
|
|
context->refcount -= 1;
|
|
|
|
|
|
|
|
|
|
if (context->refcount == 0)
|
|
|
|
|
{
|
2003-03-16 Havoc Pennington <hp@pobox.com>
Oops - test code was only testing failure of around 30 of the
mallocs in the test path, but it turns out there are 500+
mallocs. I believe this was due to misguided linking setup such
that there was one copy of dbus_malloc etc. in the daemon and one
in the shared lib, and only daemon mallocs were tested. In any
case, the test case now tests all 500+ mallocs, and doesn't pass
yet, though there are lots of fixes in this patch.
* dbus/dbus-connection.c (dbus_connection_dispatch_message): fix
this so that it doesn't need to allocate memory, since it
has no way of indicating failure due to OOM (and would be
annoying if it did).
* dbus/dbus-list.c (_dbus_list_pop_first_link): new function
* bus/Makefile.am: rearrange to create two self-contained
libraries, to avoid having libraries with overlapping symbols.
that was resulting in weirdness, e.g. I'm pretty sure there
were two copies of global static variables.
* dbus/dbus-internals.c: move the malloc debug stuff to
dbus-memory.c
* dbus/dbus-list.c (free_link): free list mempool if it becomes
empty.
* dbus/dbus-memory.c (_dbus_disable_mem_pools): new function
* dbus/dbus-address.c (dbus_parse_address): free list nodes
on failure.
* bus/dispatch.c (bus_dispatch_add_connection): free
message_handler_slot when no longer using it, so
memory leak checkers are happy for the test suite.
* dbus/dbus-server-debug-pipe.c (debug_finalize): free server name
* bus/bus.c (new_connection_callback): disconnect in here if
bus_connections_setup_connection fails.
* bus/connection.c (bus_connections_unref): fix to free the
connections
(bus_connections_setup_connection): if this fails, don't
disconnect the connection, just be sure there are no side
effects.
* dbus/dbus-string.c (undo_alignment): unbreak this
* dbus/dbus-auth.c (_dbus_auth_unref): free some stuff we were
leaking
(_dbus_auth_new): fix the order in which we free strings
on OOM failure
* bus/connection.c (bus_connection_disconnected): fix to
not send ServiceDeleted multiple times in case of memory
allocation failure
* dbus/dbus-bus.c (dbus_bus_get_base_service): new function to
get the base service name
(dbus_bus_register_client): don't return base service name,
instead store it on the DBusConnection and have an accessor
function for it.
(dbus_bus_register_client): rename dbus_bus_register()
* bus/dispatch.c (check_hello_message): verify that other
connections on the bus also got the correct results, not
just the one sending hello
2003-03-16 08:08:21 +00:00
|
|
|
_dbus_verbose ("Finalizing bus context %p\n", context);
|
|
|
|
|
|
2003-03-14 01:27:58 +00:00
|
|
|
bus_context_shutdown (context);
|
2003-03-16 Havoc Pennington <hp@pobox.com>
Oops - test code was only testing failure of around 30 of the
mallocs in the test path, but it turns out there are 500+
mallocs. I believe this was due to misguided linking setup such
that there was one copy of dbus_malloc etc. in the daemon and one
in the shared lib, and only daemon mallocs were tested. In any
case, the test case now tests all 500+ mallocs, and doesn't pass
yet, though there are lots of fixes in this patch.
* dbus/dbus-connection.c (dbus_connection_dispatch_message): fix
this so that it doesn't need to allocate memory, since it
has no way of indicating failure due to OOM (and would be
annoying if it did).
* dbus/dbus-list.c (_dbus_list_pop_first_link): new function
* bus/Makefile.am: rearrange to create two self-contained
libraries, to avoid having libraries with overlapping symbols.
that was resulting in weirdness, e.g. I'm pretty sure there
were two copies of global static variables.
* dbus/dbus-internals.c: move the malloc debug stuff to
dbus-memory.c
* dbus/dbus-list.c (free_link): free list mempool if it becomes
empty.
* dbus/dbus-memory.c (_dbus_disable_mem_pools): new function
* dbus/dbus-address.c (dbus_parse_address): free list nodes
on failure.
* bus/dispatch.c (bus_dispatch_add_connection): free
message_handler_slot when no longer using it, so
memory leak checkers are happy for the test suite.
* dbus/dbus-server-debug-pipe.c (debug_finalize): free server name
* bus/bus.c (new_connection_callback): disconnect in here if
bus_connections_setup_connection fails.
* bus/connection.c (bus_connections_unref): fix to free the
connections
(bus_connections_setup_connection): if this fails, don't
disconnect the connection, just be sure there are no side
effects.
* dbus/dbus-string.c (undo_alignment): unbreak this
* dbus/dbus-auth.c (_dbus_auth_unref): free some stuff we were
leaking
(_dbus_auth_new): fix the order in which we free strings
on OOM failure
* bus/connection.c (bus_connection_disconnected): fix to
not send ServiceDeleted multiple times in case of memory
allocation failure
* dbus/dbus-bus.c (dbus_bus_get_base_service): new function to
get the base service name
(dbus_bus_register_client): don't return base service name,
instead store it on the DBusConnection and have an accessor
function for it.
(dbus_bus_register_client): rename dbus_bus_register()
* bus/dispatch.c (check_hello_message): verify that other
connections on the bus also got the correct results, not
just the one sending hello
2003-03-16 08:08:21 +00:00
|
|
|
|
|
|
|
|
if (context->connections)
|
|
|
|
|
{
|
|
|
|
|
bus_connections_unref (context->connections);
|
|
|
|
|
context->connections = NULL;
|
|
|
|
|
}
|
2003-03-14 01:27:58 +00:00
|
|
|
|
2003-03-13 03:52:58 +00:00
|
|
|
if (context->registry)
|
2003-03-16 Havoc Pennington <hp@pobox.com>
Oops - test code was only testing failure of around 30 of the
mallocs in the test path, but it turns out there are 500+
mallocs. I believe this was due to misguided linking setup such
that there was one copy of dbus_malloc etc. in the daemon and one
in the shared lib, and only daemon mallocs were tested. In any
case, the test case now tests all 500+ mallocs, and doesn't pass
yet, though there are lots of fixes in this patch.
* dbus/dbus-connection.c (dbus_connection_dispatch_message): fix
this so that it doesn't need to allocate memory, since it
has no way of indicating failure due to OOM (and would be
annoying if it did).
* dbus/dbus-list.c (_dbus_list_pop_first_link): new function
* bus/Makefile.am: rearrange to create two self-contained
libraries, to avoid having libraries with overlapping symbols.
that was resulting in weirdness, e.g. I'm pretty sure there
were two copies of global static variables.
* dbus/dbus-internals.c: move the malloc debug stuff to
dbus-memory.c
* dbus/dbus-list.c (free_link): free list mempool if it becomes
empty.
* dbus/dbus-memory.c (_dbus_disable_mem_pools): new function
* dbus/dbus-address.c (dbus_parse_address): free list nodes
on failure.
* bus/dispatch.c (bus_dispatch_add_connection): free
message_handler_slot when no longer using it, so
memory leak checkers are happy for the test suite.
* dbus/dbus-server-debug-pipe.c (debug_finalize): free server name
* bus/bus.c (new_connection_callback): disconnect in here if
bus_connections_setup_connection fails.
* bus/connection.c (bus_connections_unref): fix to free the
connections
(bus_connections_setup_connection): if this fails, don't
disconnect the connection, just be sure there are no side
effects.
* dbus/dbus-string.c (undo_alignment): unbreak this
* dbus/dbus-auth.c (_dbus_auth_unref): free some stuff we were
leaking
(_dbus_auth_new): fix the order in which we free strings
on OOM failure
* bus/connection.c (bus_connection_disconnected): fix to
not send ServiceDeleted multiple times in case of memory
allocation failure
* dbus/dbus-bus.c (dbus_bus_get_base_service): new function to
get the base service name
(dbus_bus_register_client): don't return base service name,
instead store it on the DBusConnection and have an accessor
function for it.
(dbus_bus_register_client): rename dbus_bus_register()
* bus/dispatch.c (check_hello_message): verify that other
connections on the bus also got the correct results, not
just the one sending hello
2003-03-16 08:08:21 +00:00
|
|
|
{
|
|
|
|
|
bus_registry_unref (context->registry);
|
|
|
|
|
context->registry = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2003-03-13 03:52:58 +00:00
|
|
|
if (context->activation)
|
2003-03-16 Havoc Pennington <hp@pobox.com>
Oops - test code was only testing failure of around 30 of the
mallocs in the test path, but it turns out there are 500+
mallocs. I believe this was due to misguided linking setup such
that there was one copy of dbus_malloc etc. in the daemon and one
in the shared lib, and only daemon mallocs were tested. In any
case, the test case now tests all 500+ mallocs, and doesn't pass
yet, though there are lots of fixes in this patch.
* dbus/dbus-connection.c (dbus_connection_dispatch_message): fix
this so that it doesn't need to allocate memory, since it
has no way of indicating failure due to OOM (and would be
annoying if it did).
* dbus/dbus-list.c (_dbus_list_pop_first_link): new function
* bus/Makefile.am: rearrange to create two self-contained
libraries, to avoid having libraries with overlapping symbols.
that was resulting in weirdness, e.g. I'm pretty sure there
were two copies of global static variables.
* dbus/dbus-internals.c: move the malloc debug stuff to
dbus-memory.c
* dbus/dbus-list.c (free_link): free list mempool if it becomes
empty.
* dbus/dbus-memory.c (_dbus_disable_mem_pools): new function
* dbus/dbus-address.c (dbus_parse_address): free list nodes
on failure.
* bus/dispatch.c (bus_dispatch_add_connection): free
message_handler_slot when no longer using it, so
memory leak checkers are happy for the test suite.
* dbus/dbus-server-debug-pipe.c (debug_finalize): free server name
* bus/bus.c (new_connection_callback): disconnect in here if
bus_connections_setup_connection fails.
* bus/connection.c (bus_connections_unref): fix to free the
connections
(bus_connections_setup_connection): if this fails, don't
disconnect the connection, just be sure there are no side
effects.
* dbus/dbus-string.c (undo_alignment): unbreak this
* dbus/dbus-auth.c (_dbus_auth_unref): free some stuff we were
leaking
(_dbus_auth_new): fix the order in which we free strings
on OOM failure
* bus/connection.c (bus_connection_disconnected): fix to
not send ServiceDeleted multiple times in case of memory
allocation failure
* dbus/dbus-bus.c (dbus_bus_get_base_service): new function to
get the base service name
(dbus_bus_register_client): don't return base service name,
instead store it on the DBusConnection and have an accessor
function for it.
(dbus_bus_register_client): rename dbus_bus_register()
* bus/dispatch.c (check_hello_message): verify that other
connections on the bus also got the correct results, not
just the one sending hello
2003-03-16 08:08:21 +00:00
|
|
|
{
|
|
|
|
|
bus_activation_unref (context->activation);
|
|
|
|
|
context->activation = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2003-03-13 03:52:58 +00:00
|
|
|
if (context->server)
|
2003-03-16 Havoc Pennington <hp@pobox.com>
Oops - test code was only testing failure of around 30 of the
mallocs in the test path, but it turns out there are 500+
mallocs. I believe this was due to misguided linking setup such
that there was one copy of dbus_malloc etc. in the daemon and one
in the shared lib, and only daemon mallocs were tested. In any
case, the test case now tests all 500+ mallocs, and doesn't pass
yet, though there are lots of fixes in this patch.
* dbus/dbus-connection.c (dbus_connection_dispatch_message): fix
this so that it doesn't need to allocate memory, since it
has no way of indicating failure due to OOM (and would be
annoying if it did).
* dbus/dbus-list.c (_dbus_list_pop_first_link): new function
* bus/Makefile.am: rearrange to create two self-contained
libraries, to avoid having libraries with overlapping symbols.
that was resulting in weirdness, e.g. I'm pretty sure there
were two copies of global static variables.
* dbus/dbus-internals.c: move the malloc debug stuff to
dbus-memory.c
* dbus/dbus-list.c (free_link): free list mempool if it becomes
empty.
* dbus/dbus-memory.c (_dbus_disable_mem_pools): new function
* dbus/dbus-address.c (dbus_parse_address): free list nodes
on failure.
* bus/dispatch.c (bus_dispatch_add_connection): free
message_handler_slot when no longer using it, so
memory leak checkers are happy for the test suite.
* dbus/dbus-server-debug-pipe.c (debug_finalize): free server name
* bus/bus.c (new_connection_callback): disconnect in here if
bus_connections_setup_connection fails.
* bus/connection.c (bus_connections_unref): fix to free the
connections
(bus_connections_setup_connection): if this fails, don't
disconnect the connection, just be sure there are no side
effects.
* dbus/dbus-string.c (undo_alignment): unbreak this
* dbus/dbus-auth.c (_dbus_auth_unref): free some stuff we were
leaking
(_dbus_auth_new): fix the order in which we free strings
on OOM failure
* bus/connection.c (bus_connection_disconnected): fix to
not send ServiceDeleted multiple times in case of memory
allocation failure
* dbus/dbus-bus.c (dbus_bus_get_base_service): new function to
get the base service name
(dbus_bus_register_client): don't return base service name,
instead store it on the DBusConnection and have an accessor
function for it.
(dbus_bus_register_client): rename dbus_bus_register()
* bus/dispatch.c (check_hello_message): verify that other
connections on the bus also got the correct results, not
just the one sending hello
2003-03-16 08:08:21 +00:00
|
|
|
{
|
|
|
|
|
dbus_server_unref (context->server);
|
|
|
|
|
context->server = NULL;
|
|
|
|
|
}
|
2003-03-21 02:38:40 +00:00
|
|
|
|
|
|
|
|
if (context->rules_by_uid)
|
|
|
|
|
{
|
|
|
|
|
_dbus_hash_table_unref (context->rules_by_uid);
|
|
|
|
|
context->rules_by_uid = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (context->rules_by_gid)
|
|
|
|
|
{
|
|
|
|
|
_dbus_hash_table_unref (context->rules_by_gid);
|
|
|
|
|
context->rules_by_gid = NULL;
|
|
|
|
|
}
|
2003-03-16 Havoc Pennington <hp@pobox.com>
Oops - test code was only testing failure of around 30 of the
mallocs in the test path, but it turns out there are 500+
mallocs. I believe this was due to misguided linking setup such
that there was one copy of dbus_malloc etc. in the daemon and one
in the shared lib, and only daemon mallocs were tested. In any
case, the test case now tests all 500+ mallocs, and doesn't pass
yet, though there are lots of fixes in this patch.
* dbus/dbus-connection.c (dbus_connection_dispatch_message): fix
this so that it doesn't need to allocate memory, since it
has no way of indicating failure due to OOM (and would be
annoying if it did).
* dbus/dbus-list.c (_dbus_list_pop_first_link): new function
* bus/Makefile.am: rearrange to create two self-contained
libraries, to avoid having libraries with overlapping symbols.
that was resulting in weirdness, e.g. I'm pretty sure there
were two copies of global static variables.
* dbus/dbus-internals.c: move the malloc debug stuff to
dbus-memory.c
* dbus/dbus-list.c (free_link): free list mempool if it becomes
empty.
* dbus/dbus-memory.c (_dbus_disable_mem_pools): new function
* dbus/dbus-address.c (dbus_parse_address): free list nodes
on failure.
* bus/dispatch.c (bus_dispatch_add_connection): free
message_handler_slot when no longer using it, so
memory leak checkers are happy for the test suite.
* dbus/dbus-server-debug-pipe.c (debug_finalize): free server name
* bus/bus.c (new_connection_callback): disconnect in here if
bus_connections_setup_connection fails.
* bus/connection.c (bus_connections_unref): fix to free the
connections
(bus_connections_setup_connection): if this fails, don't
disconnect the connection, just be sure there are no side
effects.
* dbus/dbus-string.c (undo_alignment): unbreak this
* dbus/dbus-auth.c (_dbus_auth_unref): free some stuff we were
leaking
(_dbus_auth_new): fix the order in which we free strings
on OOM failure
* bus/connection.c (bus_connection_disconnected): fix to
not send ServiceDeleted multiple times in case of memory
allocation failure
* dbus/dbus-bus.c (dbus_bus_get_base_service): new function to
get the base service name
(dbus_bus_register_client): don't return base service name,
instead store it on the DBusConnection and have an accessor
function for it.
(dbus_bus_register_client): rename dbus_bus_register()
* bus/dispatch.c (check_hello_message): verify that other
connections on the bus also got the correct results, not
just the one sending hello
2003-03-16 08:08:21 +00:00
|
|
|
|
2003-03-13 03:52:58 +00:00
|
|
|
dbus_free (context->address);
|
|
|
|
|
dbus_free (context);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BusRegistry*
|
|
|
|
|
bus_context_get_registry (BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
return context->registry;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BusConnections*
|
|
|
|
|
bus_context_get_connections (BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
return context->connections;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BusActivation*
|
|
|
|
|
bus_context_get_activation (BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
return context->activation;
|
|
|
|
|
}
|
2003-03-23 07:41:54 +00:00
|
|
|
|
|
|
|
|
static dbus_bool_t
|
|
|
|
|
list_allows_user (dbus_bool_t def,
|
|
|
|
|
DBusList **list,
|
|
|
|
|
unsigned long uid,
|
|
|
|
|
const unsigned long *group_ids,
|
|
|
|
|
int n_group_ids)
|
|
|
|
|
{
|
|
|
|
|
DBusList *link;
|
|
|
|
|
dbus_bool_t allowed;
|
|
|
|
|
|
|
|
|
|
allowed = def;
|
|
|
|
|
|
|
|
|
|
link = _dbus_list_get_first_link (list);
|
|
|
|
|
while (link != NULL)
|
|
|
|
|
{
|
|
|
|
|
BusPolicyRule *rule = link->data;
|
|
|
|
|
link = _dbus_list_get_next_link (list, link);
|
|
|
|
|
|
|
|
|
|
if (rule->type == BUS_POLICY_RULE_USER)
|
|
|
|
|
{
|
|
|
|
|
if (rule->d.user.uid != uid)
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
else if (rule->type == BUS_POLICY_RULE_GROUP)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
|
while (i < n_group_ids)
|
|
|
|
|
{
|
|
|
|
|
if (rule->d.group.gid == group_ids[i])
|
|
|
|
|
break;
|
|
|
|
|
++i;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (i == n_group_ids)
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
allowed = rule->allow;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return allowed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dbus_bool_t
|
|
|
|
|
bus_context_allow_user (BusContext *context,
|
|
|
|
|
unsigned long uid)
|
|
|
|
|
{
|
|
|
|
|
dbus_bool_t allowed;
|
|
|
|
|
unsigned long *group_ids;
|
|
|
|
|
int n_group_ids;
|
|
|
|
|
|
|
|
|
|
/* On OOM or error we always reject the user */
|
|
|
|
|
if (!_dbus_get_groups (uid, &group_ids, &n_group_ids))
|
|
|
|
|
{
|
|
|
|
|
_dbus_verbose ("Did not get any groups for UID %lu\n",
|
|
|
|
|
uid);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
allowed = FALSE;
|
|
|
|
|
|
|
|
|
|
allowed = list_allows_user (allowed,
|
|
|
|
|
&context->default_rules,
|
|
|
|
|
uid,
|
|
|
|
|
group_ids, n_group_ids);
|
|
|
|
|
|
|
|
|
|
allowed = list_allows_user (allowed,
|
|
|
|
|
&context->mandatory_rules,
|
|
|
|
|
uid,
|
|
|
|
|
group_ids, n_group_ids);
|
|
|
|
|
|
|
|
|
|
dbus_free (group_ids);
|
|
|
|
|
|
|
|
|
|
return allowed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static dbus_bool_t
|
|
|
|
|
add_list_to_policy (DBusList **list,
|
|
|
|
|
BusPolicy *policy)
|
|
|
|
|
{
|
|
|
|
|
DBusList *link;
|
|
|
|
|
|
|
|
|
|
link = _dbus_list_get_first_link (list);
|
|
|
|
|
while (link != NULL)
|
|
|
|
|
{
|
|
|
|
|
BusPolicyRule *rule = link->data;
|
|
|
|
|
link = _dbus_list_get_next_link (list, link);
|
|
|
|
|
|
|
|
|
|
switch (rule->type)
|
|
|
|
|
{
|
|
|
|
|
case BUS_POLICY_RULE_USER:
|
|
|
|
|
case BUS_POLICY_RULE_GROUP:
|
|
|
|
|
/* These aren't per-connection policies */
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case BUS_POLICY_RULE_OWN:
|
|
|
|
|
case BUS_POLICY_RULE_SEND:
|
|
|
|
|
case BUS_POLICY_RULE_RECEIVE:
|
|
|
|
|
/* These are per-connection */
|
|
|
|
|
if (!bus_policy_append_rule (policy, rule))
|
|
|
|
|
return FALSE;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BusPolicy*
|
|
|
|
|
bus_context_create_connection_policy (BusContext *context,
|
|
|
|
|
DBusConnection *connection)
|
|
|
|
|
{
|
|
|
|
|
BusPolicy *policy;
|
|
|
|
|
unsigned long uid;
|
|
|
|
|
DBusList **list;
|
|
|
|
|
|
|
|
|
|
_dbus_assert (dbus_connection_get_is_authenticated (connection));
|
|
|
|
|
|
|
|
|
|
policy = bus_policy_new ();
|
|
|
|
|
if (policy == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
if (!add_list_to_policy (&context->default_rules,
|
|
|
|
|
policy))
|
|
|
|
|
goto failed;
|
|
|
|
|
|
|
|
|
|
/* we avoid the overhead of looking up user's groups
|
|
|
|
|
* if we don't have any group rules anyway
|
|
|
|
|
*/
|
|
|
|
|
if (_dbus_hash_table_get_n_entries (context->rules_by_gid) > 0)
|
|
|
|
|
{
|
|
|
|
|
const unsigned long *groups;
|
|
|
|
|
int n_groups;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
if (!bus_connection_get_groups (connection, &groups, &n_groups))
|
|
|
|
|
goto failed;
|
|
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
|
while (i < n_groups)
|
|
|
|
|
{
|
|
|
|
|
list = _dbus_hash_table_lookup_ulong (context->rules_by_gid,
|
|
|
|
|
groups[i]);
|
|
|
|
|
|
|
|
|
|
if (list != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (!add_list_to_policy (list, policy))
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
++i;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!dbus_connection_get_unix_user (connection, &uid))
|
|
|
|
|
goto failed;
|
|
|
|
|
|
|
|
|
|
list = _dbus_hash_table_lookup_ulong (context->rules_by_uid,
|
|
|
|
|
uid);
|
|
|
|
|
|
|
|
|
|
if (!add_list_to_policy (list, policy))
|
|
|
|
|
goto failed;
|
|
|
|
|
|
|
|
|
|
if (!add_list_to_policy (&context->mandatory_rules,
|
|
|
|
|
policy))
|
|
|
|
|
goto failed;
|
|
|
|
|
|
|
|
|
|
bus_policy_optimize (policy);
|
|
|
|
|
|
|
|
|
|
return policy;
|
|
|
|
|
|
|
|
|
|
failed:
|
|
|
|
|
bus_policy_unref (policy);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|