Index: trunk/server/common/oursrc/nss_nonlocal/Makefile.am =================================================================== --- trunk/server/common/oursrc/nss_nonlocal/Makefile.am (revision 1824) +++ trunk/server/common/oursrc/nss_nonlocal/Makefile.am (revision 1825) @@ -5,10 +5,6 @@ libnss_nonlocal_la_LDFLAGS = \ -version-info 2:0:0 \ - -export-symbols-regex '^_nss_nonlocal_' - -noinst_PROGRAMS = .linktest -_linktest_SOURCES = -_linktest_LDADD = libnss_nonlocal.la -_linktest_LDFLAGS = -nostdlib -entry=0 + -export-symbols-regex '^_nss_nonlocal_' \ + -no-undefined -Wl,-z,defs install-exec-hook: Index: trunk/server/common/oursrc/nss_nonlocal/README =================================================================== --- trunk/server/common/oursrc/nss_nonlocal/README (revision 1824) +++ trunk/server/common/oursrc/nss_nonlocal/README (revision 1825) @@ -9,4 +9,19 @@ group: compat nonlocal group_nonlocal: hesiod + +The module also assigns special properties to two local groups and one +local user, if they exist: + +• If the local group ‘nss-nonlocal-users’ exists, then nonlocal users + will be automatically added to it. Furthermore, if a local user is + added to this group, then that user will inherit any nonlocal gids + from a nonlocal user of the same name, as supplementary gids. + +• If the local group ‘nss-local-users’ exists, then local users will + be automatically added to it. + +• If the local user ‘nss-nonlocal-users’ is added to a local group, + then the local group will inherit the nonlocal membership of a group + of the same gid. Copyright © 2007–2010 Anders Kaseorg and Tim Abbott Index: trunk/server/common/oursrc/nss_nonlocal/configure.ac =================================================================== --- trunk/server/common/oursrc/nss_nonlocal/configure.ac (revision 1824) +++ trunk/server/common/oursrc/nss_nonlocal/configure.ac (revision 1825) @@ -1,3 +1,3 @@ -AC_INIT([nss_nonlocal], [1.11], [andersk@mit.edu]) +AC_INIT([nss_nonlocal], [2.0], [andersk@mit.edu]) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([-Wall -Werror foreign]) @@ -9,4 +9,6 @@ AC_PROG_INSTALL AC_PROG_LIBTOOL + +AC_HEADER_STDBOOL case "$target_cpu" in Index: trunk/server/common/oursrc/nss_nonlocal/nonlocal-group.c =================================================================== --- trunk/server/common/oursrc/nss_nonlocal/nonlocal-group.c (revision 1824) +++ trunk/server/common/oursrc/nss_nonlocal/nonlocal-group.c (revision 1825) @@ -34,4 +34,5 @@ #include #include +#include #include #include @@ -39,6 +40,25 @@ #include "nonlocal.h" +/* + * If the MAGIC_NONLOCAL_GROUPNAME local group exists, then nonlocal + * users will be automatically added to it. Furthermore, if a local + * user is added to this group, then that user will inherit any + * nonlocal gids from a nonlocal user of the same name, as + * supplementary gids. + */ #define MAGIC_NONLOCAL_GROUPNAME "nss-nonlocal-users" + +/* + * If the MAGIC_LOCAL_GROUPNAME local group exists, then local users + * will be automatically added to it. + */ #define MAGIC_LOCAL_GROUPNAME "nss-local-users" + +/* + * If the MAGIC_NONLOCAL_USERNAME local user is added to a local + * group, then the local group will inherit the nonlocal membership of + * a group of the same gid. + */ +#define MAGIC_NONLOCAL_USERNAME "nss-nonlocal-users" @@ -52,74 +72,63 @@ -static service_user * -nss_group_nonlocal_database(void) -{ - static service_user *nip = NULL; - if (nip == NULL) - __nss_database_lookup("group_nonlocal", NULL, "", &nip); - - return nip; -} - - -enum nss_status -check_nonlocal_gid(const char *user, gid_t gid, int *errnop) -{ - static const char *fct_name = "getgrgid_r"; - static service_user *startp = NULL; - static void *fct_start = NULL; - enum nss_status status; - service_user *nip; - union { - enum nss_status (*l)(gid_t gid, struct group *grp, - char *buffer, size_t buflen, int *errnop); - void *ptr; - } fct; +static service_user *__nss_group_nonlocal_database; + +static int +internal_function +__nss_group_nonlocal_lookup(service_user **ni, const char *fct_name, + void **fctp) +{ + if (__nss_group_nonlocal_database == NULL + && __nss_database_lookup("group_nonlocal", NULL, NULL, + &__nss_group_nonlocal_database) < 0) + return -1; + + *ni = __nss_group_nonlocal_database; + + *fctp = __nss_lookup_function(*ni, fct_name); + return 0; +} + + +enum nss_status +check_nonlocal_gid(const char *user, const char *group, gid_t gid, int *errnop) +{ + enum nss_status status; struct group gbuf; - int old_errno = errno; - + char *buf; size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX); - char *buf = malloc(buflen); - if (buf == NULL) { - *errnop = ENOMEM; - errno = old_errno; - return NSS_STATUS_TRYAGAIN; - } - - if (fct_start == NULL && - __nss_group_lookup(&startp, fct_name, &fct_start) != 0) { - free(buf); - return NSS_STATUS_UNAVAIL; - } - nip = startp; - fct.ptr = fct_start; - do { - morebuf: - if (fct.l == _nss_nonlocal_getgrgid_r) - status = NSS_STATUS_NOTFOUND; - else - status = DL_CALL_FCT(fct.l, (gid, &gbuf, buf, buflen, errnop)); - if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) { - free(buf); - buflen *= 2; - buf = malloc(buflen); - if (buf == NULL) { - *errnop = ENOMEM; - errno = old_errno; - return NSS_STATUS_TRYAGAIN; + const struct walk_nss w = { + .lookup = &__nss_group_lookup, .fct_name = "getgrgid_r", + .status = &status, .errnop = errnop, .buf = &buf, .buflen = &buflen + }; + const __typeof__(&_nss_nonlocal_getgrgid_r) self = &_nss_nonlocal_getgrgid_r; +#define args (gid, &gbuf, buf, buflen, errnop) +#include "walk_nss.h" +#undef args + + if (status == NSS_STATUS_TRYAGAIN) + return status; + else if (status != NSS_STATUS_SUCCESS) + return NSS_STATUS_SUCCESS; + + if (group == NULL || strcmp(gbuf.gr_name, group) == 0) { + char *const *mem; + for (mem = gbuf.gr_mem; *mem != NULL; mem++) + if (strcmp(*mem, MAGIC_NONLOCAL_USERNAME) == 0) { + status = check_nonlocal_user(*mem, errnop); + if (status == NSS_STATUS_TRYAGAIN) { + free(buf); + return status; + } else if (status == NSS_STATUS_NOTFOUND) { + free(buf); + return NSS_STATUS_SUCCESS; + } + break; } - goto morebuf; - } - } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0); - - if (status == NSS_STATUS_SUCCESS) { - syslog(LOG_DEBUG, "nss_nonlocal: removing local group %u (%s) from non-local user %s\n", gbuf.gr_gid, gbuf.gr_name, user); - status = NSS_STATUS_NOTFOUND; - } else if (status != NSS_STATUS_TRYAGAIN) { - status = NSS_STATUS_SUCCESS; - } - + } + + syslog(LOG_DEBUG, "nss_nonlocal: removing local group %u (%s) from non-local user %s\n", gbuf.gr_gid, gbuf.gr_name, user); free(buf); - return status; + return NSS_STATUS_NOTFOUND; } @@ -134,11 +143,13 @@ errno = 0; gid = strtoul(grp->gr_name, &end, 10); - if (errno == 0 && *end == '\0' && (gid_t)gid == gid) - status = check_nonlocal_gid(user, gid, errnop); - errno = old_errno; + if (errno == 0 && *end == '\0' && (gid_t)gid == gid) { + errno = old_errno; + status = check_nonlocal_gid(user, grp->gr_name, gid, errnop); + } else + errno = old_errno; if (status != NSS_STATUS_SUCCESS) return status; - return check_nonlocal_gid(user, grp->gr_gid, errnop); + return check_nonlocal_gid(user, grp->gr_name, grp->gr_gid, errnop); } @@ -146,61 +157,18 @@ get_local_group(const char *name, struct group *grp, char **buffer, int *errnop) { - static const char *fct_name = "getgrnam_r"; - static service_user *startp = NULL; - static void *fct_start = NULL; - enum nss_status status; - service_user *nip; - union { - enum nss_status (*l)(const char *name, struct group *grp, - char *buffer, size_t buflen, int *errnop); - void *ptr; - } fct; - size_t buflen; - int old_errno = errno; - - buflen = sysconf(_SC_GETGR_R_SIZE_MAX); - *buffer = malloc(buflen); - if (*buffer == NULL) { - *errnop = ENOMEM; - errno = old_errno; - return NSS_STATUS_TRYAGAIN; - } - - if (fct_start == NULL && - __nss_group_lookup(&startp, fct_name, &fct_start) != 0) { - free(*buffer); - *buffer = NULL; - return NSS_STATUS_UNAVAIL; - } - nip = startp; - fct.ptr = fct_start; - do { - morebuf: - if (fct.l == _nss_nonlocal_getgrnam_r) - status = NSS_STATUS_NOTFOUND; - else - status = DL_CALL_FCT(fct.l, (name, grp, *buffer, buflen, errnop)); - if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) { - free(*buffer); - buflen *= 2; - *buffer = malloc(buflen); - if (*buffer == NULL) { - *errnop = ENOMEM; - errno = old_errno; - return NSS_STATUS_TRYAGAIN; - } - goto morebuf; - } - } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0); - - if (status != NSS_STATUS_SUCCESS) { - free(*buffer); - *buffer = NULL; - } - + enum nss_status status; + size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX); + const struct walk_nss w = { + .lookup = &__nss_group_lookup, .fct_name = "getgrnam_r", + .status = &status, .errnop = errnop, .buf = buffer, .buflen = &buflen + }; + const __typeof__(&_nss_nonlocal_getgrnam_r) self = &_nss_nonlocal_getgrnam_r; +#define args (name, grp, *buffer, buflen, errnop) +#include "walk_nss.h" +#undef args return status; } -static service_user *grent_nip = NULL; +static service_user *grent_startp, *grent_nip; static void *grent_fct_start; static union { @@ -214,31 +182,20 @@ _nss_nonlocal_setgrent(int stayopen) { - static const char *fct_name = "setgrent"; - static void *fct_start = NULL; - enum nss_status status; - service_user *nip; - union { - enum nss_status (*l)(int stayopen); - void *ptr; - } fct; - - nip = nss_group_nonlocal_database(); - if (nip == NULL) - return NSS_STATUS_UNAVAIL; - if (fct_start == NULL) - fct_start = __nss_lookup_function(nip, fct_name); - fct.ptr = fct_start; - do { - if (fct.ptr == NULL) - status = NSS_STATUS_UNAVAIL; - else - status = DL_CALL_FCT(fct.l, (stayopen)); - } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0); + enum nss_status status; + const struct walk_nss w = { + .lookup = &__nss_group_nonlocal_lookup, .fct_name = "setgrent", + .status = &status + }; + const __typeof__(&_nss_nonlocal_setgrent) self = NULL; +#define args (stayopen) +#include "walk_nss.h" +#undef args if (status != NSS_STATUS_SUCCESS) return status; - grent_nip = nip; if (grent_fct_start == NULL) - grent_fct_start = __nss_lookup_function(nip, grent_fct_name); + __nss_group_nonlocal_lookup(&grent_startp, grent_fct_name, + &grent_fct_start); + grent_nip = grent_startp; grent_fct.ptr = grent_fct_start; return NSS_STATUS_SUCCESS; @@ -248,27 +205,16 @@ _nss_nonlocal_endgrent(void) { - static const char *fct_name = "endgrent"; - static void *fct_start = NULL; - enum nss_status status; - service_user *nip; - union { - enum nss_status (*l)(void); - void *ptr; - } fct; + enum nss_status status; + const struct walk_nss w = { + .lookup = &__nss_group_nonlocal_lookup, .fct_name = "endgrent", + .status = &status + }; + const __typeof__(&_nss_nonlocal_endgrent) self = NULL; grent_nip = NULL; - nip = nss_group_nonlocal_database(); - if (nip == NULL) - return NSS_STATUS_UNAVAIL; - if (fct_start == NULL) - fct_start = __nss_lookup_function(nip, fct_name); - fct.ptr = fct_start; - do { - if (fct.ptr == NULL) - status = NSS_STATUS_UNAVAIL; - else - status = DL_CALL_FCT(fct.l, ()); - } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0); +#define args () +#include "walk_nss.h" +#undef args return status; } @@ -315,13 +261,10 @@ char *buffer, size_t buflen, int *errnop) { - static const char *fct_name = "getgrnam_r"; - static void *fct_start = NULL; - enum nss_status status; - service_user *nip; - union { - enum nss_status (*l)(const char *name, struct group *grp, - char *buffer, size_t buflen, int *errnop); - void *ptr; - } fct; + enum nss_status status; + const struct walk_nss w = { + .lookup = &__nss_group_nonlocal_lookup, .fct_name = "getgrnam_r", + .status = &status, .errnop = errnop + }; + const __typeof__(&_nss_nonlocal_getgrnam_r) self = NULL; char *nonlocal_ignore = getenv(NONLOCAL_IGNORE_ENV); @@ -329,18 +272,7 @@ return NSS_STATUS_UNAVAIL; - nip = nss_group_nonlocal_database(); - if (nip == NULL) - return NSS_STATUS_UNAVAIL; - if (fct_start == NULL) - fct_start = __nss_lookup_function(nip, fct_name); - fct.ptr = fct_start; - do { - if (fct.ptr == NULL) - status = NSS_STATUS_UNAVAIL; - else - status = DL_CALL_FCT(fct.l, (name, grp, buffer, buflen, errnop)); - if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) - break; - } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0); +#define args (name, grp, buffer, buflen, errnop) +#include "walk_nss.h" +#undef args if (status != NSS_STATUS_SUCCESS) return status; @@ -358,13 +290,10 @@ char *buffer, size_t buflen, int *errnop) { - static const char *fct_name = "getgrgid_r"; - static void *fct_start = NULL; - enum nss_status status; - service_user *nip; - union { - enum nss_status (*l)(gid_t gid, struct group *grp, - char *buffer, size_t buflen, int *errnop); - void *ptr; - } fct; + enum nss_status status; + const struct walk_nss w = { + .lookup = &__nss_group_nonlocal_lookup, .fct_name = "getgrgid_r", + .status = &status, .errnop = errnop + }; + const __typeof__(&_nss_nonlocal_getgrgid_r) self = NULL; char *nonlocal_ignore = getenv(NONLOCAL_IGNORE_ENV); @@ -372,18 +301,7 @@ return NSS_STATUS_UNAVAIL; - nip = nss_group_nonlocal_database(); - if (nip == NULL) - return NSS_STATUS_UNAVAIL; - if (fct_start == NULL) - fct_start = __nss_lookup_function(nip, fct_name); - fct.ptr = fct_start; - do { - if (fct.ptr == NULL) - status = NSS_STATUS_UNAVAIL; - else - status = DL_CALL_FCT(fct.l, (gid, grp, buffer, buflen, errnop)); - if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) - break; - } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0); +#define args (gid, grp, buffer, buflen, errnop) +#include "walk_nss.h" +#undef args if (status != NSS_STATUS_SUCCESS) return status; @@ -397,4 +315,37 @@ } +static bool +add_group(gid_t group, long int *start, long int *size, gid_t **groupsp, + long int limit, int *errnop, enum nss_status *status) +{ + int i, old_errno = errno; + for (i = 0; i < *start; ++i) + if ((*groupsp)[i] == group) + return true; + if (*start + 1 > *size) { + gid_t *newgroups; + long int newsize = 2 * *size; + if (limit > 0) { + if (*size >= limit) { + *status = NSS_STATUS_SUCCESS; + return false; + } + if (newsize > limit) + newsize = limit; + } + newgroups = realloc(*groupsp, newsize * sizeof((*groupsp)[0])); + errno = old_errno; + if (newgroups == NULL) { + *errnop = ENOMEM; + *status = NSS_STATUS_TRYAGAIN; + return false; + } + *groupsp = newgroups; + *size = newsize; + } + (*groupsp)[(*start)++] = group; + return true; +} + enum nss_status _nss_nonlocal_initgroups_dyn(const char *user, gid_t group, long int *start, @@ -402,109 +353,96 @@ int *errnop) { - static const char *fct_name = "initgroups_dyn"; - static void *fct_start = NULL; - enum nss_status status; - service_user *nip; - union { - enum nss_status (*l)(const char *user, gid_t group, long int *start, - long int *size, gid_t **groupsp, long int limit, - int *errnop); - void *ptr; - } fct; + enum nss_status status; + const struct walk_nss w = { + .lookup = &__nss_group_nonlocal_lookup, .fct_name = "initgroups_dyn", + .status = &status, .errnop = errnop + }; + const __typeof__(&_nss_nonlocal_initgroups_dyn) self = NULL; struct group local_users_group, nonlocal_users_group; - gid_t local_users_gid, gid; - int is_local = 0; + bool is_nonlocal = true; char *buffer; - int old_errno; int in, out, i; - /* Check that the user is a nonlocal user before adding any groups. */ + /* Check that the user is a nonlocal user, or a member of the + * MAGIC_NONLOCAL_GROUPNAME group, before adding any groups. */ status = check_nonlocal_user(user, errnop); - if (status == NSS_STATUS_TRYAGAIN) - return status; - else if (status != NSS_STATUS_SUCCESS) - is_local = 1; - - old_errno = errno; - - status = get_local_group(MAGIC_LOCAL_GROUPNAME, - &local_users_group, &buffer, errnop); - if (status == NSS_STATUS_SUCCESS) { - local_users_gid = local_users_group.gr_gid; - free(buffer); - } else if (status == NSS_STATUS_TRYAGAIN) { - return status; - } else { - syslog(LOG_WARNING, "nss_nonlocal: Group %s does not exist locally!", - MAGIC_LOCAL_GROUPNAME); - local_users_gid = -1; - } - - if (is_local) { - gid = local_users_gid; - } else { - status = get_local_group(MAGIC_NONLOCAL_GROUPNAME, - &nonlocal_users_group, &buffer, errnop); + if (status == NSS_STATUS_TRYAGAIN) { + return status; + } else if (status != NSS_STATUS_SUCCESS) { + is_nonlocal = false; + + status = get_local_group(MAGIC_LOCAL_GROUPNAME, + &local_users_group, &buffer, errnop); if (status == NSS_STATUS_SUCCESS) { - gid = nonlocal_users_group.gr_gid; free(buffer); + if (!add_group(local_users_group.gr_gid, start, size, groupsp, + limit, errnop, &status)) + return status; } else if (status == NSS_STATUS_TRYAGAIN) { return status; } else { - syslog(LOG_WARNING, "nss_nonlocal: Group %s does not exist locally!", - MAGIC_NONLOCAL_GROUPNAME); - gid = -1; - } - } - - if (gid != -1) { - int i; - for (i = 0; i < *start; ++i) - if ((*groupsp)[i] == gid) - break; - if (i >= *start) { - if (*start + 1 > *size) { - gid_t *newgroups; - long int newsize = 2 * *size; - if (limit > 0) { - if (*size >= limit) - return NSS_STATUS_SUCCESS; - if (newsize > limit) - newsize = limit; + syslog(LOG_WARNING, + "nss_nonlocal: Group %s does not exist locally!", + MAGIC_LOCAL_GROUPNAME); + } + } + + status = get_local_group(MAGIC_NONLOCAL_GROUPNAME, + &nonlocal_users_group, &buffer, errnop); + if (status == NSS_STATUS_SUCCESS) { + free(buffer); + if (is_nonlocal) { + if (!add_group(nonlocal_users_group.gr_gid, start, size, groupsp, + limit, errnop, &status)) + return status; + } else { + int i; + for (i = 0; i < *start; ++i) { + if ((*groupsp)[i] == nonlocal_users_group.gr_gid) { + is_nonlocal = true; + break; } - newgroups = realloc(*groupsp, newsize * sizeof((*groupsp)[0])); - if (newgroups == NULL) { - *errnop = ENOMEM; - errno = old_errno; - return NSS_STATUS_TRYAGAIN; + } + + if (is_nonlocal) { + struct passwd pwbuf; + char *buf; + int nonlocal_errno = *errnop; + status = get_nonlocal_passwd(user, &pwbuf, &buf, errnop); + + if (status == NSS_STATUS_SUCCESS) { + nonlocal_errno = *errnop; + status = check_nonlocal_gid(user, NULL, pwbuf.pw_gid, + &nonlocal_errno); + free(buf); } - *groupsp = newgroups; - *size = newsize; + + if (status == NSS_STATUS_SUCCESS) { + if (!add_group(pwbuf.pw_gid, start, size, groupsp, limit, + errnop, &status)) + return status; + } else if (status == NSS_STATUS_TRYAGAIN) { + *errnop = nonlocal_errno; + return status; + } } - (*groupsp)[(*start)++] = gid; - } - } - - if (is_local) + } + } else if (status == NSS_STATUS_TRYAGAIN) { + if (is_nonlocal) + return status; + } else { + syslog(LOG_WARNING, "nss_nonlocal: Group %s does not exist locally!", + MAGIC_NONLOCAL_GROUPNAME); + } + + if (!is_nonlocal) return NSS_STATUS_SUCCESS; in = out = *start; - nip = nss_group_nonlocal_database(); - if (nip == NULL) - return NSS_STATUS_UNAVAIL; - if (fct_start == NULL) - fct_start = __nss_lookup_function(nip, fct_name); - fct.ptr = fct_start; - - do { - if (fct.ptr == NULL) - status = NSS_STATUS_UNAVAIL; - else - status = DL_CALL_FCT(fct.l, (user, group, start, size, groupsp, limit, errnop)); - if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) - break; - } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0); +#define args (user, group, start, size, groupsp, limit, errnop) +#include "walk_nss.h" +#undef args if (status != NSS_STATUS_SUCCESS) return status; @@ -519,12 +457,6 @@ continue; - /* Don't let users get into MAGIC_LOCAL_GROUPNAME from nonlocal reasons. */ - if (local_users_gid == (*groupsp)[in]) { - syslog(LOG_WARNING, "nss_nonlocal: Nonlocal user %s removed from special local users group %s", - user, MAGIC_LOCAL_GROUPNAME); - continue; - } - - status = check_nonlocal_gid(user, (*groupsp)[in], &nonlocal_errno); + status = check_nonlocal_gid(user, NULL, (*groupsp)[in], + &nonlocal_errno); if (status == NSS_STATUS_SUCCESS) { (*groupsp)[out++] = (*groupsp)[in]; Index: trunk/server/common/oursrc/nss_nonlocal/nonlocal-passwd.c =================================================================== --- trunk/server/common/oursrc/nss_nonlocal/nonlocal-passwd.c (revision 1824) +++ trunk/server/common/oursrc/nss_nonlocal/nonlocal-passwd.c (revision 1825) @@ -50,12 +50,20 @@ -static service_user * -nss_passwd_nonlocal_database(void) -{ - static service_user *nip = NULL; - if (nip == NULL) - __nss_database_lookup("passwd_nonlocal", NULL, "", &nip); - - return nip; +static service_user *__nss_passwd_nonlocal_database; + +static int +internal_function +__nss_passwd_nonlocal_lookup(service_user **ni, const char *fct_name, + void **fctp) +{ + if (__nss_passwd_nonlocal_database == NULL + && __nss_database_lookup("passwd_nonlocal", NULL, NULL, + &__nss_passwd_nonlocal_database) < 0) + return -1; + + *ni = __nss_passwd_nonlocal_database; + + *fctp = __nss_lookup_function(*ni, fct_name); + return 0; } @@ -64,53 +72,20 @@ check_nonlocal_uid(const char *user, uid_t uid, int *errnop) { - static const char *fct_name = "getpwuid_r"; - static service_user *startp = NULL; - static void *fct_start = NULL; - enum nss_status status; - service_user *nip; - union { - enum nss_status (*l)(uid_t uid, struct passwd *pwd, - char *buffer, size_t buflen, int *errnop); - void *ptr; - } fct; + enum nss_status status; struct passwd pwbuf; - int old_errno = errno; - + char *buf; size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX); - char *buf = malloc(buflen); - if (buf == NULL) { - *errnop = ENOMEM; - errno = old_errno; - return NSS_STATUS_TRYAGAIN; - } - - if (fct_start == NULL && - __nss_passwd_lookup(&startp, fct_name, &fct_start) != 0) { - free(buf); - return NSS_STATUS_UNAVAIL; - } - nip = startp; - fct.ptr = fct_start; - do { - morebuf: - if (fct.l == _nss_nonlocal_getpwuid_r) - status = NSS_STATUS_NOTFOUND; - else - status = DL_CALL_FCT(fct.l, (uid, &pwbuf, buf, buflen, errnop)); - if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) { - free(buf); - buflen *= 2; - buf = malloc(buflen); - if (buf == NULL) { - *errnop = ENOMEM; - errno = old_errno; - return NSS_STATUS_TRYAGAIN; - } - goto morebuf; - } - } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0); + const struct walk_nss w = { + .lookup = &__nss_passwd_lookup, .fct_name = "getpwuid_r", + .status = &status, .errnop = errnop, .buf = &buf, .buflen = &buflen + }; + const __typeof__(&_nss_nonlocal_getpwuid_r) self = &_nss_nonlocal_getpwuid_r; +#define args (uid, &pwbuf, buf, buflen, errnop) +#include "walk_nss.h" +#undef args if (status == NSS_STATUS_SUCCESS) { syslog(LOG_ERR, "nss_nonlocal: possible spoofing attack: non-local user %s has same UID as local user %s!\n", user, pwbuf.pw_name); + free(buf); status = NSS_STATUS_NOTFOUND; } else if (status != NSS_STATUS_TRYAGAIN) { @@ -118,5 +93,4 @@ } - free(buf); return status; } @@ -132,7 +106,10 @@ errno = 0; uid = strtoul(pwd->pw_name, &end, 10); - if (errno == 0 && *end == '\0' && (uid_t)uid == uid) + if (errno == 0 && *end == '\0' && (uid_t)uid == uid) { + errno = old_errno; status = check_nonlocal_uid(user, uid, errnop); - errno = old_errno; + } else { + errno = old_errno; + } if (status != NSS_STATUS_SUCCESS) return status; @@ -144,62 +121,46 @@ check_nonlocal_user(const char *user, int *errnop) { - static const char *fct_name = "getpwnam_r"; - static service_user *startp = NULL; - static void *fct_start = NULL; - enum nss_status status; - service_user *nip; - union { - enum nss_status (*l)(const char *name, struct passwd *pwd, - char *buffer, size_t buflen, int *errnop); - void *ptr; - } fct; + enum nss_status status; struct passwd pwbuf; - int old_errno = errno; - + char *buf; size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX); - char *buf = malloc(buflen); - if (buf == NULL) { - *errnop = ENOMEM; - errno = old_errno; - return NSS_STATUS_TRYAGAIN; - } - - if (fct_start == NULL && - __nss_passwd_lookup(&startp, fct_name, &fct_start) != 0) { + const struct walk_nss w = { + .lookup = __nss_passwd_lookup, .fct_name = "getpwnam_r", + .status = &status, .errnop = errnop, .buf = &buf, .buflen = &buflen + }; + const __typeof__(&_nss_nonlocal_getpwnam_r) self = &_nss_nonlocal_getpwnam_r; +#define args (user, &pwbuf, buf, buflen, errnop) +#include "walk_nss.h" +#undef args + + if (status == NSS_STATUS_SUCCESS) { free(buf); - return NSS_STATUS_UNAVAIL; - } - nip = startp; - fct.ptr = fct_start; - do { - morebuf: - if (fct.l == _nss_nonlocal_getpwnam_r) - status = NSS_STATUS_NOTFOUND; - else - status = DL_CALL_FCT(fct.l, (user, &pwbuf, buf, buflen, errnop)); - if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) { - free(buf); - buflen *= 2; - buf = malloc(buflen); - if (buf == NULL) { - *errnop = ENOMEM; - errno = old_errno; - return NSS_STATUS_TRYAGAIN; - } - goto morebuf; - } - } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0); - - if (status == NSS_STATUS_SUCCESS) status = NSS_STATUS_NOTFOUND; - else if (status != NSS_STATUS_TRYAGAIN) + } else if (status != NSS_STATUS_TRYAGAIN) { status = NSS_STATUS_SUCCESS; - - free(buf); + } + return status; } - -static service_user *pwent_nip = NULL; +enum nss_status +get_nonlocal_passwd(const char *name, struct passwd *pwd, char **buffer, + int *errnop) +{ + enum nss_status status; + size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX); + const struct walk_nss w = { + .lookup = __nss_passwd_nonlocal_lookup, .fct_name = "getpwnam_r", + .status = &status, .errnop = errnop, .buf = buffer, .buflen = &buflen + }; + const __typeof__(&_nss_nonlocal_getpwnam_r) self = NULL; +#define args (name, pwd, *buffer, buflen, errnop) +#include "walk_nss.h" +#undef args + return status; +} + + +static service_user *pwent_startp, *pwent_nip; static void *pwent_fct_start; static union { @@ -213,31 +174,20 @@ _nss_nonlocal_setpwent(int stayopen) { - static const char *fct_name = "setpwent"; - static void *fct_start = NULL; - enum nss_status status; - service_user *nip; - union { - enum nss_status (*l)(int stayopen); - void *ptr; - } fct; - - nip = nss_passwd_nonlocal_database(); - if (nip == NULL) - return NSS_STATUS_UNAVAIL; - if (fct_start == NULL) - fct_start = __nss_lookup_function(nip, fct_name); - fct.ptr = fct_start; - do { - if (fct.ptr == NULL) - status = NSS_STATUS_UNAVAIL; - else - status = DL_CALL_FCT(fct.l, (stayopen)); - } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0); - if (status != NSS_STATUS_SUCCESS) - return status; - - pwent_nip = nip; + enum nss_status status; + const struct walk_nss w = { + .lookup = &__nss_passwd_nonlocal_lookup, .fct_name = "setpwent", + .status = &status + }; + const __typeof__(&_nss_nonlocal_setpwent) self = NULL; +#define args (stayopen) +#include "walk_nss.h" +#undef args + if (status != NSS_STATUS_SUCCESS) + return status; + if (pwent_fct_start == NULL) - pwent_fct_start = __nss_lookup_function(nip, pwent_fct_name); + __nss_passwd_nonlocal_lookup(&pwent_startp, pwent_fct_name, + &pwent_fct_start); + pwent_nip = pwent_startp; pwent_fct.ptr = pwent_fct_start; return NSS_STATUS_SUCCESS; @@ -247,27 +197,16 @@ _nss_nonlocal_endpwent(void) { - static const char *fct_name = "endpwent"; - static void *fct_start = NULL; - enum nss_status status; - service_user *nip; - union { - enum nss_status (*l)(void); - void *ptr; - } fct; + enum nss_status status; + const struct walk_nss w = { + .lookup = &__nss_passwd_nonlocal_lookup, .fct_name = "endpwent", + .status = &status + }; + const __typeof__(&_nss_nonlocal_endpwent) self = NULL; pwent_nip = NULL; - nip = nss_passwd_nonlocal_database(); - if (nip == NULL) - return NSS_STATUS_UNAVAIL; - if (fct_start == NULL) - fct_start = __nss_lookup_function(nip, fct_name); - fct.ptr = fct_start; - do { - if (fct.ptr == NULL) - status = NSS_STATUS_UNAVAIL; - else - status = DL_CALL_FCT(fct.l, ()); - } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0); +#define args () +#include "walk_nss.h" +#undef args return status; } @@ -314,14 +253,11 @@ char *buffer, size_t buflen, int *errnop) { - static const char *fct_name = "getpwnam_r"; - static void *fct_start = NULL; - enum nss_status status; - service_user *nip; - union { - enum nss_status (*l)(const char *name, struct passwd *pwd, - char *buffer, size_t buflen, int *errnop); - void *ptr; - } fct; + enum nss_status status; int group_errno; + const struct walk_nss w = { + .lookup = __nss_passwd_nonlocal_lookup, .fct_name = "getpwnam_r", + .status = &status, .errnop = errnop + }; + const __typeof__(&_nss_nonlocal_getpwnam_r) self = NULL; char *nonlocal_ignore = getenv(NONLOCAL_IGNORE_ENV); @@ -329,18 +265,7 @@ return NSS_STATUS_UNAVAIL; - nip = nss_passwd_nonlocal_database(); - if (nip == NULL) - return NSS_STATUS_UNAVAIL; - if (fct_start == NULL) - fct_start = __nss_lookup_function(nip, fct_name); - fct.ptr = fct_start; - do { - if (fct.ptr == NULL) - status = NSS_STATUS_UNAVAIL; - else - status = DL_CALL_FCT(fct.l, (name, pwd, buffer, buflen, errnop)); - if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) - break; - } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0); +#define args (name, pwd, buffer, buflen, errnop) +#include "walk_nss.h" +#undef args if (status != NSS_STATUS_SUCCESS) return status; @@ -355,5 +280,5 @@ return status; - if (check_nonlocal_gid(name, pwd->pw_gid, &group_errno) != + if (check_nonlocal_gid(name, NULL, pwd->pw_gid, &group_errno) != NSS_STATUS_SUCCESS) pwd->pw_gid = 65534 /* nogroup */; @@ -365,14 +290,11 @@ char *buffer, size_t buflen, int *errnop) { - static const char *fct_name = "getpwuid_r"; - static void *fct_start = NULL; - enum nss_status status; - service_user *nip; - union { - enum nss_status (*l)(uid_t uid, struct passwd *pwd, - char *buffer, size_t buflen, int *errnop); - void *ptr; - } fct; + enum nss_status status; int group_errno; + const struct walk_nss w = { + .lookup = &__nss_passwd_nonlocal_lookup, .fct_name = "getpwuid_r", + .status = &status, .errnop = errnop + }; + const __typeof__(&_nss_nonlocal_getpwuid_r) self = NULL; char *nonlocal_ignore = getenv(NONLOCAL_IGNORE_ENV); @@ -380,18 +302,7 @@ return NSS_STATUS_UNAVAIL; - nip = nss_passwd_nonlocal_database(); - if (nip == NULL) - return NSS_STATUS_UNAVAIL; - if (fct_start == NULL) - fct_start = __nss_lookup_function(nip, fct_name); - fct.ptr = fct_start; - do { - if (fct.ptr == NULL) - status = NSS_STATUS_UNAVAIL; - else - status = DL_CALL_FCT(fct.l, (uid, pwd, buffer, buflen, errnop)); - if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) - break; - } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0); +#define args (uid, pwd, buffer, buflen, errnop) +#include "walk_nss.h" +#undef args if (status != NSS_STATUS_SUCCESS) return status; @@ -406,5 +317,5 @@ return status; - if (check_nonlocal_gid(pwd->pw_name, pwd->pw_gid, &group_errno) != + if (check_nonlocal_gid(pwd->pw_name, NULL, pwd->pw_gid, &group_errno) != NSS_STATUS_SUCCESS) pwd->pw_gid = 65534 /* nogroup */; Index: trunk/server/common/oursrc/nss_nonlocal/nonlocal-shadow.c =================================================================== --- trunk/server/common/oursrc/nss_nonlocal/nonlocal-shadow.c (revision 1824) +++ trunk/server/common/oursrc/nss_nonlocal/nonlocal-shadow.c (revision 1825) @@ -40,16 +40,24 @@ -static service_user * -nss_shadow_nonlocal_database(void) +static service_user *__nss_shadow_nonlocal_database; + +static int +internal_function +__nss_shadow_nonlocal_lookup(service_user **ni, const char *fct_name, + void **fctp) { - static service_user *nip = NULL; - if (nip == NULL) - __nss_database_lookup("shadow_nonlocal", NULL, "", &nip); + if (__nss_shadow_nonlocal_database == NULL + && __nss_database_lookup("shadow_nonlocal", NULL, NULL, + &__nss_shadow_nonlocal_database) < 0) + return -1; - return nip; + *ni = __nss_shadow_nonlocal_database; + + *fctp = __nss_lookup_function(*ni, fct_name); + return 0; } -static service_user *spent_nip = NULL; +static service_user *spent_startp, *spent_nip; static void *spent_fct_start; static union { @@ -63,31 +71,20 @@ _nss_nonlocal_setspent(int stayopen) { - static const char *fct_name = "setspent"; - static void *fct_start = NULL; enum nss_status status; - service_user *nip; - union { - enum nss_status (*l)(int stayopen); - void *ptr; - } fct; - - nip = nss_shadow_nonlocal_database(); - if (nip == NULL) - return NSS_STATUS_UNAVAIL; - if (fct_start == NULL) - fct_start = __nss_lookup_function(nip, fct_name); - fct.ptr = fct_start; - do { - if (fct.ptr == NULL) - status = NSS_STATUS_UNAVAIL; - else - status = DL_CALL_FCT(fct.l, (stayopen)); - } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0); + const struct walk_nss w = { + .lookup = &__nss_shadow_nonlocal_lookup, .fct_name = "setspent", + .status = &status + }; + const __typeof__(&_nss_nonlocal_setspent) self = NULL; +#define args (stayopen) +#include "walk_nss.h" +#undef args if (status != NSS_STATUS_SUCCESS) return status; - spent_nip = nip; if (spent_fct_start == NULL) - spent_fct_start = __nss_lookup_function(nip, spent_fct_name); + __nss_shadow_nonlocal_lookup(&spent_startp, spent_fct_name, + &spent_fct_start); + spent_nip = spent_startp; spent_fct.ptr = spent_fct_start; return NSS_STATUS_SUCCESS; @@ -97,27 +94,16 @@ _nss_nonlocal_endspent(void) { - static const char *fct_name = "endspent"; - static void *fct_start = NULL; enum nss_status status; - service_user *nip; - union { - enum nss_status (*l)(void); - void *ptr; - } fct; + const struct walk_nss w = { + .lookup = &__nss_shadow_nonlocal_lookup, .fct_name = "endspent", + .status = &status + }; + const __typeof__(&_nss_nonlocal_endspent) self = NULL; spent_nip = NULL; - nip = nss_shadow_nonlocal_database(); - if (nip == NULL) - return NSS_STATUS_UNAVAIL; - if (fct_start == NULL) - fct_start = __nss_lookup_function(nip, fct_name); - fct.ptr = fct_start; - do { - if (fct.ptr == NULL) - status = NSS_STATUS_UNAVAIL; - else - status = DL_CALL_FCT(fct.l, ()); - } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0); +#define args () +#include "walk_nss.h" +#undef args return status; } @@ -154,28 +140,13 @@ char *buffer, size_t buflen, int *errnop) { - static const char *fct_name = "getspnam_r"; - static void *fct_start = NULL; enum nss_status status; - service_user *nip; - union { - enum nss_status (*l)(const char *name, struct spwd *pwd, - char *buffer, size_t buflen, int *errnop); - void *ptr; - } fct; - - nip = nss_shadow_nonlocal_database(); - if (nip == NULL) - return NSS_STATUS_UNAVAIL; - if (fct_start == NULL) - fct_start = __nss_lookup_function(nip, fct_name); - fct.ptr = fct_start; - do { - if (fct.ptr == NULL) - status = NSS_STATUS_UNAVAIL; - else - status = DL_CALL_FCT(fct.l, (name, pwd, buffer, buflen, errnop)); - if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) - break; - } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0); + const struct walk_nss w = { + .lookup = __nss_shadow_nonlocal_lookup, .fct_name = "getspnam_r", + .status = &status, .errnop = errnop + }; + const __typeof__(&_nss_nonlocal_getspnam_r) self = NULL; +#define args (name, pwd, buffer, buflen, errnop) +#include "walk_nss.h" +#undef args if (status != NSS_STATUS_SUCCESS) return status; Index: trunk/server/common/oursrc/nss_nonlocal/nonlocal.h =================================================================== --- trunk/server/common/oursrc/nss_nonlocal/nonlocal.h (revision 1824) +++ trunk/server/common/oursrc/nss_nonlocal/nonlocal.h (revision 1825) @@ -1,2 +1,27 @@ +/* + * nonlocal.h + * common definitions for nss_nonlocal proxy + * + * Copyright © 2007–2010 Anders Kaseorg and Tim + * Abbott + * + * This file is part of nss_nonlocal. + * + * nss_nonlocal is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * nss_nonlocal is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with nss_nonlocal; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + #ifndef NONLOCAL_H #define NONLOCAL_H @@ -4,7 +29,39 @@ #include "config.h" +#ifdef HAVE_STDBOOL_H +# include +#else +# ifndef HAVE__BOOL +# ifdef __cplusplus +typedef bool _Bool; +# else +# define _Bool signed char +# endif +# endif +# define bool _Bool +# define false 0 +# define true 1 +# define __bool_true_false_are_defined 1 +#endif + +#include "nsswitch-internal.h" +#include + +struct walk_nss { + enum nss_status *status; + int (*lookup)(service_user **ni, const char *fct_name, + void **fctp) internal_function; + const char *fct_name; + int *errnop; + char **buf; + size_t *buflen; +}; + enum nss_status check_nonlocal_uid(const char *user, uid_t uid, int *errnop); -enum nss_status check_nonlocal_gid(const char *user, gid_t gid, int *errnop); +enum nss_status check_nonlocal_gid(const char *user, const char *group, + gid_t gid, int *errnop); enum nss_status check_nonlocal_user(const char *user, int *errnop); +enum nss_status get_nonlocal_passwd(const char *name, struct passwd *pwd, + char **buffer, int *errnop); #define NONLOCAL_IGNORE_ENV "NSS_NONLOCAL_IGNORE" Index: trunk/server/common/oursrc/nss_nonlocal/walk_nss.h =================================================================== --- trunk/server/common/oursrc/nss_nonlocal/walk_nss.h (revision 1825) +++ trunk/server/common/oursrc/nss_nonlocal/walk_nss.h (revision 1825) @@ -0,0 +1,62 @@ +{ + static service_user *startp = NULL; + static void *fct_start = NULL; + + service_user *nip; + union { + __typeof__(self) l; + void *ptr; + } fct; + int old_errno = errno; + + if (fct_start == NULL && + w.lookup(&startp, w.fct_name, &fct_start) != 0) { + *w.status = NSS_STATUS_UNAVAIL; + goto walk_nss_out; + } + + nip = startp; + fct.ptr = fct_start; + + if (w.buf != NULL) { + *w.buf = malloc(*w.buflen); + errno = old_errno; + if (*w.buf == NULL) { + *w.status = NSS_STATUS_TRYAGAIN; + *w.errnop = ENOMEM; + goto walk_nss_out; + } + } + + do { + walk_nss_morebuf: + if (fct.ptr == NULL) + *w.status = NSS_STATUS_UNAVAIL; + else if (self != NULL && fct.l == self) + *w.status = NSS_STATUS_NOTFOUND; + else + *w.status = DL_CALL_FCT(fct.l, args); + if (*w.status == NSS_STATUS_TRYAGAIN && + w.errnop != NULL && *w.errnop == ERANGE) { + if (w.buf == NULL) + break; + free(*w.buf); + *w.buflen *= 2; + *w.buf = malloc(*w.buflen); + errno = old_errno; + if (*w.buf == NULL) { + *w.errnop = ENOMEM; + goto walk_nss_out; + } + goto walk_nss_morebuf; + } + } while (__nss_next(&nip, w.fct_name, &fct.ptr, *w.status, 0) == 0); + + if (w.buf != NULL && *w.status != NSS_STATUS_SUCCESS) { + free(*w.buf); + *w.buf = NULL; + } + + walk_nss_out: + ; +} Index: trunk/server/fedora/specs/nss_nonlocal.spec =================================================================== --- trunk/server/fedora/specs/nss_nonlocal.spec (revision 1824) +++ trunk/server/fedora/specs/nss_nonlocal.spec (revision 1825) @@ -2,5 +2,5 @@ Group: System Environment/Libraries Name: nss_nonlocal -Version: 1.11 +Version: 2.0 Release: 1 URL: http://debathena.mit.edu/nss_nonlocal/ @@ -11,4 +11,5 @@ Source: %{name}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires(pre): shadow-utils %description @@ -47,6 +48,10 @@ %pre -groupadd -r nss-local-users || : -groupadd -r nss-nonlocal-users || : +getent passwd nss-nonlocal-users >/dev/null || \ + useradd -r -g nobody -d / -s /sbin/nologin \ + -c 'Magic user for local group whitelist' nss-nonlocal-users +getent group nss-local-users || groupadd -r nss-local-users +getent group nss-nonlocal-users || groupadd -r nss-nonlocal-users +exit 0 %post @@ -57,4 +62,7 @@ %changelog + +* Tue Mar 29 2011 Anders Kaseorg 2.0-1 +- New upstream version. * Sun May 2 2010 Anders Kaseorg 1.11-1