X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=loginutils%2Fadduser.c;h=0e9936ad191601538db26270c56819158de7bb65;hb=9f5a577a3241597cb5e7ba9f6df33c2e3c440e44;hp=d409eabb9427f0d121e9dd6cec4bf3cc2b8a7820;hpb=68404f13d4bf4826e3609703dad5375763db28ab;p=oweals%2Fbusybox.git diff --git a/loginutils/adduser.c b/loginutils/adduser.c index d409eabb9..0e9936ad1 100644 --- a/loginutils/adduser.c +++ b/loginutils/adduser.c @@ -7,44 +7,62 @@ * * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */ - #include "libbb.h" +#if CONFIG_LAST_SYSTEM_ID < CONFIG_FIRST_SYSTEM_ID +#error Bad LAST_SYSTEM_ID or FIRST_SYSTEM_ID in .config +#endif + +/* #define OPT_HOME (1 << 0) */ /* unused */ +/* #define OPT_GECOS (1 << 1) */ /* unused */ +#define OPT_SHELL (1 << 2) +#define OPT_GID (1 << 3) #define OPT_DONT_SET_PASS (1 << 4) #define OPT_SYSTEM_ACCOUNT (1 << 5) #define OPT_DONT_MAKE_HOME (1 << 6) +#define OPT_UID (1 << 7) - +/* We assume UID_T_MAX == INT_MAX */ /* remix */ /* recoded such that the uid may be passed in *p */ static void passwd_study(struct passwd *p) { - int max; - - if (getpwnam(p->pw_name)) - bb_error_msg_and_die("login '%s' is in use", p->pw_name); + int max = UINT_MAX; - if (option_mask32 & OPT_SYSTEM_ACCOUNT) { - p->pw_uid = 0; - max = 999; - } else { - p->pw_uid = 1000; - max = 64999; + if (getpwnam(p->pw_name)) { + bb_error_msg_and_die("%s '%s' in use", "user", p->pw_name); + /* this format string is reused in adduser and addgroup */ } + if (!(option_mask32 & OPT_UID)) { + if (option_mask32 & OPT_SYSTEM_ACCOUNT) { + p->pw_uid = CONFIG_FIRST_SYSTEM_ID; + max = CONFIG_LAST_SYSTEM_ID; + } else { + p->pw_uid = CONFIG_LAST_SYSTEM_ID + 1; + max = 64999; + } + } /* check for a free uid (and maybe gid) */ - while (getpwuid(p->pw_uid) || (!p->pw_gid && getgrgid(p->pw_uid))) + while (getpwuid(p->pw_uid) || (p->pw_gid == (gid_t)-1 && getgrgid(p->pw_uid))) { + if (option_mask32 & OPT_UID) { + /* -u N, cannot pick uid other than N: error */ + bb_error_msg_and_die("%s '%s' in use", "uid", itoa(p->pw_uid)); + /* this format string is reused in adduser and addgroup */ + } + if (p->pw_uid == max) { + bb_error_msg_and_die("no %cids left", 'u'); + } p->pw_uid++; - - if (!p->pw_gid) { - /* new gid = uid */ - p->pw_gid = p->pw_uid; - if (getgrnam(p->pw_name)) - bb_error_msg_and_die("group name '%s' is in use", p->pw_name); } - if (p->pw_uid > max) - bb_error_msg_and_die("no free uids left"); + if (p->pw_gid == (gid_t)-1) { + p->pw_gid = p->pw_uid; /* new gid = uid */ + if (getgrnam(p->pw_name)) { + bb_error_msg_and_die("%s '%s' in use", "group", p->pw_name); + /* this format string is reused in adduser and addgroup */ + } + } } static void addgroup_wrapper(struct passwd *p) @@ -56,14 +74,14 @@ static void addgroup_wrapper(struct passwd *p) free(cmd); } -static void passwd_wrapper(const char *login) ATTRIBUTE_NORETURN; +static void passwd_wrapper(const char *login) NORETURN; static void passwd_wrapper(const char *login) { static const char prog[] ALIGN1 = "passwd"; BB_EXECLP(prog, prog, login, NULL); - bb_error_msg_and_die("cannot execute %s, you must set password manually", prog); + bb_error_msg_and_die("can't execute %s, you must set password manually", prog); } #if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS @@ -76,6 +94,7 @@ static const char adduser_longopts[] ALIGN1 = "empty-password\0" No_argument "D" "system\0" No_argument "S" "no-create-home\0" No_argument "H" + "uid\0" Required_argument "u" ; #endif @@ -85,11 +104,12 @@ static const char adduser_longopts[] ALIGN1 = * can be customized via command-line parameters. */ int adduser_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int adduser_main(int argc ATTRIBUTE_UNUSED, char **argv) +int adduser_main(int argc UNUSED_PARAM, char **argv) { struct passwd pw; const char *usegroup = NULL; - FILE *file; + char *p; + unsigned opts; #if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS applet_long_options = adduser_longopts; @@ -105,46 +125,66 @@ int adduser_main(int argc ATTRIBUTE_UNUSED, char **argv) pw.pw_dir = NULL; /* exactly one non-option arg */ - opt_complementary = "=1"; - getopt32(argv, "h:g:s:G:DSH", &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, &usegroup); + /* disable interactive passwd for system accounts */ + opt_complementary = "=1:SD:u+"; + if (sizeof(pw.pw_uid) == sizeof(int)) { + opts = getopt32(argv, "h:g:s:G:DSHu:", &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, &usegroup, &pw.pw_uid); + } else { + unsigned uid; + opts = getopt32(argv, "h:g:s:G:DSHu:", &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, &usegroup, &uid); + if (opts & OPT_UID) { + pw.pw_uid = uid; + } + } argv += optind; /* fill in the passwd struct */ pw.pw_name = argv[0]; + die_if_bad_username(pw.pw_name); if (!pw.pw_dir) { /* create string for $HOME if not specified already */ pw.pw_dir = xasprintf("/home/%s", argv[0]); } pw.pw_passwd = (char *)"x"; - pw.pw_gid = usegroup ? xgroup2gid(usegroup) : 0; /* exits on failure */ + if (opts & OPT_SYSTEM_ACCOUNT) { + if (!usegroup) { + usegroup = "nogroup"; + } + if (!(opts & OPT_SHELL)) { + pw.pw_shell = (char *) "/bin/false"; + } + } + pw.pw_gid = usegroup ? xgroup2gid(usegroup) : -1; /* exits on failure */ /* make sure everything is kosher and setup uid && maybe gid */ passwd_study(&pw); - /* add to passwd */ - file = xfopen(bb_path_passwd_file, "a"); - //fseek(file, 0, SEEK_END); /* paranoia, "a" should ensure that anyway */ - if (putpwent(&pw, file) != 0) { - bb_perror_nomsg_and_die(); + p = xasprintf("x:%u:%u:%s:%s:%s", + (unsigned) pw.pw_uid, (unsigned) pw.pw_gid, + pw.pw_gecos, pw.pw_dir, pw.pw_shell); + if (update_passwd(bb_path_passwd_file, pw.pw_name, p, NULL) < 0) { + return EXIT_FAILURE; } - /* do fclose even if !ENABLE_FEATURE_CLEAN_UP. - * We will exec passwd, files must be flushed & closed before that! */ - fclose(file); + if (ENABLE_FEATURE_CLEAN_UP) + free(p); #if ENABLE_FEATURE_SHADOWPASSWDS - /* add to shadow if necessary */ - file = fopen_or_warn(bb_path_shadow_file, "a"); - if (file) { - //fseek(file, 0, SEEK_END); - fprintf(file, "%s:!:%u:0:99999:7:::\n", - pw.pw_name, /* username */ - (unsigned)(time(NULL) / 86400) /* sp->sp_lstchg */ - /*0,*/ /* sp->sp_min */ - /*99999,*/ /* sp->sp_max */ - /*7*/ /* sp->sp_warn */ - ); - fclose(file); - } + /* /etc/shadow fields: + * 1. username + * 2. encrypted password + * 3. last password change (unix date (unix time/24*60*60)) + * 4. minimum days required between password changes + * 5. maximum days password is valid + * 6. days before password is to expire that user is warned + * 7. days after password expires that account is disabled + * 8. unix date when login expires (i.e. when it may no longer be used) + */ + /* fields: 2 3 4 5 6 78 */ + p = xasprintf("!:%u:0:99999:7:::", (unsigned)(time(NULL)) / (24*60*60)); + /* ignore errors: if file is missing we suppose admin doesn't want it */ + update_passwd(bb_path_shadow_file, pw.pw_name, p, NULL); + if (ENABLE_FEATURE_CLEAN_UP) + free(p); #endif /* add to group */ @@ -153,13 +193,13 @@ int adduser_main(int argc ATTRIBUTE_UNUSED, char **argv) if (!usegroup) addgroup_wrapper(&pw); - /* Clear the umask for this process so it doesn't + /* clear the umask for this process so it doesn't * screw up the permissions on the mkdir and chown. */ umask(0); - if (!(option_mask32 & OPT_DONT_MAKE_HOME)) { - /* Set the owner and group so it is owned by the new user, - then fix up the permissions to 2755. Can't do it before - since chown will clear the setgid bit */ + if (!(opts & OPT_DONT_MAKE_HOME)) { + /* set the owner and group so it is owned by the new user, + * then fix up the permissions to 2755. Can't do it before + * since chown will clear the setgid bit */ if (mkdir(pw.pw_dir, 0755) || chown(pw.pw_dir, pw.pw_uid, pw.pw_gid) || chmod(pw.pw_dir, 02755) /* set setgid bit on homedir */ @@ -168,7 +208,7 @@ int adduser_main(int argc ATTRIBUTE_UNUSED, char **argv) } } - if (!(option_mask32 & OPT_DONT_SET_PASS)) { + if (!(opts & OPT_DONT_SET_PASS)) { /* interactively set passwd */ passwd_wrapper(pw.pw_name); }