X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Ffirstboot%2Ffirstboot.c;h=74b83f348b8323a62239dfa02fb11c738d63c1fe;hb=476da0fe00b863123461396d6acb403c92a806a5;hp=552e10d1579c0fcd3871652deddcec5a37712e3e;hpb=e03b9f2a3b6e566c612fad4e41e98a9b732460d9;p=thirdparty%2Fsystemd.git diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index 552e10d1579..74b83f348b8 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -22,15 +22,20 @@ #include "alloc-util.h" #include "ask-password-api.h" #include "copy.h" +#include "env-file.h" #include "fd-util.h" #include "fileio.h" #include "fs-util.h" #include "hostname-util.h" +#include "kbd-util.h" #include "locale-util.h" +#include "main-func.h" +#include "memory-util.h" #include "mkdir.h" #include "os-util.h" #include "parse-util.h" #include "path-util.h" +#include "pretty-print.h" #include "proc-cmdline.h" #include "random-util.h" #include "string-util.h" @@ -58,6 +63,14 @@ static bool arg_copy_keymap = false; static bool arg_copy_timezone = false; static bool arg_copy_root_password = false; +STATIC_DESTRUCTOR_REGISTER(arg_root, freep); +STATIC_DESTRUCTOR_REGISTER(arg_locale, freep); +STATIC_DESTRUCTOR_REGISTER(arg_locale_messages, freep); +STATIC_DESTRUCTOR_REGISTER(arg_keymap, freep); +STATIC_DESTRUCTOR_REGISTER(arg_timezone, freep); +STATIC_DESTRUCTOR_REGISTER(arg_hostname, freep); +STATIC_DESTRUCTOR_REGISTER(arg_root_password, erase_and_freep); + static bool press_any_key(void) { char k = 0; bool need_nl = true; @@ -74,20 +87,31 @@ static bool press_any_key(void) { } static void print_welcome(void) { - _cleanup_free_ char *pretty_name = NULL; + _cleanup_free_ char *pretty_name = NULL, *ansi_color = NULL; static bool done = false; + const char *pn; int r; if (done) return; - r = parse_os_release(arg_root, "PRETTY_NAME", &pretty_name, NULL); + r = parse_os_release( + arg_root, + "PRETTY_NAME", &pretty_name, + "ANSI_COLOR", &ansi_color, + NULL); if (r < 0) log_full_errno(r == -ENOENT ? LOG_DEBUG : LOG_WARNING, r, "Failed to read os-release file, ignoring: %m"); - printf("\nWelcome to your new installation of %s!\nPlease configure a few basic system settings:\n\n", - isempty(pretty_name) ? "Linux" : pretty_name); + pn = isempty(pretty_name) ? "Linux" : pretty_name; + + if (colors_enabled()) + printf("\nWelcome to your new installation of \x1B[%sm%s\x1B[0m!\n", ansi_color, pn); + else + printf("\nWelcome to your new installation of %s!\n", pn); + + printf("\nPlease configure your system!\n\n"); press_any_key(); @@ -151,7 +175,7 @@ static int prompt_loop(const char *text, char **l, bool (*is_valid)(const char * _cleanup_free_ char *p = NULL; unsigned u; - r = ask_string(&p, "%s %s (empty to skip): ", special_glyph(TRIANGULAR_BULLET), text); + r = ask_string(&p, "%s %s (empty to skip): ", special_glyph(SPECIAL_GLYPH_TRIANGULAR_BULLET), text); if (r < 0) return log_error_errno(r, "Failed to query user: %m"); @@ -206,25 +230,46 @@ static int prompt_locale(void) { if (r < 0) return log_error_errno(r, "Cannot query locales list: %m"); - print_welcome(); + if (strv_isempty(locales)) + log_debug("No locales found, skipping locale selection."); + else if (strv_length(locales) == 1) { - printf("\nAvailable Locales:\n\n"); - r = show_menu(locales, 3, 22, 60); - if (r < 0) - return r; + if (streq(locales[0], SYSTEMD_DEFAULT_LOCALE)) + log_debug("Only installed locale is default locale anyway, not setting locale explicitly."); + else { + log_debug("Only a single locale available (%s), selecting it as default.", locales[0]); - putchar('\n'); + arg_locale = strdup(locales[0]); + if (!arg_locale) + return log_oom(); - r = prompt_loop("Please enter system locale name or number", locales, locale_is_valid, &arg_locale); - if (r < 0) - return r; + /* Not setting arg_locale_message here, since it defaults to LANG anyway */ + } + } else { + print_welcome(); - if (isempty(arg_locale)) - return 0; + printf("\nAvailable Locales:\n\n"); + r = show_menu(locales, 3, 22, 60); + if (r < 0) + return r; - r = prompt_loop("Please enter system message locale name or number", locales, locale_is_valid, &arg_locale_messages); - if (r < 0) - return r; + putchar('\n'); + + r = prompt_loop("Please enter system locale name or number", locales, locale_is_valid, &arg_locale); + if (r < 0) + return r; + + if (isempty(arg_locale)) + return 0; + + r = prompt_loop("Please enter system message locale name or number", locales, locale_is_valid, &arg_locale_messages); + if (r < 0) + return r; + + /* Suppress the messages setting if it's the same as the main locale anyway */ + if (streq_ptr(arg_locale, arg_locale_messages)) + arg_locale_messages = mfree(arg_locale_messages); + } return 0; } @@ -241,8 +286,8 @@ static int process_locale(void) { if (arg_copy_locale && arg_root) { - mkdir_parents(etc_localeconf, 0755); - r = copy_file("/etc/locale.conf", etc_localeconf, 0, 0644, 0, COPY_REFLINK); + (void) mkdir_parents(etc_localeconf, 0755); + r = copy_file("/etc/locale.conf", etc_localeconf, 0, 0644, 0, 0, COPY_REFLINK); if (r != -ENOENT) { if (r < 0) return log_error_errno(r, "Failed to copy %s: %m", etc_localeconf); @@ -266,7 +311,7 @@ static int process_locale(void) { locales[i] = NULL; - mkdir_parents(etc_localeconf, 0755); + (void) mkdir_parents(etc_localeconf, 0755); r = write_env_file(etc_localeconf, locales); if (r < 0) return log_error_errno(r, "Failed to write %s: %m", etc_localeconf); @@ -315,8 +360,8 @@ static int process_keymap(void) { if (arg_copy_keymap && arg_root) { - mkdir_parents(etc_vconsoleconf, 0755); - r = copy_file("/etc/vconsole.conf", etc_vconsoleconf, 0, 0644, 0, COPY_REFLINK); + (void) mkdir_parents(etc_vconsoleconf, 0755); + r = copy_file("/etc/vconsole.conf", etc_vconsoleconf, 0, 0644, 0, 0, COPY_REFLINK); if (r != -ENOENT) { if (r < 0) return log_error_errno(r, "Failed to copy %s: %m", etc_vconsoleconf); @@ -399,7 +444,7 @@ static int process_timezone(void) { if (r < 0) return log_error_errno(r, "Failed to read host timezone: %m"); - mkdir_parents(etc_localtime, 0755); + (void) mkdir_parents(etc_localtime, 0755); if (symlink(p, etc_localtime) < 0) return log_error_errno(errno, "Failed to create %s symlink: %m", etc_localtime); @@ -417,7 +462,7 @@ static int process_timezone(void) { e = strjoina("../usr/share/zoneinfo/", arg_timezone); - mkdir_parents(etc_localtime, 0755); + (void) mkdir_parents(etc_localtime, 0755); if (symlink(e, etc_localtime) < 0) return log_error_errno(errno, "Failed to create %s symlink: %m", etc_localtime); @@ -440,7 +485,7 @@ static int prompt_hostname(void) { for (;;) { _cleanup_free_ char *h = NULL; - r = ask_string(&h, "%s Please enter hostname for new system (empty to skip): ", special_glyph(TRIANGULAR_BULLET)); + r = ask_string(&h, "%s Please enter hostname for new system (empty to skip): ", special_glyph(SPECIAL_GLYPH_TRIANGULAR_BULLET)); if (r < 0) return log_error_errno(r, "Failed to query hostname: %m"); @@ -478,9 +523,8 @@ static int process_hostname(void) { if (isempty(arg_hostname)) return 0; - mkdir_parents(etc_hostname, 0755); r = write_string_file(etc_hostname, arg_hostname, - WRITE_STRING_FILE_CREATE | WRITE_STRING_FILE_SYNC); + WRITE_STRING_FILE_CREATE | WRITE_STRING_FILE_SYNC | WRITE_STRING_FILE_MKDIR_0755); if (r < 0) return log_error_errno(r, "Failed to write %s: %m", etc_hostname); @@ -500,9 +544,8 @@ static int process_machine_id(void) { if (sd_id128_is_null(arg_machine_id)) return 0; - mkdir_parents(etc_machine_id, 0755); r = write_string_file(etc_machine_id, sd_id128_to_string(arg_machine_id, id), - WRITE_STRING_FILE_CREATE | WRITE_STRING_FILE_SYNC); + WRITE_STRING_FILE_CREATE | WRITE_STRING_FILE_SYNC | WRITE_STRING_FILE_MKDIR_0755); if (r < 0) return log_error_errno(r, "Failed to write machine id: %m"); @@ -527,17 +570,21 @@ static int prompt_root_password(void) { print_welcome(); putchar('\n'); - msg1 = strjoina(special_glyph(TRIANGULAR_BULLET), " Please enter a new root password (empty to skip): "); - msg2 = strjoina(special_glyph(TRIANGULAR_BULLET), " Please enter new root password again: "); + msg1 = strjoina(special_glyph(SPECIAL_GLYPH_TRIANGULAR_BULLET), " Please enter a new root password (empty to skip): "); + msg2 = strjoina(special_glyph(SPECIAL_GLYPH_TRIANGULAR_BULLET), " Please enter new root password again: "); for (;;) { - _cleanup_string_free_erase_ char *a = NULL, *b = NULL; + _cleanup_strv_free_erase_ char **a = NULL, **b = NULL; r = ask_password_tty(-1, msg1, NULL, 0, 0, NULL, &a); if (r < 0) return log_error_errno(r, "Failed to query root password: %m"); + if (strv_length(a) != 1) { + log_warning("Received multiple passwords, where we expected one."); + return -EINVAL; + } - if (isempty(a)) { + if (isempty(*a)) { log_warning("No password entered, skipping."); break; } @@ -546,12 +593,12 @@ static int prompt_root_password(void) { if (r < 0) return log_error_errno(r, "Failed to query root password: %m"); - if (!streq(a, b)) { + if (!streq(*a, *b)) { log_error("Entered passwords did not match, please try again."); continue; } - arg_root_password = TAKE_PTR(a); + arg_root_password = TAKE_PTR(*a); break; } @@ -579,12 +626,6 @@ static int write_root_shadow(const char *path, const struct spwd *p) { static int process_root_password(void) { - static const char table[] = - "abcdefghijklmnopqrstuvwxyz" - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "0123456789" - "./"; - struct spwd item = { .sp_namp = (char*) "root", .sp_min = -1, @@ -594,12 +635,9 @@ static int process_root_password(void) { .sp_expire = -1, .sp_flag = (unsigned long) -1, /* this appears to be what everybody does ... */ }; - + _cleanup_free_ char *salt = NULL; _cleanup_close_ int lock = -1; - char salt[3+16+1+1]; - uint8_t raw[16]; - unsigned i; - char *j; + struct crypt_data cd = {}; const char *etc_shadow; int r; @@ -608,7 +646,7 @@ static int process_root_password(void) { if (laccess(etc_shadow, F_OK) >= 0) return 0; - mkdir_parents(etc_shadow, 0755); + (void) mkdir_parents(etc_shadow, 0755); lock = take_etc_passwd_lock(arg_root); if (lock < 0) @@ -643,26 +681,15 @@ static int process_root_password(void) { if (!arg_root_password) return 0; - r = acquire_random_bytes(raw, 16, true); + r = make_salt(&salt); if (r < 0) return log_error_errno(r, "Failed to get salt: %m"); - /* We only bother with SHA512 hashed passwords, the rest is legacy, and we don't do legacy. */ - assert_cc(sizeof(table) == 64 + 1); - j = stpcpy(salt, "$6$"); - for (i = 0; i < 16; i++) - j[i] = table[raw[i] & 63]; - j[i++] = '$'; - j[i] = 0; - errno = 0; - item.sp_pwdp = crypt(arg_root_password, salt); - if (!item.sp_pwdp) { - if (!errno) - errno = EINVAL; - - return log_error_errno(errno, "Failed to encrypt password: %m"); - } + item.sp_pwdp = crypt_r(arg_root_password, salt, &cd); + if (!item.sp_pwdp) + return log_error_errno(errno == 0 ? SYNTHETIC_ERRNO(EINVAL) : errno, + "Failed to encrypt password: %m"); item.sp_lstchg = (long) (now(CLOCK_REALTIME) / USEC_PER_DAY); @@ -791,10 +818,9 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_LOCALE: - if (!locale_is_valid(optarg)) { - log_error("Locale %s is not valid.", optarg); - return -EINVAL; - } + if (!locale_is_valid(optarg)) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Locale %s is not valid.", optarg); r = free_and_strdup(&arg_locale, optarg); if (r < 0) @@ -803,10 +829,9 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_LOCALE_MESSAGES: - if (!locale_is_valid(optarg)) { - log_error("Locale %s is not valid.", optarg); - return -EINVAL; - } + if (!locale_is_valid(optarg)) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Locale %s is not valid.", optarg); r = free_and_strdup(&arg_locale_messages, optarg); if (r < 0) @@ -815,10 +840,9 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_KEYMAP: - if (!keymap_is_valid(optarg)) { - log_error("Keymap %s is not valid.", optarg); - return -EINVAL; - } + if (!keymap_is_valid(optarg)) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Keymap %s is not valid.", optarg); r = free_and_strdup(&arg_keymap, optarg); if (r < 0) @@ -827,10 +851,9 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_TIMEZONE: - if (!timezone_is_valid(optarg, LOG_ERR)) { - log_error("Timezone %s is not valid.", optarg); - return -EINVAL; - } + if (!timezone_is_valid(optarg, LOG_ERR)) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Timezone %s is not valid.", optarg); r = free_and_strdup(&arg_timezone, optarg); if (r < 0) @@ -854,10 +877,9 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_HOSTNAME: - if (!hostname_is_valid(optarg, true)) { - log_error("Host name %s is not valid.", optarg); - return -EINVAL; - } + if (!hostname_is_valid(optarg, true)) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Host name %s is not valid.", optarg); hostname_cleanup(optarg); r = free_and_strdup(&arg_hostname, optarg); @@ -867,10 +889,9 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_MACHINE_ID: - if (sd_id128_from_string(optarg, &arg_machine_id) < 0) { - log_error("Failed to parse machine id %s.", optarg); - return -EINVAL; - } + if (sd_id128_from_string(optarg, &arg_machine_id) < 0) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Failed to parse machine id %s.", optarg); break; @@ -936,63 +957,49 @@ static int parse_argv(int argc, char *argv[]) { return 1; } -int main(int argc, char *argv[]) { +static int run(int argc, char *argv[]) { bool enabled; int r; r = parse_argv(argc, argv); if (r <= 0) - goto finish; + return r; - log_set_target(LOG_TARGET_AUTO); - log_parse_environment(); - log_open(); + log_setup_service(); umask(0022); r = proc_cmdline_get_bool("systemd.firstboot", &enabled); - if (r < 0) { - log_error_errno(r, "Failed to parse systemd.firstboot= kernel command line argument, ignoring."); - goto finish; - } - if (r > 0 && !enabled) { - r = 0; /* disabled */ - goto finish; - } + if (r < 0) + return log_error_errno(r, "Failed to parse systemd.firstboot= kernel command line argument, ignoring: %m"); + if (r > 0 && !enabled) + return 0; /* disabled */ r = process_locale(); if (r < 0) - goto finish; + return r; r = process_keymap(); if (r < 0) - goto finish; + return r; r = process_timezone(); if (r < 0) - goto finish; + return r; r = process_hostname(); if (r < 0) - goto finish; + return r; r = process_machine_id(); if (r < 0) - goto finish; + return r; r = process_root_password(); if (r < 0) - goto finish; - -finish: - free(arg_root); - free(arg_locale); - free(arg_locale_messages); - free(arg_keymap); - free(arg_timezone); - free(arg_hostname); - string_erase(arg_root_password); - free(arg_root_password); - - return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; + return r; + + return 0; } + +DEFINE_MAIN_FUNCTION(run);