2003-03-13 03:52:58 +00:00
|
|
|
/* -*- mode: C; c-file-style: "gnu" -*- */
|
|
|
|
|
/* bus.c message bus context object
|
|
|
|
|
*
|
2004-05-29 04:17:17 +00:00
|
|
|
* Copyright (C) 2003, 2004 Red Hat, Inc.
|
2003-03-13 03:52:58 +00:00
|
|
|
*
|
2004-08-10 03:07:01 +00:00
|
|
|
* Licensed under the Academic Free License version 2.1
|
2003-03-13 03:52:58 +00:00
|
|
|
*
|
|
|
|
|
* 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 "activation.h"
|
|
|
|
|
#include "connection.h"
|
|
|
|
|
#include "services.h"
|
|
|
|
|
#include "utils.h"
|
2003-03-21 02:38:40 +00:00
|
|
|
#include "policy.h"
|
2003-03-31 08:19:50 +00:00
|
|
|
#include "config-parser.h"
|
2003-09-21 19:53:56 +00:00
|
|
|
#include "signals.h"
|
2004-07-30 05:59:34 +00:00
|
|
|
#include "selinux.h"
|
2005-06-15 02:31:38 +00:00
|
|
|
#include "dir-watch.h"
|
2003-03-21 02:38:40 +00:00
|
|
|
#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;
|
2004-04-16 15:01:25 +00:00
|
|
|
char *config_file;
|
2003-04-03 05:22:49 +00:00
|
|
|
char *type;
|
2003-03-21 02:38:40 +00:00
|
|
|
char *address;
|
2003-04-09 00:27:41 +00:00
|
|
|
char *pidfile;
|
2004-04-16 15:01:25 +00:00
|
|
|
char *user;
|
2003-04-06 23:53:27 +00:00
|
|
|
DBusLoop *loop;
|
2003-03-31 08:19:50 +00:00
|
|
|
DBusList *servers;
|
2003-03-13 03:52:58 +00:00
|
|
|
BusConnections *connections;
|
|
|
|
|
BusActivation *activation;
|
|
|
|
|
BusRegistry *registry;
|
2003-04-12 18:32:11 +00:00
|
|
|
BusPolicy *policy;
|
2003-09-21 19:53:56 +00:00
|
|
|
BusMatchmaker *matchmaker;
|
2003-04-17 00:46:36 +00:00
|
|
|
DBusUserDatabase *user_database;
|
2003-04-24 22:30:38 +00:00
|
|
|
BusLimits limits;
|
2004-04-16 15:01:25 +00:00
|
|
|
unsigned int fork : 1;
|
2003-03-13 03:52:58 +00:00
|
|
|
};
|
|
|
|
|
|
2003-06-22 19:39:47 +00:00
|
|
|
static dbus_int32_t server_data_slot = -1;
|
2003-04-04 00:39:22 +00:00
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
|
{
|
|
|
|
|
BusContext *context;
|
|
|
|
|
} BusServerData;
|
|
|
|
|
|
|
|
|
|
#define BUS_SERVER_DATA(server) (dbus_server_get_data ((server), server_data_slot))
|
|
|
|
|
|
|
|
|
|
static BusContext*
|
|
|
|
|
server_get_context (DBusServer *server)
|
|
|
|
|
{
|
|
|
|
|
BusContext *context;
|
|
|
|
|
BusServerData *bd;
|
|
|
|
|
|
2003-06-22 19:39:47 +00:00
|
|
|
if (!dbus_server_allocate_data_slot (&server_data_slot))
|
2003-04-04 00:39:22 +00:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
bd = BUS_SERVER_DATA (server);
|
|
|
|
|
if (bd == NULL)
|
2003-04-06 18:03:03 +00:00
|
|
|
{
|
2003-06-22 19:39:47 +00:00
|
|
|
dbus_server_free_data_slot (&server_data_slot);
|
2003-04-06 18:03:03 +00:00
|
|
|
return NULL;
|
|
|
|
|
}
|
2003-04-04 00:39:22 +00:00
|
|
|
|
|
|
|
|
context = bd->context;
|
|
|
|
|
|
2003-06-22 19:39:47 +00:00
|
|
|
dbus_server_free_data_slot (&server_data_slot);
|
2003-04-04 00:39:22 +00:00
|
|
|
|
|
|
|
|
return context;
|
|
|
|
|
}
|
|
|
|
|
|
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)
|
|
|
|
|
{
|
2003-04-18 04:18:57 +00:00
|
|
|
/* FIXME this can be done in dbus-mainloop.c
|
|
|
|
|
* if the code in activation.c for the babysitter
|
|
|
|
|
* watch handler is fixed.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
return dbus_watch_handle (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,
|
2003-03-31 08:19:50 +00:00
|
|
|
void *data)
|
2003-03-13 03:52:58 +00:00
|
|
|
{
|
2003-04-04 00:39:22 +00:00
|
|
|
DBusServer *server = data;
|
|
|
|
|
BusContext *context;
|
|
|
|
|
|
|
|
|
|
context = server_get_context (server);
|
|
|
|
|
|
2003-04-06 23:53:27 +00:00
|
|
|
return _dbus_loop_add_watch (context->loop,
|
|
|
|
|
watch, server_watch_callback, server,
|
|
|
|
|
NULL);
|
2003-03-13 03:52:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
remove_server_watch (DBusWatch *watch,
|
2003-03-31 08:19:50 +00:00
|
|
|
void *data)
|
2003-03-13 03:52:58 +00:00
|
|
|
{
|
2003-04-04 00:39:22 +00:00
|
|
|
DBusServer *server = data;
|
|
|
|
|
BusContext *context;
|
|
|
|
|
|
|
|
|
|
context = server_get_context (server);
|
|
|
|
|
|
2003-04-06 23:53:27 +00:00
|
|
|
_dbus_loop_remove_watch (context->loop,
|
|
|
|
|
watch, server_watch_callback, server);
|
2003-03-13 03:52:58 +00:00
|
|
|
}
|
|
|
|
|
|
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,
|
2003-03-31 08:19:50 +00:00
|
|
|
void *data)
|
2003-03-14 01:27:58 +00:00
|
|
|
{
|
2003-04-04 00:39:22 +00:00
|
|
|
DBusServer *server = data;
|
|
|
|
|
BusContext *context;
|
|
|
|
|
|
|
|
|
|
context = server_get_context (server);
|
|
|
|
|
|
2003-04-06 23:53:27 +00:00
|
|
|
return _dbus_loop_add_timeout (context->loop,
|
|
|
|
|
timeout, server_timeout_callback, server, NULL);
|
2003-03-14 01:27:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
remove_server_timeout (DBusTimeout *timeout,
|
2003-03-31 08:19:50 +00:00
|
|
|
void *data)
|
2003-03-14 01:27:58 +00:00
|
|
|
{
|
2003-04-04 00:39:22 +00:00
|
|
|
DBusServer *server = data;
|
|
|
|
|
BusContext *context;
|
|
|
|
|
|
|
|
|
|
context = server_get_context (server);
|
|
|
|
|
|
2003-04-06 23:53:27 +00:00
|
|
|
_dbus_loop_remove_timeout (context->loop,
|
|
|
|
|
timeout, server_timeout_callback, server);
|
2003-03-14 01:27:58 +00:00
|
|
|
}
|
|
|
|
|
|
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.
|
|
|
|
|
*/
|
2005-06-02 17:41:04 +00:00
|
|
|
dbus_connection_close (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
|
|
|
}
|
2003-04-19 16:16:24 +00:00
|
|
|
|
|
|
|
|
dbus_connection_set_max_received_size (new_connection,
|
2003-04-24 22:30:38 +00:00
|
|
|
context->limits.max_incoming_bytes);
|
2003-04-19 16:16:24 +00:00
|
|
|
|
|
|
|
|
dbus_connection_set_max_message_size (new_connection,
|
2003-04-24 22:30:38 +00:00
|
|
|
context->limits.max_message_size);
|
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-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-04-04 00:39:22 +00:00
|
|
|
static void
|
|
|
|
|
free_server_data (void *data)
|
|
|
|
|
{
|
|
|
|
|
BusServerData *bd = data;
|
|
|
|
|
|
|
|
|
|
dbus_free (bd);
|
|
|
|
|
}
|
|
|
|
|
|
2003-03-31 08:19:50 +00:00
|
|
|
static dbus_bool_t
|
|
|
|
|
setup_server (BusContext *context,
|
|
|
|
|
DBusServer *server,
|
2003-04-01 05:33:01 +00:00
|
|
|
char **auth_mechanisms,
|
2003-03-31 08:19:50 +00:00
|
|
|
DBusError *error)
|
2003-04-01 05:33:01 +00:00
|
|
|
{
|
2003-04-04 00:39:22 +00:00
|
|
|
BusServerData *bd;
|
2003-04-05 23:50:47 +00:00
|
|
|
|
|
|
|
|
bd = dbus_new0 (BusServerData, 1);
|
|
|
|
|
if (!dbus_server_set_data (server,
|
|
|
|
|
server_data_slot,
|
|
|
|
|
bd, free_server_data))
|
|
|
|
|
{
|
|
|
|
|
dbus_free (bd);
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bd->context = context;
|
2003-04-04 00:39:22 +00:00
|
|
|
|
2003-04-01 05:33:01 +00:00
|
|
|
if (!dbus_server_set_auth_mechanisms (server, (const char**) auth_mechanisms))
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2003-03-31 08:19:50 +00:00
|
|
|
dbus_server_set_new_connection_function (server,
|
|
|
|
|
new_connection_callback,
|
|
|
|
|
context, NULL);
|
|
|
|
|
|
|
|
|
|
if (!dbus_server_set_watch_functions (server,
|
|
|
|
|
add_server_watch,
|
|
|
|
|
remove_server_watch,
|
|
|
|
|
NULL,
|
|
|
|
|
server,
|
|
|
|
|
NULL))
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!dbus_server_set_timeout_functions (server,
|
|
|
|
|
add_server_timeout,
|
|
|
|
|
remove_server_timeout,
|
|
|
|
|
NULL,
|
|
|
|
|
server, NULL))
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2003-04-04 00:39:22 +00:00
|
|
|
|
2003-03-31 08:19:50 +00:00
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-16 15:01:25 +00:00
|
|
|
/* This code only gets executed the first time the
|
|
|
|
|
config files are parsed. It is not executed
|
|
|
|
|
when config files are reloaded.*/
|
|
|
|
|
static dbus_bool_t
|
|
|
|
|
process_config_first_time_only (BusContext *context,
|
|
|
|
|
BusConfigParser *parser,
|
|
|
|
|
DBusError *error)
|
2003-03-13 03:52:58 +00:00
|
|
|
{
|
2003-03-31 08:19:50 +00:00
|
|
|
DBusList *link;
|
|
|
|
|
DBusList **addresses;
|
2003-04-06 23:15:41 +00:00
|
|
|
const char *user, *pidfile;
|
2003-04-01 05:33:01 +00:00
|
|
|
char **auth_mechanisms;
|
|
|
|
|
DBusList **auth_mechanisms_list;
|
|
|
|
|
int len;
|
2004-04-16 15:01:25 +00:00
|
|
|
dbus_bool_t retval;
|
2003-03-31 08:19:50 +00:00
|
|
|
|
2004-04-16 15:01:25 +00:00
|
|
|
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
|
2003-04-06 18:03:03 +00:00
|
|
|
|
2004-04-16 15:01:25 +00:00
|
|
|
retval = FALSE;
|
2003-04-01 05:33:01 +00:00
|
|
|
auth_mechanisms = NULL;
|
2003-04-06 23:15:41 +00:00
|
|
|
|
|
|
|
|
/* Check for an existing pid file. Of course this is a race;
|
|
|
|
|
* we'd have to use fcntl() locks on the pid file to
|
|
|
|
|
* avoid that. But we want to check for the pid file
|
|
|
|
|
* before overwriting any existing sockets, etc.
|
|
|
|
|
*/
|
|
|
|
|
pidfile = bus_config_parser_get_pidfile (parser);
|
|
|
|
|
if (pidfile != NULL)
|
|
|
|
|
{
|
|
|
|
|
DBusString u;
|
|
|
|
|
DBusStat stbuf;
|
|
|
|
|
|
|
|
|
|
_dbus_string_init_const (&u, pidfile);
|
|
|
|
|
|
2004-08-10 21:32:25 +00:00
|
|
|
if (_dbus_stat (&u, &stbuf, NULL))
|
2003-04-06 23:15:41 +00:00
|
|
|
{
|
|
|
|
|
dbus_set_error (error, DBUS_ERROR_FAILED,
|
|
|
|
|
"The pid file \"%s\" exists, if the message bus is not running, remove this file",
|
|
|
|
|
pidfile);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-03-13 03:52:58 +00:00
|
|
|
|
2004-04-16 15:01:25 +00:00
|
|
|
/* keep around the pid filename so we can delete it later */
|
|
|
|
|
context->pidfile = _dbus_strdup (pidfile);
|
2003-04-01 05:33:01 +00:00
|
|
|
|
|
|
|
|
/* Build an array of auth mechanisms */
|
|
|
|
|
|
|
|
|
|
auth_mechanisms_list = bus_config_parser_get_mechanisms (parser);
|
|
|
|
|
len = _dbus_list_get_length (auth_mechanisms_list);
|
|
|
|
|
|
|
|
|
|
if (len > 0)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
auth_mechanisms = dbus_new0 (char*, len + 1);
|
|
|
|
|
if (auth_mechanisms == NULL)
|
2004-04-16 15:01:25 +00:00
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
2003-04-01 05:33:01 +00:00
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
|
link = _dbus_list_get_first_link (auth_mechanisms_list);
|
|
|
|
|
while (link != NULL)
|
|
|
|
|
{
|
|
|
|
|
auth_mechanisms[i] = _dbus_strdup (link->data);
|
|
|
|
|
if (auth_mechanisms[i] == NULL)
|
2004-04-16 15:01:25 +00:00
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
2003-04-01 05:33:01 +00:00
|
|
|
link = _dbus_list_get_next_link (auth_mechanisms_list, link);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
auth_mechanisms = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Listen on our addresses */
|
2003-03-31 08:19:50 +00:00
|
|
|
|
|
|
|
|
addresses = bus_config_parser_get_addresses (parser);
|
|
|
|
|
|
|
|
|
|
link = _dbus_list_get_first_link (addresses);
|
|
|
|
|
while (link != NULL)
|
|
|
|
|
{
|
|
|
|
|
DBusServer *server;
|
|
|
|
|
|
|
|
|
|
server = dbus_server_listen (link->data, error);
|
|
|
|
|
if (server == NULL)
|
2004-04-16 15:01:25 +00:00
|
|
|
{
|
|
|
|
|
_DBUS_ASSERT_ERROR_IS_SET (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
2003-04-01 05:33:01 +00:00
|
|
|
else if (!setup_server (context, server, auth_mechanisms, error))
|
2004-04-16 15:01:25 +00:00
|
|
|
{
|
|
|
|
|
_DBUS_ASSERT_ERROR_IS_SET (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
2003-03-31 08:19:50 +00:00
|
|
|
|
|
|
|
|
if (!_dbus_list_append (&context->servers, server))
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
link = _dbus_list_get_next_link (addresses, link);
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-03 05:22:49 +00:00
|
|
|
/* note that type may be NULL */
|
|
|
|
|
context->type = _dbus_strdup (bus_config_parser_get_type (parser));
|
2003-10-16 Havoc Pennington <hp@redhat.com>
* bus/connection.c (bus_pending_reply_expired): either cancel or
execute, not both
(bus_connections_check_reply): use unlink, not remove_link, as we
don't want to free the link; fixes double free mess
* dbus/dbus-pending-call.c (dbus_pending_call_block): fix in case
where no reply was received
* dbus/dbus-connection.c (_dbus_pending_call_complete_and_unlock):
fix a refcount leak
* bus/signals.c (match_rule_matches): add special cases for the
bus driver, so you can match on sender/destination for it.
* dbus/dbus-sysdeps.c (_dbus_abort): print backtrace if
DBUS_PRINT_BACKTRACE is set
* dbus/dbus-internals.c: add pid to assertion failure messages
* dbus/dbus-connection.c: add message type code to the debug spew
* glib/dbus-gproxy.c (gproxy_get_match_rule): match rules want
sender=foo not service=foo
* dbus/dbus-bus.c (dbus_bus_get): if the activation bus is the
session bus but DBUS_SESSION_BUS_ADDRESS isn't set, use
DBUS_ACTIVATION_ADDRESS instead
* bus/activation.c: set DBUS_SESSION_BUS_ADDRESS,
DBUS_SYSTEM_BUS_ADDRESS if appropriate
* bus/bus.c (bus_context_new): handle OOM copying bus type into
context struct
* dbus/dbus-message.c (dbus_message_iter_get_object_path): new function
(dbus_message_iter_get_object_path_array): new function (half
finished, disabled for the moment)
* glib/dbus-gproxy.c (dbus_gproxy_end_call): properly handle
DBUS_MESSAGE_TYPE_ERROR
* tools/dbus-launch.c (babysit): support DBUS_DEBUG_OUTPUT to
avoid redirecting stderr to /dev/null
(babysit): close stdin if not doing the "exit_with_session" thing
* dbus/dbus-sysdeps.c (_dbus_become_daemon): delete some leftover
debug code; change DBUS_DEBUG_OUTPUT to only enable stderr, not
stdout/stdin, so things don't get confused
* bus/system.conf.in: fix to allow replies, I modified .conf
instead of .conf.in again.
2003-10-16 06:34:51 +00:00
|
|
|
if (bus_config_parser_get_type (parser) != NULL && context->type == NULL)
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
2004-04-16 15:01:25 +00:00
|
|
|
|
|
|
|
|
user = bus_config_parser_get_user (parser);
|
|
|
|
|
if (user != NULL)
|
|
|
|
|
{
|
|
|
|
|
context->user = _dbus_strdup (user);
|
|
|
|
|
if (context->user == NULL)
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
context->fork = bus_config_parser_get_fork (parser);
|
2003-04-01 05:33:01 +00:00
|
|
|
|
2004-04-16 15:01:25 +00:00
|
|
|
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
|
|
|
|
|
retval = TRUE;
|
|
|
|
|
|
|
|
|
|
failed:
|
|
|
|
|
dbus_free_string_array (auth_mechanisms);
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This code gets executed every time the config files
|
|
|
|
|
are parsed: both during BusContext construction
|
|
|
|
|
and on reloads. */
|
|
|
|
|
static dbus_bool_t
|
|
|
|
|
process_config_every_time (BusContext *context,
|
|
|
|
|
BusConfigParser *parser,
|
|
|
|
|
dbus_bool_t is_reload,
|
|
|
|
|
DBusError *error)
|
|
|
|
|
{
|
|
|
|
|
DBusString full_address;
|
|
|
|
|
DBusList *link;
|
|
|
|
|
|
|
|
|
|
dbus_bool_t retval;
|
|
|
|
|
|
|
|
|
|
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
|
|
|
|
|
|
|
|
|
|
retval = FALSE;
|
|
|
|
|
|
|
|
|
|
if (!_dbus_string_init (&full_address))
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* get our limits and timeout lengths */
|
|
|
|
|
bus_config_parser_get_limits (parser, &context->limits);
|
|
|
|
|
|
|
|
|
|
context->policy = bus_config_parser_steal_policy (parser);
|
|
|
|
|
_dbus_assert (context->policy != NULL);
|
|
|
|
|
|
2003-03-31 08:19:50 +00:00
|
|
|
/* We have to build the address backward, so that
|
|
|
|
|
* <listen> later in the config file have priority
|
|
|
|
|
*/
|
|
|
|
|
link = _dbus_list_get_last_link (&context->servers);
|
|
|
|
|
while (link != NULL)
|
|
|
|
|
{
|
|
|
|
|
char *addr;
|
|
|
|
|
|
|
|
|
|
addr = dbus_server_get_address (link->data);
|
|
|
|
|
if (addr == NULL)
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (_dbus_string_get_length (&full_address) > 0)
|
|
|
|
|
{
|
|
|
|
|
if (!_dbus_string_append (&full_address, ";"))
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-03-13 03:52:58 +00:00
|
|
|
|
2003-03-31 08:19:50 +00:00
|
|
|
if (!_dbus_string_append (&full_address, addr))
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dbus_free (addr);
|
|
|
|
|
|
|
|
|
|
link = _dbus_list_get_prev_link (&context->servers, link);
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-16 15:01:25 +00:00
|
|
|
if (is_reload)
|
|
|
|
|
dbus_free (context->address);
|
|
|
|
|
|
2003-03-31 08:19:50 +00:00
|
|
|
if (!_dbus_string_copy_data (&full_address, &context->address))
|
2003-03-13 03:52:58 +00:00
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
2003-04-01 05:33:01 +00:00
|
|
|
|
2004-04-16 15:01:25 +00:00
|
|
|
/* Create activation subsystem */
|
|
|
|
|
|
|
|
|
|
if (is_reload)
|
|
|
|
|
bus_activation_unref (context->activation);
|
|
|
|
|
|
|
|
|
|
context->activation = bus_activation_new (context, &full_address,
|
|
|
|
|
bus_config_parser_get_service_dirs (parser),
|
|
|
|
|
error);
|
|
|
|
|
if (context->activation == NULL)
|
|
|
|
|
{
|
|
|
|
|
_DBUS_ASSERT_ERROR_IS_SET (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
2005-06-15 02:31:38 +00:00
|
|
|
/* Drop existing conf-dir watches (if applicable) and watch all conf directories */
|
|
|
|
|
|
|
|
|
|
if (is_reload)
|
|
|
|
|
bus_drop_all_directory_watches ();
|
|
|
|
|
|
|
|
|
|
_dbus_list_foreach (bus_config_parser_get_conf_dirs (parser),
|
|
|
|
|
(DBusForeachFunction) bus_watch_directory,
|
|
|
|
|
NULL);
|
|
|
|
|
|
2004-04-16 15:01:25 +00:00
|
|
|
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
|
|
|
|
|
retval = TRUE;
|
|
|
|
|
|
|
|
|
|
failed:
|
|
|
|
|
_dbus_string_free (&full_address);
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static dbus_bool_t
|
2004-11-07 Colin Walters <walters@verbum.org>
* bus/bus.c (load_config): Break into three
separate functions: process_config_first_time_only,
process_config_every_time, and process_config_postinit.
(process_config_every_time): Move call of
bus_registry_set_service_context_table into
process_config_postinit.
(process_config_postinit): New function, does
any processing that needs to happen late
in initialization (and also on reload).
(bus_context_new): Instead of calling load_config,
open config parser here and call process_config_first_time_only
and process_config_every_time directly. Later, after
we have forked but before changing UID,
invoke bus_selinux_full_init, and then call
process_config_postinit.
(bus_context_reload_config): As in bus_context_new,
load parse file inside here, and call process_config_every_time
and process_config_postinit.
* bus/services.h, bus/services.c
(bus_registry_set_service_context_table): Rename
from bus_registry_set_sid_table. Take string hash from config
parser, and convert them here into SIDs.
* bus/config-parser.c (struct BusConfigParser): Have
config parser only store a mapping of service->context
string.
(merge_service_context_hash): New function.
(merge_included): Merge context string hashes instead
of using bus_selinux_id_table_union.
(bus_config_parser_new): Don't use bus_selinux_id_table_new;
simply create a new string hash.
(bus_config_parser_unref): Unref it.
(start_selinux_child): Simply insert strings into hash,
don't call bus_selinux_id_table_copy_over.
* bus/selinux.h, bus/selinux.c (bus_selinux_id_table_union)
(bus_selinux_id_table_copy_over): Delete.
2004-11-07 17:05:19 +00:00
|
|
|
process_config_postinit (BusContext *context,
|
|
|
|
|
BusConfigParser *parser,
|
|
|
|
|
DBusError *error)
|
2004-04-16 15:01:25 +00:00
|
|
|
{
|
2004-11-07 Colin Walters <walters@verbum.org>
* bus/bus.c (load_config): Break into three
separate functions: process_config_first_time_only,
process_config_every_time, and process_config_postinit.
(process_config_every_time): Move call of
bus_registry_set_service_context_table into
process_config_postinit.
(process_config_postinit): New function, does
any processing that needs to happen late
in initialization (and also on reload).
(bus_context_new): Instead of calling load_config,
open config parser here and call process_config_first_time_only
and process_config_every_time directly. Later, after
we have forked but before changing UID,
invoke bus_selinux_full_init, and then call
process_config_postinit.
(bus_context_reload_config): As in bus_context_new,
load parse file inside here, and call process_config_every_time
and process_config_postinit.
* bus/services.h, bus/services.c
(bus_registry_set_service_context_table): Rename
from bus_registry_set_sid_table. Take string hash from config
parser, and convert them here into SIDs.
* bus/config-parser.c (struct BusConfigParser): Have
config parser only store a mapping of service->context
string.
(merge_service_context_hash): New function.
(merge_included): Merge context string hashes instead
of using bus_selinux_id_table_union.
(bus_config_parser_new): Don't use bus_selinux_id_table_new;
simply create a new string hash.
(bus_config_parser_unref): Unref it.
(start_selinux_child): Simply insert strings into hash,
don't call bus_selinux_id_table_copy_over.
* bus/selinux.h, bus/selinux.c (bus_selinux_id_table_union)
(bus_selinux_id_table_copy_over): Delete.
2004-11-07 17:05:19 +00:00
|
|
|
DBusHashTable *service_context_table;
|
2004-04-16 15:01:25 +00:00
|
|
|
|
2004-11-07 Colin Walters <walters@verbum.org>
* bus/bus.c (load_config): Break into three
separate functions: process_config_first_time_only,
process_config_every_time, and process_config_postinit.
(process_config_every_time): Move call of
bus_registry_set_service_context_table into
process_config_postinit.
(process_config_postinit): New function, does
any processing that needs to happen late
in initialization (and also on reload).
(bus_context_new): Instead of calling load_config,
open config parser here and call process_config_first_time_only
and process_config_every_time directly. Later, after
we have forked but before changing UID,
invoke bus_selinux_full_init, and then call
process_config_postinit.
(bus_context_reload_config): As in bus_context_new,
load parse file inside here, and call process_config_every_time
and process_config_postinit.
* bus/services.h, bus/services.c
(bus_registry_set_service_context_table): Rename
from bus_registry_set_sid_table. Take string hash from config
parser, and convert them here into SIDs.
* bus/config-parser.c (struct BusConfigParser): Have
config parser only store a mapping of service->context
string.
(merge_service_context_hash): New function.
(merge_included): Merge context string hashes instead
of using bus_selinux_id_table_union.
(bus_config_parser_new): Don't use bus_selinux_id_table_new;
simply create a new string hash.
(bus_config_parser_unref): Unref it.
(start_selinux_child): Simply insert strings into hash,
don't call bus_selinux_id_table_copy_over.
* bus/selinux.h, bus/selinux.c (bus_selinux_id_table_union)
(bus_selinux_id_table_copy_over): Delete.
2004-11-07 17:05:19 +00:00
|
|
|
service_context_table = bus_config_parser_steal_service_context_table (parser);
|
|
|
|
|
if (!bus_registry_set_service_context_table (context->registry,
|
|
|
|
|
service_context_table))
|
2004-04-16 15:01:25 +00:00
|
|
|
{
|
2004-11-07 Colin Walters <walters@verbum.org>
* bus/bus.c (load_config): Break into three
separate functions: process_config_first_time_only,
process_config_every_time, and process_config_postinit.
(process_config_every_time): Move call of
bus_registry_set_service_context_table into
process_config_postinit.
(process_config_postinit): New function, does
any processing that needs to happen late
in initialization (and also on reload).
(bus_context_new): Instead of calling load_config,
open config parser here and call process_config_first_time_only
and process_config_every_time directly. Later, after
we have forked but before changing UID,
invoke bus_selinux_full_init, and then call
process_config_postinit.
(bus_context_reload_config): As in bus_context_new,
load parse file inside here, and call process_config_every_time
and process_config_postinit.
* bus/services.h, bus/services.c
(bus_registry_set_service_context_table): Rename
from bus_registry_set_sid_table. Take string hash from config
parser, and convert them here into SIDs.
* bus/config-parser.c (struct BusConfigParser): Have
config parser only store a mapping of service->context
string.
(merge_service_context_hash): New function.
(merge_included): Merge context string hashes instead
of using bus_selinux_id_table_union.
(bus_config_parser_new): Don't use bus_selinux_id_table_new;
simply create a new string hash.
(bus_config_parser_unref): Unref it.
(start_selinux_child): Simply insert strings into hash,
don't call bus_selinux_id_table_copy_over.
* bus/selinux.h, bus/selinux.c (bus_selinux_id_table_union)
(bus_selinux_id_table_copy_over): Delete.
2004-11-07 17:05:19 +00:00
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
return FALSE;
|
2004-04-16 15:01:25 +00:00
|
|
|
}
|
|
|
|
|
|
2004-11-07 Colin Walters <walters@verbum.org>
* bus/bus.c (load_config): Break into three
separate functions: process_config_first_time_only,
process_config_every_time, and process_config_postinit.
(process_config_every_time): Move call of
bus_registry_set_service_context_table into
process_config_postinit.
(process_config_postinit): New function, does
any processing that needs to happen late
in initialization (and also on reload).
(bus_context_new): Instead of calling load_config,
open config parser here and call process_config_first_time_only
and process_config_every_time directly. Later, after
we have forked but before changing UID,
invoke bus_selinux_full_init, and then call
process_config_postinit.
(bus_context_reload_config): As in bus_context_new,
load parse file inside here, and call process_config_every_time
and process_config_postinit.
* bus/services.h, bus/services.c
(bus_registry_set_service_context_table): Rename
from bus_registry_set_sid_table. Take string hash from config
parser, and convert them here into SIDs.
* bus/config-parser.c (struct BusConfigParser): Have
config parser only store a mapping of service->context
string.
(merge_service_context_hash): New function.
(merge_included): Merge context string hashes instead
of using bus_selinux_id_table_union.
(bus_config_parser_new): Don't use bus_selinux_id_table_new;
simply create a new string hash.
(bus_config_parser_unref): Unref it.
(start_selinux_child): Simply insert strings into hash,
don't call bus_selinux_id_table_copy_over.
* bus/selinux.h, bus/selinux.c (bus_selinux_id_table_union)
(bus_selinux_id_table_copy_over): Delete.
2004-11-07 17:05:19 +00:00
|
|
|
_dbus_hash_table_unref (service_context_table);
|
|
|
|
|
return TRUE;
|
2004-04-16 15:01:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BusContext*
|
|
|
|
|
bus_context_new (const DBusString *config_file,
|
2004-09-12 10:23:42 +00:00
|
|
|
ForceForkSetting force_fork,
|
2004-04-16 15:01:25 +00:00
|
|
|
int print_addr_fd,
|
|
|
|
|
int print_pid_fd,
|
|
|
|
|
DBusError *error)
|
|
|
|
|
{
|
|
|
|
|
BusContext *context;
|
2004-11-07 Colin Walters <walters@verbum.org>
* bus/bus.c (load_config): Break into three
separate functions: process_config_first_time_only,
process_config_every_time, and process_config_postinit.
(process_config_every_time): Move call of
bus_registry_set_service_context_table into
process_config_postinit.
(process_config_postinit): New function, does
any processing that needs to happen late
in initialization (and also on reload).
(bus_context_new): Instead of calling load_config,
open config parser here and call process_config_first_time_only
and process_config_every_time directly. Later, after
we have forked but before changing UID,
invoke bus_selinux_full_init, and then call
process_config_postinit.
(bus_context_reload_config): As in bus_context_new,
load parse file inside here, and call process_config_every_time
and process_config_postinit.
* bus/services.h, bus/services.c
(bus_registry_set_service_context_table): Rename
from bus_registry_set_sid_table. Take string hash from config
parser, and convert them here into SIDs.
* bus/config-parser.c (struct BusConfigParser): Have
config parser only store a mapping of service->context
string.
(merge_service_context_hash): New function.
(merge_included): Merge context string hashes instead
of using bus_selinux_id_table_union.
(bus_config_parser_new): Don't use bus_selinux_id_table_new;
simply create a new string hash.
(bus_config_parser_unref): Unref it.
(start_selinux_child): Simply insert strings into hash,
don't call bus_selinux_id_table_copy_over.
* bus/selinux.h, bus/selinux.c (bus_selinux_id_table_union)
(bus_selinux_id_table_copy_over): Delete.
2004-11-07 17:05:19 +00:00
|
|
|
BusConfigParser *parser;
|
2004-04-16 15:01:25 +00:00
|
|
|
|
|
|
|
|
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
|
|
|
|
|
|
2004-11-07 Colin Walters <walters@verbum.org>
* bus/bus.c (load_config): Break into three
separate functions: process_config_first_time_only,
process_config_every_time, and process_config_postinit.
(process_config_every_time): Move call of
bus_registry_set_service_context_table into
process_config_postinit.
(process_config_postinit): New function, does
any processing that needs to happen late
in initialization (and also on reload).
(bus_context_new): Instead of calling load_config,
open config parser here and call process_config_first_time_only
and process_config_every_time directly. Later, after
we have forked but before changing UID,
invoke bus_selinux_full_init, and then call
process_config_postinit.
(bus_context_reload_config): As in bus_context_new,
load parse file inside here, and call process_config_every_time
and process_config_postinit.
* bus/services.h, bus/services.c
(bus_registry_set_service_context_table): Rename
from bus_registry_set_sid_table. Take string hash from config
parser, and convert them here into SIDs.
* bus/config-parser.c (struct BusConfigParser): Have
config parser only store a mapping of service->context
string.
(merge_service_context_hash): New function.
(merge_included): Merge context string hashes instead
of using bus_selinux_id_table_union.
(bus_config_parser_new): Don't use bus_selinux_id_table_new;
simply create a new string hash.
(bus_config_parser_unref): Unref it.
(start_selinux_child): Simply insert strings into hash,
don't call bus_selinux_id_table_copy_over.
* bus/selinux.h, bus/selinux.c (bus_selinux_id_table_union)
(bus_selinux_id_table_copy_over): Delete.
2004-11-07 17:05:19 +00:00
|
|
|
context = NULL;
|
|
|
|
|
parser = NULL;
|
|
|
|
|
|
2004-04-16 15:01:25 +00:00
|
|
|
if (!dbus_server_allocate_data_slot (&server_data_slot))
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
context = dbus_new0 (BusContext, 1);
|
|
|
|
|
if (context == NULL)
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
context->refcount = 1;
|
|
|
|
|
|
|
|
|
|
if (!_dbus_string_copy_data (config_file, &context->config_file))
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
context->loop = _dbus_loop_new ();
|
|
|
|
|
if (context->loop == NULL)
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
2004-07-30 05:59:34 +00:00
|
|
|
context->registry = bus_registry_new (context);
|
|
|
|
|
if (context->registry == NULL)
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
2004-11-07 Colin Walters <walters@verbum.org>
* bus/bus.c (load_config): Break into three
separate functions: process_config_first_time_only,
process_config_every_time, and process_config_postinit.
(process_config_every_time): Move call of
bus_registry_set_service_context_table into
process_config_postinit.
(process_config_postinit): New function, does
any processing that needs to happen late
in initialization (and also on reload).
(bus_context_new): Instead of calling load_config,
open config parser here and call process_config_first_time_only
and process_config_every_time directly. Later, after
we have forked but before changing UID,
invoke bus_selinux_full_init, and then call
process_config_postinit.
(bus_context_reload_config): As in bus_context_new,
load parse file inside here, and call process_config_every_time
and process_config_postinit.
* bus/services.h, bus/services.c
(bus_registry_set_service_context_table): Rename
from bus_registry_set_sid_table. Take string hash from config
parser, and convert them here into SIDs.
* bus/config-parser.c (struct BusConfigParser): Have
config parser only store a mapping of service->context
string.
(merge_service_context_hash): New function.
(merge_included): Merge context string hashes instead
of using bus_selinux_id_table_union.
(bus_config_parser_new): Don't use bus_selinux_id_table_new;
simply create a new string hash.
(bus_config_parser_unref): Unref it.
(start_selinux_child): Simply insert strings into hash,
don't call bus_selinux_id_table_copy_over.
* bus/selinux.h, bus/selinux.c (bus_selinux_id_table_union)
(bus_selinux_id_table_copy_over): Delete.
2004-11-07 17:05:19 +00:00
|
|
|
|
|
|
|
|
parser = bus_config_load (config_file, TRUE, NULL, error);
|
|
|
|
|
if (parser == NULL)
|
|
|
|
|
{
|
|
|
|
|
_DBUS_ASSERT_ERROR_IS_SET (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
2004-07-30 05:59:34 +00:00
|
|
|
|
2004-11-07 Colin Walters <walters@verbum.org>
* bus/bus.c (load_config): Break into three
separate functions: process_config_first_time_only,
process_config_every_time, and process_config_postinit.
(process_config_every_time): Move call of
bus_registry_set_service_context_table into
process_config_postinit.
(process_config_postinit): New function, does
any processing that needs to happen late
in initialization (and also on reload).
(bus_context_new): Instead of calling load_config,
open config parser here and call process_config_first_time_only
and process_config_every_time directly. Later, after
we have forked but before changing UID,
invoke bus_selinux_full_init, and then call
process_config_postinit.
(bus_context_reload_config): As in bus_context_new,
load parse file inside here, and call process_config_every_time
and process_config_postinit.
* bus/services.h, bus/services.c
(bus_registry_set_service_context_table): Rename
from bus_registry_set_sid_table. Take string hash from config
parser, and convert them here into SIDs.
* bus/config-parser.c (struct BusConfigParser): Have
config parser only store a mapping of service->context
string.
(merge_service_context_hash): New function.
(merge_included): Merge context string hashes instead
of using bus_selinux_id_table_union.
(bus_config_parser_new): Don't use bus_selinux_id_table_new;
simply create a new string hash.
(bus_config_parser_unref): Unref it.
(start_selinux_child): Simply insert strings into hash,
don't call bus_selinux_id_table_copy_over.
* bus/selinux.h, bus/selinux.c (bus_selinux_id_table_union)
(bus_selinux_id_table_copy_over): Delete.
2004-11-07 17:05:19 +00:00
|
|
|
if (!process_config_first_time_only (context, parser, error))
|
|
|
|
|
{
|
|
|
|
|
_DBUS_ASSERT_ERROR_IS_SET (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
if (!process_config_every_time (context, parser, FALSE, error))
|
2004-04-16 15:01:25 +00:00
|
|
|
{
|
|
|
|
|
_DBUS_ASSERT_ERROR_IS_SET (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* we need another ref of the server data slot for the context
|
|
|
|
|
* to own
|
|
|
|
|
*/
|
|
|
|
|
if (!dbus_server_allocate_data_slot (&server_data_slot))
|
|
|
|
|
_dbus_assert_not_reached ("second ref of server data slot failed");
|
|
|
|
|
|
|
|
|
|
context->user_database = _dbus_user_database_new ();
|
|
|
|
|
if (context->user_database == NULL)
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-06 20:04:47 +00:00
|
|
|
/* Note that we don't know whether the print_addr_fd is
|
|
|
|
|
* one of the sockets we're using to listen on, or some
|
|
|
|
|
* other random thing. But I think the answer is "don't do
|
|
|
|
|
* that then"
|
|
|
|
|
*/
|
|
|
|
|
if (print_addr_fd >= 0)
|
|
|
|
|
{
|
|
|
|
|
DBusString addr;
|
|
|
|
|
const char *a = bus_context_get_address (context);
|
|
|
|
|
int bytes;
|
|
|
|
|
|
|
|
|
|
_dbus_assert (a != NULL);
|
|
|
|
|
if (!_dbus_string_init (&addr))
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!_dbus_string_append (&addr, a) ||
|
|
|
|
|
!_dbus_string_append (&addr, "\n"))
|
|
|
|
|
{
|
|
|
|
|
_dbus_string_free (&addr);
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bytes = _dbus_string_get_length (&addr);
|
|
|
|
|
if (_dbus_write (print_addr_fd, &addr, 0, bytes) != bytes)
|
|
|
|
|
{
|
|
|
|
|
dbus_set_error (error, DBUS_ERROR_FAILED,
|
|
|
|
|
"Printing message bus address: %s\n",
|
|
|
|
|
_dbus_strerror (errno));
|
|
|
|
|
_dbus_string_free (&addr);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (print_addr_fd > 2)
|
|
|
|
|
_dbus_close (print_addr_fd, NULL);
|
|
|
|
|
|
|
|
|
|
_dbus_string_free (&addr);
|
|
|
|
|
}
|
|
|
|
|
|
2003-03-13 03:52:58 +00:00
|
|
|
context->connections = bus_connections_new (context);
|
|
|
|
|
if (context->connections == NULL)
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
2003-09-21 19:53:56 +00:00
|
|
|
context->matchmaker = bus_matchmaker_new ();
|
|
|
|
|
if (context->matchmaker == NULL)
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-01 05:33:01 +00:00
|
|
|
/* Now become a daemon if appropriate */
|
2004-09-12 10:23:42 +00:00
|
|
|
if ((force_fork != FORK_NEVER && context->fork) || force_fork == FORK_ALWAYS)
|
2003-04-01 05:33:01 +00:00
|
|
|
{
|
2003-04-06 23:15:41 +00:00
|
|
|
DBusString u;
|
|
|
|
|
|
2004-04-16 15:01:25 +00:00
|
|
|
if (context->pidfile)
|
|
|
|
|
_dbus_string_init_const (&u, context->pidfile);
|
2003-04-06 23:15:41 +00:00
|
|
|
|
2004-10-29 19:59:15 +00:00
|
|
|
if (!_dbus_become_daemon (context->pidfile ? &u : NULL,
|
|
|
|
|
print_pid_fd,
|
|
|
|
|
error))
|
2004-04-16 15:01:25 +00:00
|
|
|
{
|
|
|
|
|
_DBUS_ASSERT_ERROR_IS_SET (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
2003-04-01 05:33:01 +00:00
|
|
|
}
|
2003-04-06 23:15:41 +00:00
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Need to write PID file for ourselves, not for the child process */
|
2004-04-16 15:01:25 +00:00
|
|
|
if (context->pidfile != NULL)
|
2003-04-06 23:15:41 +00:00
|
|
|
{
|
|
|
|
|
DBusString u;
|
|
|
|
|
|
2004-04-16 15:01:25 +00:00
|
|
|
_dbus_string_init_const (&u, context->pidfile);
|
2003-04-06 23:15:41 +00:00
|
|
|
|
|
|
|
|
if (!_dbus_write_pid_file (&u, _dbus_getpid (), error))
|
2004-04-16 15:01:25 +00:00
|
|
|
{
|
|
|
|
|
_DBUS_ASSERT_ERROR_IS_SET (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
2003-04-06 23:15:41 +00:00
|
|
|
}
|
|
|
|
|
}
|
2003-04-09 00:27:41 +00:00
|
|
|
|
2003-05-04 08:54:24 +00:00
|
|
|
/* Write PID if requested */
|
|
|
|
|
if (print_pid_fd >= 0)
|
|
|
|
|
{
|
|
|
|
|
DBusString pid;
|
|
|
|
|
int bytes;
|
|
|
|
|
|
|
|
|
|
if (!_dbus_string_init (&pid))
|
|
|
|
|
{
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!_dbus_string_append_int (&pid, _dbus_getpid ()) ||
|
|
|
|
|
!_dbus_string_append (&pid, "\n"))
|
|
|
|
|
{
|
|
|
|
|
_dbus_string_free (&pid);
|
|
|
|
|
BUS_SET_OOM (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bytes = _dbus_string_get_length (&pid);
|
|
|
|
|
if (_dbus_write (print_pid_fd, &pid, 0, bytes) != bytes)
|
|
|
|
|
{
|
|
|
|
|
dbus_set_error (error, DBUS_ERROR_FAILED,
|
|
|
|
|
"Printing message bus PID: %s\n",
|
|
|
|
|
_dbus_strerror (errno));
|
|
|
|
|
_dbus_string_free (&pid);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (print_pid_fd > 2)
|
|
|
|
|
_dbus_close (print_pid_fd, NULL);
|
|
|
|
|
|
|
|
|
|
_dbus_string_free (&pid);
|
|
|
|
|
}
|
2004-11-07 Colin Walters <walters@verbum.org>
* bus/bus.c (load_config): Break into three
separate functions: process_config_first_time_only,
process_config_every_time, and process_config_postinit.
(process_config_every_time): Move call of
bus_registry_set_service_context_table into
process_config_postinit.
(process_config_postinit): New function, does
any processing that needs to happen late
in initialization (and also on reload).
(bus_context_new): Instead of calling load_config,
open config parser here and call process_config_first_time_only
and process_config_every_time directly. Later, after
we have forked but before changing UID,
invoke bus_selinux_full_init, and then call
process_config_postinit.
(bus_context_reload_config): As in bus_context_new,
load parse file inside here, and call process_config_every_time
and process_config_postinit.
* bus/services.h, bus/services.c
(bus_registry_set_service_context_table): Rename
from bus_registry_set_sid_table. Take string hash from config
parser, and convert them here into SIDs.
* bus/config-parser.c (struct BusConfigParser): Have
config parser only store a mapping of service->context
string.
(merge_service_context_hash): New function.
(merge_included): Merge context string hashes instead
of using bus_selinux_id_table_union.
(bus_config_parser_new): Don't use bus_selinux_id_table_new;
simply create a new string hash.
(bus_config_parser_unref): Unref it.
(start_selinux_child): Simply insert strings into hash,
don't call bus_selinux_id_table_copy_over.
* bus/selinux.h, bus/selinux.c (bus_selinux_id_table_union)
(bus_selinux_id_table_copy_over): Delete.
2004-11-07 17:05:19 +00:00
|
|
|
|
|
|
|
|
if (!bus_selinux_full_init ())
|
|
|
|
|
{
|
|
|
|
|
_dbus_warn ("SELinux initialization failed\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!process_config_postinit (context, parser, error))
|
|
|
|
|
{
|
|
|
|
|
_DBUS_ASSERT_ERROR_IS_SET (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
2005-06-15 02:31:38 +00:00
|
|
|
|
2004-11-07 Colin Walters <walters@verbum.org>
* bus/bus.c (load_config): Break into three
separate functions: process_config_first_time_only,
process_config_every_time, and process_config_postinit.
(process_config_every_time): Move call of
bus_registry_set_service_context_table into
process_config_postinit.
(process_config_postinit): New function, does
any processing that needs to happen late
in initialization (and also on reload).
(bus_context_new): Instead of calling load_config,
open config parser here and call process_config_first_time_only
and process_config_every_time directly. Later, after
we have forked but before changing UID,
invoke bus_selinux_full_init, and then call
process_config_postinit.
(bus_context_reload_config): As in bus_context_new,
load parse file inside here, and call process_config_every_time
and process_config_postinit.
* bus/services.h, bus/services.c
(bus_registry_set_service_context_table): Rename
from bus_registry_set_sid_table. Take string hash from config
parser, and convert them here into SIDs.
* bus/config-parser.c (struct BusConfigParser): Have
config parser only store a mapping of service->context
string.
(merge_service_context_hash): New function.
(merge_included): Merge context string hashes instead
of using bus_selinux_id_table_union.
(bus_config_parser_new): Don't use bus_selinux_id_table_new;
simply create a new string hash.
(bus_config_parser_unref): Unref it.
(start_selinux_child): Simply insert strings into hash,
don't call bus_selinux_id_table_copy_over.
* bus/selinux.h, bus/selinux.c (bus_selinux_id_table_union)
(bus_selinux_id_table_copy_over): Delete.
2004-11-07 17:05:19 +00:00
|
|
|
if (parser != NULL)
|
2005-06-16 06:05:09 +00:00
|
|
|
{
|
|
|
|
|
bus_config_parser_unref (parser);
|
|
|
|
|
parser = NULL;
|
|
|
|
|
}
|
2003-05-04 08:54:24 +00:00
|
|
|
|
2003-04-11 20:10:36 +00:00
|
|
|
/* Here we change our credentials if required,
|
|
|
|
|
* as soon as we've set up our sockets and pidfile
|
|
|
|
|
*/
|
2004-04-16 15:01:25 +00:00
|
|
|
if (context->user != NULL)
|
2003-04-11 20:10:36 +00:00
|
|
|
{
|
|
|
|
|
DBusCredentials creds;
|
|
|
|
|
DBusString u;
|
|
|
|
|
|
2004-04-16 15:01:25 +00:00
|
|
|
_dbus_string_init_const (&u, context->user);
|
2003-04-11 20:10:36 +00:00
|
|
|
|
|
|
|
|
if (!_dbus_credentials_from_username (&u, &creds) ||
|
|
|
|
|
creds.uid < 0 ||
|
|
|
|
|
creds.gid < 0)
|
|
|
|
|
{
|
|
|
|
|
dbus_set_error (error, DBUS_ERROR_FAILED,
|
|
|
|
|
"Could not get UID and GID for username \"%s\"",
|
2004-04-16 15:01:25 +00:00
|
|
|
context->user);
|
2003-04-11 20:10:36 +00:00
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!_dbus_change_identity (creds.uid, creds.gid, error))
|
2004-04-16 15:01:25 +00:00
|
|
|
{
|
|
|
|
|
_DBUS_ASSERT_ERROR_IS_SET (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
2003-04-11 20:10:36 +00:00
|
|
|
}
|
2003-04-01 05:33:01 +00:00
|
|
|
|
2003-06-22 19:39:47 +00:00
|
|
|
dbus_server_free_data_slot (&server_data_slot);
|
2003-03-13 03:52:58 +00:00
|
|
|
|
|
|
|
|
return context;
|
|
|
|
|
|
2003-04-01 05:33:01 +00:00
|
|
|
failed:
|
2004-11-07 Colin Walters <walters@verbum.org>
* bus/bus.c (load_config): Break into three
separate functions: process_config_first_time_only,
process_config_every_time, and process_config_postinit.
(process_config_every_time): Move call of
bus_registry_set_service_context_table into
process_config_postinit.
(process_config_postinit): New function, does
any processing that needs to happen late
in initialization (and also on reload).
(bus_context_new): Instead of calling load_config,
open config parser here and call process_config_first_time_only
and process_config_every_time directly. Later, after
we have forked but before changing UID,
invoke bus_selinux_full_init, and then call
process_config_postinit.
(bus_context_reload_config): As in bus_context_new,
load parse file inside here, and call process_config_every_time
and process_config_postinit.
* bus/services.h, bus/services.c
(bus_registry_set_service_context_table): Rename
from bus_registry_set_sid_table. Take string hash from config
parser, and convert them here into SIDs.
* bus/config-parser.c (struct BusConfigParser): Have
config parser only store a mapping of service->context
string.
(merge_service_context_hash): New function.
(merge_included): Merge context string hashes instead
of using bus_selinux_id_table_union.
(bus_config_parser_new): Don't use bus_selinux_id_table_new;
simply create a new string hash.
(bus_config_parser_unref): Unref it.
(start_selinux_child): Simply insert strings into hash,
don't call bus_selinux_id_table_copy_over.
* bus/selinux.h, bus/selinux.c (bus_selinux_id_table_union)
(bus_selinux_id_table_copy_over): Delete.
2004-11-07 17:05:19 +00:00
|
|
|
if (parser != NULL)
|
|
|
|
|
bus_config_parser_unref (parser);
|
2003-03-31 08:19:50 +00:00
|
|
|
if (context != NULL)
|
|
|
|
|
bus_context_unref (context);
|
|
|
|
|
|
2004-04-21 21:29:07 +00:00
|
|
|
if (server_data_slot >= 0)
|
|
|
|
|
dbus_server_free_data_slot (&server_data_slot);
|
2003-04-04 00:39:22 +00:00
|
|
|
|
2003-03-13 03:52:58 +00:00
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-16 15:01:25 +00:00
|
|
|
dbus_bool_t
|
|
|
|
|
bus_context_reload_config (BusContext *context,
|
|
|
|
|
DBusError *error)
|
|
|
|
|
{
|
2004-11-07 Colin Walters <walters@verbum.org>
* bus/bus.c (load_config): Break into three
separate functions: process_config_first_time_only,
process_config_every_time, and process_config_postinit.
(process_config_every_time): Move call of
bus_registry_set_service_context_table into
process_config_postinit.
(process_config_postinit): New function, does
any processing that needs to happen late
in initialization (and also on reload).
(bus_context_new): Instead of calling load_config,
open config parser here and call process_config_first_time_only
and process_config_every_time directly. Later, after
we have forked but before changing UID,
invoke bus_selinux_full_init, and then call
process_config_postinit.
(bus_context_reload_config): As in bus_context_new,
load parse file inside here, and call process_config_every_time
and process_config_postinit.
* bus/services.h, bus/services.c
(bus_registry_set_service_context_table): Rename
from bus_registry_set_sid_table. Take string hash from config
parser, and convert them here into SIDs.
* bus/config-parser.c (struct BusConfigParser): Have
config parser only store a mapping of service->context
string.
(merge_service_context_hash): New function.
(merge_included): Merge context string hashes instead
of using bus_selinux_id_table_union.
(bus_config_parser_new): Don't use bus_selinux_id_table_new;
simply create a new string hash.
(bus_config_parser_unref): Unref it.
(start_selinux_child): Simply insert strings into hash,
don't call bus_selinux_id_table_copy_over.
* bus/selinux.h, bus/selinux.c (bus_selinux_id_table_union)
(bus_selinux_id_table_copy_over): Delete.
2004-11-07 17:05:19 +00:00
|
|
|
BusConfigParser *parser;
|
|
|
|
|
DBusString config_file;
|
|
|
|
|
dbus_bool_t ret;
|
|
|
|
|
|
|
|
|
|
ret = FALSE;
|
|
|
|
|
_dbus_string_init_const (&config_file, context->config_file);
|
|
|
|
|
parser = bus_config_load (&config_file, TRUE, NULL, error);
|
|
|
|
|
if (parser == NULL)
|
|
|
|
|
{
|
|
|
|
|
_DBUS_ASSERT_ERROR_IS_SET (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!process_config_every_time (context, parser, TRUE, error))
|
|
|
|
|
{
|
|
|
|
|
_DBUS_ASSERT_ERROR_IS_SET (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
if (!process_config_postinit (context, parser, error))
|
|
|
|
|
{
|
|
|
|
|
_DBUS_ASSERT_ERROR_IS_SET (error);
|
|
|
|
|
goto failed;
|
|
|
|
|
}
|
|
|
|
|
ret = TRUE;
|
|
|
|
|
|
|
|
|
|
failed:
|
|
|
|
|
if (parser != NULL)
|
|
|
|
|
bus_config_parser_unref (parser);
|
|
|
|
|
return ret;
|
2004-04-16 15:01:25 +00:00
|
|
|
}
|
|
|
|
|
|
2003-03-31 08:19:50 +00:00
|
|
|
static void
|
|
|
|
|
shutdown_server (BusContext *context,
|
|
|
|
|
DBusServer *server)
|
2003-03-13 03:52:58 +00:00
|
|
|
{
|
2003-03-31 08:19:50 +00:00
|
|
|
if (server == NULL ||
|
|
|
|
|
!dbus_server_get_is_connected (server))
|
2003-03-14 01:27:58 +00:00
|
|
|
return;
|
|
|
|
|
|
2003-03-31 08:19:50 +00:00
|
|
|
if (!dbus_server_set_watch_functions (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");
|
|
|
|
|
|
2003-03-31 08:19:50 +00:00
|
|
|
if (!dbus_server_set_timeout_functions (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-31 08:19:50 +00:00
|
|
|
dbus_server_disconnect (server);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
bus_context_shutdown (BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
DBusList *link;
|
|
|
|
|
|
|
|
|
|
link = _dbus_list_get_first_link (&context->servers);
|
|
|
|
|
while (link != NULL)
|
|
|
|
|
{
|
|
|
|
|
shutdown_server (context, link->data);
|
|
|
|
|
|
|
|
|
|
link = _dbus_list_get_next_link (&context->servers, link);
|
|
|
|
|
}
|
2003-03-13 03:52:58 +00:00
|
|
|
}
|
|
|
|
|
|
2003-11-27 01:25:50 +00:00
|
|
|
BusContext *
|
2003-03-13 03:52:58 +00:00
|
|
|
bus_context_ref (BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
_dbus_assert (context->refcount > 0);
|
|
|
|
|
context->refcount += 1;
|
2003-11-27 01:25:50 +00:00
|
|
|
|
|
|
|
|
return context;
|
2003-03-13 03:52:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
bus_context_unref (BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
_dbus_assert (context->refcount > 0);
|
|
|
|
|
context->refcount -= 1;
|
|
|
|
|
|
|
|
|
|
if (context->refcount == 0)
|
|
|
|
|
{
|
2003-03-31 08:19:50 +00:00
|
|
|
DBusList *link;
|
|
|
|
|
|
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-31 08:19:50 +00:00
|
|
|
|
|
|
|
|
link = _dbus_list_get_first_link (&context->servers);
|
|
|
|
|
while (link != 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-31 08:19:50 +00:00
|
|
|
dbus_server_unref (link->data);
|
|
|
|
|
|
|
|
|
|
link = _dbus_list_get_next_link (&context->servers, link);
|
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-31 08:19:50 +00:00
|
|
|
_dbus_list_clear (&context->servers);
|
2003-03-21 02:38:40 +00:00
|
|
|
|
2003-04-12 18:32:11 +00:00
|
|
|
if (context->policy)
|
2003-03-21 02:38:40 +00:00
|
|
|
{
|
2003-04-12 18:32:11 +00:00
|
|
|
bus_policy_unref (context->policy);
|
|
|
|
|
context->policy = NULL;
|
2003-03-21 02:38:40 +00:00
|
|
|
}
|
2003-04-12 18:32:11 +00:00
|
|
|
|
2003-04-04 00:39:22 +00:00
|
|
|
if (context->loop)
|
|
|
|
|
{
|
2003-04-06 23:53:27 +00:00
|
|
|
_dbus_loop_unref (context->loop);
|
2003-04-04 00:39:22 +00:00
|
|
|
context->loop = NULL;
|
|
|
|
|
}
|
2003-09-21 19:53:56 +00:00
|
|
|
|
|
|
|
|
if (context->matchmaker)
|
|
|
|
|
{
|
|
|
|
|
bus_matchmaker_unref (context->matchmaker);
|
|
|
|
|
context->matchmaker = NULL;
|
|
|
|
|
}
|
2003-04-04 00:39:22 +00:00
|
|
|
|
2004-04-16 15:01:25 +00:00
|
|
|
dbus_free (context->config_file);
|
2003-04-03 05:22:49 +00:00
|
|
|
dbus_free (context->type);
|
2003-03-13 03:52:58 +00:00
|
|
|
dbus_free (context->address);
|
2004-04-16 15:01:25 +00:00
|
|
|
dbus_free (context->user);
|
2003-04-09 00:27:41 +00:00
|
|
|
|
|
|
|
|
if (context->pidfile)
|
|
|
|
|
{
|
|
|
|
|
DBusString u;
|
|
|
|
|
_dbus_string_init_const (&u, context->pidfile);
|
|
|
|
|
|
|
|
|
|
/* Deliberately ignore errors here, since there's not much
|
|
|
|
|
* we can do about it, and we're exiting anyways.
|
|
|
|
|
*/
|
|
|
|
|
_dbus_delete_file (&u, NULL);
|
|
|
|
|
|
|
|
|
|
dbus_free (context->pidfile);
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-21 21:29:07 +00:00
|
|
|
if (context->user_database != NULL)
|
|
|
|
|
_dbus_user_database_unref (context->user_database);
|
2003-04-17 00:46:36 +00:00
|
|
|
|
2003-03-13 03:52:58 +00:00
|
|
|
dbus_free (context);
|
2003-04-04 00:39:22 +00:00
|
|
|
|
2003-06-22 19:39:47 +00:00
|
|
|
dbus_server_free_data_slot (&server_data_slot);
|
2003-03-13 03:52:58 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-03 05:22:49 +00:00
|
|
|
/* type may be NULL */
|
|
|
|
|
const char*
|
|
|
|
|
bus_context_get_type (BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
return context->type;
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-06 18:03:03 +00:00
|
|
|
const char*
|
|
|
|
|
bus_context_get_address (BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
return context->address;
|
|
|
|
|
}
|
|
|
|
|
|
2003-03-13 03:52:58 +00:00
|
|
|
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
|
|
|
|
2003-09-21 19:53:56 +00:00
|
|
|
BusMatchmaker*
|
|
|
|
|
bus_context_get_matchmaker (BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
return context->matchmaker;
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-06 23:53:27 +00:00
|
|
|
DBusLoop*
|
2003-04-04 00:39:22 +00:00
|
|
|
bus_context_get_loop (BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
return context->loop;
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-17 00:46:36 +00:00
|
|
|
DBusUserDatabase*
|
|
|
|
|
bus_context_get_user_database (BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
return context->user_database;
|
|
|
|
|
}
|
|
|
|
|
|
2003-03-23 07:41:54 +00:00
|
|
|
dbus_bool_t
|
|
|
|
|
bus_context_allow_user (BusContext *context,
|
|
|
|
|
unsigned long uid)
|
|
|
|
|
{
|
2003-04-17 00:46:36 +00:00
|
|
|
return bus_policy_allow_user (context->policy,
|
|
|
|
|
context->user_database,
|
|
|
|
|
uid);
|
2003-03-23 07:41:54 +00:00
|
|
|
}
|
|
|
|
|
|
2004-07-30 05:59:34 +00:00
|
|
|
BusPolicy *
|
|
|
|
|
bus_context_get_policy (BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
return context->policy;
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-12 18:32:11 +00:00
|
|
|
BusClientPolicy*
|
|
|
|
|
bus_context_create_client_policy (BusContext *context,
|
2003-04-27 06:25:42 +00:00
|
|
|
DBusConnection *connection,
|
|
|
|
|
DBusError *error)
|
2003-03-23 07:41:54 +00:00
|
|
|
{
|
2003-04-27 06:25:42 +00:00
|
|
|
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
|
|
|
|
|
return bus_policy_create_client_policy (context->policy, connection,
|
|
|
|
|
error);
|
2003-03-23 07:41:54 +00:00
|
|
|
}
|
2003-04-05 19:03:40 +00:00
|
|
|
|
|
|
|
|
int
|
|
|
|
|
bus_context_get_activation_timeout (BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
|
2003-04-24 22:30:38 +00:00
|
|
|
return context->limits.activation_timeout;
|
2003-04-05 19:03:40 +00:00
|
|
|
}
|
2003-04-14 02:29:21 +00:00
|
|
|
|
2003-04-19 16:16:24 +00:00
|
|
|
int
|
|
|
|
|
bus_context_get_auth_timeout (BusContext *context)
|
|
|
|
|
{
|
2003-04-24 22:30:38 +00:00
|
|
|
return context->limits.auth_timeout;
|
2003-04-19 16:16:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
bus_context_get_max_completed_connections (BusContext *context)
|
|
|
|
|
{
|
2003-04-24 22:30:38 +00:00
|
|
|
return context->limits.max_completed_connections;
|
2003-04-19 16:16:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
bus_context_get_max_incomplete_connections (BusContext *context)
|
|
|
|
|
{
|
2003-04-24 22:30:38 +00:00
|
|
|
return context->limits.max_incomplete_connections;
|
2003-04-19 16:16:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
bus_context_get_max_connections_per_user (BusContext *context)
|
|
|
|
|
{
|
2003-04-24 22:30:38 +00:00
|
|
|
return context->limits.max_connections_per_user;
|
2003-04-19 16:16:24 +00:00
|
|
|
}
|
|
|
|
|
|
2003-04-25 23:50:34 +00:00
|
|
|
int
|
|
|
|
|
bus_context_get_max_pending_activations (BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
return context->limits.max_pending_activations;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
bus_context_get_max_services_per_connection (BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
return context->limits.max_services_per_connection;
|
|
|
|
|
}
|
|
|
|
|
|
2003-09-21 19:53:56 +00:00
|
|
|
int
|
|
|
|
|
bus_context_get_max_match_rules_per_connection (BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
return context->limits.max_match_rules_per_connection;
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-14 05:16:56 +00:00
|
|
|
int
|
|
|
|
|
bus_context_get_max_replies_per_connection (BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
return context->limits.max_replies_per_connection;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
bus_context_get_reply_timeout (BusContext *context)
|
|
|
|
|
{
|
|
|
|
|
return context->limits.reply_timeout;
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-10 02:42:21 +00:00
|
|
|
/*
|
|
|
|
|
* addressed_recipient is the recipient specified in the message.
|
|
|
|
|
*
|
|
|
|
|
* proposed_recipient is the recipient we're considering sending
|
|
|
|
|
* to right this second, and may be an eavesdropper.
|
|
|
|
|
*
|
|
|
|
|
* sender is the sender of the message.
|
|
|
|
|
*
|
|
|
|
|
* NULL for proposed_recipient or sender definitely means the bus driver.
|
|
|
|
|
*
|
|
|
|
|
* NULL for addressed_recipient may mean the bus driver, or may mean
|
|
|
|
|
* no destination was specified in the message (e.g. a signal).
|
|
|
|
|
*/
|
2003-04-14 02:29:21 +00:00
|
|
|
dbus_bool_t
|
|
|
|
|
bus_context_check_security_policy (BusContext *context,
|
2003-10-14 05:16:56 +00:00
|
|
|
BusTransaction *transaction,
|
2003-04-14 02:29:21 +00:00
|
|
|
DBusConnection *sender,
|
2003-09-21 19:53:56 +00:00
|
|
|
DBusConnection *addressed_recipient,
|
|
|
|
|
DBusConnection *proposed_recipient,
|
2003-04-14 02:29:21 +00:00
|
|
|
DBusMessage *message,
|
|
|
|
|
DBusError *error)
|
|
|
|
|
{
|
|
|
|
|
BusClientPolicy *sender_policy;
|
|
|
|
|
BusClientPolicy *recipient_policy;
|
2003-10-14 05:16:56 +00:00
|
|
|
int type;
|
2003-10-14 22:16:03 +00:00
|
|
|
dbus_bool_t requested_reply;
|
2003-10-14 05:16:56 +00:00
|
|
|
|
|
|
|
|
type = dbus_message_get_type (message);
|
|
|
|
|
|
|
|
|
|
/* dispatch.c was supposed to ensure these invariants */
|
|
|
|
|
_dbus_assert (dbus_message_get_destination (message) != NULL ||
|
2003-10-22 16:01:08 +00:00
|
|
|
type == DBUS_MESSAGE_TYPE_SIGNAL ||
|
|
|
|
|
(sender == NULL && !bus_connection_is_active (proposed_recipient)));
|
2003-10-14 05:16:56 +00:00
|
|
|
_dbus_assert (type == DBUS_MESSAGE_TYPE_SIGNAL ||
|
|
|
|
|
addressed_recipient != NULL ||
|
2005-02-17 21:19:49 +00:00
|
|
|
strcmp (dbus_message_get_destination (message), DBUS_SERVICE_DBUS) == 0);
|
2003-09-21 19:53:56 +00:00
|
|
|
|
2003-10-14 22:16:03 +00:00
|
|
|
switch (type)
|
|
|
|
|
{
|
|
|
|
|
case DBUS_MESSAGE_TYPE_METHOD_CALL:
|
|
|
|
|
case DBUS_MESSAGE_TYPE_SIGNAL:
|
|
|
|
|
case DBUS_MESSAGE_TYPE_METHOD_RETURN:
|
|
|
|
|
case DBUS_MESSAGE_TYPE_ERROR:
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
_dbus_verbose ("security check disallowing message of unknown type %d\n",
|
|
|
|
|
type);
|
|
|
|
|
|
|
|
|
|
dbus_set_error (error, DBUS_ERROR_ACCESS_DENIED,
|
|
|
|
|
"Message bus will not accept messages of unknown type\n");
|
|
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
requested_reply = FALSE;
|
|
|
|
|
|
2003-04-14 02:29:21 +00:00
|
|
|
if (sender != NULL)
|
|
|
|
|
{
|
2004-11-09 Colin Walters <walters@verbum.org>
* dbus/dbus-string.c (_dbus_string_get_length): New
function, writes DBusString to C buffer.
* dbus/dbus-string.h: Prototype it.
* dbus/dbus-message.c (dbus_message_type_to_string): New
function, converts message type into C string.
* dbus/dbus-message.h: Prototype it.
* bus/selinux.c (bus_selinux_check): Take source pid,
target pid, and audit data. Pass audit data to
avc_has_perm.
(log_audit_callback): New function, appends extra
audit information.
(bus_selinux_allows_acquire_service): Also take
service name, add it to audit data.
(bus_selinux_allows_send): Also take message
type, interface, method member, error name,
and destination, and add them to audit data.
(log_cb): Initialize func_audit.
* bus/selinux.h (bus_selinux_allows_acquire_service)
(bus_selinux_allows_send): Update prototypes
* bus/services.c (bus_registry_acquire_service): Pass
service name to bus_selinux_allows_acquire_service.
* bus/bus.c (bus_context_check_security_policy): Pass
additional audit data. Move assignment of dest
to its own line.
2004-11-09 06:11:33 +00:00
|
|
|
const char *dest;
|
|
|
|
|
|
|
|
|
|
dest = dbus_message_get_destination (message);
|
|
|
|
|
|
2004-07-30 05:59:34 +00:00
|
|
|
/* First verify the SELinux access controls. If allowed then
|
|
|
|
|
* go on with the standard checks.
|
|
|
|
|
*/
|
2004-11-09 Colin Walters <walters@verbum.org>
* dbus/dbus-string.c (_dbus_string_get_length): New
function, writes DBusString to C buffer.
* dbus/dbus-string.h: Prototype it.
* dbus/dbus-message.c (dbus_message_type_to_string): New
function, converts message type into C string.
* dbus/dbus-message.h: Prototype it.
* bus/selinux.c (bus_selinux_check): Take source pid,
target pid, and audit data. Pass audit data to
avc_has_perm.
(log_audit_callback): New function, appends extra
audit information.
(bus_selinux_allows_acquire_service): Also take
service name, add it to audit data.
(bus_selinux_allows_send): Also take message
type, interface, method member, error name,
and destination, and add them to audit data.
(log_cb): Initialize func_audit.
* bus/selinux.h (bus_selinux_allows_acquire_service)
(bus_selinux_allows_send): Update prototypes
* bus/services.c (bus_registry_acquire_service): Pass
service name to bus_selinux_allows_acquire_service.
* bus/bus.c (bus_context_check_security_policy): Pass
additional audit data. Move assignment of dest
to its own line.
2004-11-09 06:11:33 +00:00
|
|
|
if (!bus_selinux_allows_send (sender, proposed_recipient,
|
|
|
|
|
dbus_message_type_to_string (dbus_message_get_type (message)),
|
|
|
|
|
dbus_message_get_interface (message),
|
|
|
|
|
dbus_message_get_member (message),
|
|
|
|
|
dbus_message_get_error_name (message),
|
2005-04-13 14:27:11 +00:00
|
|
|
dest ? dest : DBUS_SERVICE_DBUS, error))
|
2004-07-30 05:59:34 +00:00
|
|
|
{
|
2005-04-13 14:27:11 +00:00
|
|
|
|
|
|
|
|
if (dbus_error_is_set (error) &&
|
|
|
|
|
dbus_error_has_name (error, DBUS_ERROR_NO_MEMORY))
|
|
|
|
|
{
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-07-30 05:59:34 +00:00
|
|
|
dbus_set_error (error, DBUS_ERROR_ACCESS_DENIED,
|
|
|
|
|
"An SELinux policy prevents this sender "
|
|
|
|
|
"from sending this message to this recipient "
|
|
|
|
|
"(rejected message had interface \"%s\" "
|
|
|
|
|
"member \"%s\" error name \"%s\" destination \"%s\")",
|
|
|
|
|
dbus_message_get_interface (message) ?
|
|
|
|
|
dbus_message_get_interface (message) : "(unset)",
|
|
|
|
|
dbus_message_get_member (message) ?
|
|
|
|
|
dbus_message_get_member (message) : "(unset)",
|
|
|
|
|
dbus_message_get_error_name (message) ?
|
|
|
|
|
dbus_message_get_error_name (message) : "(unset)",
|
2005-02-17 21:19:49 +00:00
|
|
|
dest ? dest : DBUS_SERVICE_DBUS);
|
2004-07-30 05:59:34 +00:00
|
|
|
_dbus_verbose ("SELinux security check denying send to service\n");
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-27 06:25:42 +00:00
|
|
|
if (bus_connection_is_active (sender))
|
2003-04-25 23:50:34 +00:00
|
|
|
{
|
2003-04-27 06:25:42 +00:00
|
|
|
sender_policy = bus_connection_get_policy (sender);
|
|
|
|
|
_dbus_assert (sender_policy != NULL);
|
2003-10-14 22:16:03 +00:00
|
|
|
|
|
|
|
|
/* Fill in requested_reply variable with TRUE if this is a
|
|
|
|
|
* reply and the reply was pending.
|
|
|
|
|
*/
|
|
|
|
|
if (dbus_message_get_reply_serial (message) != 0)
|
2003-10-14 05:16:56 +00:00
|
|
|
{
|
|
|
|
|
if (proposed_recipient != NULL /* not to the bus driver */ &&
|
2003-10-14 22:16:03 +00:00
|
|
|
addressed_recipient == proposed_recipient /* not eavesdropping */)
|
|
|
|
|
{
|
|
|
|
|
DBusError error2;
|
|
|
|
|
|
|
|
|
|
dbus_error_init (&error2);
|
|
|
|
|
requested_reply = bus_connections_check_reply (bus_connection_get_connections (sender),
|
|
|
|
|
transaction,
|
|
|
|
|
sender, addressed_recipient, message,
|
|
|
|
|
&error2);
|
|
|
|
|
if (dbus_error_is_set (&error2))
|
|
|
|
|
{
|
|
|
|
|
dbus_move_error (&error2, error);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-10-14 05:16:56 +00:00
|
|
|
}
|
2003-04-27 06:25:42 +00:00
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Policy for inactive connections is that they can only send
|
|
|
|
|
* the hello message to the bus driver
|
|
|
|
|
*/
|
2003-09-21 19:53:56 +00:00
|
|
|
if (proposed_recipient == NULL &&
|
2003-08-18 22:43:30 +00:00
|
|
|
dbus_message_is_method_call (message,
|
2005-02-17 21:19:49 +00:00
|
|
|
DBUS_INTERFACE_DBUS,
|
2003-08-18 22:43:30 +00:00
|
|
|
"Hello"))
|
2003-04-27 06:25:42 +00:00
|
|
|
{
|
|
|
|
|
_dbus_verbose ("security check allowing %s message\n",
|
2003-08-18 15:27:33 +00:00
|
|
|
"Hello");
|
2003-04-27 06:25:42 +00:00
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
_dbus_verbose ("security check disallowing non-%s message\n",
|
2003-08-18 15:27:33 +00:00
|
|
|
"Hello");
|
2003-04-27 06:25:42 +00:00
|
|
|
|
|
|
|
|
dbus_set_error (error, DBUS_ERROR_ACCESS_DENIED,
|
|
|
|
|
"Client tried to send a message other than %s without being registered",
|
2003-08-18 15:27:33 +00:00
|
|
|
"Hello");
|
2003-04-27 06:25:42 +00:00
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2003-04-25 23:50:34 +00:00
|
|
|
}
|
2003-04-14 02:29:21 +00:00
|
|
|
}
|
|
|
|
|
else
|
2003-10-14 22:16:03 +00:00
|
|
|
{
|
|
|
|
|
sender_policy = NULL;
|
|
|
|
|
|
|
|
|
|
/* If the sender is the bus driver, we assume any reply was a
|
|
|
|
|
* requested reply as bus driver won't send bogus ones
|
|
|
|
|
*/
|
|
|
|
|
if (addressed_recipient == proposed_recipient /* not eavesdropping */ &&
|
|
|
|
|
dbus_message_get_reply_serial (message) != 0)
|
|
|
|
|
requested_reply = TRUE;
|
|
|
|
|
}
|
2003-04-14 02:29:21 +00:00
|
|
|
|
2003-04-27 06:25:42 +00:00
|
|
|
_dbus_assert ((sender != NULL && sender_policy != NULL) ||
|
|
|
|
|
(sender == NULL && sender_policy == NULL));
|
|
|
|
|
|
2003-09-21 19:53:56 +00:00
|
|
|
if (proposed_recipient != NULL)
|
2003-04-14 02:29:21 +00:00
|
|
|
{
|
2003-04-27 06:25:42 +00:00
|
|
|
/* only the bus driver can send to an inactive recipient (as it
|
|
|
|
|
* owns no services, so other apps can't address it). Inactive
|
|
|
|
|
* recipients can receive any message.
|
|
|
|
|
*/
|
2003-09-21 19:53:56 +00:00
|
|
|
if (bus_connection_is_active (proposed_recipient))
|
2003-04-25 23:50:34 +00:00
|
|
|
{
|
2003-09-21 19:53:56 +00:00
|
|
|
recipient_policy = bus_connection_get_policy (proposed_recipient);
|
2003-04-27 06:25:42 +00:00
|
|
|
_dbus_assert (recipient_policy != NULL);
|
|
|
|
|
}
|
|
|
|
|
else if (sender == NULL)
|
|
|
|
|
{
|
|
|
|
|
_dbus_verbose ("security check using NULL recipient policy for message from bus\n");
|
|
|
|
|
recipient_policy = NULL;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
_dbus_assert_not_reached ("a message was somehow sent to an inactive recipient from a source other than the message bus\n");
|
|
|
|
|
recipient_policy = NULL;
|
2003-04-25 23:50:34 +00:00
|
|
|
}
|
2003-04-14 02:29:21 +00:00
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
recipient_policy = NULL;
|
2003-04-27 06:25:42 +00:00
|
|
|
|
2003-09-21 19:53:56 +00:00
|
|
|
_dbus_assert ((proposed_recipient != NULL && recipient_policy != NULL) ||
|
|
|
|
|
(proposed_recipient != NULL && sender == NULL && recipient_policy == NULL) ||
|
|
|
|
|
(proposed_recipient == NULL && recipient_policy == NULL));
|
2003-04-27 06:25:42 +00:00
|
|
|
|
|
|
|
|
if (sender_policy &&
|
2003-04-14 02:29:21 +00:00
|
|
|
!bus_client_policy_check_can_send (sender_policy,
|
2004-05-29 04:17:17 +00:00
|
|
|
context->registry,
|
|
|
|
|
requested_reply,
|
|
|
|
|
proposed_recipient,
|
2003-04-14 02:29:21 +00:00
|
|
|
message))
|
|
|
|
|
{
|
2004-11-09 Colin Walters <walters@verbum.org>
* dbus/dbus-string.c (_dbus_string_get_length): New
function, writes DBusString to C buffer.
* dbus/dbus-string.h: Prototype it.
* dbus/dbus-message.c (dbus_message_type_to_string): New
function, converts message type into C string.
* dbus/dbus-message.h: Prototype it.
* bus/selinux.c (bus_selinux_check): Take source pid,
target pid, and audit data. Pass audit data to
avc_has_perm.
(log_audit_callback): New function, appends extra
audit information.
(bus_selinux_allows_acquire_service): Also take
service name, add it to audit data.
(bus_selinux_allows_send): Also take message
type, interface, method member, error name,
and destination, and add them to audit data.
(log_cb): Initialize func_audit.
* bus/selinux.h (bus_selinux_allows_acquire_service)
(bus_selinux_allows_send): Update prototypes
* bus/services.c (bus_registry_acquire_service): Pass
service name to bus_selinux_allows_acquire_service.
* bus/bus.c (bus_context_check_security_policy): Pass
additional audit data. Move assignment of dest
to its own line.
2004-11-09 06:11:33 +00:00
|
|
|
const char *dest;
|
|
|
|
|
|
|
|
|
|
dest = dbus_message_get_destination (message);
|
2003-04-14 02:29:21 +00:00
|
|
|
dbus_set_error (error, DBUS_ERROR_ACCESS_DENIED,
|
|
|
|
|
"A security policy in place prevents this sender "
|
|
|
|
|
"from sending this message to this recipient, "
|
|
|
|
|
"see message bus configuration file (rejected message "
|
2003-08-18 15:27:33 +00:00
|
|
|
"had interface \"%s\" member \"%s\" error name \"%s\" destination \"%s\")",
|
|
|
|
|
dbus_message_get_interface (message) ?
|
|
|
|
|
dbus_message_get_interface (message) : "(unset)",
|
|
|
|
|
dbus_message_get_member (message) ?
|
|
|
|
|
dbus_message_get_member (message) : "(unset)",
|
|
|
|
|
dbus_message_get_error_name (message) ?
|
|
|
|
|
dbus_message_get_error_name (message) : "(unset)",
|
2005-02-17 21:19:49 +00:00
|
|
|
dest ? dest : DBUS_SERVICE_DBUS);
|
2003-05-16 20:09:25 +00:00
|
|
|
_dbus_verbose ("security policy disallowing message due to sender policy\n");
|
2003-04-14 02:29:21 +00:00
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-27 06:25:42 +00:00
|
|
|
if (recipient_policy &&
|
2003-04-14 02:29:21 +00:00
|
|
|
!bus_client_policy_check_can_receive (recipient_policy,
|
2003-10-14 22:16:03 +00:00
|
|
|
context->registry,
|
|
|
|
|
requested_reply,
|
|
|
|
|
sender,
|
2003-09-21 19:53:56 +00:00
|
|
|
addressed_recipient, proposed_recipient,
|
2003-04-14 02:29:21 +00:00
|
|
|
message))
|
|
|
|
|
{
|
2004-11-09 Colin Walters <walters@verbum.org>
* dbus/dbus-string.c (_dbus_string_get_length): New
function, writes DBusString to C buffer.
* dbus/dbus-string.h: Prototype it.
* dbus/dbus-message.c (dbus_message_type_to_string): New
function, converts message type into C string.
* dbus/dbus-message.h: Prototype it.
* bus/selinux.c (bus_selinux_check): Take source pid,
target pid, and audit data. Pass audit data to
avc_has_perm.
(log_audit_callback): New function, appends extra
audit information.
(bus_selinux_allows_acquire_service): Also take
service name, add it to audit data.
(bus_selinux_allows_send): Also take message
type, interface, method member, error name,
and destination, and add them to audit data.
(log_cb): Initialize func_audit.
* bus/selinux.h (bus_selinux_allows_acquire_service)
(bus_selinux_allows_send): Update prototypes
* bus/services.c (bus_registry_acquire_service): Pass
service name to bus_selinux_allows_acquire_service.
* bus/bus.c (bus_context_check_security_policy): Pass
additional audit data. Move assignment of dest
to its own line.
2004-11-09 06:11:33 +00:00
|
|
|
const char *dest;
|
|
|
|
|
|
|
|
|
|
dest = dbus_message_get_destination (message);
|
2003-04-14 02:29:21 +00:00
|
|
|
dbus_set_error (error, DBUS_ERROR_ACCESS_DENIED,
|
|
|
|
|
"A security policy in place prevents this recipient "
|
|
|
|
|
"from receiving this message from this sender, "
|
|
|
|
|
"see message bus configuration file (rejected message "
|
2003-10-14 22:16:03 +00:00
|
|
|
"had interface \"%s\" member \"%s\" error name \"%s\" destination \"%s\" reply serial %u requested_reply=%d)",
|
2003-08-18 15:27:33 +00:00
|
|
|
dbus_message_get_interface (message) ?
|
|
|
|
|
dbus_message_get_interface (message) : "(unset)",
|
|
|
|
|
dbus_message_get_member (message) ?
|
|
|
|
|
dbus_message_get_member (message) : "(unset)",
|
|
|
|
|
dbus_message_get_error_name (message) ?
|
|
|
|
|
dbus_message_get_error_name (message) : "(unset)",
|
2005-02-17 21:19:49 +00:00
|
|
|
dest ? dest : DBUS_SERVICE_DBUS,
|
2003-10-14 22:16:03 +00:00
|
|
|
dbus_message_get_reply_serial (message),
|
|
|
|
|
requested_reply);
|
2003-05-16 20:09:25 +00:00
|
|
|
_dbus_verbose ("security policy disallowing message due to recipient policy\n");
|
2003-04-14 02:29:21 +00:00
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-19 16:16:24 +00:00
|
|
|
/* See if limits on size have been exceeded */
|
2003-09-21 19:53:56 +00:00
|
|
|
if (proposed_recipient &&
|
|
|
|
|
dbus_connection_get_outgoing_size (proposed_recipient) >
|
2003-04-24 22:30:38 +00:00
|
|
|
context->limits.max_outgoing_bytes)
|
2003-04-19 16:16:24 +00:00
|
|
|
{
|
2004-11-09 Colin Walters <walters@verbum.org>
* dbus/dbus-string.c (_dbus_string_get_length): New
function, writes DBusString to C buffer.
* dbus/dbus-string.h: Prototype it.
* dbus/dbus-message.c (dbus_message_type_to_string): New
function, converts message type into C string.
* dbus/dbus-message.h: Prototype it.
* bus/selinux.c (bus_selinux_check): Take source pid,
target pid, and audit data. Pass audit data to
avc_has_perm.
(log_audit_callback): New function, appends extra
audit information.
(bus_selinux_allows_acquire_service): Also take
service name, add it to audit data.
(bus_selinux_allows_send): Also take message
type, interface, method member, error name,
and destination, and add them to audit data.
(log_cb): Initialize func_audit.
* bus/selinux.h (bus_selinux_allows_acquire_service)
(bus_selinux_allows_send): Update prototypes
* bus/services.c (bus_registry_acquire_service): Pass
service name to bus_selinux_allows_acquire_service.
* bus/bus.c (bus_context_check_security_policy): Pass
additional audit data. Move assignment of dest
to its own line.
2004-11-09 06:11:33 +00:00
|
|
|
const char *dest;
|
|
|
|
|
|
|
|
|
|
dest = dbus_message_get_destination (message);
|
2003-04-19 16:16:24 +00:00
|
|
|
dbus_set_error (error, DBUS_ERROR_LIMITS_EXCEEDED,
|
|
|
|
|
"The destination service \"%s\" has a full message queue",
|
2003-09-21 19:53:56 +00:00
|
|
|
dest ? dest : (proposed_recipient ?
|
|
|
|
|
bus_connection_get_name (proposed_recipient) :
|
2005-02-17 21:19:49 +00:00
|
|
|
DBUS_SERVICE_DBUS));
|
2003-05-16 20:09:25 +00:00
|
|
|
_dbus_verbose ("security policy disallowing message due to full message queue\n");
|
2003-04-19 16:16:24 +00:00
|
|
|
return FALSE;
|
|
|
|
|
}
|
2003-05-16 20:09:25 +00:00
|
|
|
|
2003-10-14 05:16:56 +00:00
|
|
|
if (type == DBUS_MESSAGE_TYPE_METHOD_CALL)
|
|
|
|
|
{
|
|
|
|
|
/* Record that we will allow a reply here in the future (don't
|
|
|
|
|
* bother if the recipient is the bus). Only the addressed recipient
|
|
|
|
|
* may reply.
|
|
|
|
|
*/
|
|
|
|
|
if (sender && addressed_recipient &&
|
|
|
|
|
!bus_connections_expect_reply (bus_connection_get_connections (sender),
|
|
|
|
|
transaction,
|
|
|
|
|
sender, addressed_recipient,
|
|
|
|
|
message, error))
|
|
|
|
|
{
|
|
|
|
|
_dbus_verbose ("Failed to record reply expectation or problem with the message expecting a reply\n");
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-05-16 20:09:25 +00:00
|
|
|
_dbus_verbose ("security policy allowing message\n");
|
2003-04-14 02:29:21 +00:00
|
|
|
return TRUE;
|
|
|
|
|
}
|