X-Git-Url: http://andersk.mit.edu/gitweb/nss_nonlocal.git/blobdiff_plain/d905b3694128b82d2f9e7dfa5155ee281ac07be2..e40bea7ed12613f7442023989bfc5e75fe242e91:/nonlocal-group.c diff --git a/nonlocal-group.c b/nonlocal-group.c index 085fafd..c7903bd 100644 --- a/nonlocal-group.c +++ b/nonlocal-group.c @@ -2,28 +2,25 @@ * nonlocal-group.c * group database for nss_nonlocal proxy * - * Copyright © 2007 Anders Kaseorg and Tim Abbott - * + * Copyright © 2007–2010 Anders Kaseorg and Tim + * Abbott * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: + * This file is part of nss_nonlocal. * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. + * 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. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. + * 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 */ #define _GNU_SOURCE @@ -81,7 +78,7 @@ check_nonlocal_gid(const char *user, gid_t gid, int *errnop) struct group gbuf; int old_errno = errno; - int buflen = sysconf(_SC_GETGR_R_SIZE_MAX); + size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX); char *buf = malloc(buflen); if (buf == NULL) { *errnop = ENOMEM; @@ -116,7 +113,7 @@ check_nonlocal_gid(const char *user, gid_t gid, int *errnop) } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0); if (status == NSS_STATUS_SUCCESS) { - syslog(LOG_WARNING, "nss_nonlocal: removing local group %u (%s) from non-local user %s\n", gbuf.gr_gid, gbuf.gr_name, user); + 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; @@ -127,7 +124,26 @@ check_nonlocal_gid(const char *user, gid_t gid, int *errnop) } enum nss_status -get_local_group(const char *name, struct group *grp, char *buffer, size_t buflen, int *errnop) +check_nonlocal_group(const char *user, struct group *grp, int *errnop) +{ + enum nss_status status = NSS_STATUS_SUCCESS; + int old_errno = errno; + char *end; + unsigned long gid; + + 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 (status != NSS_STATUS_SUCCESS) + return status; + + return check_nonlocal_gid(user, grp->gr_gid, errnop); +} + +enum nss_status +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; @@ -139,13 +155,12 @@ get_local_group(const char *name, struct group *grp, char *buffer, size_t buflen char *buffer, size_t buflen, int *errnop); void *ptr; } fct; - struct group gbuf; - int n; + size_t buflen; int old_errno = errno; - int len = sysconf(_SC_GETGR_R_SIZE_MAX); - char *buf = malloc(len); - if (buf == NULL) { + buflen = sysconf(_SC_GETGR_R_SIZE_MAX); + *buffer = malloc(buflen); + if (*buffer == NULL) { *errnop = ENOMEM; errno = old_errno; return NSS_STATUS_TRYAGAIN; @@ -153,7 +168,8 @@ get_local_group(const char *name, struct group *grp, char *buffer, size_t buflen if (fct_start == NULL && __nss_group_lookup(&startp, fct_name, &fct_start) != 0) { - free(buf); + free(*buffer); + *buffer = NULL; return NSS_STATUS_UNAVAIL; } nip = startp; @@ -163,12 +179,12 @@ get_local_group(const char *name, struct group *grp, char *buffer, size_t buflen if (fct.l == _nss_nonlocal_getgrnam_r) status = NSS_STATUS_NOTFOUND; else - status = DL_CALL_FCT(fct.l, (name, &gbuf, buf, len, errnop)); + status = DL_CALL_FCT(fct.l, (name, grp, *buffer, buflen, errnop)); if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) { - free(buf); - len *= 2; - buf = malloc(len); - if (buf == NULL) { + free(*buffer); + buflen *= 2; + *buffer = malloc(buflen); + if (*buffer == NULL) { *errnop = ENOMEM; errno = old_errno; return NSS_STATUS_TRYAGAIN; @@ -177,42 +193,11 @@ get_local_group(const char *name, struct group *grp, char *buffer, size_t buflen } } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0); - if (status != NSS_STATUS_SUCCESS) - goto get_local_group_done; - - n = snprintf(buffer, buflen, "%s", gbuf.gr_name); - if (n < 0 || n >= buflen) { - *errnop = ERANGE; - status = NSS_STATUS_TRYAGAIN; - goto get_local_group_done; + if (status != NSS_STATUS_SUCCESS) { + free(*buffer); + *buffer = NULL; } - grp->gr_name = buffer; - buffer += n; - buflen -= n; - - n = snprintf(buffer, buflen, "%s", gbuf.gr_passwd); - if (n < 0 || n >= buflen) { - *errnop = ERANGE; - status = NSS_STATUS_TRYAGAIN; - goto get_local_group_done; - } - grp->gr_passwd = buffer; - buffer += n; - buflen -= n; - - grp->gr_gid = gbuf.gr_gid; - if (buflen < sizeof(void *)) { - *errnop = ERANGE; - status = NSS_STATUS_TRYAGAIN; - goto get_local_group_done; - } - *(void **)buffer = NULL; - buffer += sizeof(void *); - buflen -= sizeof(void *); - - get_local_group_done: - free(buf); return status; } @@ -311,7 +296,7 @@ _nss_nonlocal_getgrent_r(struct group *grp, char *buffer, size_t buflen, do status = DL_CALL_FCT(grent_fct.l, (grp, buffer, buflen, errnop)); while (status == NSS_STATUS_SUCCESS && - check_nonlocal_gid("(unknown)", grp->gr_gid, &nonlocal_errno) != NSS_STATUS_SUCCESS); + check_nonlocal_group("(unknown)", grp, &nonlocal_errno) != NSS_STATUS_SUCCESS); } if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) return status; @@ -360,7 +345,12 @@ _nss_nonlocal_getgrnam_r(const char *name, struct group *grp, if (status != NSS_STATUS_SUCCESS) return status; - return check_nonlocal_gid(name, grp->gr_gid, errnop); + if (strcmp(name, grp->gr_name) != 0) { + syslog(LOG_ERR, "nss_nonlocal: discarding group %s from lookup for group %s\n", grp->gr_name, name); + return NSS_STATUS_NOTFOUND; + } + + return check_nonlocal_group(name, grp, errnop); } enum nss_status @@ -398,7 +388,12 @@ _nss_nonlocal_getgrgid_r(gid_t gid, struct group *grp, if (status != NSS_STATUS_SUCCESS) return status; - return check_nonlocal_gid(grp->gr_name, grp->gr_gid, errnop); + if (gid != grp->gr_gid) { + syslog(LOG_ERR, "nss_nonlocal: discarding gid %d from lookup for gid %d\n", grp->gr_gid, gid); + return NSS_STATUS_NOTFOUND; + } + + return check_nonlocal_group(grp->gr_name, grp, errnop); } enum nss_status @@ -420,8 +415,9 @@ _nss_nonlocal_initgroups_dyn(const char *user, gid_t group, long int *start, struct group local_users_group, nonlocal_users_group; gid_t local_users_gid, gid; int is_local = 0; - int buflen; char *buffer; + int old_errno; + int in, out, i; /* Check that the user is a nonlocal user before adding any groups. */ status = check_nonlocal_user(user, errnop); @@ -430,52 +426,36 @@ _nss_nonlocal_initgroups_dyn(const char *user, gid_t group, long int *start, else if (status != NSS_STATUS_SUCCESS) is_local = 1; - int old_errno = errno; + 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; - } status = get_local_group(MAGIC_LOCAL_GROUPNAME, - &local_users_group, buffer, buflen, errnop); + &local_users_group, &buffer, errnop); if (status == NSS_STATUS_SUCCESS) { local_users_gid = local_users_group.gr_gid; - } else if (status == NSS_STATUS_TRYAGAIN) { 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; } - free(buffer); if (is_local) { gid = local_users_gid; } else { - buflen = sysconf(_SC_GETGR_R_SIZE_MAX); - buffer = malloc(buflen); - if (buffer == NULL) { - *errnop = ENOMEM; - errno = old_errno; - return NSS_STATUS_TRYAGAIN; - } status = get_local_group(MAGIC_NONLOCAL_GROUPNAME, - &nonlocal_users_group, buffer, buflen, errnop); + &nonlocal_users_group, &buffer, errnop); if (status == NSS_STATUS_SUCCESS) { gid = nonlocal_users_group.gr_gid; - } else if (status == NSS_STATUS_TRYAGAIN) { free(buffer); + } 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; } - free(buffer); } if (gid != -1) { @@ -509,7 +489,7 @@ _nss_nonlocal_initgroups_dyn(const char *user, gid_t group, long int *start, if (is_local) return NSS_STATUS_SUCCESS; - int in = *start, out = *start, i; + in = out = *start; nip = nss_group_nonlocal_database(); if (nip == NULL)