shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-05 06:52:22 +03:00
Code

user-util: Allow names starting with a digit

Browse Source 
In 1a29610f5f the change inadvertedly
disabled names with digit as the first character. This follow-up change
allows a digit as the first character in compat mode.

Fixes: #15141
This commit is contained in:
Balint Reczey 2020-03-18 18:29:02 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent acd1987a18
commit 93c23c9297
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/basic/user-util.c
View File

@ -701,16 +701,18 @@ int take_etc_passwd_lock(const char *root) {
bool valid_user_group_name_full(const char *u, bool strict) { bool valid_user_group_name_full(const char *u, bool strict) {
const char *i; const char *i;
long sz; long sz;
bool warned = false;
/* Checks if the specified name is a valid user/group name. Also see POSIX IEEE Std 1003.1-2008, 2016 Edition, /* Checks if the specified name is a valid user/group name. Also see POSIX IEEE Std 1003.1-2008, 2016 Edition,
* 3.437. We are a bit stricter here however. Specifically we deviate from POSIX rules: * 3.437. We are a bit stricter here however. Specifically we deviate from POSIX rules:
* *
* - We require that names fit into the appropriate utmp field * - We require that names fit into the appropriate utmp field
* - We don't allow empty user names * - We don't allow empty user names
* - No dots or digits in the first character * - No dots in the first character
* *
* If strict==true, additionally: * If strict==true, additionally:
* - We don't allow any dots (this conflicts with chown syntax which permits dots as user/group name separator) * - We don't allow any dots (this conflicts with chown syntax which permits dots as user/group name separator)
* - We don't allow a digit as the first character
* *
* Note that other systems are even more restrictive, and don't permit underscores or uppercase characters. * Note that other systems are even more restrictive, and don't permit underscores or uppercase characters.
*/ */
@ -720,17 +722,26 @@ bool valid_user_group_name_full(const char *u, bool strict) {
if (!(u[0] >= 'a' && u[0] <= 'z') && if (!(u[0] >= 'a' && u[0] <= 'z') &&
!(u[0] >= 'A' && u[0] <= 'Z') && !(u[0] >= 'A' && u[0] <= 'Z') &&
!(u[0] >= '0' && u[0] <= '9' && !strict) &&
u[0] != '_') u[0] != '_')
return false; return false;
bool warned = false; bool only_digits_seen = u[0] >= '0' && u[0] <= '9';
if (only_digits_seen) {
log_warning("User or group name \"%s\" starts with a digit, accepting for compatibility.", u);
warned = true;
}
for (i = u+1; *i; i++) { for (i = u+1; *i; i++) {
if (((*i >= 'a' && *i <= 'z') || if (((*i >= 'a' && *i <= 'z') ||
(*i >= 'A' && *i <= 'Z') || (*i >= 'A' && *i <= 'Z') ||
(*i >= '0' && *i <= '9') || (*i >= '0' && *i <= '9') ||
IN_SET(*i, '_', '-'))) IN_SET(*i, '_', '-'))) {
if (!(*i >= '0' && *i <= '9'))
only_digits_seen = false;
continue; continue;
}
if (*i == '.' && !strict) { if (*i == '.' && !strict) {
if (!warned) { if (!warned) {
@ -744,6 +755,9 @@ bool valid_user_group_name_full(const char *u, bool strict) {
return false; return false;
} }
if (only_digits_seen)
return false;
sz = sysconf(_SC_LOGIN_NAME_MAX); sz = sysconf(_SC_LOGIN_NAME_MAX);
assert_se(sz > 0); assert_se(sz > 0);

4
src/test/test-user-util.c
View File

@ -96,7 +96,7 @@ static void test_valid_user_group_name_compat(void) {
assert_se(valid_user_group_name_compat("eff.")); assert_se(valid_user_group_name_compat("eff."));
assert_se(valid_user_group_name_compat("some5")); assert_se(valid_user_group_name_compat("some5"));
assert_se(!valid_user_group_name_compat("5some")); assert_se(valid_user_group_name_compat("5some"));
assert_se(valid_user_group_name_compat("INNER5NUMBER")); assert_se(valid_user_group_name_compat("INNER5NUMBER"));
} }
@ -166,7 +166,7 @@ static void test_valid_user_group_name_or_id_compat(void) {
assert_se(valid_user_group_name_or_id_compat("kk-k")); assert_se(valid_user_group_name_or_id_compat("kk-k"));
assert_se(valid_user_group_name_or_id_compat("some5")); assert_se(valid_user_group_name_or_id_compat("some5"));
assert_se(!valid_user_group_name_or_id_compat("5some")); assert_se(valid_user_group_name_or_id_compat("5some"));
assert_se(valid_user_group_name_or_id_compat("INNER5NUMBER")); assert_se(valid_user_group_name_or_id_compat("INNER5NUMBER"));
} }