X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flocale%2Flocaled.c;h=fd0eb2db550e6a7ef2976ba51bc90e0704066da5;hp=22950a60a988db33db185e1aa38cce5c7503d8ef;hb=e3b3286f2220835c297504af1eafe1801972d30b;hpb=0d0f0c50d3a1d90f03972a6abb82e6413daaa583 diff --git a/src/locale/localed.c b/src/locale/localed.c index 22950a60a..fd0eb2db5 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c @@ -4,6 +4,7 @@ This file is part of systemd. Copyright 2011 Lennart Poettering + Copyright 2013 Kay Sievers systemd is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -19,242 +20,181 @@ along with systemd; If not, see . ***/ -#include - #include #include #include +#include "sd-bus.h" + #include "util.h" #include "mkdir.h" #include "strv.h" -#include "dbus-common.h" -#include "polkit.h" #include "def.h" - -#define INTERFACE \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" - -#define INTROSPECTION \ - DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE \ - "\n" \ - INTERFACE \ - BUS_PROPERTIES_INTERFACE \ - BUS_INTROSPECTABLE_INTERFACE \ - BUS_PEER_INTERFACE \ - "\n" - -#define INTERFACES_LIST \ - BUS_GENERIC_INTERFACES_LIST \ - "org.freedesktop.locale1\0" - -const char locale_interface[] _introspect_("locale1") = INTERFACE; +#include "env-util.h" +#include "fileio.h" +#include "fileio-label.h" +#include "bus-util.h" +#include "bus-error.h" +#include "bus-message.h" +#include "event-util.h" +#include "locale-util.h" +#include "selinux-util.h" + +#ifdef HAVE_XKBCOMMON +#include +#endif enum { /* We don't list LC_ALL here on purpose. People should be * using LANG instead. */ - - PROP_LANG, - PROP_LANGUAGE, - PROP_LC_CTYPE, - PROP_LC_NUMERIC, - PROP_LC_TIME, - PROP_LC_COLLATE, - PROP_LC_MONETARY, - PROP_LC_MESSAGES, - PROP_LC_PAPER, - PROP_LC_NAME, - PROP_LC_ADDRESS, - PROP_LC_TELEPHONE, - PROP_LC_MEASUREMENT, - PROP_LC_IDENTIFICATION, - _PROP_MAX + LOCALE_LANG, + LOCALE_LANGUAGE, + LOCALE_LC_CTYPE, + LOCALE_LC_NUMERIC, + LOCALE_LC_TIME, + LOCALE_LC_COLLATE, + LOCALE_LC_MONETARY, + LOCALE_LC_MESSAGES, + LOCALE_LC_PAPER, + LOCALE_LC_NAME, + LOCALE_LC_ADDRESS, + LOCALE_LC_TELEPHONE, + LOCALE_LC_MEASUREMENT, + LOCALE_LC_IDENTIFICATION, + _LOCALE_MAX }; -static const char * const names[_PROP_MAX] = { - [PROP_LANG] = "LANG", - [PROP_LANGUAGE] = "LANGUAGE", - [PROP_LC_CTYPE] = "LC_CTYPE", - [PROP_LC_NUMERIC] = "LC_NUMERIC", - [PROP_LC_TIME] = "LC_TIME", - [PROP_LC_COLLATE] = "LC_COLLATE", - [PROP_LC_MONETARY] = "LC_MONETARY", - [PROP_LC_MESSAGES] = "LC_MESSAGES", - [PROP_LC_PAPER] = "LC_PAPER", - [PROP_LC_NAME] = "LC_NAME", - [PROP_LC_ADDRESS] = "LC_ADDRESS", - [PROP_LC_TELEPHONE] = "LC_TELEPHONE", - [PROP_LC_MEASUREMENT] = "LC_MEASUREMENT", - [PROP_LC_IDENTIFICATION] = "LC_IDENTIFICATION" +static const char * const names[_LOCALE_MAX] = { + [LOCALE_LANG] = "LANG", + [LOCALE_LANGUAGE] = "LANGUAGE", + [LOCALE_LC_CTYPE] = "LC_CTYPE", + [LOCALE_LC_NUMERIC] = "LC_NUMERIC", + [LOCALE_LC_TIME] = "LC_TIME", + [LOCALE_LC_COLLATE] = "LC_COLLATE", + [LOCALE_LC_MONETARY] = "LC_MONETARY", + [LOCALE_LC_MESSAGES] = "LC_MESSAGES", + [LOCALE_LC_PAPER] = "LC_PAPER", + [LOCALE_LC_NAME] = "LC_NAME", + [LOCALE_LC_ADDRESS] = "LC_ADDRESS", + [LOCALE_LC_TELEPHONE] = "LC_TELEPHONE", + [LOCALE_LC_MEASUREMENT] = "LC_MEASUREMENT", + [LOCALE_LC_IDENTIFICATION] = "LC_IDENTIFICATION" }; -static char *data[_PROP_MAX] = { - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL -}; +typedef struct Context { + char *locale[_LOCALE_MAX]; -typedef struct State { - char *x11_layout, *x11_model, *x11_variant, *x11_options; - char *vc_keymap, *vc_keymap_toggle; -} State; + char *x11_layout; + char *x11_model; + char *x11_variant; + char *x11_options; -static State state; + char *vc_keymap; + char *vc_keymap_toggle; -static usec_t remain_until = 0; + Hashmap *polkit_registry; +} Context; -static int free_and_set(char **s, const char *v) { - int r; - char *t; - - assert(s); - - r = strdup_or_null(isempty(v) ? NULL : v, &t); - if (r < 0) - return r; +static const char* nonempty(const char *s) { + return isempty(s) ? NULL : s; +} +static void free_and_replace(char **s, char *v) { free(*s); - *s = t; - - return 0; + *s = v; } -static void free_data_locale(void) { - int p; +static bool startswith_comma(const char *s, const char *prefix) { + const char *t; - for (p = 0; p < _PROP_MAX; p++) { - free(data[p]); - data[p] = NULL; - } + return s && (t = startswith(s, prefix)) && (*t == ','); } -static void free_data_x11(void) { - free(state.x11_layout); - free(state.x11_model); - free(state.x11_variant); - free(state.x11_options); +static void context_free_x11(Context *c) { + free_and_replace(&c->x11_layout, NULL); + free_and_replace(&c->x11_model, NULL); + free_and_replace(&c->x11_variant, NULL); + free_and_replace(&c->x11_options, NULL); +} - state.x11_layout = state.x11_model = state.x11_variant = state.x11_options = NULL; +static void context_free_vconsole(Context *c) { + free_and_replace(&c->vc_keymap, NULL); + free_and_replace(&c->vc_keymap_toggle, NULL); } -static void free_data_vconsole(void) { - free(state.vc_keymap); - free(state.vc_keymap_toggle); +static void context_free_locale(Context *c) { + int p; - state.vc_keymap = state.vc_keymap_toggle = NULL; + for (p = 0; p < _LOCALE_MAX; p++) + free_and_replace(&c->locale[p], NULL); } -static void simplify(void) { +static void context_free(Context *c) { + context_free_locale(c); + context_free_x11(c); + context_free_vconsole(c); + + bus_verify_polkit_async_registry_free(c->polkit_registry); +}; + +static void locale_simplify(Context *c) { int p; - for (p = 1; p < _PROP_MAX; p++) - if (isempty(data[p]) || streq_ptr(data[PROP_LANG], data[p])) { - free(data[p]); - data[p] = NULL; - } + for (p = LOCALE_LANG+1; p < _LOCALE_MAX; p++) + if (isempty(c->locale[p]) || streq_ptr(c->locale[LOCALE_LANG], c->locale[p])) + free_and_replace(&c->locale[p], NULL); } -static int read_data_locale(void) { +static int locale_read_data(Context *c) { int r; - free_data_locale(); + context_free_locale(c); r = parse_env_file("/etc/locale.conf", NEWLINE, - "LANG", &data[PROP_LANG], - "LANGUAGE", &data[PROP_LANGUAGE], - "LC_CTYPE", &data[PROP_LC_CTYPE], - "LC_NUMERIC", &data[PROP_LC_NUMERIC], - "LC_TIME", &data[PROP_LC_TIME], - "LC_COLLATE", &data[PROP_LC_COLLATE], - "LC_MONETARY", &data[PROP_LC_MONETARY], - "LC_MESSAGES", &data[PROP_LC_MESSAGES], - "LC_PAPER", &data[PROP_LC_PAPER], - "LC_NAME", &data[PROP_LC_NAME], - "LC_ADDRESS", &data[PROP_LC_ADDRESS], - "LC_TELEPHONE", &data[PROP_LC_TELEPHONE], - "LC_MEASUREMENT", &data[PROP_LC_MEASUREMENT], - "LC_IDENTIFICATION", &data[PROP_LC_IDENTIFICATION], + "LANG", &c->locale[LOCALE_LANG], + "LANGUAGE", &c->locale[LOCALE_LANGUAGE], + "LC_CTYPE", &c->locale[LOCALE_LC_CTYPE], + "LC_NUMERIC", &c->locale[LOCALE_LC_NUMERIC], + "LC_TIME", &c->locale[LOCALE_LC_TIME], + "LC_COLLATE", &c->locale[LOCALE_LC_COLLATE], + "LC_MONETARY", &c->locale[LOCALE_LC_MONETARY], + "LC_MESSAGES", &c->locale[LOCALE_LC_MESSAGES], + "LC_PAPER", &c->locale[LOCALE_LC_PAPER], + "LC_NAME", &c->locale[LOCALE_LC_NAME], + "LC_ADDRESS", &c->locale[LOCALE_LC_ADDRESS], + "LC_TELEPHONE", &c->locale[LOCALE_LC_TELEPHONE], + "LC_MEASUREMENT", &c->locale[LOCALE_LC_MEASUREMENT], + "LC_IDENTIFICATION", &c->locale[LOCALE_LC_IDENTIFICATION], NULL); if (r == -ENOENT) { int p; /* Fill in what we got passed from systemd. */ - - for (p = 0; p < _PROP_MAX; p++) { - char *e, *d; - + for (p = 0; p < _LOCALE_MAX; p++) { assert(names[p]); - e = getenv(names[p]); - if (e) { - d = strdup(e); - if (!d) - return -ENOMEM; - } else - d = NULL; - - free(data[p]); - data[p] = d; + r = free_and_strdup(&c->locale[p], + nonempty(getenv(names[p]))); + if (r < 0) + return r; } r = 0; } - simplify(); + locale_simplify(c); return r; } -static void free_data(void) { - free_data_locale(); - free_data_vconsole(); - free_data_x11(); -} - -static int read_data_vconsole(void) { +static int vconsole_read_data(Context *c) { int r; - free_data_vconsole(); + context_free_vconsole(c); r = parse_env_file("/etc/vconsole.conf", NEWLINE, - "KEYMAP", &state.vc_keymap, - "KEYMAP_TOGGLE", &state.vc_keymap_toggle, + "KEYMAP", &c->vc_keymap, + "KEYMAP_TOGGLE", &c->vc_keymap_toggle, NULL); if (r < 0 && r != -ENOENT) @@ -263,32 +203,17 @@ static int read_data_vconsole(void) { return 0; } -static int read_data_x11(void) { - FILE *f; +static int x11_read_data(Context *c) { + _cleanup_fclose_ FILE *f; char line[LINE_MAX]; bool in_section = false; + int r; - free_data_x11(); + context_free_x11(c); f = fopen("/etc/X11/xorg.conf.d/00-keyboard.conf", "re"); - if (!f) { - if (errno == ENOENT) { - -#ifdef TARGET_FEDORA - f = fopen("/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf", "re"); - if (!f) { - if (errno == ENOENT) - return 0; - else - return -errno; - } -#else - return 0; -#endif - - } else - return -errno; - } + if (!f) + return errno == ENOENT ? 0 : -errno; while (fgets(line, sizeof(line), f)) { char *l; @@ -300,290 +225,223 @@ static int read_data_x11(void) { continue; if (in_section && first_word(l, "Option")) { - char **a; + _cleanup_strv_free_ char **a = NULL; - a = strv_split_quoted(l); - if (!a) { - fclose(f); - return -ENOMEM; - } + r = strv_split_quoted(&a, l, 0); + if (r < 0) + return r; if (strv_length(a) == 3) { - if (streq(a[1], "XkbLayout")) { - free(state.x11_layout); - state.x11_layout = a[2]; + free_and_replace(&c->x11_layout, a[2]); a[2] = NULL; } else if (streq(a[1], "XkbModel")) { - free(state.x11_model); - state.x11_model = a[2]; + free_and_replace(&c->x11_model, a[2]); a[2] = NULL; } else if (streq(a[1], "XkbVariant")) { - free(state.x11_variant); - state.x11_variant = a[2]; + free_and_replace(&c->x11_variant, a[2]); a[2] = NULL; } else if (streq(a[1], "XkbOptions")) { - free(state.x11_options); - state.x11_options = a[2]; + free_and_replace(&c->x11_options, a[2]); a[2] = NULL; } } - strv_free(a); - } else if (!in_section && first_word(l, "Section")) { - char **a; + _cleanup_strv_free_ char **a = NULL; - a = strv_split_quoted(l); - if (!a) { - fclose(f); + r = strv_split_quoted(&a, l, 0); + if (r < 0) return -ENOMEM; - } if (strv_length(a) == 2 && streq(a[1], "InputClass")) in_section = true; - strv_free(a); } else if (in_section && first_word(l, "EndSection")) in_section = false; } - fclose(f); - return 0; } -static int read_data(void) { +static int context_read_data(Context *c) { int r, q, p; - r = read_data_locale(); - q = read_data_vconsole(); - p = read_data_x11(); + r = locale_read_data(c); + q = vconsole_read_data(c); + p = x11_read_data(c); return r < 0 ? r : q < 0 ? q : p; } -static int write_data_locale(void) { +static int locale_write_data(Context *c, char ***settings) { int r, p; - char **l = NULL; + _cleanup_strv_free_ char **l = NULL; + + /* Set values will be returned as strv in *settings on success. */ - r = load_env_file("/etc/locale.conf", &l); + r = load_env_file(NULL, "/etc/locale.conf", NULL, &l); if (r < 0 && r != -ENOENT) return r; - for (p = 0; p < _PROP_MAX; p++) { - char *t, **u; + for (p = 0; p < _LOCALE_MAX; p++) { + _cleanup_free_ char *t = NULL; + char **u; assert(names[p]); - if (isempty(data[p])) { + if (isempty(c->locale[p])) { l = strv_env_unset(l, names[p]); continue; } - if (asprintf(&t, "%s=%s", names[p], data[p]) < 0) { - strv_free(l); + if (asprintf(&t, "%s=%s", names[p], c->locale[p]) < 0) return -ENOMEM; - } u = strv_env_set(l, t); - free(t); - strv_free(l); - if (!u) return -ENOMEM; + strv_free(l); l = u; } if (strv_isempty(l)) { - strv_free(l); - if (unlink("/etc/locale.conf") < 0) return errno == ENOENT ? 0 : -errno; return 0; } - r = write_env_file("/etc/locale.conf", l); - strv_free(l); + r = write_env_file_label("/etc/locale.conf", l); + if (r < 0) + return r; - return r; + *settings = l; + l = NULL; + return 0; } -static void push_data(DBusConnection *bus) { - char **l_set = NULL, **l_unset = NULL, **t; - int c_set = 0, c_unset = 0, p; - DBusError error; - DBusMessage *m = NULL, *reply = NULL; - DBusMessageIter iter, sub; - - dbus_error_init(&error); +static int locale_update_system_manager(Context *c, sd_bus *bus) { + _cleanup_free_ char **l_unset = NULL; + _cleanup_strv_free_ char **l_set = NULL; + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; + sd_bus_error error = SD_BUS_ERROR_NULL; + unsigned c_set, c_unset, p; + int r; assert(bus); - l_set = new0(char*, _PROP_MAX); - l_unset = new0(char*, _PROP_MAX); - if (!l_set || !l_unset) { - log_oom(); - goto finish; - } + l_unset = new0(char*, _LOCALE_MAX); + if (!l_unset) + return -ENOMEM; + + l_set = new0(char*, _LOCALE_MAX); + if (!l_set) + return -ENOMEM; - for (p = 0; p < _PROP_MAX; p++) { + for (p = 0, c_set = 0, c_unset = 0; p < _LOCALE_MAX; p++) { assert(names[p]); - if (isempty(data[p])) + if (isempty(c->locale[p])) l_unset[c_set++] = (char*) names[p]; else { char *s; - if (asprintf(&s, "%s=%s", names[p], data[p]) < 0) { - log_oom(); - goto finish; - } + if (asprintf(&s, "%s=%s", names[p], c->locale[p]) < 0) + return -ENOMEM; l_set[c_unset++] = s; } } - assert(c_set + c_unset == _PROP_MAX); - m = dbus_message_new_method_call("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "UnsetAndSetEnvironment"); - if (!m) { - log_error("Could not allocate message."); - goto finish; - } - - dbus_message_iter_init_append(m, &iter); - - if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &sub)) { - log_oom(); - goto finish; - } - - STRV_FOREACH(t, l_unset) - if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, t)) { - log_oom(); - goto finish; - } - - if (!dbus_message_iter_close_container(&iter, &sub) || - !dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &sub)) { - log_oom(); - goto finish; - } - - STRV_FOREACH(t, l_set) - if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, t)) { - log_oom(); - goto finish; - } - - if (!dbus_message_iter_close_container(&iter, &sub)) { - log_oom(); - goto finish; - } - - reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error); - if (!reply) { - log_error("Failed to set locale information: %s", bus_error_message(&error)); - goto finish; - } + assert(c_set + c_unset == _LOCALE_MAX); + r = sd_bus_message_new_method_call(bus, &m, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "UnsetAndSetEnvironment"); + if (r < 0) + return r; -finish: - if (m) - dbus_message_unref(m); + r = sd_bus_message_append_strv(m, l_unset); + if (r < 0) + return r; - if (reply) - dbus_message_unref(reply); + r = sd_bus_message_append_strv(m, l_set); + if (r < 0) + return r; - dbus_error_free(&error); + r = sd_bus_call(bus, m, 0, &error, NULL); + if (r < 0) + log_error_errno(r, "Failed to update the manager environment: %m"); - strv_free(l_set); - free(l_unset); + return 0; } -static int write_data_vconsole(void) { +static int vconsole_write_data(Context *c) { int r; - char **l = NULL; + _cleanup_strv_free_ char **l = NULL; - r = load_env_file("/etc/vconsole.conf", &l); + r = load_env_file(NULL, "/etc/vconsole.conf", NULL, &l); if (r < 0 && r != -ENOENT) return r; - if (isempty(state.vc_keymap)) + if (isempty(c->vc_keymap)) l = strv_env_unset(l, "KEYMAP"); else { - char *s, **u; + _cleanup_free_ char *s = NULL; + char **u; - s = strappend("KEYMAP=", state.vc_keymap); - if (!s) { - strv_free(l); + s = strappend("KEYMAP=", c->vc_keymap); + if (!s) return -ENOMEM; - } u = strv_env_set(l, s); - free(s); - strv_free(l); - if (!u) return -ENOMEM; + strv_free(l); l = u; } - if (isempty(state.vc_keymap_toggle)) + if (isempty(c->vc_keymap_toggle)) l = strv_env_unset(l, "KEYMAP_TOGGLE"); else { - char *s, **u; + _cleanup_free_ char *s = NULL; + char **u; - s = strappend("KEYMAP_TOGGLE=", state.vc_keymap_toggle); - if (!s) { - strv_free(l); + s = strappend("KEYMAP_TOGGLE=", c->vc_keymap_toggle); + if (!s) return -ENOMEM; - } u = strv_env_set(l, s); - free(s); - strv_free(l); - if (!u) return -ENOMEM; + strv_free(l); l = u; } if (strv_isempty(l)) { - strv_free(l); - if (unlink("/etc/vconsole.conf") < 0) return errno == ENOENT ? 0 : -errno; return 0; } - r = write_env_file("/etc/vconsole.conf", l); - strv_free(l); - - return r; + return write_env_file_label("/etc/vconsole.conf", l); } -static int write_data_x11(void) { - FILE *f; - char *temp_path; +static int x11_write_data(Context *c) { + _cleanup_fclose_ FILE *f = NULL; + _cleanup_free_ char *temp_path = NULL; int r; - if (isempty(state.x11_layout) && - isempty(state.x11_model) && - isempty(state.x11_variant) && - isempty(state.x11_options)) { - -#ifdef TARGET_FEDORA - unlink("/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf"); - - /* Symlink this to /dev/null, so that s-s-k (if it is - * still running) doesn't recreate this. */ - symlink("/dev/null", "/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf"); -#endif + if (isempty(c->x11_layout) && + isempty(c->x11_model) && + isempty(c->x11_variant) && + isempty(c->x11_options)) { if (unlink("/etc/X11/xorg.conf.d/00-keyboard.conf") < 0) return errno == ENOENT ? 0 : -errno; @@ -591,7 +449,7 @@ static int write_data_x11(void) { return 0; } - mkdir_parents_label("/etc/X11/xorg.conf.d", 0755); + mkdir_p_label("/etc/X11/xorg.conf.d", 0755); r = fopen_temporary("/etc/X11/xorg.conf.d/00-keyboard.conf", &f, &temp_path); if (r < 0) @@ -605,17 +463,17 @@ static int write_data_x11(void) { " Identifier \"system-keyboard\"\n" " MatchIsKeyboard \"on\"\n", f); - if (!isempty(state.x11_layout)) - fprintf(f, " Option \"XkbLayout\" \"%s\"\n", state.x11_layout); + if (!isempty(c->x11_layout)) + fprintf(f, " Option \"XkbLayout\" \"%s\"\n", c->x11_layout); - if (!isempty(state.x11_model)) - fprintf(f, " Option \"XkbModel\" \"%s\"\n", state.x11_model); + if (!isempty(c->x11_model)) + fprintf(f, " Option \"XkbModel\" \"%s\"\n", c->x11_model); - if (!isempty(state.x11_variant)) - fprintf(f, " Option \"XkbVariant\" \"%s\"\n", state.x11_variant); + if (!isempty(c->x11_variant)) + fprintf(f, " Option \"XkbVariant\" \"%s\"\n", c->x11_variant); - if (!isempty(state.x11_options)) - fprintf(f, " Option \"XkbOptions\" \"%s\"\n", state.x11_options); + if (!isempty(c->x11_options)) + fprintf(f, " Option \"XkbOptions\" \"%s\"\n", c->x11_options); fputs("EndSection\n", f); fflush(f); @@ -624,85 +482,38 @@ static int write_data_x11(void) { r = -errno; unlink("/etc/X11/xorg.conf.d/00-keyboard.conf"); unlink(temp_path); - } else { - -#ifdef TARGET_FEDORA - unlink("/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf"); - - /* Symlink this to /dev/null, so that s-s-k (if it is - * still running) doesn't recreate this. */ - symlink("/dev/null", "/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf"); -#endif - - r = 0; - } - - fclose(f); - free(temp_path); - - return r; + return r; + } else + return 0; } -static int load_vconsole_keymap(DBusConnection *bus, DBusError *error) { - DBusMessage *m = NULL, *reply = NULL; - const char *name = "systemd-vconsole-setup.service", *mode = "replace"; +static int vconsole_reload(sd_bus *bus) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; int r; - DBusError _error; assert(bus); - if (!error) { - dbus_error_init(&_error); - error = &_error; - } - - m = dbus_message_new_method_call( + r = sd_bus_call_method(bus, "org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", - "RestartUnit"); - if (!m) { - log_error("Could not allocate message."); - r = -ENOMEM; - goto finish; - } - - if (!dbus_message_append_args(m, - DBUS_TYPE_STRING, &name, - DBUS_TYPE_STRING, &mode, - DBUS_TYPE_INVALID)) { - log_error("Could not append arguments to message."); - r = -ENOMEM; - goto finish; - } - - reply = dbus_connection_send_with_reply_and_block(bus, m, -1, error); - if (!reply) { - log_error("Failed to issue method call: %s", bus_error_message(error)); - r = -EIO; - goto finish; - } - - r = 0; - -finish: - if (m) - dbus_message_unref(m); - - if (reply) - dbus_message_unref(reply); - - if (error == &_error) - dbus_error_free(error); + "RestartUnit", + &error, + NULL, + "ss", "systemd-vconsole-setup.service", "replace"); + if (r < 0) + log_error("Failed to issue method call: %s", bus_error_message(&error, -r)); return r; } -static char *strnulldash(const char *s) { - return s == NULL || *s == 0 || (s[0] == '-' && s[1] == 0) ? NULL : (char*) s; +static const char* strnulldash(const char *s) { + return isempty(s) || streq(s, "-") ? NULL : s; } -static int read_next_mapping(FILE *f, unsigned *n, char ***a) { +static int read_next_mapping(const char* filename, + unsigned min_fields, unsigned max_fields, + FILE *f, unsigned *n, char ***a) { assert(f); assert(n); assert(a); @@ -710,6 +521,8 @@ static int read_next_mapping(FILE *f, unsigned *n, char ***a) { for (;;) { char line[LINE_MAX]; char *l, **b; + int r; + size_t length; errno = 0; if (!fgets(line, sizeof(line), f)) { @@ -726,12 +539,13 @@ static int read_next_mapping(FILE *f, unsigned *n, char ***a) { if (l[0] == 0 || l[0] == '#') continue; - b = strv_split_quoted(l); - if (!b) - return -ENOMEM; + r = strv_split_quoted(&b, l, 0); + if (r < 0) + return r; - if (strv_length(b) < 5) { - log_error("Invalid line "SYSTEMD_KBD_MODEL_MAP":%u, ignoring.", *n); + length = strv_length(b); + if (length < min_fields || length > max_fields) { + log_error("Invalid line %s:%u, ignoring.", filename, *n); strv_free(b); continue; @@ -742,22 +556,22 @@ static int read_next_mapping(FILE *f, unsigned *n, char ***a) { } } -static int convert_vconsole_to_x11(DBusConnection *connection) { +static int vconsole_convert_to_x11(Context *c, sd_bus *bus) { bool modified = false; - assert(connection); + assert(bus); - if (isempty(state.vc_keymap)) { + if (isempty(c->vc_keymap)) { modified = - !isempty(state.x11_layout) || - !isempty(state.x11_model) || - !isempty(state.x11_variant) || - !isempty(state.x11_options); + !isempty(c->x11_layout) || + !isempty(c->x11_model) || + !isempty(c->x11_variant) || + !isempty(c->x11_options); - free_data_x11(); + context_free_x11(c); } else { - FILE *f; + _cleanup_fclose_ FILE *f = NULL; unsigned n = 0; f = fopen(SYSTEMD_KBD_MODEL_MAP, "re"); @@ -765,634 +579,696 @@ static int convert_vconsole_to_x11(DBusConnection *connection) { return -errno; for (;;) { - char **a; + _cleanup_strv_free_ char **a = NULL; int r; - r = read_next_mapping(f, &n, &a); - if (r < 0) { - fclose(f); + r = read_next_mapping(SYSTEMD_KBD_MODEL_MAP, 5, UINT_MAX, f, &n, &a); + if (r < 0) return r; - } - if (r == 0) break; - if (!streq(state.vc_keymap, a[0])) { - strv_free(a); + if (!streq(c->vc_keymap, a[0])) continue; - } - if (!streq_ptr(state.x11_layout, strnulldash(a[1])) || - !streq_ptr(state.x11_model, strnulldash(a[2])) || - !streq_ptr(state.x11_variant, strnulldash(a[3])) || - !streq_ptr(state.x11_options, strnulldash(a[4]))) { - - if (free_and_set(&state.x11_layout, strnulldash(a[1])) < 0 || - free_and_set(&state.x11_model, strnulldash(a[2])) < 0 || - free_and_set(&state.x11_variant, strnulldash(a[3])) < 0 || - free_and_set(&state.x11_options, strnulldash(a[4])) < 0) { - strv_free(a); - fclose(f); + if (!streq_ptr(c->x11_layout, strnulldash(a[1])) || + !streq_ptr(c->x11_model, strnulldash(a[2])) || + !streq_ptr(c->x11_variant, strnulldash(a[3])) || + !streq_ptr(c->x11_options, strnulldash(a[4]))) { + + if (free_and_strdup(&c->x11_layout, strnulldash(a[1])) < 0 || + free_and_strdup(&c->x11_model, strnulldash(a[2])) < 0 || + free_and_strdup(&c->x11_variant, strnulldash(a[3])) < 0 || + free_and_strdup(&c->x11_options, strnulldash(a[4])) < 0) return -ENOMEM; - } modified = true; } - strv_free(a); break; } - - fclose(f); } if (modified) { - dbus_bool_t b; - DBusMessage *changed; int r; - r = write_data_x11(); + r = x11_write_data(c); if (r < 0) - log_error("Failed to set X11 keyboard layout: %s", strerror(-r)); + return log_error_errno(r, "Failed to set X11 keyboard layout: %m"); + + log_info("Changed X11 keyboard layout to '%s' model '%s' variant '%s' options '%s'", + strempty(c->x11_layout), + strempty(c->x11_model), + strempty(c->x11_variant), + strempty(c->x11_options)); - changed = bus_properties_changed_new( + sd_bus_emit_properties_changed(bus, "/org/freedesktop/locale1", "org.freedesktop.locale1", - "X11Layout\0" - "X11Model\0" - "X11Variant\0" - "X11Options\0"); - - if (!changed) - return -ENOMEM; - - b = dbus_connection_send(connection, changed, NULL); - dbus_message_unref(changed); - - if (!b) - return -ENOMEM; - } + "X11Layout", "X11Model", "X11Variant", "X11Options", NULL); + } else + log_debug("X11 keyboard layout was not modified."); return 0; } -static int convert_x11_to_vconsole(DBusConnection *connection) { - bool modified = false; +static int find_converted_keymap(const char *x11_layout, const char *x11_variant, char **new_keymap) { + const char *dir; + _cleanup_free_ char *n; - assert(connection); + if (x11_variant) + n = strjoin(x11_layout, "-", x11_variant, NULL); + else + n = strdup(x11_layout); + if (!n) + return -ENOMEM; - if (isempty(state.x11_layout)) { + NULSTR_FOREACH(dir, KBD_KEYMAP_DIRS) { + _cleanup_free_ char *p = NULL, *pz = NULL; + bool uncompressed; - modified = - !isempty(state.vc_keymap) || - !isempty(state.vc_keymap_toggle); + p = strjoin(dir, "xkb/", n, ".map", NULL); + pz = strjoin(dir, "xkb/", n, ".map.gz", NULL); + if (!p || !pz) + return -ENOMEM; - free_data_x11(); - } else { - FILE *f; - unsigned n = 0; - unsigned best_matching = 0; - char *new_keymap = NULL; + uncompressed = access(p, F_OK) == 0; + if (uncompressed || access(pz, F_OK) == 0) { + log_debug("Found converted keymap %s at %s", + n, uncompressed ? p : pz); - f = fopen(SYSTEMD_KBD_MODEL_MAP, "re"); - if (!f) - return -errno; + *new_keymap = n; + n = NULL; + return 1; + } + } - for (;;) { - char **a; - unsigned matching = 0; - int r; + return 0; +} - r = read_next_mapping(f, &n, &a); - if (r < 0) { - fclose(f); - return r; - } +static int find_legacy_keymap(Context *c, char **new_keymap) { + _cleanup_fclose_ FILE *f; + unsigned n = 0; + unsigned best_matching = 0; + int r; - if (r == 0) - break; + f = fopen(SYSTEMD_KBD_MODEL_MAP, "re"); + if (!f) + return -errno; - /* Determine how well matching this entry is */ - if (streq_ptr(state.x11_layout, a[1])) - /* If we got an exact match, this is best */ - matching = 10; - else { - size_t x; - - x = strcspn(state.x11_layout, ","); - - /* We have multiple X layouts, look - * for an entry that matches our key - * with the everything but the first - * layout stripped off. */ - if (x > 0 && - strlen(a[1]) == x && - strncmp(state.x11_layout, a[1], x) == 0) - matching = 5; - else { - size_t w; - - /* If that didn't work, strip - * off the other layouts from - * the entry, too */ - - w = strcspn(a[1], ","); - - if (x > 0 && x == w && - memcmp(state.x11_layout, a[1], x) == 0) - matching = 1; - } + for (;;) { + _cleanup_strv_free_ char **a = NULL; + unsigned matching = 0; + + r = read_next_mapping(SYSTEMD_KBD_MODEL_MAP, 5, UINT_MAX, f, &n, &a); + if (r < 0) + return r; + if (r == 0) + break; + + /* Determine how well matching this entry is */ + if (streq_ptr(c->x11_layout, a[1])) + /* If we got an exact match, this is best */ + matching = 10; + else { + /* We have multiple X layouts, look for an + * entry that matches our key with everything + * but the first layout stripped off. */ + if (startswith_comma(c->x11_layout, a[1])) + matching = 5; + else { + char *x; + + /* If that didn't work, strip off the + * other layouts from the entry, too */ + x = strndupa(a[1], strcspn(a[1], ",")); + if (startswith_comma(c->x11_layout, x)) + matching = 1; } + } - if (matching > 0 && - streq_ptr(state.x11_model, a[2])) { + if (matching > 0) { + if (isempty(c->x11_model) || streq_ptr(c->x11_model, a[2])) { matching++; - if (streq_ptr(state.x11_variant, a[3])) { + if (streq_ptr(c->x11_variant, a[3])) { matching++; - if (streq_ptr(state.x11_options, a[4])) + if (streq_ptr(c->x11_options, a[4])) matching++; } } + } + + /* The best matching entry so far, then let's save that */ + if (matching >= MAX(best_matching, 1u)) { + log_debug("Found legacy keymap %s with score %u", + a[0], matching); - /* The best matching entry so far, then let's - * save that */ if (matching > best_matching) { best_matching = matching; - free(new_keymap); - new_keymap = strdup(a[0]); - - if (!new_keymap) { - strv_free(a); - fclose(f); - return -ENOMEM; - } + r = free_and_strdup(new_keymap, a[0]); + if (r < 0) + return r; } + } + } + + if (best_matching < 10 && c->x11_layout) { + /* The best match is only the first part of the X11 + * keymap. Check if we have a converted map which + * matches just the first layout. + */ + char *l, *v = NULL, *converted; + + l = strndupa(c->x11_layout, strcspn(c->x11_layout, ",")); + if (c->x11_variant) + v = strndupa(c->x11_variant, strcspn(c->x11_variant, ",")); + r = find_converted_keymap(l, v, &converted); + if (r < 0) + return r; + if (r > 0) + free_and_replace(new_keymap, converted); + } + + return 0; +} + +static int find_language_fallback(const char *lang, char **language) { + _cleanup_fclose_ FILE *f = NULL; + unsigned n = 0; + + assert(language); - strv_free(a); + f = fopen(SYSTEMD_LANGUAGE_FALLBACK_MAP, "re"); + if (!f) + return -errno; + + for (;;) { + _cleanup_strv_free_ char **a = NULL; + int r; + + r = read_next_mapping(SYSTEMD_LANGUAGE_FALLBACK_MAP, 2, 2, f, &n, &a); + if (r <= 0) + return r; + + if (streq(lang, a[0])) { + assert(strv_length(a) == 2); + *language = a[1]; + a[1] = NULL; + return 1; } + } - fclose(f); + assert_not_reached("should not be here"); +} + +static int x11_convert_to_vconsole(Context *c, sd_bus *bus) { + bool modified = false; + int r; - if (!streq_ptr(state.vc_keymap, new_keymap)) { - free(state.vc_keymap); - state.vc_keymap = new_keymap; + assert(bus); - free(state.vc_keymap_toggle); - state.vc_keymap_toggle = NULL; + if (isempty(c->x11_layout)) { + modified = + !isempty(c->vc_keymap) || + !isempty(c->vc_keymap_toggle); + + context_free_x11(c); + } else { + char *new_keymap = NULL; + + r = find_converted_keymap(c->x11_layout, c->x11_variant, &new_keymap); + if (r < 0) + return r; + else if (r == 0) { + r = find_legacy_keymap(c, &new_keymap); + if (r < 0) + return r; + } + + if (!streq_ptr(c->vc_keymap, new_keymap)) { + free_and_replace(&c->vc_keymap, new_keymap); + free_and_replace(&c->vc_keymap_toggle, NULL); modified = true; } else free(new_keymap); } if (modified) { - dbus_bool_t b; - DBusMessage *changed; - int r; - - r = write_data_vconsole(); + r = vconsole_write_data(c); if (r < 0) - log_error("Failed to set virtual console keymap: %s", strerror(-r)); + log_error_errno(r, "Failed to set virtual console keymap: %m"); + + log_info("Changed virtual console keymap to '%s' toggle '%s'", + strempty(c->vc_keymap), strempty(c->vc_keymap_toggle)); - changed = bus_properties_changed_new( + sd_bus_emit_properties_changed(bus, "/org/freedesktop/locale1", "org.freedesktop.locale1", - "VConsoleKeymap\0" - "VConsoleKeymapToggle\0"); + "VConsoleKeymap", "VConsoleKeymapToggle", NULL); - if (!changed) - return -ENOMEM; - - b = dbus_connection_send(connection, changed, NULL); - dbus_message_unref(changed); - - if (!b) - return -ENOMEM; - - return load_vconsole_keymap(connection, NULL); - } + return vconsole_reload(bus); + } else + log_debug("Virtual console keymap was not modified."); return 0; } -static int append_locale(DBusMessageIter *i, const char *property, void *userdata) { - int r, c = 0, p; - char **l; +static int property_get_locale( + sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) { + + Context *c = userdata; + _cleanup_strv_free_ char **l = NULL; + int p, q; - l = new0(char*, _PROP_MAX+1); + l = new0(char*, _LOCALE_MAX+1); if (!l) return -ENOMEM; - for (p = 0; p < _PROP_MAX; p++) { + for (p = 0, q = 0; p < _LOCALE_MAX; p++) { char *t; - if (isempty(data[p])) + if (isempty(c->locale[p])) continue; - if (asprintf(&t, "%s=%s", names[p], data[p]) < 0) { - strv_free(l); + if (asprintf(&t, "%s=%s", names[p], c->locale[p]) < 0) return -ENOMEM; - } - l[c++] = t; + l[q++] = t; } - r = bus_property_append_strv(i, property, (void*) l); - strv_free(l); - - return r; + return sd_bus_message_append_strv(reply, l); } -static const BusProperty bus_locale_properties[] = { - { "Locale", append_locale, "as", 0 }, - { "X11Layout", bus_property_append_string, "s", offsetof(State, x11_layout), true }, - { "X11Model", bus_property_append_string, "s", offsetof(State, x11_model), true }, - { "X11Variant", bus_property_append_string, "s", offsetof(State, x11_variant), true }, - { "X11Options", bus_property_append_string, "s", offsetof(State, x11_options), true }, - { "VConsoleKeymap", bus_property_append_string, "s", offsetof(State, vc_keymap), true }, - { "VConsoleKeymapToggle", bus_property_append_string, "s", offsetof(State, vc_keymap_toggle), true }, - { NULL, } -}; - -static const BusBoundProperties bps[] = { - { "org.freedesktop.locale1", bus_locale_properties, &state }, - { NULL, } -}; +static int method_set_locale(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *error) { + Context *c = userdata; + _cleanup_strv_free_ char **l = NULL; + char **i; + const char *lang = NULL; + int interactive; + bool modified = false; + bool have[_LOCALE_MAX] = {}; + int p; + int r; -static DBusHandlerResult locale_message_handler( - DBusConnection *connection, - DBusMessage *message, - void *userdata) { + r = bus_message_read_strv_extend(m, &l); + if (r < 0) + return r; - DBusMessage *reply = NULL, *changed = NULL; - DBusError error; - int r; + r = sd_bus_message_read_basic(m, 'b', &interactive); + if (r < 0) + return r; - assert(connection); - assert(message); + /* Check whether a variable changed and if it is valid */ + STRV_FOREACH(i, l) { + bool valid = false; - dbus_error_init(&error); + for (p = 0; p < _LOCALE_MAX; p++) { + size_t k; - if (dbus_message_is_method_call(message, "org.freedesktop.locale1", "SetLocale")) { - char **l = NULL, **i; - dbus_bool_t interactive; - DBusMessageIter iter; - bool modified = false; - bool passed[_PROP_MAX]; - int p; + k = strlen(names[p]); + if (startswith(*i, names[p]) && + (*i)[k] == '=' && + locale_is_valid((*i) + k + 1)) { + valid = true; + have[p] = true; - if (!dbus_message_iter_init(message, &iter)) - return bus_send_error_reply(connection, message, NULL, -EINVAL); + if (p == LOCALE_LANG) + lang = (*i) + k + 1; - r = bus_parse_strv_iter(&iter, &l); - if (r < 0) { - if (r == -ENOMEM) - goto oom; + if (!streq_ptr(*i + k + 1, c->locale[p])) + modified = true; - return bus_send_error_reply(connection, message, NULL, r); + break; + } } - if (!dbus_message_iter_next(&iter) || - dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_BOOLEAN) { - strv_free(l); - return bus_send_error_reply(connection, message, NULL, -EINVAL); - } + if (!valid) + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid Locale data."); + } + + /* If LANG was specified, but not LANGUAGE, check if we should + * set it based on the language fallback table. */ + if (have[LOCALE_LANG] && !have[LOCALE_LANGUAGE]) { + _cleanup_free_ char *language = NULL; - dbus_message_iter_get_basic(&iter, &interactive); + assert(lang); - zero(passed); + (void) find_language_fallback(lang, &language); + if (language) { + log_debug("Converted LANG=%s to LANGUAGE=%s", lang, language); + if (!streq_ptr(language, c->locale[LOCALE_LANGUAGE])) { + r = strv_extendf(&l, "LANGUAGE=%s", language); + if (r < 0) + return r; - /* Check whether a variable changed and if so valid */ - STRV_FOREACH(i, l) { - bool valid = false; + have[LOCALE_LANGUAGE] = true; + modified = true; + } + } + } - for (p = 0; p < _PROP_MAX; p++) { + /* Check whether a variable is unset */ + if (!modified) + for (p = 0; p < _LOCALE_MAX; p++) + if (!isempty(c->locale[p]) && !have[p]) { + modified = true; + break; + } + + if (modified) { + _cleanup_strv_free_ char **settings = NULL; + + r = bus_verify_polkit_async( + m, + CAP_SYS_ADMIN, + "org.freedesktop.locale1.set-locale", + interactive, + UID_INVALID, + &c->polkit_registry, + error); + if (r < 0) + return r; + if (r == 0) + return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */ + + STRV_FOREACH(i, l) + for (p = 0; p < _LOCALE_MAX; p++) { size_t k; k = strlen(names[p]); if (startswith(*i, names[p]) && (*i)[k] == '=') { - valid = true; - passed[p] = true; - - if (!streq_ptr(*i + k + 1, data[p])) - modified = true; - + r = free_and_strdup(&c->locale[p], *i + k + 1); + if (r < 0) + return r; break; } } - if (!valid) { - strv_free(l); - return bus_send_error_reply(connection, message, NULL, -EINVAL); - } - } + for (p = 0; p < _LOCALE_MAX; p++) { + if (have[p]) + continue; - /* Check whether a variable is unset */ - if (!modified) { - for (p = 0; p < _PROP_MAX; p++) - if (!isempty(data[p]) && !passed[p]) { - modified = true; - break; - } + free_and_replace(&c->locale[p], NULL); } - if (modified) { - - r = verify_polkit(connection, message, "org.freedesktop.locale1.set-locale", interactive, NULL, &error); - if (r < 0) { - strv_free(l); - return bus_send_error_reply(connection, message, &error, r); - } - - STRV_FOREACH(i, l) { - for (p = 0; p < _PROP_MAX; p++) { - size_t k; - - k = strlen(names[p]); - if (startswith(*i, names[p]) && (*i)[k] == '=') { - char *t; - - t = strdup(*i + k + 1); - if (!t) { - strv_free(l); - goto oom; - } + locale_simplify(c); - free(data[p]); - data[p] = t; + r = locale_write_data(c, &settings); + if (r < 0) { + log_error_errno(r, "Failed to set locale: %m"); + return sd_bus_error_set_errnof(error, r, "Failed to set locale: %s", strerror(-r)); + } - break; - } - } - } + locale_update_system_manager(c, bus); - strv_free(l); + if (settings) { + _cleanup_free_ char *line; - for (p = 0; p < _PROP_MAX; p++) { - if (passed[p]) - continue; + line = strv_join(settings, ", "); + log_info("Changed locale to %s.", strnull(line)); + } else + log_info("Changed locale to unset."); - free(data[p]); - data[p] = NULL; - } + sd_bus_emit_properties_changed(bus, + "/org/freedesktop/locale1", + "org.freedesktop.locale1", + "Locale", NULL); + } else + log_debug("Locale settings were not modified."); - simplify(); - r = write_data_locale(); - if (r < 0) { - log_error("Failed to set locale: %s", strerror(-r)); - return bus_send_error_reply(connection, message, NULL, r); - } + return sd_bus_reply_method_return(m, NULL); +} - push_data(connection); +static int method_set_vc_keyboard(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *error) { + Context *c = userdata; + const char *keymap, *keymap_toggle; + int convert, interactive; + int r; - log_info("Changed locale information."); + r = sd_bus_message_read(m, "ssbb", &keymap, &keymap_toggle, &convert, &interactive); + if (r < 0) + return r; - changed = bus_properties_changed_new( - "/org/freedesktop/locale1", - "org.freedesktop.locale1", - "Locale\0"); - if (!changed) - goto oom; - } - } else if (dbus_message_is_method_call(message, "org.freedesktop.locale1", "SetVConsoleKeyboard")) { + if (isempty(keymap)) + keymap = NULL; - const char *keymap, *keymap_toggle; - dbus_bool_t convert, interactive; + if (isempty(keymap_toggle)) + keymap_toggle = NULL; - if (!dbus_message_get_args( - message, - &error, - DBUS_TYPE_STRING, &keymap, - DBUS_TYPE_STRING, &keymap_toggle, - DBUS_TYPE_BOOLEAN, &convert, - DBUS_TYPE_BOOLEAN, &interactive, - DBUS_TYPE_INVALID)) - return bus_send_error_reply(connection, message, &error, -EINVAL); + if (!streq_ptr(keymap, c->vc_keymap) || + !streq_ptr(keymap_toggle, c->vc_keymap_toggle)) { - if (isempty(keymap)) - keymap = NULL; + if ((keymap && (!filename_is_valid(keymap) || !string_is_safe(keymap))) || + (keymap_toggle && (!filename_is_valid(keymap_toggle) || !string_is_safe(keymap_toggle)))) + return sd_bus_error_set_errnof(error, -EINVAL, "Received invalid keymap data"); - if (isempty(keymap_toggle)) - keymap_toggle = NULL; + r = bus_verify_polkit_async( + m, + CAP_SYS_ADMIN, + "org.freedesktop.locale1.set-keyboard", + interactive, + UID_INVALID, + &c->polkit_registry, + error); + if (r < 0) + return r; + if (r == 0) + return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */ - if (!streq_ptr(keymap, state.vc_keymap) || - !streq_ptr(keymap_toggle, state.vc_keymap_toggle)) { + if (free_and_strdup(&c->vc_keymap, keymap) < 0 || + free_and_strdup(&c->vc_keymap_toggle, keymap_toggle) < 0) + return -ENOMEM; - r = verify_polkit(connection, message, "org.freedesktop.locale1.set-keyboard", interactive, NULL, &error); - if (r < 0) - return bus_send_error_reply(connection, message, &error, r); + r = vconsole_write_data(c); + if (r < 0) { + log_error_errno(r, "Failed to set virtual console keymap: %m"); + return sd_bus_error_set_errnof(error, r, "Failed to set virtual console keymap: %s", strerror(-r)); + } - if (free_and_set(&state.vc_keymap, keymap) < 0 || - free_and_set(&state.vc_keymap_toggle, keymap_toggle) < 0) - goto oom; + log_info("Changed virtual console keymap to '%s' toggle '%s'", + strempty(c->vc_keymap), strempty(c->vc_keymap_toggle)); - r = write_data_vconsole(); - if (r < 0) { - log_error("Failed to set virtual console keymap: %s", strerror(-r)); - return bus_send_error_reply(connection, message, NULL, r); - } + r = vconsole_reload(bus); + if (r < 0) + log_error_errno(r, "Failed to request keymap reload: %m"); - log_info("Changed virtual console keymap to '%s'", strempty(state.vc_keymap)); + sd_bus_emit_properties_changed(bus, + "/org/freedesktop/locale1", + "org.freedesktop.locale1", + "VConsoleKeymap", "VConsoleKeymapToggle", NULL); - r = load_vconsole_keymap(connection, NULL); + if (convert) { + r = vconsole_convert_to_x11(c, bus); if (r < 0) - log_error("Failed to request keymap reload: %s", strerror(-r)); - - changed = bus_properties_changed_new( - "/org/freedesktop/locale1", - "org.freedesktop.locale1", - "VConsoleKeymap\0" - "VConsoleKeymapToggle\0"); - if (!changed) - goto oom; - - if (convert) { - r = convert_vconsole_to_x11(connection); - - if (r < 0) - log_error("Failed to convert keymap data: %s", strerror(-r)); - } + log_error_errno(r, "Failed to convert keymap data: %m"); } + } - } else if (dbus_message_is_method_call(message, "org.freedesktop.locale1", "SetX11Keyboard")) { + return sd_bus_reply_method_return(m, NULL); +} - const char *layout, *model, *variant, *options; - dbus_bool_t convert, interactive; +#ifdef HAVE_XKBCOMMON +static void log_xkb(struct xkb_context *ctx, enum xkb_log_level lvl, const char *format, va_list args) { + const char *fmt; - if (!dbus_message_get_args( - message, - &error, - DBUS_TYPE_STRING, &layout, - DBUS_TYPE_STRING, &model, - DBUS_TYPE_STRING, &variant, - DBUS_TYPE_STRING, &options, - DBUS_TYPE_BOOLEAN, &convert, - DBUS_TYPE_BOOLEAN, &interactive, - DBUS_TYPE_INVALID)) - return bus_send_error_reply(connection, message, &error, -EINVAL); + fmt = strjoina("libxkbcommon: ", format); + log_internalv(LOG_DEBUG, 0, __FILE__, __LINE__, __func__, fmt, args); +} - if (isempty(layout)) - layout = NULL; +static int verify_xkb_rmlvo(const char *model, const char *layout, const char *variant, const char *options) { + const struct xkb_rule_names rmlvo = { + .model = model, + .layout = layout, + .variant = variant, + .options = options, + }; + struct xkb_context *ctx = NULL; + struct xkb_keymap *km = NULL; + int r; - if (isempty(model)) - model = NULL; + /* compile keymap from RMLVO information to check out its validity */ - if (isempty(variant)) - variant = NULL; + ctx = xkb_context_new(XKB_CONTEXT_NO_ENVIRONMENT_NAMES); + if (!ctx) { + r = -ENOMEM; + goto exit; + } - if (isempty(options)) - options = NULL; + xkb_context_set_log_fn(ctx, log_xkb); - if (!streq_ptr(layout, state.x11_layout) || - !streq_ptr(model, state.x11_model) || - !streq_ptr(variant, state.x11_variant) || - !streq_ptr(options, state.x11_options)) { + km = xkb_keymap_new_from_names(ctx, &rmlvo, XKB_KEYMAP_COMPILE_NO_FLAGS); + if (!km) { + r = -EINVAL; + goto exit; + } - r = verify_polkit(connection, message, "org.freedesktop.locale1.set-keyboard", interactive, NULL, &error); - if (r < 0) - return bus_send_error_reply(connection, message, &error, r); - - if (free_and_set(&state.x11_layout, layout) < 0 || - free_and_set(&state.x11_model, model) < 0 || - free_and_set(&state.x11_variant, variant) < 0 || - free_and_set(&state.x11_options, options) < 0) - goto oom; - - r = write_data_x11(); - if (r < 0) { - log_error("Failed to set X11 keyboard layout: %s", strerror(-r)); - return bus_send_error_reply(connection, message, NULL, r); - } + r = 0; - log_info("Changed X11 keyboard layout to '%s'", strempty(state.x11_layout)); +exit: + xkb_keymap_unref(km); + xkb_context_unref(ctx); + return r; +} +#else +static int verify_xkb_rmlvo(const char *model, const char *layout, const char *variant, const char *options) { + return 0; +} +#endif - changed = bus_properties_changed_new( - "/org/freedesktop/locale1", - "org.freedesktop.locale1", - "X11Layout\0" - "X11Model\0" - "X11Variant\0" - "X11Options\0"); - if (!changed) - goto oom; +static int method_set_x11_keyboard(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *error) { + Context *c = userdata; + const char *layout, *model, *variant, *options; + int convert, interactive; + int r; - if (convert) { - r = convert_x11_to_vconsole(connection); + r = sd_bus_message_read(m, "ssssbb", &layout, &model, &variant, &options, &convert, &interactive); + if (r < 0) + return r; - if (r < 0) - log_error("Failed to convert keymap data: %s", strerror(-r)); - } - } - } else - return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps); + if (isempty(layout)) + layout = NULL; + + if (isempty(model)) + model = NULL; + + if (isempty(variant)) + variant = NULL; + + if (isempty(options)) + options = NULL; + + if (!streq_ptr(layout, c->x11_layout) || + !streq_ptr(model, c->x11_model) || + !streq_ptr(variant, c->x11_variant) || + !streq_ptr(options, c->x11_options)) { + + if ((layout && !string_is_safe(layout)) || + (model && !string_is_safe(model)) || + (variant && !string_is_safe(variant)) || + (options && !string_is_safe(options))) + return sd_bus_error_set_errnof(error, -EINVAL, "Received invalid keyboard data"); + + r = bus_verify_polkit_async( + m, + CAP_SYS_ADMIN, + "org.freedesktop.locale1.set-keyboard", + interactive, + UID_INVALID, + &c->polkit_registry, + error); + if (r < 0) + return r; + if (r == 0) + return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */ - if (!(reply = dbus_message_new_method_return(message))) - goto oom; + r = verify_xkb_rmlvo(model, layout, variant, options); + if (r < 0) { + log_error_errno(r, "Cannot compile XKB keymap for new x11 keyboard layout ('%s' / '%s' / '%s' / '%s'): %m", + strempty(model), strempty(layout), strempty(variant), strempty(options)); + return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Cannot compile XKB keymap, refusing"); + } - if (!dbus_connection_send(connection, reply, NULL)) - goto oom; + if (free_and_strdup(&c->x11_layout, layout) < 0 || + free_and_strdup(&c->x11_model, model) < 0 || + free_and_strdup(&c->x11_variant, variant) < 0 || + free_and_strdup(&c->x11_options, options) < 0) + return -ENOMEM; - dbus_message_unref(reply); - reply = NULL; + r = x11_write_data(c); + if (r < 0) { + log_error_errno(r, "Failed to set X11 keyboard layout: %m"); + return sd_bus_error_set_errnof(error, r, "Failed to set X11 keyboard layout: %s", strerror(-r)); + } - if (changed) { + log_info("Changed X11 keyboard layout to '%s' model '%s' variant '%s' options '%s'", + strempty(c->x11_layout), + strempty(c->x11_model), + strempty(c->x11_variant), + strempty(c->x11_options)); - if (!dbus_connection_send(connection, changed, NULL)) - goto oom; + sd_bus_emit_properties_changed(bus, + "/org/freedesktop/locale1", + "org.freedesktop.locale1", + "X11Layout", "X11Model", "X11Variant", "X11Options", NULL); - dbus_message_unref(changed); + if (convert) { + r = x11_convert_to_vconsole(c, bus); + if (r < 0) + log_error_errno(r, "Failed to convert keymap data: %m"); + } } - return DBUS_HANDLER_RESULT_HANDLED; - -oom: - if (reply) - dbus_message_unref(reply); - - if (changed) - dbus_message_unref(changed); - - dbus_error_free(&error); - - return DBUS_HANDLER_RESULT_NEED_MEMORY; + return sd_bus_reply_method_return(m, NULL); } -static int connect_bus(DBusConnection **_bus) { - static const DBusObjectPathVTable locale_vtable = { - .message_function = locale_message_handler - }; - DBusError error; - DBusConnection *bus = NULL; +static const sd_bus_vtable locale_vtable[] = { + SD_BUS_VTABLE_START(0), + SD_BUS_PROPERTY("Locale", "as", property_get_locale, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), + SD_BUS_PROPERTY("X11Layout", "s", NULL, offsetof(Context, x11_layout), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), + SD_BUS_PROPERTY("X11Model", "s", NULL, offsetof(Context, x11_model), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), + SD_BUS_PROPERTY("X11Variant", "s", NULL, offsetof(Context, x11_variant), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), + SD_BUS_PROPERTY("X11Options", "s", NULL, offsetof(Context, x11_options), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), + SD_BUS_PROPERTY("VConsoleKeymap", "s", NULL, offsetof(Context, vc_keymap), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), + SD_BUS_PROPERTY("VConsoleKeymapToggle", "s", NULL, offsetof(Context, vc_keymap_toggle), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), + SD_BUS_METHOD("SetLocale", "asb", NULL, method_set_locale, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("SetVConsoleKeyboard", "ssbb", NULL, method_set_vc_keyboard, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("SetX11Keyboard", "ssssbb", NULL, method_set_x11_keyboard, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_VTABLE_END +}; + +static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) { + _cleanup_bus_close_unref_ sd_bus *bus = NULL; int r; + assert(c); + assert(event); assert(_bus); - dbus_error_init(&error); - - bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error); - if (!bus) { - log_error("Failed to get system D-Bus connection: %s", bus_error_message(&error)); - r = -ECONNREFUSED; - goto fail; - } - - dbus_connection_set_exit_on_disconnect(bus, FALSE); + r = sd_bus_default_system(&bus); + if (r < 0) + return log_error_errno(r, "Failed to get system bus connection: %m"); - if (!dbus_connection_register_object_path(bus, "/org/freedesktop/locale1", &locale_vtable, NULL) || - !dbus_connection_add_filter(bus, bus_exit_idle_filter, &remain_until, NULL)) { - r = log_oom(); - goto fail; - } + r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/locale1", "org.freedesktop.locale1", locale_vtable, c); + if (r < 0) + return log_error_errno(r, "Failed to register object: %m"); - r = dbus_bus_request_name(bus, "org.freedesktop.locale1", DBUS_NAME_FLAG_DO_NOT_QUEUE, &error); - if (dbus_error_is_set(&error)) { - log_error("Failed to register name on bus: %s", bus_error_message(&error)); - r = -EEXIST; - goto fail; - } + r = sd_bus_request_name(bus, "org.freedesktop.locale1", 0); + if (r < 0) + return log_error_errno(r, "Failed to register name: %m"); - if (r != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { - log_error("Failed to acquire name."); - r = -EEXIST; - goto fail; - } + r = sd_bus_attach_event(bus, event, 0); + if (r < 0) + return log_error_errno(r, "Failed to attach bus to event loop: %m"); - if (_bus) - *_bus = bus; + *_bus = bus; + bus = NULL; return 0; - -fail: - dbus_connection_close(bus); - dbus_connection_unref(bus); - - dbus_error_free(&error); - - return r; } int main(int argc, char *argv[]) { + _cleanup_(context_free) Context context = {}; + _cleanup_event_unref_ sd_event *event = NULL; + _cleanup_bus_close_unref_ sd_bus *bus = NULL; int r; - DBusConnection *bus = NULL; - bool exiting = false; log_set_target(LOG_TARGET_AUTO); log_parse_environment(); log_open(); umask(0022); - - if (argc == 2 && streq(argv[1], "--introspect")) { - fputs(DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE - "\n", stdout); - fputs(locale_interface, stdout); - fputs("\n", stdout); - return 0; - } + mac_selinux_init("/etc"); if (argc != 1) { log_error("This program takes no arguments."); @@ -1400,38 +1276,30 @@ int main(int argc, char *argv[]) { goto finish; } - r = read_data(); + r = sd_event_default(&event); if (r < 0) { - log_error("Failed to read locale data: %s", strerror(-r)); + log_error_errno(r, "Failed to allocate event loop: %m"); goto finish; } - r = connect_bus(&bus); + sd_event_set_watchdog(event, true); + + r = connect_bus(&context, event, &bus); if (r < 0) goto finish; - remain_until = now(CLOCK_MONOTONIC) + DEFAULT_EXIT_USEC; - for (;;) { - - if (!dbus_connection_read_write_dispatch(bus, exiting ? -1 : (int) (DEFAULT_EXIT_USEC/USEC_PER_MSEC))) - break; - - if (!exiting && remain_until < now(CLOCK_MONOTONIC)) { - exiting = true; - bus_async_unregister_and_exit(bus, "org.freedesktop.locale1"); - } + r = context_read_data(&context); + if (r < 0) { + log_error_errno(r, "Failed to read locale data: %m"); + goto finish; } - r = 0; - -finish: - free_data(); - - if (bus) { - dbus_connection_flush(bus); - dbus_connection_close(bus); - dbus_connection_unref(bus); + r = bus_event_loop_with_idle(event, bus, "org.freedesktop.locale1", DEFAULT_EXIT_USEC, NULL, NULL); + if (r < 0) { + log_error_errno(r, "Failed to run event loop: %m"); + goto finish; } +finish: return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }