X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdbus-manager.c;h=4bed5c88459641b0a7f263da8ceb47807d98b1a8;hp=2edbc37b5e2bfedb8ce8b8b3a49ce6a971893a06;hb=0a524ba7c3d86f17e61928763633b5a817a7d020;hpb=05feefe0fb049bb0f7c59584058ee0350462920c diff --git a/src/dbus-manager.c b/src/dbus-manager.c index 2edbc37b5..4bed5c884 100644 --- a/src/dbus-manager.c +++ b/src/dbus-manager.c @@ -20,6 +20,7 @@ ***/ #include +#include #include "dbus.h" #include "log.h" @@ -27,6 +28,7 @@ #include "strv.h" #include "bus-errors.h" #include "build.h" +#include "dbus-common.h" #define BUS_MANAGER_INTERFACE_BEGIN \ " \n" @@ -126,6 +128,10 @@ " \n" \ " \n" \ " \n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ " \n" #define BUS_MANAGER_INTERFACE_SIGNALS \ @@ -145,6 +151,12 @@ " \n" \ " \n" \ " \n" \ + " " \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ " " #define BUS_MANAGER_INTERFACE_PROPERTIES_GENERAL \ @@ -154,8 +166,11 @@ " \n" \ " \n" \ " \n" \ + " \n" \ " \n" \ + " \n" \ " \n" \ + " \n" \ " \n" \ " \n" \ " \n" \ @@ -215,25 +230,27 @@ const char bus_manager_interface[] _introspect_("Manager") = BUS_MANAGER_INTERFA static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_manager_append_running_as, manager_running_as, ManagerRunningAs); static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_manager_append_exec_output, exec_output, ExecOutput); -static int bus_manager_append_tainted(Manager *m, DBusMessageIter *i, const char *property, void *data) { +static int bus_manager_append_tainted(DBusMessageIter *i, const char *property, void *data) { const char *t; - char buf[64] = "", *e = buf, *p = NULL; + Manager *m = data; + char buf[LINE_MAX] = "", *e = buf, *p = NULL; - assert(m); assert(i); assert(property); + assert(m); - if (path_is_mount_point("/usr") > 0 || dir_is_empty("/usr") > 0) - e = stpcpy(e, "usr-separate-fs"); + if (m->taint_usr) + e = stpcpy(e, "usr-separate-fs "); - if (readlink_malloc("/etc/mtab", &p) < 0) { - if (e != buf) - e = stpcpy(e, " "); - e = stpcpy(e, "etc-mtab-not-symlink"); - } else + if (readlink_malloc("/etc/mtab", &p) < 0) + e = stpcpy(e, "etc-mtab-not-symlink "); + else free(p); - t = buf; + if (access("/proc/cgroups", F_OK) < 0) + e = stpcpy(e, "cgroups-missing "); + + t = strstrip(buf); if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &t)) return -ENOMEM; @@ -241,10 +258,9 @@ static int bus_manager_append_tainted(Manager *m, DBusMessageIter *i, const char return 0; } -static int bus_manager_append_log_target(Manager *m, DBusMessageIter *i, const char *property, void *data) { +static int bus_manager_append_log_target(DBusMessageIter *i, const char *property, void *data) { const char *t; - assert(m); assert(i); assert(property); @@ -256,10 +272,9 @@ static int bus_manager_append_log_target(Manager *m, DBusMessageIter *i, const c return 0; } -static int bus_manager_set_log_target(Manager *m, DBusMessageIter *i, const char *property) { +static int bus_manager_set_log_target(DBusMessageIter *i, const char *property) { const char *t; - assert(m); assert(i); assert(property); @@ -268,10 +283,9 @@ static int bus_manager_set_log_target(Manager *m, DBusMessageIter *i, const char return log_set_target_from_string(t); } -static int bus_manager_append_log_level(Manager *m, DBusMessageIter *i, const char *property, void *data) { +static int bus_manager_append_log_level(DBusMessageIter *i, const char *property, void *data) { const char *t; - assert(m); assert(i); assert(property); @@ -283,10 +297,9 @@ static int bus_manager_append_log_level(Manager *m, DBusMessageIter *i, const ch return 0; } -static int bus_manager_set_log_level(Manager *m, DBusMessageIter *i, const char *property) { +static int bus_manager_set_log_level(DBusMessageIter *i, const char *property) { const char *t; - assert(m); assert(i); assert(property); @@ -295,12 +308,13 @@ static int bus_manager_set_log_level(Manager *m, DBusMessageIter *i, const char return log_set_max_level_from_string(t); } -static int bus_manager_append_n_names(Manager *m, DBusMessageIter *i, const char *property, void *data) { +static int bus_manager_append_n_names(DBusMessageIter *i, const char *property, void *data) { + Manager *m = data; uint32_t u; - assert(m); assert(i); assert(property); + assert(m); u = hashmap_size(m->units); @@ -310,12 +324,13 @@ static int bus_manager_append_n_names(Manager *m, DBusMessageIter *i, const char return 0; } -static int bus_manager_append_n_jobs(Manager *m, DBusMessageIter *i, const char *property, void *data) { +static int bus_manager_append_n_jobs(DBusMessageIter *i, const char *property, void *data) { + Manager *m = data; uint32_t u; - assert(m); assert(i); assert(property); + assert(m); u = hashmap_size(m->jobs); @@ -325,12 +340,13 @@ static int bus_manager_append_n_jobs(Manager *m, DBusMessageIter *i, const char return 0; } -static int bus_manager_append_progress(Manager *m, DBusMessageIter *i, const char *property, void *data) { +static int bus_manager_append_progress(DBusMessageIter *i, const char *property, void *data) { double d; + Manager *m = data; - assert(m); assert(i); assert(property); + assert(m); if (dual_timestamp_is_set(&m->finish_timestamp)) d = 1.0; @@ -367,15 +383,18 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, { "org.freedesktop.systemd1.Manager", "RunningAs", bus_manager_append_running_as, "s", &m->running_as }, { "org.freedesktop.systemd1.Manager", "Tainted", bus_manager_append_tainted, "s", m }, { "org.freedesktop.systemd1.Manager", "InitRDTimestamp", bus_property_append_uint64, "t", &m->initrd_timestamp.realtime }, + { "org.freedesktop.systemd1.Manager", "InitRDTimestampMonotonic", bus_property_append_uint64, "t", &m->initrd_timestamp.monotonic }, { "org.freedesktop.systemd1.Manager", "StartupTimestamp", bus_property_append_uint64, "t", &m->startup_timestamp.realtime }, + { "org.freedesktop.systemd1.Manager", "StartupTimestampMonotonic", bus_property_append_uint64, "t", &m->startup_timestamp.monotonic }, { "org.freedesktop.systemd1.Manager", "FinishTimestamp", bus_property_append_uint64, "t", &m->finish_timestamp.realtime }, - { "org.freedesktop.systemd1.Manager", "LogLevel", bus_manager_append_log_level, "s", NULL, bus_manager_set_log_level}, - { "org.freedesktop.systemd1.Manager", "LogTarget", bus_manager_append_log_target, "s", NULL, bus_manager_set_log_target}, - { "org.freedesktop.systemd1.Manager", "NNames", bus_manager_append_n_names, "u", NULL }, - { "org.freedesktop.systemd1.Manager", "NJobs", bus_manager_append_n_jobs, "u", NULL }, + { "org.freedesktop.systemd1.Manager", "FinishTimestampMonotonic", bus_property_append_uint64, "t",&m->finish_timestamp.monotonic }, + { "org.freedesktop.systemd1.Manager", "LogLevel", bus_manager_append_log_level, "s", m, bus_manager_set_log_level }, + { "org.freedesktop.systemd1.Manager", "LogTarget", bus_manager_append_log_target, "s", m, bus_manager_set_log_target }, + { "org.freedesktop.systemd1.Manager", "NNames", bus_manager_append_n_names, "u", m }, + { "org.freedesktop.systemd1.Manager", "NJobs", bus_manager_append_n_jobs, "u", m }, { "org.freedesktop.systemd1.Manager", "NInstalledJobs",bus_property_append_uint32, "u", &m->n_installed_jobs }, { "org.freedesktop.systemd1.Manager", "NFailedJobs", bus_property_append_uint32, "u", &m->n_failed_jobs }, - { "org.freedesktop.systemd1.Manager", "Progress", bus_manager_append_progress, "d", NULL }, + { "org.freedesktop.systemd1.Manager", "Progress", bus_manager_append_progress, "d", m }, { "org.freedesktop.systemd1.Manager", "Environment", bus_property_append_strv, "as", m->environment }, { "org.freedesktop.systemd1.Manager", "ConfirmSpawn", bus_property_append_bool, "b", &m->confirm_spawn }, { "org.freedesktop.systemd1.Manager", "ShowStatus", bus_property_append_bool, "b", &m->show_status }, @@ -417,11 +436,11 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, &error, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID)) - return bus_send_error_reply(m, connection, message, &error, -EINVAL); + return bus_send_error_reply(connection, message, &error, -EINVAL); if (!(u = manager_get_unit(m, name))) { dbus_set_error(&error, BUS_ERROR_NO_SUCH_UNIT, "Unit %s is not loaded.", name); - return bus_send_error_reply(m, connection, message, &error, -ENOENT); + return bus_send_error_reply(connection, message, &error, -ENOENT); } if (!(reply = dbus_message_new_method_return(message))) @@ -444,11 +463,11 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, &error, DBUS_TYPE_UINT32, &pid, DBUS_TYPE_INVALID)) - return bus_send_error_reply(m, connection, message, &error, -EINVAL); + return bus_send_error_reply(connection, message, &error, -EINVAL); if (!(u = cgroup_unit_by_pid(m, (pid_t) pid))) { dbus_set_error(&error, BUS_ERROR_NO_SUCH_UNIT, "No unit for PID %lu is loaded.", (unsigned long) pid); - return bus_send_error_reply(m, connection, message, &error, -ENOENT); + return bus_send_error_reply(connection, message, &error, -ENOENT); } if (!(reply = dbus_message_new_method_return(message))) @@ -471,10 +490,10 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, &error, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID)) - return bus_send_error_reply(m, connection, message, &error, -EINVAL); + return bus_send_error_reply(connection, message, &error, -EINVAL); if ((r = manager_load_unit(m, name, NULL, &error, &u)) < 0) - return bus_send_error_reply(m, connection, message, &error, r); + return bus_send_error_reply(connection, message, &error, r); if (!(reply = dbus_message_new_method_return(message))) goto oom; @@ -521,21 +540,34 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, DBUS_TYPE_STRING, &smode, DBUS_TYPE_INT32, &signo, DBUS_TYPE_INVALID)) - return bus_send_error_reply(m, connection, message, &error, -EINVAL); + return bus_send_error_reply(connection, message, &error, -EINVAL); + + if (isempty(swho)) + who = KILL_ALL; + else { + who = kill_who_from_string(swho); + if (who < 0) + return bus_send_error_reply(connection, message, &error, -EINVAL); + } + + if (isempty(smode)) + mode = KILL_CONTROL_GROUP; + else { + mode = kill_mode_from_string(smode); + if (mode < 0) + return bus_send_error_reply(connection, message, &error, -EINVAL); + } - if ((mode = kill_mode_from_string(smode)) < 0 || - (who = kill_who_from_string(swho)) < 0 || - signo <= 0 || - signo >= _NSIG) - return bus_send_error_reply(m, connection, message, &error, -EINVAL); + if (signo <= 0 || signo >= _NSIG) + return bus_send_error_reply(connection, message, &error, -EINVAL); if (!(u = manager_get_unit(m, name))) { dbus_set_error(&error, BUS_ERROR_NO_SUCH_UNIT, "Unit %s is not loaded.", name); - return bus_send_error_reply(m, connection, message, &error, -ENOENT); + return bus_send_error_reply(connection, message, &error, -ENOENT); } if ((r = unit_kill(u, who, mode, signo, &error)) < 0) - return bus_send_error_reply(m, connection, message, &error, r); + return bus_send_error_reply(connection, message, &error, r); if (!(reply = dbus_message_new_method_return(message))) goto oom; @@ -549,11 +581,11 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, &error, DBUS_TYPE_UINT32, &id, DBUS_TYPE_INVALID)) - return bus_send_error_reply(m, connection, message, &error, -EINVAL); + return bus_send_error_reply(connection, message, &error, -EINVAL); if (!(j = manager_get_job(m, id))) { dbus_set_error(&error, BUS_ERROR_NO_SUCH_JOB, "Job %u does not exist.", (unsigned) id); - return bus_send_error_reply(m, connection, message, &error, -ENOENT); + return bus_send_error_reply(connection, message, &error, -ENOENT); } if (!(reply = dbus_message_new_method_return(message))) @@ -591,11 +623,11 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, &error, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID)) - return bus_send_error_reply(m, connection, message, &error, -EINVAL); + return bus_send_error_reply(connection, message, &error, -EINVAL); if (!(u = manager_get_unit(m, name))) { dbus_set_error(&error, BUS_ERROR_NO_SUCH_UNIT, "Unit %s is not loaded.", name); - return bus_send_error_reply(m, connection, message, &error, -ENOENT); + return bus_send_error_reply(connection, message, &error, -ENOENT); } unit_reset_failed(u); @@ -757,7 +789,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, if ((r = set_put(s, client)) < 0) { free(client); - return bus_send_error_reply(m, connection, message, NULL, r); + return bus_send_error_reply(connection, message, NULL, r); } if (!(reply = dbus_message_new_method_return(message))) @@ -768,7 +800,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, if (!(client = set_remove(BUS_CONNECTION_SUBSCRIBED(m, connection), (char*) message_get_sender_with_fallback(message)))) { dbus_set_error(&error, BUS_ERROR_NOT_SUBSCRIBED, "Client is not subscribed."); - return bus_send_error_reply(m, connection, message, &error, -ENOENT); + return bus_send_error_reply(connection, message, &error, -ENOENT); } free(client); @@ -815,13 +847,13 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, DBUS_TYPE_STRING, &name, DBUS_TYPE_BOOLEAN, &cleanup, DBUS_TYPE_INVALID)) - return bus_send_error_reply(m, connection, message, &error, -EINVAL); + return bus_send_error_reply(connection, message, &error, -EINVAL); if (name && name[0] == 0) name = NULL; if ((r = snapshot_create(m, name, cleanup, &error, &s)) < 0) - return bus_send_error_reply(m, connection, message, &error, r); + return bus_send_error_reply(connection, message, &error, r); if (!(reply = dbus_message_new_method_return(message))) goto oom; @@ -913,8 +945,8 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, } else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Manager", "Reexecute")) { - if (!(reply = dbus_message_new_method_return(message))) - goto oom; + /* We don't send a reply back here, the client should + * just wait for us disconnecting. */ m->exit_code = MANAGER_REEXECUTE; @@ -922,7 +954,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, if (m->running_as == MANAGER_SYSTEM) { dbus_set_error(&error, BUS_ERROR_NOT_SUPPORTED, "Exit is only supported for user service managers."); - return bus_send_error_reply(m, connection, message, &error, -ENOTSUP); + return bus_send_error_reply(connection, message, &error, -ENOTSUP); } if (!(reply = dbus_message_new_method_return(message))) @@ -934,7 +966,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, if (m->running_as != MANAGER_SYSTEM) { dbus_set_error(&error, BUS_ERROR_NOT_SUPPORTED, "Reboot is only supported for system managers."); - return bus_send_error_reply(m, connection, message, &error, -ENOTSUP); + return bus_send_error_reply(connection, message, &error, -ENOTSUP); } if (!(reply = dbus_message_new_method_return(message))) @@ -946,7 +978,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, if (m->running_as != MANAGER_SYSTEM) { dbus_set_error(&error, BUS_ERROR_NOT_SUPPORTED, "Powering off is only supported for system managers."); - return bus_send_error_reply(m, connection, message, &error, -ENOTSUP); + return bus_send_error_reply(connection, message, &error, -ENOTSUP); } if (!(reply = dbus_message_new_method_return(message))) @@ -958,7 +990,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, if (m->running_as != MANAGER_SYSTEM) { dbus_set_error(&error, BUS_ERROR_NOT_SUPPORTED, "Halting is only supported for system managers."); - return bus_send_error_reply(m, connection, message, &error, -ENOTSUP); + return bus_send_error_reply(connection, message, &error, -ENOTSUP); } if (!(reply = dbus_message_new_method_return(message))) @@ -970,7 +1002,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, if (m->running_as != MANAGER_SYSTEM) { dbus_set_error(&error, BUS_ERROR_NOT_SUPPORTED, "kexec is only supported for system managers."); - return bus_send_error_reply(m, connection, message, &error, -ENOTSUP); + return bus_send_error_reply(connection, message, &error, -ENOTSUP); } if (!(reply = dbus_message_new_method_return(message))) @@ -985,7 +1017,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, if (r == -ENOMEM) goto oom; - return bus_send_error_reply(m, connection, message, NULL, r); + return bus_send_error_reply(connection, message, NULL, r); } e = strv_env_merge(2, m->environment, l); @@ -1009,7 +1041,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, if (r == -ENOMEM) goto oom; - return bus_send_error_reply(m, connection, message, NULL, r); + return bus_send_error_reply(connection, message, NULL, r); } e = strv_env_delete(m->environment, 1, l); @@ -1018,14 +1050,68 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, if (!e) goto oom; - if (!(reply = dbus_message_new_method_return(message))) + if (!(reply = dbus_message_new_method_return(message))) { + strv_free(e); goto oom; + } strv_free(m->environment); m->environment = e; + } else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Manager", "UnsetAndSetEnvironment")) { + char **l_set = NULL, **l_unset = NULL, **e = NULL, **f = NULL; + DBusMessageIter iter; + + if (!dbus_message_iter_init(message, &iter)) + return bus_send_error_reply(connection, message, NULL, -EINVAL); + + r = bus_parse_strv_iter(&iter, &l_unset); + if (r < 0) { + if (r == -ENOMEM) + goto oom; + + return bus_send_error_reply(connection, message, NULL, r); + } + + if (!dbus_message_iter_next(&iter)) { + strv_free(l_unset); + return bus_send_error_reply(connection, message, NULL, -EINVAL); + } + + r = bus_parse_strv_iter(&iter, &l_set); + if (r < 0) { + strv_free(l_unset); + if (r == -ENOMEM) + goto oom; + + return bus_send_error_reply(connection, message, NULL, r); + } + + e = strv_env_delete(m->environment, 1, l_unset); + strv_free(l_unset); + + if (!e) { + strv_free(l_set); + goto oom; + } + + f = strv_env_merge(2, e, l_set); + strv_free(l_set); + strv_free(e); + + if (!f) + goto oom; + + if (!(reply = dbus_message_new_method_return(message))) { + strv_free(f); + goto oom; + } + + strv_free(m->environment); + m->environment = f; + } else - return bus_default_message_handler(m, connection, message, NULL, INTERFACES_LIST, properties); + return bus_default_message_handler(connection, message, NULL, INTERFACES_LIST, properties); if (job_type != _JOB_TYPE_INVALID) { const char *name, *smode, *old_name = NULL; @@ -1051,24 +1137,24 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, DBUS_TYPE_INVALID); if (!b) - return bus_send_error_reply(m, connection, message, &error, -EINVAL); + return bus_send_error_reply(connection, message, &error, -EINVAL); if (old_name) if (!(u = manager_get_unit(m, old_name)) || !u->meta.job || u->meta.job->type != JOB_START) { dbus_set_error(&error, BUS_ERROR_NO_SUCH_JOB, "No job queued for unit %s", old_name); - return bus_send_error_reply(m, connection, message, &error, -ENOENT); + return bus_send_error_reply(connection, message, &error, -ENOENT); } if ((mode = job_mode_from_string(smode)) == _JOB_MODE_INVALID) { dbus_set_error(&error, BUS_ERROR_INVALID_JOB_MODE, "Job mode %s is invalid.", smode); - return bus_send_error_reply(m, connection, message, &error, -EINVAL); + return bus_send_error_reply(connection, message, &error, -EINVAL); } if ((r = manager_load_unit(m, name, NULL, &error, &u)) < 0) - return bus_send_error_reply(m, connection, message, &error, r); + return bus_send_error_reply(connection, message, &error, r); if (reload_if_possible && unit_can_reload(u)) { if (job_type == JOB_RESTART) @@ -1082,11 +1168,11 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, ((job_type == JOB_RESTART || job_type == JOB_TRY_RESTART) && (u->meta.refuse_manual_start || u->meta.refuse_manual_stop))) { dbus_set_error(&error, BUS_ERROR_ONLY_BY_DEPENDENCY, "Operation refused, may be requested by dependency only."); - return bus_send_error_reply(m, connection, message, &error, -EPERM); + return bus_send_error_reply(connection, message, &error, -EPERM); } if ((r = manager_add_job(m, job_type, u, mode, true, &error, &j)) < 0) - return bus_send_error_reply(m, connection, message, &error, r); + return bus_send_error_reply(connection, message, &error, r); if (!(j->bus_client = strdup(message_get_sender_with_fallback(message)))) goto oom; @@ -1106,8 +1192,6 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, goto oom; } - free(path); - if (reply) { if (!dbus_connection_send(connection, reply, NULL)) goto oom; @@ -1115,6 +1199,8 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, dbus_message_unref(reply); } + free(path); + return DBUS_HANDLER_RESULT_HANDLED; oom: