emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge pull request #352 from hallyn/2021-06-01/relpath

Browse Source 
usermod, newusers, prefix: enforce absolute paths for homedir
This commit is contained in:
Serge Hallyn 2021-06-03 21:31:17 -05:00 committed by GitHub
commit a6154b8572
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libmisc/prefix_flag.c
View File

@ -109,6 +109,12 @@ extern const char* process_prefix_flag (const char* short_opt, int argc, char **
return ""; /* if prefix is "/" then we ignore the flag option */ return ""; /* if prefix is "/" then we ignore the flag option */
/* should we prevent symbolic link from being used as a prefix? */ /* should we prevent symbolic link from being used as a prefix? */
if ( prefix[0] != '/') {
fprintf (shadow_logfd,
_("%s: prefix must be an absolute path\n"),
Prog);
exit (E_BAD_ARG);
}
size_t len; size_t len;
len = strlen(prefix) + strlen(PASSWD_FILE) + 2; len = strlen(prefix) + strlen(PASSWD_FILE) + 2;
passwd_db_file = xmalloc(len); passwd_db_file = xmalloc(len);

7
src/newusers.c
View File

@ -1250,6 +1250,13 @@ int main (int argc, char **argv)
/* FIXME: should check for directory */ /* FIXME: should check for directory */
mode_t mode = getdef_num ("HOME_MODE", mode_t mode = getdef_num ("HOME_MODE",
0777 & ~getdef_num ("UMASK", GETDEF_DEFAULT_UMASK)); 0777 & ~getdef_num ("UMASK", GETDEF_DEFAULT_UMASK));
if (newpw.pw_dir[0] != '/') {
fprintf(stderr,
_("%s: line %d: homedir must be an absolute path\n"),
Prog, line);
errors++;
continue;
};
if (mkdir (newpw.pw_dir, mode) != 0) { if (mkdir (newpw.pw_dir, mode) != 0) {
fprintf (stderr, fprintf (stderr,
_("%s: line %d: mkdir %s failed: %s\n"), _("%s: line %d: mkdir %s failed: %s\n"),

6
src/usermod.c
View File

@ -1110,6 +1110,12 @@ static void process_flags (int argc, char **argv)
} }
dflg = true; dflg = true;
user_newhome = optarg; user_newhome = optarg;
if (user_newhome[0] != '/') {
fprintf (stderr,
_("%s: homedir must be an absolute path\n"),
Prog);
exit (E_BAD_ARG);
}
break; break;
case 'e': case 'e':
if ('\0' != *optarg) { if ('\0' != *optarg) {