X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fdbus-job.c;h=096542be39c3c5b49d0f6eeaa5b0a56a0ab26bd7;hb=8e70580bb07ae46dc0b0bf377de6333540668acc;hp=ef839ffb55dafe8c88408a2908bc6133cd0e9f8d;hpb=97e6a11996855800f68dc41c13537784198c8b61;p=elogind.git diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c index ef839ffb5..096542be3 100644 --- a/src/core/dbus-job.c +++ b/src/core/dbus-job.c @@ -25,6 +25,7 @@ #include "log.h" #include "dbus-job.h" #include "dbus-common.h" +#include "selinux-access.h" #define BUS_JOB_INTERFACE \ " \n" \ @@ -68,7 +69,8 @@ static int bus_job_append_unit(DBusMessageIter *i, const char *property, void *d if (!dbus_message_iter_open_container(i, DBUS_TYPE_STRUCT, NULL, &sub)) return -ENOMEM; - if (!(p = unit_dbus_path(j->unit))) + p = unit_dbus_path(j->unit); + if (!p) return -ENOMEM; if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &j->unit->id) || @@ -94,43 +96,37 @@ static const BusProperty bus_job_properties[] = { }; static DBusHandlerResult bus_job_message_dispatch(Job *j, DBusConnection *connection, DBusMessage *message) { - DBusMessage *reply = NULL; + _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Job", "Cancel")) { - if (!(reply = dbus_message_new_method_return(message))) - goto oom; - job_finish_and_invalidate(j, JOB_CANCELED); + SELINUX_UNIT_ACCESS_CHECK(j->unit, connection, message, "stop"); + job_finish_and_invalidate(j, JOB_CANCELED, true); + reply = dbus_message_new_method_return(message); + if (!reply) + return DBUS_HANDLER_RESULT_NEED_MEMORY; } else { const BusBoundProperties bps[] = { { "org.freedesktop.systemd1.Job", bus_job_properties, j }, { NULL, } }; + + SELINUX_UNIT_ACCESS_CHECK(j->unit, connection, message, "status"); return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps); } - if (reply) { - if (!dbus_connection_send(connection, reply, NULL)) - goto oom; - - dbus_message_unref(reply); - } + if (!bus_maybe_send_reply(connection, message, reply)) + return DBUS_HANDLER_RESULT_NEED_MEMORY; return DBUS_HANDLER_RESULT_HANDLED; - -oom: - if (reply) - dbus_message_unref(reply); - - return DBUS_HANDLER_RESULT_NEED_MEMORY; } static DBusHandlerResult bus_job_message_handler(DBusConnection *connection, DBusMessage *message, void *data) { Manager *m = data; Job *j; int r; - DBusMessage *reply; + _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; assert(connection); assert(message); @@ -145,7 +141,10 @@ static DBusHandlerResult bus_job_message_handler(DBusConnection *connection, DBu Iterator i; size_t size; - if (!(reply = dbus_message_new_method_return(message))) + SELINUX_ACCESS_CHECK(connection, message, "status"); + + reply = dbus_message_new_method_return(message); + if (!reply) goto oom; /* We roll our own introspection code here, instead of @@ -153,7 +152,8 @@ static DBusHandlerResult bus_job_message_handler(DBusConnection *connection, DBu * need to generate our introspection string * dynamically. */ - if (!(f = open_memstream(&introspection, &size))) + f = open_memstream(&introspection, &size); + if (!f) goto oom; fputs(DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE @@ -185,39 +185,31 @@ static DBusHandlerResult bus_job_message_handler(DBusConnection *connection, DBu free(introspection); - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) goto oom; - dbus_message_unref(reply); - return DBUS_HANDLER_RESULT_HANDLED; } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } - if ((r = manager_get_job_from_dbus_path(m, dbus_message_get_path(message), &j)) < 0) { - - if (r == -ENOMEM) - return DBUS_HANDLER_RESULT_NEED_MEMORY; - - if (r == -ENOENT) { - DBusError e; - - dbus_error_init(&e); - dbus_set_error_const(&e, DBUS_ERROR_UNKNOWN_OBJECT, "Unknown job"); - return bus_send_error_reply(connection, message, &e, r); - } + r = manager_get_job_from_dbus_path(m, dbus_message_get_path(message), &j); + if (r == -ENOMEM) + goto oom; + if (r == -ENOENT) { + DBusError e; - return bus_send_error_reply(connection, message, NULL, r); + dbus_error_init(&e); + dbus_set_error_const(&e, DBUS_ERROR_UNKNOWN_OBJECT, "Unknown job"); + return bus_send_error_reply(connection, message, &e, r); } + if (r < 0) + return bus_send_error_reply(connection, message, NULL, r); return bus_job_message_dispatch(j, connection, message); oom: - if (reply) - dbus_message_unref(reply); - return DBUS_HANDLER_RESULT_NEED_MEMORY; } @@ -232,7 +224,7 @@ static int job_send_message(Job *j, DBusMessage* (*new_message)(Job *j)) { assert(j); assert(new_message); - if (bus_has_subscriber(j->manager)) { + if (bus_has_subscriber(j->manager) || j->forgot_bus_clients) { m = new_message(j); if (!m) goto oom; @@ -295,6 +287,7 @@ static DBusMessage* new_change_signal_message(Job *j) { if (!dbus_message_append_args(m, DBUS_TYPE_UINT32, &j->id, DBUS_TYPE_OBJECT_PATH, &p, + DBUS_TYPE_STRING, &j->unit->id, DBUS_TYPE_INVALID)) goto oom; } @@ -326,6 +319,7 @@ static DBusMessage* new_removed_signal_message(Job *j) { if (!dbus_message_append_args(m, DBUS_TYPE_UINT32, &j->id, DBUS_TYPE_OBJECT_PATH, &p, + DBUS_TYPE_STRING, &j->unit->id, DBUS_TYPE_STRING, &r, DBUS_TYPE_INVALID)) goto oom; @@ -347,7 +341,7 @@ void bus_job_send_change_signal(Job *j) { j->in_dbus_queue = false; } - if (!bus_has_subscriber(j->manager) && !j->bus_client_list) { + if (!bus_has_subscriber(j->manager) && !j->bus_client_list && !j->forgot_bus_clients) { j->sent_dbus_new_signal = true; return; } @@ -366,7 +360,7 @@ oom: void bus_job_send_removed_signal(Job *j) { assert(j); - if (!bus_has_subscriber(j->manager) && !j->bus_client_list) + if (!bus_has_subscriber(j->manager) && !j->bus_client_list && !j->forgot_bus_clients) return; if (!j->sent_dbus_new_signal)