X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flocale%2Flocaled.c;h=4e56382f4f2365d6bd4acd2cd7c72cec7981808b;hp=7e03d82575ab0f9cd823b6644c8f4e86e4ece153;hb=d4f5a1f47dbd04f26f2ddf951c97c4cb0ebbbe62;hpb=c49b30a23583ff39daaa26696bcab478d2fee0bb diff --git a/src/locale/localed.c b/src/locale/localed.c index 7e03d8257..4e56382f4 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "sd-bus.h" @@ -38,6 +39,11 @@ #include "bus-error.h" #include "bus-message.h" #include "event-util.h" +#include "locale-util.h" + +#ifdef HAVE_XKBCOMMON +#include +#endif enum { /* We don't list LC_ALL here on purpose. People should be @@ -90,20 +96,8 @@ typedef struct Context { Hashmap *polkit_registry; } Context; -static int free_and_copy(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; - - free(*s); - *s = t; - - return 0; +static const char* nonempty(const char *s) { + return isempty(s) ? NULL : s; } static void free_and_replace(char **s, char *v) { @@ -111,6 +105,12 @@ static void free_and_replace(char **s, char *v) { *s = v; } +static bool startswith_comma(const char *s, const char *prefix) { + const char *t; + + return s && (t = startswith(s, prefix)) && (*t == ','); +} + static void context_free_x11(Context *c) { free_and_replace(&c->x11_layout, NULL); free_and_replace(&c->x11_model, NULL); @@ -130,22 +130,20 @@ static void context_free_locale(Context *c) { free_and_replace(&c->locale[p], NULL); } -static void context_free(Context *c, sd_bus *bus) { +static void context_free(Context *c) { context_free_locale(c); context_free_x11(c); context_free_vconsole(c); - bus_verify_polkit_async_registry_free(bus, c->polkit_registry); + bus_verify_polkit_async_registry_free(c->polkit_registry); }; static void locale_simplify(Context *c) { int p; for (p = LOCALE_LANG+1; p < _LOCALE_MAX; p++) - if (isempty(c->locale[p]) || streq_ptr(c->locale[LOCALE_LANG], c->locale[p])) { - free(c->locale[p]); - c->locale[p] = NULL; - } + if (isempty(c->locale[p]) || streq_ptr(c->locale[LOCALE_LANG], c->locale[p])) + free_and_replace(&c->locale[p], NULL); } static int locale_read_data(Context *c) { @@ -177,7 +175,8 @@ static int locale_read_data(Context *c) { for (p = 0; p < _LOCALE_MAX; p++) { assert(names[p]); - r = free_and_copy(&c->locale[p], getenv(names[p])); + r = free_and_strdup(&c->locale[p], + nonempty(getenv(names[p]))); if (r < 0) return r; } @@ -206,9 +205,10 @@ static int vconsole_read_data(Context *c) { } static int x11_read_data(Context *c) { - FILE *f; + _cleanup_fclose_ FILE *f; char line[LINE_MAX]; bool in_section = false; + int r; context_free_x11(c); @@ -226,13 +226,11 @@ static int x11_read_data(Context *c) { 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, false); + if (r < 0) + return r; if (strv_length(a) == 3) { if (streq(a[1], "XkbLayout")) { @@ -250,27 +248,20 @@ static int x11_read_data(Context *c) { } } - 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, false); + 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; } @@ -284,16 +275,19 @@ static int context_read_data(Context *c) { return r < 0 ? r : q < 0 ? q : p; } -static int locale_write_data(Context *c) { +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", NULL, &l); + r = load_env_file(NULL, "/etc/locale.conf", NULL, &l); if (r < 0 && r != -ENOENT) return r; for (p = 0; p < _LOCALE_MAX; p++) { - char *t, **u; + _cleanup_free_ char *t = NULL; + char **u; assert(names[p]); @@ -302,24 +296,18 @@ static int locale_write_data(Context *c) { continue; } - if (asprintf(&t, "%s=%s", names[p], c->locale[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; @@ -327,9 +315,12 @@ static int locale_write_data(Context *c) { } r = write_env_file_label("/etc/locale.conf", l); - strv_free(l); + if (r < 0) + return r; - return r; + *settings = l; + l = NULL; + return 0; } static int locale_update_system_manager(Context *c, sd_bus *bus) { @@ -366,11 +357,11 @@ static int locale_update_system_manager(Context *c, sd_bus *bus) { } assert(c_set + c_unset == _LOCALE_MAX); - r = sd_bus_message_new_method_call(bus, + r = sd_bus_message_new_method_call(bus, &m, "org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", - "UnsetAndSetEnvironment", &m); + "UnsetAndSetEnvironment"); if (r < 0) return r; @@ -391,72 +382,61 @@ static int locale_update_system_manager(Context *c, sd_bus *bus) { 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", NULL, &l); + r = load_env_file(NULL, "/etc/vconsole.conf", NULL, &l); if (r < 0 && r != -ENOENT) return r; 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=", c->vc_keymap); - if (!s) { - strv_free(l); + 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(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=", c->vc_keymap_toggle); - if (!s) { - strv_free(l); + 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_label("/etc/vconsole.conf", l); - strv_free(l); - - return r; + return write_env_file_label("/etc/vconsole.conf", l); } -static int write_data_x11(Context *c) { - 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(c->x11_layout) && @@ -503,13 +483,9 @@ static int write_data_x11(Context *c) { r = -errno; unlink("/etc/X11/xorg.conf.d/00-keyboard.conf"); unlink(temp_path); + return r; } else - r = 0; - - fclose(f); - free(temp_path); - - return r; + return 0; } static int vconsole_reload(sd_bus *bus) { @@ -532,8 +508,8 @@ static int vconsole_reload(sd_bus *bus) { 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) { @@ -544,6 +520,7 @@ static int read_next_mapping(FILE *f, unsigned *n, char ***a) { for (;;) { char line[LINE_MAX]; char *l, **b; + int r; errno = 0; if (!fgets(line, sizeof(line), f)) { @@ -560,9 +537,9 @@ 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, false); + if (r < 0) + return r; if (strv_length(b) < 5) { log_error("Invalid line "SYSTEMD_KBD_MODEL_MAP":%u, ignoring.", *n); @@ -591,7 +568,7 @@ static int vconsole_convert_to_x11(Context *c, sd_bus *bus) { context_free_x11(c); } else { - FILE *f; + _cleanup_fclose_ FILE *f = NULL; unsigned n = 0; f = fopen(SYSTEMD_KBD_MODEL_MAP, "re"); @@ -599,129 +576,138 @@ static int vconsole_convert_to_x11(Context *c, sd_bus *bus) { 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); + if (r < 0) return r; - } - if (r == 0) break; - if (!streq(c->vc_keymap, a[0])) { - strv_free(a); + if (!streq(c->vc_keymap, a[0])) continue; - } 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_copy(&c->x11_layout, strnulldash(a[1])) < 0 || - free_and_copy(&c->x11_model, strnulldash(a[2])) < 0 || - free_and_copy(&c->x11_variant, strnulldash(a[3])) < 0 || - free_and_copy(&c->x11_options, strnulldash(a[4])) < 0) { - strv_free(a); - fclose(f); + 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) { int r; - r = write_data_x11(c); - if (r < 0) + r = x11_write_data(c); + if (r < 0) { log_error("Failed to set X11 keyboard layout: %s", strerror(-r)); + return r; + } + + 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)); sd_bus_emit_properties_changed(bus, "/org/freedesktop/locale1", "org.freedesktop.locale1", "X11Layout", "X11Model", "X11Variant", "X11Options", NULL); - } + } else + log_debug("X11 keyboard layout was not modified."); return 0; } -static int x11_convert_to_vconsole(Context *c, sd_bus *bus) { - 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(bus); + if (x11_variant) + n = strjoin(x11_layout, "-", x11_variant, NULL); + else + n = strdup(x11_layout); + if (!n) + return -ENOMEM; - if (isempty(c->x11_layout)) { + NULSTR_FOREACH(dir, KBD_KEYMAP_DIRS) { + _cleanup_free_ char *p = NULL, *pz = NULL; + bool uncompressed; - modified = - !isempty(c->vc_keymap) || - !isempty(c->vc_keymap_toggle); + p = strjoin(dir, "xkb/", n, ".map", NULL); + pz = strjoin(dir, "xkb/", n, ".map.gz", NULL); + if (!p || !pz) + return -ENOMEM; - context_free_x11(c); - } else { - _cleanup_fclose_ 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 (;;) { - _cleanup_strv_free_ char **a = NULL; - unsigned matching = 0; - int r; + return 0; +} - r = read_next_mapping(f, &n, &a); - if (r < 0) - return r; - if (r == 0) - break; +static int find_legacy_keymap(Context *c, char **new_keymap) { + _cleanup_fclose_ FILE *f; + unsigned n = 0; + unsigned best_matching = 0; + int r; - /* 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 { - size_t x; - - x = strcspn(c->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 && - strneq(c->x11_layout, a[1], x)) - 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(c->x11_layout, a[1], x) == 0) - matching = 1; - } + f = fopen(SYSTEMD_KBD_MODEL_MAP, "re"); + if (!f) + return -errno; + + for (;;) { + _cleanup_strv_free_ char **a = NULL; + unsigned matching = 0; + + r = read_next_mapping(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(c->x11_model, a[2])) { + if (matching > 0) { + if (isempty(c->x11_model) || streq_ptr(c->x11_model, a[2])) { matching++; if (streq_ptr(c->x11_variant, a[3])) { @@ -731,18 +717,67 @@ static int x11_convert_to_vconsole(Context *c, sd_bus *bus) { 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) - 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 x11_convert_to_vconsole(Context *c, sd_bus *bus) { + bool modified = false; + int r; + + assert(bus); + + 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); @@ -753,25 +788,34 @@ static int x11_convert_to_vconsole(Context *c, sd_bus *bus) { } if (modified) { - int r; - r = vconsole_write_data(c); if (r < 0) log_error("Failed to set virtual console keymap: %s", strerror(-r)); + log_info("Changed virtual console keymap to '%s' toggle '%s'", + strempty(c->vc_keymap), strempty(c->vc_keymap_toggle)); + sd_bus_emit_properties_changed(bus, "/org/freedesktop/locale1", "org.freedesktop.locale1", "VConsoleKeymap", "VConsoleKeymapToggle", NULL); return vconsole_reload(bus); - } + } else + log_debug("Virtual console keymap was not modified."); return 0; } -static int property_get_locale(sd_bus *bus, const char *path, const char *interface, - const char *property, sd_bus_message *reply, sd_bus_error *error, void *userdata) { +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; @@ -795,9 +839,8 @@ static int property_get_locale(sd_bus *bus, const char *path, const char *interf return sd_bus_message_append_strv(reply, l); } -static int method_set_locale(sd_bus *bus, sd_bus_message *m, void *userdata) { +static int method_set_locale(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *error) { Context *c = userdata; - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_strv_free_ char **l = NULL; char **i; int interactive; @@ -808,13 +851,13 @@ static int method_set_locale(sd_bus *bus, sd_bus_message *m, void *userdata) { r = bus_message_read_strv_extend(m, &l); if (r < 0) - return sd_bus_reply_method_errno(bus, m, r, NULL); + return r; r = sd_bus_message_read_basic(m, 'b', &interactive); if (r < 0) - return sd_bus_reply_method_errno(bus, m, r, NULL); + return r; - /* Check whether a variable changed and if so valid */ + /* Check whether a variable changed and if it is valid */ STRV_FOREACH(i, l) { bool valid = false; @@ -824,7 +867,7 @@ static int method_set_locale(sd_bus *bus, sd_bus_message *m, void *userdata) { k = strlen(names[p]); if (startswith(*i, names[p]) && (*i)[k] == '=' && - string_is_safe((*i) + k + 1)) { + locale_is_valid((*i) + k + 1)) { valid = true; passed[p] = true; @@ -836,45 +879,38 @@ static int method_set_locale(sd_bus *bus, sd_bus_message *m, void *userdata) { } if (!valid) - sd_bus_reply_method_errorf(bus, m, SD_BUS_ERROR_INVALID_ARGS, "Invalid Locale data."); + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid Locale data."); } /* Check whether a variable is unset */ - if (!modified) { + if (!modified) for (p = 0; p < _LOCALE_MAX; p++) if (!isempty(c->locale[p]) && !passed[p]) { modified = true; break; } - } if (modified) { - r = bus_verify_polkit_async(bus, &c->polkit_registry, m, - "org.freedesktop.locale1.set-locale", interactive, - &error, method_set_locale, c); + _cleanup_strv_free_ char **settings = NULL; + + r = bus_verify_polkit_async(m, CAP_SYS_ADMIN, "org.freedesktop.locale1.set-locale", interactive, &c->polkit_registry, error); if (r < 0) - return sd_bus_reply_method_errno(bus, m, r, &error); + 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) { + 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] == '=') { - char *t; - - t = strdup(*i + k + 1); - if (!t) - return -ENOMEM; - - free(c->locale[p]); - c->locale[p] = t; + r = free_and_strdup(&c->locale[p], *i + k + 1); + if (r < 0) + return r; break; } } - } for (p = 0; p < _LOCALE_MAX; p++) { if (passed[p]) @@ -885,35 +921,42 @@ static int method_set_locale(sd_bus *bus, sd_bus_message *m, void *userdata) { locale_simplify(c); - r = locale_write_data(c); + r = locale_write_data(c, &settings); if (r < 0) { log_error("Failed to set locale: %s", strerror(-r)); - return sd_bus_reply_method_errnof(bus, m, r, "Failed to set locale: %s", strerror(-r)); + return sd_bus_error_set_errnof(error, r, "Failed to set locale: %s", strerror(-r)); } locale_update_system_manager(c, bus); - log_info("Changed locale information."); + if (settings) { + _cleanup_free_ char *line; + + line = strv_join(settings, ", "); + log_info("Changed locale to %s.", strnull(line)); + } else + log_info("Changed locale to unset."); sd_bus_emit_properties_changed(bus, "/org/freedesktop/locale1", "org.freedesktop.locale1", "Locale", NULL); - } + } else + log_debug("Locale settings were not modified."); + - return sd_bus_reply_method_return(bus, m, NULL); + return sd_bus_reply_method_return(m, NULL); } -static int method_set_vc_keyboard(sd_bus *bus, sd_bus_message *m, void *userdata) { +static int method_set_vc_keyboard(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *error) { Context *c = userdata; - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; const char *keymap, *keymap_toggle; int convert, interactive; int r; r = sd_bus_message_read(m, "ssbb", &keymap, &keymap_toggle, &convert, &interactive); if (r < 0) - return sd_bus_reply_method_errno(bus, m, r, NULL); + return r; if (isempty(keymap)) keymap = NULL; @@ -926,27 +969,26 @@ static int method_set_vc_keyboard(sd_bus *bus, sd_bus_message *m, void *userdata if ((keymap && (!filename_is_safe(keymap) || !string_is_safe(keymap))) || (keymap_toggle && (!filename_is_safe(keymap_toggle) || !string_is_safe(keymap_toggle)))) - return sd_bus_reply_method_errnof(bus, m, r, "Received invalid keymap data: %s", -EINVAL); + return sd_bus_error_set_errnof(error, -EINVAL, "Received invalid keymap data"); - r = bus_verify_polkit_async(bus, &c->polkit_registry, m, - "org.freedesktop.locale1.set-keyboard", - interactive, &error, method_set_vc_keyboard, c); + r = bus_verify_polkit_async(m, CAP_SYS_ADMIN, "org.freedesktop.locale1.set-keyboard", interactive, &c->polkit_registry, error); if (r < 0) - return sd_bus_reply_method_errno(bus, m, r, &error); + 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 (free_and_copy(&c->vc_keymap, keymap) < 0 || - free_and_copy(&c->vc_keymap_toggle, keymap_toggle) < 0) + if (free_and_strdup(&c->vc_keymap, keymap) < 0 || + free_and_strdup(&c->vc_keymap_toggle, keymap_toggle) < 0) return -ENOMEM; r = vconsole_write_data(c); if (r < 0) { log_error("Failed to set virtual console keymap: %s", strerror(-r)); - return sd_bus_reply_method_errnof(bus, m, r, "Failed to set virtual console keymap: %s", strerror(-r)); + return sd_bus_error_set_errnof(error, r, "Failed to set virtual console keymap: %s", strerror(-r)); } - log_info("Changed virtual console keymap to '%s'", strempty(c->vc_keymap)); + log_info("Changed virtual console keymap to '%s' toggle '%s'", + strempty(c->vc_keymap), strempty(c->vc_keymap_toggle)); r = vconsole_reload(bus); if (r < 0) @@ -964,19 +1006,63 @@ static int method_set_vc_keyboard(sd_bus *bus, sd_bus_message *m, void *userdata } } - return sd_bus_reply_method_return(bus, m, NULL); + return sd_bus_reply_method_return(m, NULL); +} + +#ifdef HAVE_XKBCOMMON +static void log_xkb(struct xkb_context *ctx, enum xkb_log_level lvl, const char *format, va_list args) { + /* suppress xkb messages for now */ +} + +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; + + /* compile keymap from RMLVO information to check out its validity */ + + ctx = xkb_context_new(XKB_CONTEXT_NO_ENVIRONMENT_NAMES); + if (!ctx) { + r = -ENOMEM; + goto exit; + } + + xkb_context_set_log_fn(ctx, log_xkb); + + km = xkb_keymap_new_from_names(ctx, &rmlvo, XKB_KEYMAP_COMPILE_NO_FLAGS); + if (!km) { + r = -EINVAL; + goto exit; + } + + r = 0; + +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 -static int method_set_x11_keyboard(sd_bus *bus, sd_bus_message *m, void *userdata) { +static int method_set_x11_keyboard(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *error) { Context *c = userdata; - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; const char *layout, *model, *variant, *options; int convert, interactive; int r; r = sd_bus_message_read(m, "ssssbb", &layout, &model, &variant, &options, &convert, &interactive); if (r < 0) - return sd_bus_reply_method_errno(bus, m, r, NULL); + return r; if (isempty(layout)) layout = NULL; @@ -999,34 +1085,41 @@ static int method_set_x11_keyboard(sd_bus *bus, sd_bus_message *m, void *userdat (model && !string_is_safe(model)) || (variant && !string_is_safe(variant)) || (options && !string_is_safe(options))) - return sd_bus_reply_method_errnof(bus, m, r, "Received invalid keyboard data: %s", -EINVAL); + return sd_bus_error_set_errnof(error, -EINVAL, "Received invalid keyboard data"); - r = bus_verify_polkit_async(bus, &c->polkit_registry, m, - "org.freedesktop.locale1.set-keyboard", - interactive, &error, method_set_x11_keyboard, c); + r = verify_xkb_rmlvo(model, layout, variant, options); if (r < 0) - return sd_bus_reply_method_errno(bus, m, r, &error); + log_warning("Cannot compile XKB keymap for new x11 keyboard layout ('%s' / '%s' / '%s' / '%s'): %s", + strempty(model), strempty(layout), strempty(variant), strempty(options), strerror(-r)); + + r = bus_verify_polkit_async(m, CAP_SYS_ADMIN, "org.freedesktop.locale1.set-keyboard", interactive, &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 (free_and_copy(&c->x11_layout, layout) < 0 || - free_and_copy(&c->x11_model, model) < 0 || - free_and_copy(&c->x11_variant, variant) < 0 || - free_and_copy(&c->x11_options, options) < 0) + 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; - r = write_data_x11(c); + r = x11_write_data(c); if (r < 0) { log_error("Failed to set X11 keyboard layout: %s", strerror(-r)); - return sd_bus_reply_method_errnof(bus, m, r, "Failed to set X11 keyboard layout: %s", strerror(-r)); + return sd_bus_error_set_errnof(error, r, "Failed to set X11 keyboard layout: %s", strerror(-r)); } - log_info("Changed X11 keyboard layout to '%s'", strempty(c->x11_layout)); + 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)); sd_bus_emit_properties_changed(bus, "/org/freedesktop/locale1", "org.freedesktop.locale1", - "X11Layout" "X11Model" "X11Variant" "X11Options", NULL); + "X11Layout", "X11Model", "X11Variant", "X11Options", NULL); if (convert) { r = x11_convert_to_vconsole(c, bus); @@ -1035,7 +1128,7 @@ static int method_set_x11_keyboard(sd_bus *bus, sd_bus_message *m, void *userdat } } - return sd_bus_reply_method_return(bus, m, NULL); + return sd_bus_reply_method_return(m, NULL); } static const sd_bus_vtable locale_vtable[] = { @@ -1047,43 +1140,38 @@ static const sd_bus_vtable locale_vtable[] = { 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, 0), - SD_BUS_METHOD("SetVConsoleKeyboard", "ssbb", NULL, method_set_vc_keyboard, 0), - SD_BUS_METHOD("SetX11Keyboard", "ssssbb", NULL, method_set_x11_keyboard, 0), + 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_unref_ sd_bus *bus = NULL; + _cleanup_bus_close_unref_ sd_bus *bus = NULL; int r; assert(c); assert(event); assert(_bus); - r = sd_bus_open_system(&bus); + r = sd_bus_default_system(&bus); if (r < 0) { log_error("Failed to get system bus connection: %s", strerror(-r)); return r; } - r = sd_bus_add_object_vtable(bus, "/org/freedesktop/locale1", "org.freedesktop.locale1", locale_vtable, c); + r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/locale1", "org.freedesktop.locale1", locale_vtable, c); if (r < 0) { log_error("Failed to register object: %s", strerror(-r)); return r; } - r = sd_bus_request_name(bus, "org.freedesktop.locale1", SD_BUS_NAME_DO_NOT_QUEUE); + r = sd_bus_request_name(bus, "org.freedesktop.locale1", 0); if (r < 0) { log_error("Failed to register name: %s", strerror(-r)); return r; } - if (r != SD_BUS_NAME_PRIMARY_OWNER) { - log_error("Failed to acquire name."); - return -EEXIST; - } - r = sd_bus_attach_event(bus, event, 0); if (r < 0) { log_error("Failed to attach bus to event loop: %s", strerror(-r)); @@ -1097,9 +1185,9 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) { } int main(int argc, char *argv[]) { - Context context = {}; + _cleanup_(context_free) Context context = {}; _cleanup_event_unref_ sd_event *event = NULL; - _cleanup_bus_unref_ sd_bus *bus = NULL; + _cleanup_bus_close_unref_ sd_bus *bus = NULL; int r; log_set_target(LOG_TARGET_AUTO); @@ -1107,7 +1195,7 @@ int main(int argc, char *argv[]) { log_open(); umask(0022); - label_init("/etc"); + mac_selinux_init("/etc"); if (argc != 1) { log_error("This program takes no arguments."); @@ -1115,12 +1203,14 @@ int main(int argc, char *argv[]) { goto finish; } - r = sd_event_new(&event); + r = sd_event_default(&event); if (r < 0) { log_error("Failed to allocate event loop: %s", strerror(-r)); goto finish; } + sd_event_set_watchdog(event, true); + r = connect_bus(&context, event, &bus); if (r < 0) goto finish; @@ -1131,16 +1221,12 @@ int main(int argc, char *argv[]) { goto finish; } - r = bus_event_loop_with_idle(event, bus, "org.freedesktop.locale1", DEFAULT_EXIT_USEC); + r = bus_event_loop_with_idle(event, bus, "org.freedesktop.locale1", DEFAULT_EXIT_USEC, NULL, NULL); if (r < 0) { log_error("Failed to run event loop: %s", strerror(-r)); goto finish; } - r = 0; - finish: - context_free(&context, bus); - return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }