From b47ff73b182b5544d49611019a287a11ed7ffa34 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 31 May 2018 16:15:21 +0900 Subject: [PATCH 1/5] locale: return earlier if no operation will be done --- src/locale/localed.c | 222 +++++++++++++++++++++---------------------- 1 file changed, 110 insertions(+), 112 deletions(-) diff --git a/src/locale/localed.c b/src/locale/localed.c index 4559168d00..ccc552008a 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c @@ -349,8 +349,7 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_error *error) { Context *c = userdata; const char *keymap, *keymap_toggle; - int convert, interactive; - int r; + int convert, interactive, r; assert(m); assert(c); @@ -362,55 +361,55 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro keymap = empty_to_null(keymap); keymap_toggle = empty_to_null(keymap_toggle); - if (!streq_ptr(keymap, c->vc_keymap) || - !streq_ptr(keymap_toggle, c->vc_keymap_toggle)) { + if (streq_ptr(keymap, c->vc_keymap) && + streq_ptr(keymap_toggle, c->vc_keymap_toggle)) + return sd_bus_reply_method_return(m, 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_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Received invalid keymap data"); + 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_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Received invalid keymap data"); - r = bus_verify_polkit_async( - m, - CAP_SYS_ADMIN, - "org.freedesktop.locale1.set-keyboard", - NULL, - interactive, - UID_INVALID, - &polkit_registry, - error); + r = bus_verify_polkit_async( + m, + CAP_SYS_ADMIN, + "org.freedesktop.locale1.set-keyboard", + NULL, + interactive, + UID_INVALID, + &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_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_errno(r, "Failed to set virtual console keymap: %m"); + return sd_bus_error_set_errnof(error, 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)); + + r = vconsole_reload(sd_bus_message_get_bus(m)); + if (r < 0) + log_error_errno(r, "Failed to request keymap reload: %m"); + + (void) sd_bus_emit_properties_changed( + sd_bus_message_get_bus(m), + "/org/freedesktop/locale1", + "org.freedesktop.locale1", + "VConsoleKeymap", "VConsoleKeymapToggle", NULL); + + if (convert) { + r = vconsole_convert_to_x11_and_emit(c, sd_bus_message_get_bus(m)); 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_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_errno(r, "Failed to set virtual console keymap: %m"); - return sd_bus_error_set_errnof(error, 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)); - - r = vconsole_reload(sd_bus_message_get_bus(m)); - if (r < 0) - log_error_errno(r, "Failed to request keymap reload: %m"); - - (void) sd_bus_emit_properties_changed( - sd_bus_message_get_bus(m), - "/org/freedesktop/locale1", - "org.freedesktop.locale1", - "VConsoleKeymap", "VConsoleKeymapToggle", NULL); - - if (convert) { - r = vconsole_convert_to_x11_and_emit(c, sd_bus_message_get_bus(m)); - if (r < 0) - log_error_errno(r, "Failed to convert keymap data: %m"); - } + log_error_errno(r, "Failed to convert keymap data: %m"); } return sd_bus_reply_method_return(m, NULL); @@ -522,8 +521,7 @@ static int verify_xkb_rmlvo(const char *model, const char *layout, const char *v static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_error *error) { Context *c = userdata; const char *layout, *model, *variant, *options; - int convert, interactive; - int r; + int convert, interactive, r; assert(m); assert(c); @@ -537,71 +535,71 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err variant = empty_to_null(variant); options = empty_to_null(options); - 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 (streq_ptr(layout, c->x11_layout) && + streq_ptr(model, c->x11_model) && + streq_ptr(variant, c->x11_variant) && + streq_ptr(options, c->x11_options)) + return sd_bus_reply_method_return(m, NULL); - 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_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Received invalid keyboard data"); + 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_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Received invalid keyboard data"); - r = bus_verify_polkit_async( - m, - CAP_SYS_ADMIN, - "org.freedesktop.locale1.set-keyboard", - NULL, - interactive, - UID_INVALID, - &polkit_registry, - error); + r = bus_verify_polkit_async( + m, + CAP_SYS_ADMIN, + "org.freedesktop.locale1.set-keyboard", + NULL, + interactive, + UID_INVALID, + &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 */ + + 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)); + + if (r == -EOPNOTSUPP) + return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, "Local keyboard configuration not supported on this system."); + + return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Specified keymap cannot be compiled, refusing as invalid."); + } + + 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 = 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: %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)); + + (void) sd_bus_emit_properties_changed( + sd_bus_message_get_bus(m), + "/org/freedesktop/locale1", + "org.freedesktop.locale1", + "X11Layout", "X11Model", "X11Variant", "X11Options", NULL); + + if (convert) { + r = x11_convert_to_vconsole_and_emit(c, sd_bus_message_get_bus(m)); 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 */ - - 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)); - - if (r == -EOPNOTSUPP) - return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, "Local keyboard configuration not supported on this system."); - - return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Specified keymap cannot be compiled, refusing as invalid."); - } - - 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 = 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: %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)); - - (void) sd_bus_emit_properties_changed( - sd_bus_message_get_bus(m), - "/org/freedesktop/locale1", - "org.freedesktop.locale1", - "X11Layout", "X11Model", "X11Variant", "X11Options", NULL); - - if (convert) { - r = x11_convert_to_vconsole_and_emit(c, sd_bus_message_get_bus(m)); - if (r < 0) - log_error_errno(r, "Failed to convert keymap data: %m"); - } + log_error_errno(r, "Failed to convert keymap data: %m"); } return sd_bus_reply_method_return(m, NULL); From fe28d8874637ef159d350ecde562bd1dd799e932 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 29 May 2018 15:49:21 +0900 Subject: [PATCH 2/5] locale: check xkb data before requesting authentication --- src/locale/localed.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/locale/localed.c b/src/locale/localed.c index ccc552008a..ab16705d1d 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c @@ -547,6 +547,17 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err (options && !string_is_safe(options))) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Received invalid keyboard data"); + 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)); + + if (r == -EOPNOTSUPP) + return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, "Local keyboard configuration not supported on this system."); + + return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Specified keymap cannot be compiled, refusing as invalid."); + } + r = bus_verify_polkit_async( m, CAP_SYS_ADMIN, @@ -561,17 +572,6 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err if (r == 0) return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */ - 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)); - - if (r == -EOPNOTSUPP) - return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, "Local keyboard configuration not supported on this system."); - - return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Specified keymap cannot be compiled, refusing as invalid."); - } - 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 || From 6a837b035fa69f02f20815d00ce6c261b9f1a2e9 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 30 May 2018 01:35:26 +0900 Subject: [PATCH 3/5] locale: use _cleanup_free_ and free_and_replace --- src/locale/keymap-util.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c index 7cc2eb4407..50f7a1b7f7 100644 --- a/src/locale/keymap-util.c +++ b/src/locale/keymap-util.c @@ -668,7 +668,7 @@ int x11_convert_to_vconsole(Context *c) { context_free_vconsole(c); } else { - char *new_keymap = NULL; + _cleanup_free_ char *new_keymap = NULL; int r; r = find_converted_keymap(c->x11_layout, c->x11_variant, &new_keymap); @@ -687,12 +687,10 @@ int x11_convert_to_vconsole(Context *c) { c->x11_layout); if (!streq_ptr(c->vc_keymap, new_keymap)) { - free(c->vc_keymap); - c->vc_keymap = new_keymap; + free_and_replace(c->vc_keymap, new_keymap); c->vc_keymap_toggle = mfree(c->vc_keymap_toggle); modified = true; - } else - free(new_keymap); + } } if (modified) From df4fd2c757a833885c5130136d78db96198bc8b3 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 31 May 2018 16:22:05 +0900 Subject: [PATCH 4/5] locale: re-read configuration files if changed Closes #8491. --- src/locale/keymap-util.c | 180 +++++++++++++++++------- src/locale/keymap-util.h | 16 ++- src/locale/localed.c | 295 +++++++++++++++++++++++---------------- 3 files changed, 318 insertions(+), 173 deletions(-) diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c index 50f7a1b7f7..f1670ae879 100644 --- a/src/locale/keymap-util.c +++ b/src/locale/keymap-util.c @@ -80,39 +80,64 @@ void context_free(Context *c) { context_free_vconsole(c); }; -void locale_simplify(Context *c) { +void locale_simplify(char *locale[_VARIABLE_LC_MAX]) { int p; for (p = VARIABLE_LANG+1; p < _VARIABLE_LC_MAX; p++) - if (isempty(c->locale[p]) || streq_ptr(c->locale[VARIABLE_LANG], c->locale[p])) - c->locale[p] = mfree(c->locale[p]); + if (isempty(locale[p]) || streq_ptr(locale[VARIABLE_LANG], locale[p])) + locale[p] = mfree(locale[p]); } -static int locale_read_data(Context *c) { +int locale_read_data(Context *c, sd_bus_message *m) { + struct stat st; int r; - context_free_locale(c); + /* Do not try to re-read the file within single bus operation. */ + if (m && m == c->locale_cache) + return 0; - r = parse_env_file(NULL, "/etc/locale.conf", NEWLINE, - "LANG", &c->locale[VARIABLE_LANG], - "LANGUAGE", &c->locale[VARIABLE_LANGUAGE], - "LC_CTYPE", &c->locale[VARIABLE_LC_CTYPE], - "LC_NUMERIC", &c->locale[VARIABLE_LC_NUMERIC], - "LC_TIME", &c->locale[VARIABLE_LC_TIME], - "LC_COLLATE", &c->locale[VARIABLE_LC_COLLATE], - "LC_MONETARY", &c->locale[VARIABLE_LC_MONETARY], - "LC_MESSAGES", &c->locale[VARIABLE_LC_MESSAGES], - "LC_PAPER", &c->locale[VARIABLE_LC_PAPER], - "LC_NAME", &c->locale[VARIABLE_LC_NAME], - "LC_ADDRESS", &c->locale[VARIABLE_LC_ADDRESS], - "LC_TELEPHONE", &c->locale[VARIABLE_LC_TELEPHONE], - "LC_MEASUREMENT", &c->locale[VARIABLE_LC_MEASUREMENT], - "LC_IDENTIFICATION", &c->locale[VARIABLE_LC_IDENTIFICATION], - NULL); + /* To suppress multiple call of stat(), store the message to cache here. */ + c->locale_cache = m; - if (r == -ENOENT) { + r = stat("/etc/locale.conf", &st); + if (r < 0 && errno != ENOENT) + return -errno; + + if (r >= 0) { + usec_t t; + + /* If mtime is not changed, then we do not need to re-read the file. */ + t = timespec_load(&st.st_mtim); + if (c->locale_mtime != USEC_INFINITY && t == c->locale_mtime) + return 0; + + c->locale_mtime = t; + context_free_locale(c); + + r = parse_env_file(NULL, "/etc/locale.conf", NEWLINE, + "LANG", &c->locale[VARIABLE_LANG], + "LANGUAGE", &c->locale[VARIABLE_LANGUAGE], + "LC_CTYPE", &c->locale[VARIABLE_LC_CTYPE], + "LC_NUMERIC", &c->locale[VARIABLE_LC_NUMERIC], + "LC_TIME", &c->locale[VARIABLE_LC_TIME], + "LC_COLLATE", &c->locale[VARIABLE_LC_COLLATE], + "LC_MONETARY", &c->locale[VARIABLE_LC_MONETARY], + "LC_MESSAGES", &c->locale[VARIABLE_LC_MESSAGES], + "LC_PAPER", &c->locale[VARIABLE_LC_PAPER], + "LC_NAME", &c->locale[VARIABLE_LC_NAME], + "LC_ADDRESS", &c->locale[VARIABLE_LC_ADDRESS], + "LC_TELEPHONE", &c->locale[VARIABLE_LC_TELEPHONE], + "LC_MEASUREMENT", &c->locale[VARIABLE_LC_MEASUREMENT], + "LC_IDENTIFICATION", &c->locale[VARIABLE_LC_IDENTIFICATION], + NULL); + if (r < 0) + return r; + } else { int p; + c->locale_mtime = USEC_INFINITY; + context_free_locale(c); + /* Fill in what we got passed from systemd. */ for (p = 0; p < _VARIABLE_LC_MAX; p++) { const char *name; @@ -124,41 +149,86 @@ static int locale_read_data(Context *c) { if (r < 0) return r; } - - r = 0; } - locale_simplify(c); - return r; + locale_simplify(c->locale); + return 0; } -static int vconsole_read_data(Context *c) { +int vconsole_read_data(Context *c, sd_bus_message *m) { + struct stat st; + usec_t t; int r; + /* Do not try to re-read the file within single bus operation. */ + if (m && m == c->vc_cache) + return 0; + + /* To suppress multiple call of stat(), store the message to cache here. */ + c->vc_cache = m; + + if (stat("/etc/vconsole.conf", &st) < 0) { + if (errno != ENOENT) + return -errno; + + c->vc_mtime = USEC_INFINITY; + context_free_vconsole(c); + return 0; + } + + /* If mtime is not changed, then we do not need to re-read */ + t = timespec_load(&st.st_mtim); + if (c->vc_mtime != USEC_INFINITY && t == c->vc_mtime) + return 0; + + c->vc_mtime = t; context_free_vconsole(c); r = parse_env_file(NULL, "/etc/vconsole.conf", NEWLINE, "KEYMAP", &c->vc_keymap, "KEYMAP_TOGGLE", &c->vc_keymap_toggle, NULL); - - if (r < 0 && r != -ENOENT) + if (r < 0) return r; return 0; } -static int x11_read_data(Context *c) { - _cleanup_fclose_ FILE *f; - char line[LINE_MAX]; +int x11_read_data(Context *c, sd_bus_message *m) { + _cleanup_fclose_ FILE *f = NULL; bool in_section = false; + char line[LINE_MAX]; + struct stat st; + usec_t t; int r; + /* Do not try to re-read the file within single bus operation. */ + if (m && m == c->x11_cache) + return 0; + + /* To suppress multiple call of stat(), store the message to cache here. */ + c->x11_cache = m; + + if (stat("/etc/X11/xorg.conf.d/00-keyboard.conf", &st) < 0) { + if (errno != ENOENT) + return -errno; + + c->x11_mtime = USEC_INFINITY; + context_free_x11(c); + return 0; + } + + /* If mtime is not changed, then we do not need to re-read */ + t = timespec_load(&st.st_mtim); + if (c->x11_mtime != USEC_INFINITY && t == c->x11_mtime) + return 0; + + c->x11_mtime = t; context_free_x11(c); f = fopen("/etc/X11/xorg.conf.d/00-keyboard.conf", "re"); if (!f) - return errno == ENOENT ? 0 : -errno; + return -errno; while (fgets(line, sizeof(line), f)) { char *l; @@ -210,26 +280,13 @@ static int x11_read_data(Context *c) { return 0; } -int context_read_data(Context *c) { - int r, q, p; - - r = locale_read_data(c); - q = vconsole_read_data(c); - p = x11_read_data(c); - - return r < 0 ? r : q < 0 ? q : p; -} - int locale_write_data(Context *c, char ***settings) { - int r, p; _cleanup_strv_free_ char **l = NULL; + struct stat st; + int r, p; /* Set values will be returned as strv in *settings on success. */ - r = load_env_file(NULL, "/etc/locale.conf", NULL, &l); - if (r < 0 && r != -ENOENT) - return r; - for (p = 0; p < _VARIABLE_LC_MAX; p++) { _cleanup_free_ char *t = NULL; char **u; @@ -238,10 +295,8 @@ int locale_write_data(Context *c, char ***settings) { name = locale_variable_to_string(p); assert(name); - if (isempty(c->locale[p])) { - l = strv_env_unset(l, name); + if (isempty(c->locale[p])) continue; - } if (asprintf(&t, "%s=%s", name, c->locale[p]) < 0) return -ENOMEM; @@ -257,6 +312,7 @@ int locale_write_data(Context *c, char ***settings) { if (unlink("/etc/locale.conf") < 0) return errno == ENOENT ? 0 : -errno; + c->locale_mtime = USEC_INFINITY; return 0; } @@ -265,12 +321,17 @@ int locale_write_data(Context *c, char ***settings) { return r; *settings = TAKE_PTR(l); + + if (stat("/etc/locale.conf", &st) >= 0) + c->locale_mtime = timespec_load(&st.st_mtim); + return 0; } int vconsole_write_data(Context *c) { - int r; _cleanup_strv_free_ char **l = NULL; + struct stat st; + int r; r = load_env_file(NULL, "/etc/vconsole.conf", NULL, &l); if (r < 0 && r != -ENOENT) @@ -314,15 +375,24 @@ int vconsole_write_data(Context *c) { if (unlink("/etc/vconsole.conf") < 0) return errno == ENOENT ? 0 : -errno; + c->vc_mtime = USEC_INFINITY; return 0; } - return write_env_file_label("/etc/vconsole.conf", l); + r = write_env_file_label("/etc/vconsole.conf", l); + if (r < 0) + return r; + + if (stat("/etc/vconsole.conf", &st) >= 0) + c->vc_mtime = timespec_load(&st.st_mtim); + + return 0; } int x11_write_data(Context *c) { _cleanup_fclose_ FILE *f = NULL; _cleanup_free_ char *temp_path = NULL; + struct stat st; int r; if (isempty(c->x11_layout) && @@ -333,6 +403,7 @@ int x11_write_data(Context *c) { if (unlink("/etc/X11/xorg.conf.d/00-keyboard.conf") < 0) return errno == ENOENT ? 0 : -errno; + c->vc_mtime = USEC_INFINITY; return 0; } @@ -375,6 +446,9 @@ int x11_write_data(Context *c) { goto fail; } + if (stat("/etc/X11/xorg.conf.d/00-keyboard.conf", &st) >= 0) + c->x11_mtime = timespec_load(&st.st_mtim); + return 0; fail: diff --git a/src/locale/keymap-util.h b/src/locale/keymap-util.h index 715af154f1..41bdd02862 100644 --- a/src/locale/keymap-util.h +++ b/src/locale/keymap-util.h @@ -6,16 +6,25 @@ Copyright 2013 Kay Sievers ***/ +#include "sd-bus.h" + #include "locale-util.h" +#include "time-util.h" typedef struct Context { + sd_bus_message *locale_cache; + usec_t locale_mtime; char *locale[_VARIABLE_LC_MAX]; + sd_bus_message *x11_cache; + usec_t x11_mtime; char *x11_layout; char *x11_model; char *x11_variant; char *x11_options; + sd_bus_message *vc_cache; + usec_t vc_mtime; char *vc_keymap; char *vc_keymap_toggle; } Context; @@ -24,11 +33,14 @@ int find_converted_keymap(const char *x11_layout, const char *x11_variant, char int find_legacy_keymap(Context *c, char **new_keymap); int find_language_fallback(const char *lang, char **language); -int context_read_data(Context *c); +int locale_read_data(Context *c, sd_bus_message *m); +int vconsole_read_data(Context *c, sd_bus_message *m); +int x11_read_data(Context *c, sd_bus_message *m); + void context_free(Context *c); int vconsole_convert_to_x11(Context *c); int vconsole_write_data(Context *c); int x11_convert_to_vconsole(Context *c); int x11_write_data(Context *c); -void locale_simplify(Context *c); +void locale_simplify(char *locale[_VARIABLE_LC_MAX]); int locale_write_data(Context *c, char ***settings); diff --git a/src/locale/localed.c b/src/locale/localed.c index ab16705d1d..823bcd52b8 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c @@ -88,7 +88,7 @@ static int locale_update_system_manager(Context *c, sd_bus *bus) { r = sd_bus_call(bus, m, 0, &error, NULL); if (r < 0) - log_error_errno(r, "Failed to update the manager environment: %m"); + log_error_errno(r, "Failed to update the manager environment, ignoring: %m"); return 0; } @@ -113,10 +113,14 @@ static int vconsole_reload(sd_bus *bus) { return r; } -static int vconsole_convert_to_x11_and_emit(Context *c, sd_bus *bus) { +static int vconsole_convert_to_x11_and_emit(Context *c, sd_bus_message *m) { int r; - assert(bus); + assert(m); + + r = x11_read_data(c, m); + if (r < 0) + return r; r = vconsole_convert_to_x11(c); if (r <= 0) @@ -127,7 +131,7 @@ static int vconsole_convert_to_x11_and_emit(Context *c, sd_bus *bus) { if (r < 0) return log_error_errno(r, "Failed to write X11 keyboard layout: %m"); - sd_bus_emit_properties_changed(bus, + sd_bus_emit_properties_changed(sd_bus_message_get_bus(m), "/org/freedesktop/locale1", "org.freedesktop.locale1", "X11Layout", "X11Model", "X11Variant", "X11Options", NULL); @@ -135,10 +139,14 @@ static int vconsole_convert_to_x11_and_emit(Context *c, sd_bus *bus) { return 1; } -static int x11_convert_to_vconsole_and_emit(Context *c, sd_bus *bus) { +static int x11_convert_to_vconsole_and_emit(Context *c, sd_bus_message *m) { int r; - assert(bus); + assert(m); + + r = vconsole_read_data(c, m); + if (r < 0) + return r; r = x11_convert_to_vconsole(c); if (r <= 0) @@ -149,12 +157,12 @@ static int x11_convert_to_vconsole_and_emit(Context *c, sd_bus *bus) { if (r < 0) log_error_errno(r, "Failed to save virtual console keymap: %m"); - sd_bus_emit_properties_changed(bus, + sd_bus_emit_properties_changed(sd_bus_message_get_bus(m), "/org/freedesktop/locale1", "org.freedesktop.locale1", "VConsoleKeymap", "VConsoleKeymapToggle", NULL); - return vconsole_reload(bus); + return vconsole_reload(sd_bus_message_get_bus(m)); } static int property_get_locale( @@ -168,7 +176,11 @@ static int property_get_locale( Context *c = userdata; _cleanup_strv_free_ char **l = NULL; - int p, q; + int p, q, r; + + r = locale_read_data(c, reply); + if (r < 0) + return r; l = new0(char*, _VARIABLE_LC_MAX+1); if (!l) @@ -193,16 +205,73 @@ static int property_get_locale( return sd_bus_message_append_strv(reply, l); } +static int property_get_vconsole( + 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; + int r; + + r = vconsole_read_data(c, reply); + if (r < 0) + return r; + + if (streq(property, "VConsoleKeymap")) + return sd_bus_message_append_basic(reply, 's', c->vc_keymap); + else if (streq(property, "VConsoleKeymapToggle")) + return sd_bus_message_append_basic(reply, 's', c->vc_keymap_toggle); + + return -EINVAL; +} + +static int property_get_xkb( + 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; + int r; + + r = x11_read_data(c, reply); + if (r < 0) + return r; + + if (streq(property, "X11Layout")) + return sd_bus_message_append_basic(reply, 's', c->x11_layout); + else if (streq(property, "X11Model")) + return sd_bus_message_append_basic(reply, 's', c->x11_model); + else if (streq(property, "X11Variant")) + return sd_bus_message_append_basic(reply, 's', c->x11_variant); + else if (streq(property, "X11Options")) + return sd_bus_message_append_basic(reply, 's', c->x11_options); + + return -EINVAL; +} + +static void locale_free(char ***l) { + int p; + + for (p = 0; p < _VARIABLE_LC_MAX; p++) + (*l)[p] = mfree((*l)[p]); +} + static int method_set_locale(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; + _cleanup_strv_free_ char **settings = NULL, **l = NULL; + char *new_locale[_VARIABLE_LC_MAX] = {}; + _cleanup_(locale_free) char **dummy = new_locale; bool modified = false; - bool have[_VARIABLE_LC_MAX] = {}; - int p; - int r; + int interactive, p, r; + char **i; assert(m); assert(c); @@ -215,7 +284,7 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er if (r < 0) return r; - /* Check whether a variable changed and if it is valid */ + /* Check whether a variable is valid */ STRV_FOREACH(i, l) { bool valid = false; @@ -231,13 +300,10 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er (*i)[k] == '=' && locale_is_valid((*i) + k + 1)) { valid = true; - have[p] = true; - if (p == VARIABLE_LANG) - lang = (*i) + k + 1; - - if (!streq_ptr(*i + k + 1, c->locale[p])) - modified = true; + new_locale[p] = strdup((*i) + k + 1); + if (!new_locale[p]) + return -ENOMEM; break; } @@ -249,99 +315,82 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er /* If LANG was specified, but not LANGUAGE, check if we should * set it based on the language fallback table. */ - if (have[VARIABLE_LANG] && !have[VARIABLE_LANGUAGE]) { + if (!isempty(new_locale[VARIABLE_LANG]) && + isempty(new_locale[VARIABLE_LANGUAGE])) { _cleanup_free_ char *language = NULL; - assert(lang); - - (void) find_language_fallback(lang, &language); + (void) find_language_fallback(new_locale[VARIABLE_LANG], &language); if (language) { - log_debug("Converted LANG=%s to LANGUAGE=%s", lang, language); - if (!streq_ptr(language, c->locale[VARIABLE_LANGUAGE])) { - r = strv_extendf(&l, "LANGUAGE=%s", language); - if (r < 0) - return r; - - have[VARIABLE_LANGUAGE] = true; - modified = true; - } + log_debug("Converted LANG=%s to LANGUAGE=%s", new_locale[VARIABLE_LANG], language); + free_and_replace(new_locale[VARIABLE_LANGUAGE], language); } } - /* Check whether a variable is unset */ - if (!modified) - for (p = 0; p < _VARIABLE_LC_MAX; p++) - if (!isempty(c->locale[p]) && !have[p]) { - modified = true; - break; - } + r = locale_read_data(c, m); + if (r < 0) { + log_error_errno(r, "Failed to read locale data: %m"); + return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Failed to read locale data"); + } - if (modified) { - _cleanup_strv_free_ char **settings = NULL; - - r = bus_verify_polkit_async( - m, - CAP_SYS_ADMIN, - "org.freedesktop.locale1.set-locale", - NULL, - interactive, - UID_INVALID, - &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 < _VARIABLE_LC_MAX; p++) { - size_t k; - const char *name; - - name = locale_variable_to_string(p); - assert(name); - - k = strlen(name); - if (startswith(*i, name) && (*i)[k] == '=') { - r = free_and_strdup(&c->locale[p], *i + k + 1); - if (r < 0) - return r; - break; - } - } - - for (p = 0; p < _VARIABLE_LC_MAX; p++) { - if (have[p]) - continue; - - c->locale[p] = mfree(c->locale[p]); + /* Merge with the current settings */ + for (p = 0; p < _VARIABLE_LC_MAX; p++) + if (!isempty(c->locale[p]) && isempty(new_locale[p])) { + new_locale[p] = strdup(c->locale[p]); + if (!new_locale[p]) + return -ENOMEM; } - locale_simplify(c); + locale_simplify(new_locale); - 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: %m"); + for (p = 0; p < _VARIABLE_LC_MAX; p++) + if (!streq_ptr(c->locale[p], new_locale[p])) { + modified = true; + break; } - locale_update_system_manager(c, sd_bus_message_get_bus(m)); - - 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."); - - (void) sd_bus_emit_properties_changed( - sd_bus_message_get_bus(m), - "/org/freedesktop/locale1", - "org.freedesktop.locale1", - "Locale", NULL); - } else + if (!modified) { log_debug("Locale settings were not modified."); + return sd_bus_reply_method_return(m, NULL); + } + + r = bus_verify_polkit_async( + m, + CAP_SYS_ADMIN, + "org.freedesktop.locale1.set-locale", + NULL, + interactive, + UID_INVALID, + &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 */ + + for (p = 0; p < _VARIABLE_LC_MAX; p++) + free_and_replace(c->locale[p], new_locale[p]); + + 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: %m"); + } + + (void) locale_update_system_manager(c, sd_bus_message_get_bus(m)); + + 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."); + + (void) sd_bus_emit_properties_changed( + sd_bus_message_get_bus(m), + "/org/freedesktop/locale1", + "org.freedesktop.locale1", + "Locale", NULL); return sd_bus_reply_method_return(m, NULL); } @@ -361,6 +410,12 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro keymap = empty_to_null(keymap); keymap_toggle = empty_to_null(keymap_toggle); + r = vconsole_read_data(c, m); + if (r < 0) { + log_error_errno(r, "Failed to read virtual console keymap data: %m"); + return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Failed to read virtual console keymap data"); + } + if (streq_ptr(keymap, c->vc_keymap) && streq_ptr(keymap_toggle, c->vc_keymap_toggle)) return sd_bus_reply_method_return(m, NULL); @@ -407,7 +462,7 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro "VConsoleKeymap", "VConsoleKeymapToggle", NULL); if (convert) { - r = vconsole_convert_to_x11_and_emit(c, sd_bus_message_get_bus(m)); + r = vconsole_convert_to_x11_and_emit(c, m); if (r < 0) log_error_errno(r, "Failed to convert keymap data: %m"); } @@ -535,6 +590,12 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err variant = empty_to_null(variant); options = empty_to_null(options); + r = x11_read_data(c, m); + if (r < 0) { + log_error_errno(r, "Failed to read x11 keyboard layout data: %m"); + return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Failed to read x11 keyboard layout data"); + } + if (streq_ptr(layout, c->x11_layout) && streq_ptr(model, c->x11_model) && streq_ptr(variant, c->x11_variant) && @@ -597,7 +658,7 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err "X11Layout", "X11Model", "X11Variant", "X11Options", NULL); if (convert) { - r = x11_convert_to_vconsole_and_emit(c, sd_bus_message_get_bus(m)); + r = x11_convert_to_vconsole_and_emit(c, m); if (r < 0) log_error_errno(r, "Failed to convert keymap data: %m"); } @@ -608,12 +669,12 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err 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_PROPERTY("X11Layout", "s", property_get_xkb, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), + SD_BUS_PROPERTY("X11Model", "s", property_get_xkb, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), + SD_BUS_PROPERTY("X11Variant", "s", property_get_xkb, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), + SD_BUS_PROPERTY("X11Options", "s", property_get_xkb, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), + SD_BUS_PROPERTY("VConsoleKeymap", "s", property_get_vconsole, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), + SD_BUS_PROPERTY("VConsoleKeymapToggle", "s", property_get_vconsole, 0, 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), @@ -650,7 +711,11 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) { } int main(int argc, char *argv[]) { - _cleanup_(context_free) Context context = {}; + _cleanup_(context_free) Context context = { + .locale_mtime = USEC_INFINITY, + .vc_mtime = USEC_INFINITY, + .x11_mtime = USEC_INFINITY, + }; _cleanup_(sd_event_unrefp) sd_event *event = NULL; _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; int r; @@ -680,12 +745,6 @@ int main(int argc, char *argv[]) { if (r < 0) goto finish; - r = context_read_data(&context); - if (r < 0) { - log_error_errno(r, "Failed to read locale data: %m"); - goto finish; - } - 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"); From 4156e767f68016b45f7927e818e0514628afd43f Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 31 May 2018 16:27:07 +0900 Subject: [PATCH 5/5] locale: assume locale is for LANG= when variable name is not specified Closes #6070. --- man/localectl.xml | 9 +++++---- src/locale/localed.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/man/localectl.xml b/man/localectl.xml index 0a763f2524..b32c0fb4d6 100644 --- a/man/localectl.xml +++ b/man/localectl.xml @@ -121,11 +121,12 @@ - set-locale LOCALE… + set-locale LOCALE + set-locale VARIABLE=LOCALE… - Set the system locale. This takes one or more - assignments such as "LANG=de_DE.utf8", - "LC_MESSAGES=en_GB.utf8", and so on. See + Set the system locale. This takes one locale such as en_US.UTF-8, or takes one or more + locale assignments such as LANG=de_DE.utf8, LC_MESSAGES=en_GB.utf8, and so on. If + one locale without variable name is provided, then LANG= locale variable will be set. See locale7 for details on the available settings and their meanings. Use list-locales for a list of available diff --git a/src/locale/localed.c b/src/locale/localed.c index 823bcd52b8..d4835eb0a1 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c @@ -284,6 +284,18 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er if (r < 0) return r; + /* If single locale without variable name is provided, then we assume it is LANG=. */ + if (strv_length(l) == 1 && !strchr(*l, '=')) { + if (!locale_is_valid(*l)) + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid Locale data."); + + new_locale[VARIABLE_LANG] = strdup(*l); + if (!new_locale[VARIABLE_LANG]) + return -ENOMEM; + + l = strv_free(l); + } + /* Check whether a variable is valid */ STRV_FOREACH(i, l) { bool valid = false;