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

useradd: check only local groups with -G option

Browse Source 
Check only local groups when adding new supplementary groups to a user

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1727236
This commit is contained in:
ikerexxe 2020-03-30 09:08:23 +02:00
parent 140510de9d
commit 8762f465d4
1 changed files with 157 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

234
src/useradd.c
View File

@ -211,6 +211,7 @@ static void get_defaults (void);
static void show_defaults (void); static void show_defaults (void);
static int set_defaults (void); static int set_defaults (void);
static int get_groups (char *); static int get_groups (char *);
static struct group * get_local_group (char * grp_name);
static void usage (int status); static void usage (int status);
static void new_pwent (struct passwd *); static void new_pwent (struct passwd *);
@ -220,7 +221,10 @@ static void grp_update (void);
static void process_flags (int argc, char **argv); static void process_flags (int argc, char **argv);
static void close_files (void); static void close_files (void);
static void close_group_files (void);
static void unlock_group_files (void);
static void open_files (void); static void open_files (void);
static void open_group_files (void);
static void open_shadow (void); static void open_shadow (void);
static void faillog_reset (uid_t); static void faillog_reset (uid_t);
static void lastlog_reset (uid_t); static void lastlog_reset (uid_t);
@ -731,6 +735,11 @@ static int get_groups (char *list)
return 0; return 0;
} }
/*
* Open the group files
*/
open_group_files ();
/* /*
* So long as there is some data to be converted, strip off * So long as there is some data to be converted, strip off
* each name and look it up. A mix of numerical and string * each name and look it up. A mix of numerical and string
@ -749,7 +758,7 @@ static int get_groups (char *list)
* Names starting with digits are treated as numerical * Names starting with digits are treated as numerical
* GID values, otherwise the string is looked up as is. * GID values, otherwise the string is looked up as is.
*/ */
grp = prefix_getgr_nam_gid (list); grp = get_local_group (list);
/* /*
* There must be a match, either by GID value or by * There must be a match, either by GID value or by
@ -799,6 +808,9 @@ static int get_groups (char *list)
user_groups[ngroups++] = xstrdup (grp->gr_name); user_groups[ngroups++] = xstrdup (grp->gr_name);
} while (NULL != list); } while (NULL != list);
close_group_files ();
unlock_group_files ();
user_groups[ngroups] = (char *) 0; user_groups[ngroups] = (char *) 0;
/* /*
@ -811,6 +823,44 @@ static int get_groups (char *list)
return 0; return 0;
} }
/*
* get_local_group - checks if a given group name exists locally
*
* get_local_group() checks if a given group name exists locally.
* If the name exists the group information is returned, otherwise NULL is
* returned.
*/
static struct group * get_local_group(char * grp_name)
{
const struct group *grp;
struct group *result_grp = NULL;
long long int gid;
char *endptr;
gid = strtoll (grp_name, &endptr, 10);
if ( ('\0' != *grp_name)
&& ('\0' == *endptr)
&& (ERANGE != errno)
&& (gid == (gid_t)gid)) {
grp = gr_locate_gid ((gid_t) gid);
}
else {
grp = gr_locate(grp_name);
}
if (grp != NULL) {
result_grp = __gr_dup (grp);
if (NULL == result_grp) {
fprintf (stderr,
_("%s: Out of memory. Cannot find group '%s'.\n"),
Prog, grp_name);
fail_exit (E_GRP_UPDATE);
}
}
return result_grp;
}
/* /*
* usage - display usage message and exit * usage - display usage message and exit
*/ */
@ -1530,23 +1580,9 @@ static void close_files (void)
SYSLOG ((LOG_ERR, "failure while writing changes to %s", spw_dbname ())); SYSLOG ((LOG_ERR, "failure while writing changes to %s", spw_dbname ()));
fail_exit (E_PW_UPDATE); fail_exit (E_PW_UPDATE);
} }
if (do_grp_update) {
if (gr_close () == 0) { close_group_files ();
fprintf (stderr,
_("%s: failure while writing changes to %s\n"), Prog, gr_dbname ());
SYSLOG ((LOG_ERR, "failure while writing changes to %s", gr_dbname ()));
fail_exit (E_GRP_UPDATE);
}
#ifdef SHADOWGRP
if (is_shadow_grp && (sgr_close () == 0)) {
fprintf (stderr,
_("%s: failure while writing changes to %s\n"),
Prog, sgr_dbname ());
SYSLOG ((LOG_ERR, "failure while writing changes to %s", sgr_dbname ()));
fail_exit (E_GRP_UPDATE);
}
#endif
}
#ifdef ENABLE_SUBIDS #ifdef ENABLE_SUBIDS
if (is_sub_uid && (sub_uid_close () == 0)) { if (is_sub_uid && (sub_uid_close () == 0)) {
fprintf (stderr, fprintf (stderr,
@ -1587,34 +1623,9 @@ static void close_files (void)
/* continue */ /* continue */
} }
pw_locked = false; pw_locked = false;
if (gr_unlock () == 0) {
fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, gr_dbname ()); unlock_group_files ();
SYSLOG ((LOG_ERR, "failed to unlock %s", gr_dbname ()));
#ifdef WITH_AUDIT
audit_logger (AUDIT_ADD_USER, Prog,
"unlocking group file",
user_name, AUDIT_NO_ID,
SHADOW_AUDIT_FAILURE);
#endif
/* continue */
}
gr_locked = false;
#ifdef SHADOWGRP
if (is_shadow_grp) {
if (sgr_unlock () == 0) {
fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, sgr_dbname ());
SYSLOG ((LOG_ERR, "failed to unlock %s", sgr_dbname ()));
#ifdef WITH_AUDIT
audit_logger (AUDIT_ADD_USER, Prog,
"unlocking gshadow file",
user_name, AUDIT_NO_ID,
SHADOW_AUDIT_FAILURE);
#endif
/* continue */
}
sgr_locked = false;
}
#endif
#ifdef ENABLE_SUBIDS #ifdef ENABLE_SUBIDS
if (is_sub_uid) { if (is_sub_uid) {
if (sub_uid_unlock () == 0) { if (sub_uid_unlock () == 0) {
@ -1647,6 +1658,71 @@ static void close_files (void)
#endif /* ENABLE_SUBIDS */ #endif /* ENABLE_SUBIDS */
} }
/*
* close_group_files - close all of the files that were opened
*
* close_group_files() closes all of the files that were opened related
* with groups. This causes any modified entries to be written out.
*/
static void close_group_files (void)
{
if (do_grp_update) {
if (gr_close () == 0) {
fprintf (stderr,
_("%s: failure while writing changes to %s\n"), Prog, gr_dbname ());
SYSLOG ((LOG_ERR, "failure while writing changes to %s", gr_dbname ()));
fail_exit (E_GRP_UPDATE);
}
#ifdef SHADOWGRP
if (is_shadow_grp && (sgr_close () == 0)) {
fprintf (stderr,
_("%s: failure while writing changes to %s\n"),
Prog, sgr_dbname ());
SYSLOG ((LOG_ERR, "failure while writing changes to %s", sgr_dbname ()));
fail_exit (E_GRP_UPDATE);
}
#endif /* SHADOWGRP */
}
}
/*
* unlock_group_files - unlock all of the files that were locked
*
* unlock_group_files() unlocks all of the files that were locked related
* with groups. This causes any modified entries to be written out.
*/
static void unlock_group_files (void)
{
if (gr_unlock () == 0) {
fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, gr_dbname ());
SYSLOG ((LOG_ERR, "failed to unlock %s", gr_dbname ()));
#ifdef WITH_AUDIT
audit_logger (AUDIT_ADD_USER, Prog,
"unlocking-group-file",
user_name, AUDIT_NO_ID,
SHADOW_AUDIT_FAILURE);
#endif /* WITH_AUDIT */
/* continue */
}
gr_locked = false;
#ifdef SHADOWGRP
if (is_shadow_grp) {
if (sgr_unlock () == 0) {
fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, sgr_dbname ());
SYSLOG ((LOG_ERR, "failed to unlock %s", sgr_dbname ()));
#ifdef WITH_AUDIT
audit_logger (AUDIT_ADD_USER, Prog,
"unlocking-gshadow-file",
user_name, AUDIT_NO_ID,
SHADOW_AUDIT_FAILURE);
#endif /* WITH_AUDIT */
/* continue */
}
sgr_locked = false;
}
#endif /* SHADOWGRP */
}
/* /*
* open_files - lock and open the password files * open_files - lock and open the password files
* *
@ -1668,37 +1744,8 @@ static void open_files (void)
/* shadow file will be opened by open_shadow(); */ /* shadow file will be opened by open_shadow(); */
/* open_group_files ();
* Lock and open the group file.
*/
if (gr_lock () == 0) {
fprintf (stderr,
_("%s: cannot lock %s; try again later.\n"),
Prog, gr_dbname ());
fail_exit (E_GRP_UPDATE);
}
gr_locked = true;
if (gr_open (O_CREAT | O_RDWR) == 0) {
fprintf (stderr, _("%s: cannot open %s\n"), Prog, gr_dbname ());
fail_exit (E_GRP_UPDATE);
}
#ifdef SHADOWGRP
if (is_shadow_grp) {
if (sgr_lock () == 0) {
fprintf (stderr,
_("%s: cannot lock %s; try again later.\n"),
Prog, sgr_dbname ());
fail_exit (E_GRP_UPDATE);
}
sgr_locked = true;
if (sgr_open (O_CREAT | O_RDWR) == 0) {
fprintf (stderr,
_("%s: cannot open %s\n"),
Prog, sgr_dbname ());
fail_exit (E_GRP_UPDATE);
}
}
#endif
#ifdef ENABLE_SUBIDS #ifdef ENABLE_SUBIDS
if (is_sub_uid) { if (is_sub_uid) {
if (sub_uid_lock () == 0) { if (sub_uid_lock () == 0) {
@ -1733,6 +1780,39 @@ static void open_files (void)
#endif /* ENABLE_SUBIDS */ #endif /* ENABLE_SUBIDS */
} }
static void open_group_files (void)
{
if (gr_lock () == 0) {
fprintf (stderr,
_("%s: cannot lock %s; try again later.\n"),
Prog, gr_dbname ());
fail_exit (E_GRP_UPDATE);
}
gr_locked = true;
if (gr_open (O_CREAT | O_RDWR) == 0) {
fprintf (stderr, _("%s: cannot open %s\n"), Prog, gr_dbname ());
fail_exit (E_GRP_UPDATE);
}
#ifdef SHADOWGRP
if (is_shadow_grp) {
if (sgr_lock () == 0) {
fprintf (stderr,
_("%s: cannot lock %s; try again later.\n"),
Prog, sgr_dbname ());
fail_exit (E_GRP_UPDATE);
}
sgr_locked = true;
if (sgr_open (O_CREAT | O_RDWR) == 0) {
fprintf (stderr,
_("%s: cannot open %s\n"),
Prog, sgr_dbname ());
fail_exit (E_GRP_UPDATE);
}
}
#endif /* SHADOWGRP */
}
static void open_shadow (void) static void open_shadow (void)
{ {
if (!is_shadow_pwd) { if (!is_shadow_pwd) {