X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fdbus-job.c;h=a85d3185c247339cf246f4b8844574edd3cd1ba0;hp=ab6d610243ef12ce54b284276c4afe5312b83a4a;hb=c2756a68401102786be343712c0c35acbd73d28d;hpb=b30e2f4c18ad81b04e4314fd191a5d458553773c
diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c
index ab6d61024..a85d3185c 100644
--- a/src/core/dbus-job.c
+++ b/src/core/dbus-job.c
@@ -6,16 +6,16 @@
Copyright 2010 Lennart Poettering
systemd 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
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd 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.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
***/
@@ -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;
}
@@ -225,130 +217,149 @@ const DBusObjectPathVTable bus_job_vtable = {
.message_function = bus_job_message_handler
};
-static int job_send_message(Job *j, DBusMessage *m) {
+static int job_send_message(Job *j, DBusMessage* (*new_message)(Job *j)) {
+ _cleanup_dbus_message_unref_ DBusMessage *m = NULL;
int r;
assert(j);
- assert(m);
+ assert(new_message);
+
+ if (bus_has_subscriber(j->manager) || j->forgot_bus_clients) {
+ m = new_message(j);
+ if (!m)
+ return -ENOMEM;
- if (bus_has_subscriber(j->manager)) {
- if ((r = bus_broadcast(j->manager, m)) < 0)
+ r = bus_broadcast(j->manager, m);
+ if (r < 0)
return r;
- } else if (j->bus_client) {
+ } else {
/* If nobody is subscribed, we just send the message
- * to the client which created the job */
+ * to the client(s) which created the job */
+ JobBusClient *cl;
+ assert(j->bus_client_list);
- assert(j->bus);
+ LIST_FOREACH(client, cl, j->bus_client_list) {
+ assert(cl->bus);
- if (!dbus_message_set_destination(m, j->bus_client))
- return -ENOMEM;
+ m = new_message(j);
+ if (!m)
+ return -ENOMEM;
- if (!dbus_connection_send(j->bus, m, NULL))
- return -ENOMEM;
+ if (!dbus_message_set_destination(m, cl->name))
+ return -ENOMEM;
+
+ if (!dbus_connection_send(cl->bus, m, NULL))
+ return -ENOMEM;
+
+ dbus_message_unref(m);
+ m = NULL;
+ }
}
return 0;
}
-void bus_job_send_change_signal(Job *j) {
- char *p = NULL;
- DBusMessage *m = NULL;
-
- assert(j);
-
- if (j->in_dbus_queue) {
- LIST_REMOVE(Job, dbus_queue, j->manager->dbus_job_queue, j);
- j->in_dbus_queue = false;
- }
-
- if (!bus_has_subscriber(j->manager) && !j->bus_client) {
- j->sent_dbus_new_signal = true;
- return;
- }
+static DBusMessage* new_change_signal_message(Job *j) {
+ _cleanup_free_ char *p = NULL;
+ DBusMessage *m;
- if (!(p = job_dbus_path(j)))
- goto oom;
+ p = job_dbus_path(j);
+ if (!p)
+ return NULL;
if (j->sent_dbus_new_signal) {
/* Send a properties changed signal */
-
- if (!(m = bus_properties_changed_new(p, "org.freedesktop.systemd1.Job", INVALIDATING_PROPERTIES)))
- goto oom;
+ m = bus_properties_changed_new(p, "org.freedesktop.systemd1.Job", INVALIDATING_PROPERTIES);
+ if (!m)
+ return NULL;
} else {
/* Send a new signal */
- if (!(m = dbus_message_new_signal("/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "JobNew")))
- goto oom;
+ m = dbus_message_new_signal("/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "JobNew");
+ if (!m)
+ return NULL;
if (!dbus_message_append_args(m,
DBUS_TYPE_UINT32, &j->id,
DBUS_TYPE_OBJECT_PATH, &p,
- DBUS_TYPE_INVALID))
- goto oom;
+ DBUS_TYPE_STRING, &j->unit->id,
+ DBUS_TYPE_INVALID)) {
+ dbus_message_unref(m);
+ return NULL;
+ }
}
- if (job_send_message(j, m) < 0)
- goto oom;
+ return m;
+}
- free(p);
- dbus_message_unref(m);
+static DBusMessage* new_removed_signal_message(Job *j) {
+ _cleanup_free_ char *p = NULL;
+ DBusMessage *m;
+ const char *r;
- j->sent_dbus_new_signal = true;
+ p = job_dbus_path(j);
+ if (!p)
+ return NULL;
- return;
+ m = dbus_message_new_signal("/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "JobRemoved");
+ if (!m)
+ return NULL;
-oom:
- free(p);
+ r = job_result_to_string(j->result);
- if (m)
+ 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)) {
dbus_message_unref(m);
+ return NULL;
+ }
- log_error("Failed to allocate job change signal.");
+ return m;
}
-void bus_job_send_removed_signal(Job *j) {
- char *p = NULL;
- DBusMessage *m = NULL;
- const char *r;
-
+void bus_job_send_change_signal(Job *j) {
assert(j);
- if (!bus_has_subscriber(j->manager) && !j->bus_client)
- return;
+ if (j->in_dbus_queue) {
+ LIST_REMOVE(Job, dbus_queue, j->manager->dbus_job_queue, j);
+ j->in_dbus_queue = false;
+ }
- if (!j->sent_dbus_new_signal)
- bus_job_send_change_signal(j);
+ if (!bus_has_subscriber(j->manager) && !j->bus_client_list && !j->forgot_bus_clients) {
+ j->sent_dbus_new_signal = true;
+ return;
+ }
- if (!(p = job_dbus_path(j)))
+ if (job_send_message(j, new_change_signal_message) < 0)
goto oom;
- if (!(m = dbus_message_new_signal("/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "JobRemoved")))
- goto oom;
+ j->sent_dbus_new_signal = true;
- r = job_result_to_string(j->result);
+ return;
- if (!dbus_message_append_args(m,
- DBUS_TYPE_UINT32, &j->id,
- DBUS_TYPE_OBJECT_PATH, &p,
- DBUS_TYPE_STRING, &r,
- DBUS_TYPE_INVALID))
- goto oom;
+oom:
+ log_error("Failed to allocate job change signal.");
+}
- if (job_send_message(j, m) < 0)
- goto oom;
+void bus_job_send_removed_signal(Job *j) {
+ assert(j);
- free(p);
- dbus_message_unref(m);
+ if (!bus_has_subscriber(j->manager) && !j->bus_client_list && !j->forgot_bus_clients)
+ return;
- return;
+ if (!j->sent_dbus_new_signal)
+ bus_job_send_change_signal(j);
-oom:
- free(p);
+ if (job_send_message(j, new_removed_signal_message) < 0)
+ goto oom;
- if (m)
- dbus_message_unref(m);
+ return;
+oom:
log_error("Failed to allocate job remove signal.");
}