Compare commits

...

2 Commits

Author SHA1 Message Date
Daan De Meyer 61dbcae179 home: Prompt for auxiliary groups in homectl firstboot 2024-09-17 20:48:36 +02:00
Daan De Meyer 8be0135d40 Move show_menu() to terminal-utl.h 2024-09-17 20:48:21 +02:00
4 changed files with 152 additions and 47 deletions

View File

@ -29,6 +29,7 @@
#include "fd-util.h" #include "fd-util.h"
#include "fileio.h" #include "fileio.h"
#include "fs-util.h" #include "fs-util.h"
#include "glyph-util.h"
#include "hexdecoct.h" #include "hexdecoct.h"
#include "inotify-util.h" #include "inotify-util.h"
#include "io-util.h" #include "io-util.h"
@ -274,6 +275,52 @@ bool any_key_to_proceed(void) {
return key != 'q'; return key != 'q';
} }
int show_menu(char **x, unsigned n_columns, unsigned width, unsigned percentage) {
unsigned break_lines, break_modulo;
size_t n, per_column, i, j;
assert(n_columns > 0);
n = strv_length(x);
per_column = DIV_ROUND_UP(n, n_columns);
break_lines = lines();
if (break_lines > 2)
break_lines--;
/* The first page gets two extra lines, since we want to show
* a title */
break_modulo = break_lines;
if (break_modulo > 3)
break_modulo -= 3;
for (i = 0; i < per_column; i++) {
for (j = 0; j < n_columns; j++) {
_cleanup_free_ char *e = NULL;
if (j * per_column + i >= n)
break;
e = ellipsize(x[j * per_column + i], width, percentage);
if (!e)
return log_oom();
printf("%4zu) %-*s", j * per_column + i + 1, (int) width, e);
}
putchar('\n');
/* on the first screen we reserve 2 extra lines for the title */
if (i % break_lines == break_modulo) {
if (!any_key_to_proceed())
return 0;
}
}
return 0;
}
int open_terminal(const char *name, int mode) { int open_terminal(const char *name, int mode) {
_cleanup_close_ int fd = -EBADF; _cleanup_close_ int fd = -EBADF;
unsigned c = 0; unsigned c = 0;

View File

@ -79,6 +79,7 @@ int read_one_char(FILE *f, char *ret, usec_t timeout, bool *need_nl);
int ask_char(char *ret, const char *replies, const char *text, ...) _printf_(3, 4); int ask_char(char *ret, const char *replies, const char *text, ...) _printf_(3, 4);
int ask_string(char **ret, const char *text, ...) _printf_(2, 3); int ask_string(char **ret, const char *text, ...) _printf_(2, 3);
bool any_key_to_proceed(void); bool any_key_to_proceed(void);
int show_menu(char **x, unsigned n_columns, unsigned width, unsigned percentage);
int vt_disallocate(const char *name); int vt_disallocate(const char *name);

View File

@ -132,52 +132,6 @@ static void print_welcome(int rfd) {
done = true; done = true;
} }
static int show_menu(char **x, unsigned n_columns, unsigned width, unsigned percentage) {
unsigned break_lines, break_modulo;
size_t n, per_column, i, j;
assert(n_columns > 0);
n = strv_length(x);
per_column = DIV_ROUND_UP(n, n_columns);
break_lines = lines();
if (break_lines > 2)
break_lines--;
/* The first page gets two extra lines, since we want to show
* a title */
break_modulo = break_lines;
if (break_modulo > 3)
break_modulo -= 3;
for (i = 0; i < per_column; i++) {
for (j = 0; j < n_columns; j++) {
_cleanup_free_ char *e = NULL;
if (j * per_column + i >= n)
break;
e = ellipsize(x[j * per_column + i], width, percentage);
if (!e)
return log_oom();
printf("%4zu) %-*s", j * per_column + i + 1, (int) width, e);
}
putchar('\n');
/* on the first screen we reserve 2 extra lines for the title */
if (i % break_lines == break_modulo) {
if (!any_key_to_proceed())
return 0;
}
}
return 0;
}
static int prompt_loop(const char *text, char **l, unsigned percentage, bool (*is_valid)(const char *name), char **ret) { static int prompt_loop(const char *text, char **l, unsigned percentage, bool (*is_valid)(const char *name), char **ret) {
int r; int r;

View File

@ -2463,7 +2463,7 @@ static int create_interactively(void) {
continue; continue;
} }
r = userdb_by_name(username, USERDB_SUPPRESS_SHADOW, /* ret= */ NULL); r = userdb_by_name(username, USERDB_SUPPRESS_SHADOW|USERDB_EXCLUDE_DYNAMIC_USER, /* ret= */ NULL);
if (r == -ESRCH) if (r == -ESRCH)
break; break;
if (r < 0) if (r < 0)
@ -2476,6 +2476,109 @@ static int create_interactively(void) {
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to set userName field: %m"); return log_error_errno(r, "Failed to set userName field: %m");
_cleanup_(userdb_iterator_freep) UserDBIterator *iterator = NULL;
_cleanup_strv_free_ char **available = NULL, **groups = NULL;
r = groupdb_all(USERDB_SUPPRESS_SHADOW|USERDB_EXCLUDE_DYNAMIC_USER, &iterator);
if (r == -ENOLINK)
log_debug_errno(r, "No entries found. (Didn't check via Varlink.)");
else if (r == -ESRCH)
log_debug_errno(r, "No entries found.");
else if (r < 0)
return log_error_errno(r, "Failed to enumerate groups: %m");
else {
for (;;) {
_cleanup_(group_record_unrefp) GroupRecord *gr = NULL;
r = groupdb_iterator_get(iterator, &gr);
if (r == -ESRCH)
break;
if (r < 0)
return log_error_errno(r, "Failed acquire next group: %m");
if (!IN_SET(group_record_disposition(gr), USER_REGULAR, USER_SYSTEM))
continue;
if (group_record_disposition(gr) == USER_REGULAR) {
_cleanup_(user_record_unrefp) UserRecord *ur = NULL;
r = userdb_by_name(gr->group_name, USERDB_SUPPRESS_SHADOW|USERDB_EXCLUDE_DYNAMIC_USER, &ur);
if (r < 0 && r != -ESRCH)
return log_error_errno(r, "Failed to check if matching user exists for group '%s': %m", gr->group_name);
if (r >= 0 && user_record_disposition(ur) == USER_REGULAR)
continue;
}
r = strv_extend(&available, gr->group_name);
if (r < 0)
return log_oom();
}
}
for (;;) {
_cleanup_free_ char *s = NULL;
unsigned u;
r = ask_string(&s,
"%s Please enter an auxiliary group for user %s (empty to continue, \"list\" to list available groups): ",
special_glyph(SPECIAL_GLYPH_TRIANGULAR_BULLET), username);
if (r < 0)
return log_error_errno(r, "Failed to query user for auxiliary group: %m");
if (isempty(s))
break;
if (streq(s, "list")) {
r = show_menu(available, /*n_columns=*/ 3, /*width=*/ 20, /*percentage=*/ 60);
if (r < 0)
return r;
putchar('\n');
continue;
};
r = safe_atou(s, &u);
if (r >= 0) {
if (u <= 0 || u > strv_length(available)) {
log_error("Specified entry number out of range.");
continue;
}
log_info("Selected '%s'.", available[u-1]);
r = strv_extend(&groups, available[u-1]);
if (r < 0)
return log_oom();
continue;
}
if (!valid_user_group_name(s, /* flags= */ 0)) {
log_notice("Specified group name is not a valid UNIX group name, try again: %s", s);
continue;
}
r = groupdb_by_name(s, USERDB_SUPPRESS_SHADOW|USERDB_EXCLUDE_DYNAMIC_USER, /*ret=*/ NULL);
if (r == -ESRCH) {
log_notice("Specified auxiliary group does not exist, try again: %s", s);
continue;
}
if (r < 0)
return log_error_errno(r, "Failed to check if specified group '%s' already exists: %m", s);
r = strv_extend(&groups, s);
if (r < 0)
return log_oom();
}
if (groups) {
r = sd_json_variant_set_field_strv(&arg_identity_extra, "memberOf", groups);
if (r < 0)
return log_error_errno(r, "Failed to set memberOf field: %m");
}
return create_home_common(/* input= */ NULL); return create_home_common(/* input= */ NULL);
} }