Split out implementation-specific back end code out of pwutil.c
into pwutil_impl.c. This will allow the main pwutil code to be used for lookup methods other than getpw* and getgr*.
This commit is contained in:
Todd C. Miller
338
plugins/sudoers/pwutil_impl.c
Normal file
338
plugins/sudoers/pwutil_impl.c
Normal file
@@ -0,0 +1,338 @@
|
||||
/*
|
||||
* Copyright (c) 1996, 1998-2005, 2007-2012
|
||||
* Todd C. Miller <Todd.Miller@courtesan.com>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*
|
||||
* Sponsored in part by the Defense Advanced Research Projects
|
||||
* Agency (DARPA) and Air Force Research Laboratory, Air Force
|
||||
* Materiel Command, USAF, under agreement number F39502-99-1-0512.
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/param.h>
|
||||
#include <stdio.h>
|
||||
#ifdef STDC_HEADERS
|
||||
# include <stdlib.h>
|
||||
# include <stddef.h>
|
||||
#else
|
||||
# ifdef HAVE_STDLIB_H
|
||||
# include <stdlib.h>
|
||||
# endif
|
||||
#endif /* STDC_HEADERS */
|
||||
#ifdef HAVE_STRING_H
|
||||
# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS)
|
||||
# include <memory.h>
|
||||
# endif
|
||||
# include <string.h>
|
||||
#endif /* HAVE_STRING_H */
|
||||
#ifdef HAVE_STRINGS_H
|
||||
# include <strings.h>
|
||||
#endif /* HAVE_STRINGS_H */
|
||||
#ifdef HAVE_UNISTD_H
|
||||
# include <unistd.h>
|
||||
#endif /* HAVE_UNISTD_H */
|
||||
#ifdef HAVE_UTMPX_H
|
||||
# include <utmpx.h>
|
||||
#else
|
||||
# include <utmp.h>
|
||||
#endif /* HAVE_UTMPX_H */
|
||||
#include <limits.h>
|
||||
#include <pwd.h>
|
||||
#include <grp.h>
|
||||
|
||||
#include "sudoers.h"
|
||||
#include "pwutil.h"
|
||||
|
||||
#define FIELD_SIZE(src, name, size) \
|
||||
do { \
|
||||
if (src->name) { \
|
||||
size = strlen(src->name) + 1; \
|
||||
total += size; \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
#define FIELD_COPY(src, dst, name, size) \
|
||||
do { \
|
||||
if (src->name) { \
|
||||
memcpy(cp, src->name, size); \
|
||||
dst->name = cp; \
|
||||
cp += size; \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
/*
|
||||
* Dynamically allocate space for a struct item plus the key and data
|
||||
* elements. If name is non-NULL it is used as the key, else the
|
||||
* uid is the key. Fills in datum from struct password.
|
||||
*/
|
||||
struct cache_item *
|
||||
sudo_make_pwitem(uid_t uid, const char *name)
|
||||
{
|
||||
char *cp;
|
||||
const char *pw_shell;
|
||||
size_t nsize, psize, csize, gsize, dsize, ssize, total;
|
||||
struct cache_item_pw *pwitem;
|
||||
struct passwd *pw, *newpw;
|
||||
debug_decl(make_pwitem, SUDO_DEBUG_NSS)
|
||||
|
||||
/* Look up by name or uid. */
|
||||
pw = name ? getpwnam(name) : getpwuid(uid);
|
||||
if (pw == NULL)
|
||||
debug_return_ptr(NULL);
|
||||
|
||||
/* If shell field is empty, expand to _PATH_BSHELL. */
|
||||
pw_shell = (pw->pw_shell == NULL || pw->pw_shell[0] == '\0')
|
||||
? _PATH_BSHELL : pw->pw_shell;
|
||||
|
||||
/* Allocate in one big chunk for easy freeing. */
|
||||
nsize = psize = csize = gsize = dsize = ssize = 0;
|
||||
total = sizeof(*pwitem);
|
||||
FIELD_SIZE(pw, pw_name, nsize);
|
||||
FIELD_SIZE(pw, pw_passwd, psize);
|
||||
#ifdef HAVE_LOGIN_CAP_H
|
||||
FIELD_SIZE(pw, pw_class, csize);
|
||||
#endif
|
||||
FIELD_SIZE(pw, pw_gecos, gsize);
|
||||
FIELD_SIZE(pw, pw_dir, dsize);
|
||||
/* Treat shell specially since we expand "" -> _PATH_BSHELL */
|
||||
ssize = strlen(pw_shell) + 1;
|
||||
total += ssize;
|
||||
if (name != NULL)
|
||||
total += strlen(name) + 1;
|
||||
|
||||
/* Allocate space for struct item, struct passwd and the strings. */
|
||||
pwitem = ecalloc(1, total);
|
||||
newpw = &pwitem->pw;
|
||||
|
||||
/*
|
||||
* Copy in passwd contents and make strings relative to space
|
||||
* at the end of the struct.
|
||||
*/
|
||||
memcpy(newpw, pw, sizeof(*pw));
|
||||
cp = (char *)(pwitem + 1);
|
||||
FIELD_COPY(pw, newpw, pw_name, nsize);
|
||||
FIELD_COPY(pw, newpw, pw_passwd, psize);
|
||||
#ifdef HAVE_LOGIN_CAP_H
|
||||
FIELD_COPY(pw, newpw, pw_class, csize);
|
||||
#endif
|
||||
FIELD_COPY(pw, newpw, pw_gecos, gsize);
|
||||
FIELD_COPY(pw, newpw, pw_dir, dsize);
|
||||
/* Treat shell specially since we expand "" -> _PATH_BSHELL */
|
||||
memcpy(cp, pw_shell, ssize);
|
||||
newpw->pw_shell = cp;
|
||||
cp += ssize;
|
||||
|
||||
/* Set key and datum. */
|
||||
if (name != NULL) {
|
||||
memcpy(cp, name, strlen(name) + 1);
|
||||
pwitem->cache.k.name = cp;
|
||||
} else {
|
||||
pwitem->cache.k.uid = pw->pw_uid;
|
||||
}
|
||||
pwitem->cache.d.pw = newpw;
|
||||
pwitem->cache.refcnt = 1;
|
||||
|
||||
debug_return_ptr(&pwitem->cache);
|
||||
}
|
||||
|
||||
/*
|
||||
* Dynamically allocate space for a struct item plus the key and data
|
||||
* elements. If name is non-NULL it is used as the key, else the
|
||||
* gid is the key. Fills in datum from struct group.
|
||||
*/
|
||||
struct cache_item *
|
||||
sudo_make_gritem(gid_t gid, const char *name)
|
||||
{
|
||||
char *cp;
|
||||
size_t nsize, psize, nmem, total, len;
|
||||
struct cache_item_gr *gritem;
|
||||
struct group *gr, *newgr;
|
||||
debug_decl(make_gritem, SUDO_DEBUG_NSS)
|
||||
|
||||
/* Look up by name or gid. */
|
||||
gr = name ? getgrnam(name) : getgrgid(gid);
|
||||
if (gr == NULL)
|
||||
debug_return_ptr(NULL);
|
||||
|
||||
/* Allocate in one big chunk for easy freeing. */
|
||||
nsize = psize = nmem = 0;
|
||||
total = sizeof(*gritem);
|
||||
FIELD_SIZE(gr, gr_name, nsize);
|
||||
FIELD_SIZE(gr, gr_passwd, psize);
|
||||
if (gr->gr_mem) {
|
||||
for (nmem = 0; gr->gr_mem[nmem] != NULL; nmem++)
|
||||
total += strlen(gr->gr_mem[nmem]) + 1;
|
||||
nmem++;
|
||||
total += sizeof(char *) * nmem;
|
||||
}
|
||||
if (name != NULL)
|
||||
total += strlen(name) + 1;
|
||||
|
||||
gritem = ecalloc(1, total);
|
||||
|
||||
/*
|
||||
* Copy in group contents and make strings relative to space
|
||||
* at the end of the buffer. Note that gr_mem must come
|
||||
* immediately after struct group to guarantee proper alignment.
|
||||
*/
|
||||
newgr = &gritem->gr;
|
||||
memcpy(newgr, gr, sizeof(*gr));
|
||||
cp = (char *)(gritem + 1);
|
||||
if (gr->gr_mem) {
|
||||
newgr->gr_mem = (char **)cp;
|
||||
cp += sizeof(char *) * nmem;
|
||||
for (nmem = 0; gr->gr_mem[nmem] != NULL; nmem++) {
|
||||
len = strlen(gr->gr_mem[nmem]) + 1;
|
||||
memcpy(cp, gr->gr_mem[nmem], len);
|
||||
newgr->gr_mem[nmem] = cp;
|
||||
cp += len;
|
||||
}
|
||||
newgr->gr_mem[nmem] = NULL;
|
||||
}
|
||||
FIELD_COPY(gr, newgr, gr_passwd, psize);
|
||||
FIELD_COPY(gr, newgr, gr_name, nsize);
|
||||
|
||||
/* Set key and datum. */
|
||||
if (name != NULL) {
|
||||
memcpy(cp, name, strlen(name) + 1);
|
||||
gritem->cache.k.name = cp;
|
||||
} else {
|
||||
gritem->cache.k.gid = gr->gr_gid;
|
||||
}
|
||||
gritem->cache.d.gr = newgr;
|
||||
gritem->cache.refcnt = 1;
|
||||
|
||||
debug_return_ptr(&gritem->cache);
|
||||
}
|
||||
|
||||
#ifdef HAVE_UTMPX_H
|
||||
# define GROUPNAME_LEN (sizeof((struct utmpx *)0)->ut_user + 1)
|
||||
#else
|
||||
# ifdef HAVE_STRUCT_UTMP_UT_USER
|
||||
# define GROUPNAME_LEN (sizeof((struct utmp *)0)->ut_user + 1)
|
||||
# else
|
||||
# define GROUPNAME_LEN (sizeof((struct utmp *)0)->ut_name + 1)
|
||||
# endif
|
||||
#endif /* HAVE_UTMPX_H */
|
||||
|
||||
/*
|
||||
* Dynamically allocate space for a struct item plus the key and data
|
||||
* elements. Fills in datum from the gids arrays or from getgrouplist(3).
|
||||
* Consumes (frees) the gids array on success.
|
||||
*/
|
||||
struct cache_item *
|
||||
sudo_make_grlist_item(struct passwd *pw)
|
||||
{
|
||||
char *cp;
|
||||
size_t i, nsize, ngroups, total, len;
|
||||
struct cache_item_grlist *grlitem;
|
||||
struct group_list *grlist;
|
||||
GETGROUPS_T *gids;
|
||||
struct group *grp;
|
||||
int ngids;
|
||||
debug_decl(make_grlist_item, SUDO_DEBUG_NSS)
|
||||
|
||||
if (pw == sudo_user.pw && sudo_user.gids != NULL) {
|
||||
gids = user_gids;
|
||||
ngids = user_ngids;
|
||||
user_gids = NULL;
|
||||
user_ngids = 0;
|
||||
} else {
|
||||
#if defined(HAVE_SYSCONF) && defined(_SC_NGROUPS_MAX)
|
||||
ngids = (int)sysconf(_SC_NGROUPS_MAX) * 2;
|
||||
if (ngids < 0)
|
||||
#endif
|
||||
ngids = NGROUPS_MAX * 2;
|
||||
gids = emalloc2(ngids, sizeof(GETGROUPS_T));
|
||||
if (getgrouplist(pw->pw_name, pw->pw_gid, gids, &ngids) == -1) {
|
||||
efree(gids);
|
||||
gids = emalloc2(ngids, sizeof(GETGROUPS_T));
|
||||
if (getgrouplist(pw->pw_name, pw->pw_gid, gids, &ngids) == -1) {
|
||||
efree(gids);
|
||||
debug_return_ptr(NULL);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (ngids <= 0)
|
||||
debug_return_ptr(NULL);
|
||||
|
||||
#ifdef HAVE_SETAUTHDB
|
||||
aix_setauthdb((char *) pw->pw_name);
|
||||
#endif
|
||||
|
||||
/* Allocate in one big chunk for easy freeing. */
|
||||
nsize = strlen(pw->pw_name) + 1;
|
||||
total = sizeof(*grlitem) + nsize;
|
||||
total += sizeof(char *) * ngids;
|
||||
total += sizeof(gid_t *) * ngids;
|
||||
total += GROUPNAME_LEN * ngids;
|
||||
|
||||
again:
|
||||
grlitem = ecalloc(1, total);
|
||||
|
||||
/*
|
||||
* Copy in group list and make pointers relative to space
|
||||
* at the end of the buffer. Note that the groups array must come
|
||||
* immediately after struct group to guarantee proper alignment.
|
||||
*/
|
||||
grlist = &grlitem->grlist;
|
||||
cp = (char *)(grlitem + 1);
|
||||
grlist->groups = (char **)cp;
|
||||
cp += sizeof(char *) * ngids;
|
||||
grlist->gids = (gid_t *)cp;
|
||||
cp += sizeof(gid_t) * ngids;
|
||||
|
||||
/* Set key and datum. */
|
||||
memcpy(cp, pw->pw_name, nsize);
|
||||
grlitem->cache.k.name = cp;
|
||||
grlitem->cache.d.grlist = grlist;
|
||||
grlitem->cache.refcnt = 1;
|
||||
cp += nsize;
|
||||
|
||||
/*
|
||||
* Store group IDs.
|
||||
*/
|
||||
for (i = 0; i < ngids; i++)
|
||||
grlist->gids[i] = gids[i];
|
||||
grlist->ngids = ngids;
|
||||
|
||||
/*
|
||||
* Resolve and store group names by ID.
|
||||
*/
|
||||
ngroups = 0;
|
||||
for (i = 0; i < ngids; i++) {
|
||||
if ((grp = sudo_getgrgid(gids[i])) != NULL) {
|
||||
len = strlen(grp->gr_name) + 1;
|
||||
if (cp - (char *)grlitem + len > total) {
|
||||
total += len + GROUPNAME_LEN;
|
||||
efree(grlitem);
|
||||
sudo_gr_delref(grp);
|
||||
goto again;
|
||||
}
|
||||
memcpy(cp, grp->gr_name, len);
|
||||
grlist->groups[ngroups++] = cp;
|
||||
cp += len;
|
||||
sudo_gr_delref(grp);
|
||||
}
|
||||
}
|
||||
grlist->ngroups = ngroups;
|
||||
|
||||
#ifdef HAVE_SETAUTHDB
|
||||
aix_restoreauthdb();
|
||||
#endif
|
||||
|
||||
debug_return_ptr(&grlitem->cache);
|
||||
}
|
||||
Reference in New Issue
Block a user