X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fidmapd%2Fidmapd.c;h=6b5971cad526aa86e472937f8af9492fb323fb45;hp=c8ce6b2db54e305d6cf57aeb8541584490b44e7f;hb=bcd0fcaf0966c546da5043be700587f73174ae25;hpb=a07343ee0da4f0974a23b673ae1b0d482c7426a1 diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c index c8ce6b2..6b5971c 100644 --- a/utils/idmapd/idmapd.c +++ b/utils/idmapd/idmapd.c @@ -55,7 +55,6 @@ #include #include #include -#include #include #include #include @@ -66,6 +65,7 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ +#include "xlog.h" #include "cfg.h" #include "queue.h" #include "nfslib.h" @@ -137,15 +137,16 @@ static void imconv(struct idmap_client *, struct idmap_msg *); static void idtonameres(struct idmap_msg *); static void nametoidres(struct idmap_msg *); -static int nfsdopen(); +static int nfsdopen(void); static int nfsdopenone(struct idmap_client *); static void nfsdreopen(void); size_t strlcat(char *, const char *, size_t); size_t strlcpy(char *, const char *, size_t); -ssize_t atomicio(ssize_t (*)(), int, void *, size_t); +ssize_t atomicio(ssize_t (*f) (int, void*, size_t), + int, void *, size_t); void mydaemon(int, int); -void release_parent(); +void release_parent(void); static int verbose = 0; #define DEFAULT_IDMAP_CACHE_EXPIRY 600 /* seconds */ @@ -186,71 +187,6 @@ flush_nfsd_idmap_cache(void) return ret; } -static void -msg_format(char *rtnbuff, int rtnbuffsize, int errval, - const char *fmt, va_list args) -{ - char buff[1024]; - int n; - - vsnprintf(buff, sizeof(buff), fmt, args); - - if ((n = strlen(buff)) > 0 && buff[n-1] == '\n') - buff[--n] = '\0'; - - snprintf(rtnbuff, rtnbuffsize, "%s: %s", buff, strerror(errval)); -} - -static void -idmapd_warn(const char *fmt, ...) -{ - int errval = errno; /* save this! */ - char buff[1024]; - va_list args; - - va_start(args, fmt); - msg_format(buff, sizeof(buff), errval, fmt, args); - va_end(args); - - syslog(LOG_WARNING, "%s", buff); -} - -static void -idmapd_warnx(const char *fmt, ...) -{ - va_list args; - - va_start(args, fmt); - vsyslog(LOG_WARNING, fmt, args); - va_end(args); -} - -static void -idmapd_err(int eval, const char *fmt, ...) -{ - int errval = errno; /* save this! */ - char buff[1024]; - va_list args; - - va_start(args, fmt); - msg_format(buff, sizeof(buff), errval, fmt, args); - va_end(args); - - syslog(LOG_ERR, "%s", buff); - exit(eval); -} - -static void -idmapd_errx(int eval, const char *fmt, ...) -{ - va_list args; - - va_start(args, fmt); - vsyslog(LOG_ERR, fmt, args); - va_end(args); - exit(eval); -} - int main(int argc, char **argv) { @@ -275,7 +211,7 @@ main(int argc, char **argv) progname++; else progname = argv[0]; - openlog(progname, LOG_PID, LOG_DAEMON); + xlog_open(progname); #define GETOPTSTR "vfd:p:U:G:c:CS" opterr=0; /* Turn off error messages */ @@ -346,7 +282,7 @@ main(int argc, char **argv) nobodygid = gr->gr_gid; #ifdef HAVE_NFS4_SET_DEBUG - nfs4_set_debug(verbose, idmapd_warnx); + nfs4_set_debug(verbose, xlog_warn); #endif if (conf_path == NULL) conf_path = _PATH_IDMAPDCONF; @@ -359,15 +295,14 @@ main(int argc, char **argv) event_init(); if (verbose > 0) - idmapd_warnx("Expiration time is %d seconds.", + xlog_warn("Expiration time is %d seconds.", cache_entry_expiration); if (serverstart) { nfsdret = nfsdopen(); if (nfsdret == 0) { ret = flush_nfsd_idmap_cache(); if (ret) - idmapd_errx(1, - "main: Failed to flush nfsd idmap cache\n"); + xlog_err("main: Failed to flush nfsd idmap cache\n: %s", strerror(errno)); } } @@ -382,7 +317,7 @@ main(int argc, char **argv) char timeout_buf[12]; if ((timeout_fd = open(CLIENT_CACHE_TIMEOUT_FILE, O_RDWR)) == -1) { - idmapd_warnx("Unable to open '%s' to set " + xlog_warn("Unable to open '%s' to set " "client cache expiration time " "to %d seconds\n", CLIENT_CACHE_TIMEOUT_FILE, @@ -391,7 +326,7 @@ main(int argc, char **argv) len = snprintf(timeout_buf, sizeof(timeout_buf), "%d", cache_entry_expiration); if ((write(timeout_fd, timeout_buf, len)) != len) - idmapd_warnx("Error writing '%s' to " + xlog_warn("Error writing '%s' to " "'%s' to set client " "cache expiration time\n", timeout_buf, @@ -401,14 +336,14 @@ main(int argc, char **argv) } if ((fd = open(pipefsdir, O_RDONLY)) == -1) - idmapd_err(1, "main: open(%s)", pipefsdir); + xlog_err("main: open(%s): %s", pipefsdir, strerror(errno)); if (fcntl(fd, F_SETSIG, SIGUSR1) == -1) - idmapd_err(1, "main: fcntl(%s)", pipefsdir); + xlog_err("main: fcntl(%s): %s", pipefsdir, strerror(errno)); if (fcntl(fd, F_NOTIFY, DN_CREATE | DN_DELETE | DN_MODIFY | DN_MULTISHOT) == -1) - idmapd_err(1, "main: fcntl(%s)", pipefsdir); + xlog_err("main: fcntl(%s): %s", pipefsdir, strerror(errno)); TAILQ_INIT(&icq); @@ -428,12 +363,12 @@ main(int argc, char **argv) } if (nfsdret != 0 && fd == 0) - idmapd_errx(1, "main: Neither NFS client nor NFSd found"); + xlog_err("main: Neither NFS client nor NFSd found"); release_parent(); if (event_dispatch() < 0) - idmapd_errx(1, "main: event_dispatch returns errno %d (%s)", + xlog_err("main: event_dispatch returns errno %d (%s)", errno, strerror(errno)); /* NOTREACHED */ return 1; @@ -444,13 +379,13 @@ dirscancb(int fd, short which, void *data) { int nent, i; struct dirent **ents; - struct idmap_client *ic; + struct idmap_client *ic, *nextic; char path[PATH_MAX]; struct idmap_clientq *icq = data; nent = scandir(pipefsdir, &ents, NULL, alphasort); if (nent == -1) { - idmapd_warn("dirscancb: scandir(%s)", pipefsdir); + xlog_warn("dirscancb: scandir(%s): %s", pipefsdir, strerror(errno)); return; } @@ -464,7 +399,7 @@ dirscancb(int fd, short which, void *data) goto next; if ((ic = calloc(1, sizeof(*ic))) == NULL) - return; + goto out; strlcpy(ic->ic_clid, ents[i]->d_name + 4, sizeof(ic->ic_clid)); path[0] = '\0'; @@ -472,21 +407,21 @@ dirscancb(int fd, short which, void *data) pipefsdir, ents[i]->d_name); if ((ic->ic_dirfd = open(path, O_RDONLY, 0)) == -1) { - idmapd_warn("dirscancb: open(%s)", path); + xlog_warn("dirscancb: open(%s): %s", path, strerror(errno)); free(ic); - return; + goto out; } strlcat(path, "/idmap", sizeof(path)); strlcpy(ic->ic_path, path, sizeof(ic->ic_path)); if (verbose > 0) - idmapd_warnx("New client: %s", ic->ic_clid); + xlog_warn("New client: %s", ic->ic_clid); if (nfsopen(ic) == -1) { close(ic->ic_dirfd); free(ic); - return; + goto out; } ic->ic_id = "Client"; @@ -498,20 +433,28 @@ dirscancb(int fd, short which, void *data) } } - TAILQ_FOREACH(ic, icq, ic_next) { + ic = TAILQ_FIRST(icq); + while(ic != NULL) { + nextic=TAILQ_NEXT(ic, ic_next); if (!ic->ic_scanned) { event_del(&ic->ic_event); close(ic->ic_fd); close(ic->ic_dirfd); TAILQ_REMOVE(icq, ic, ic_next); if (verbose > 0) { - idmapd_warnx("Stale client: %s", ic->ic_clid); - idmapd_warnx("\t-> closed %s", ic->ic_path); + xlog_warn("Stale client: %s", ic->ic_clid); + xlog_warn("\t-> closed %s", ic->ic_path); } free(ic); } else ic->ic_scanned = 0; + ic = nextic; } + +out: + for (i = 0; i < nent; i++) + free(ents[i]); + free(ents); return; } @@ -541,7 +484,8 @@ nfsdcb(int fd, short which, void *data) struct idmap_client *ic = data; struct idmap_msg im; u_char buf[IDMAP_MAXMSGSZ + 1]; - size_t len, bsiz; + size_t len; + ssize_t bsiz; char *bp, typebuf[IDMAP_MAXMSGSZ], buf1[IDMAP_MAXMSGSZ], authbuf[IDMAP_MAXMSGSZ], *p; unsigned long tmp; @@ -550,7 +494,7 @@ nfsdcb(int fd, short which, void *data) goto out; if ((len = read(ic->ic_fd, buf, sizeof(buf))) <= 0) { - idmapd_warnx("nfsdcb: read(%s) failed: errno %d (%s)", + xlog_warn("nfsdcb: read(%s) failed: errno %d (%s)", ic->ic_path, len?errno:0, len?strerror(errno):"End of File"); goto out; @@ -558,21 +502,21 @@ nfsdcb(int fd, short which, void *data) /* Get rid of newline and terminate buffer*/ buf[len - 1] = '\0'; - bp = buf; + bp = (char *)buf; memset(&im, 0, sizeof(im)); /* Authentication name -- ignored for now*/ if (getfield(&bp, authbuf, sizeof(authbuf)) == -1) { - idmapd_warnx("nfsdcb: bad authentication name in upcall\n"); + xlog_warn("nfsdcb: bad authentication name in upcall\n"); return; } if (getfield(&bp, typebuf, sizeof(typebuf)) == -1) { - idmapd_warnx("nfsdcb: bad type in upcall\n"); + xlog_warn("nfsdcb: bad type in upcall\n"); return; } if (verbose > 0) - idmapd_warnx("nfsdcb: authbuf=%s authtype=%s", + xlog_warn("nfsdcb: authbuf=%s authtype=%s", authbuf, typebuf); im.im_type = strcmp(typebuf, "user") == 0 ? @@ -582,33 +526,33 @@ nfsdcb(int fd, short which, void *data) case IC_NAMEID: im.im_conv = IDMAP_CONV_NAMETOID; if (getfield(&bp, im.im_name, sizeof(im.im_name)) == -1) { - idmapd_warnx("nfsdcb: bad name in upcall\n"); + xlog_warn("nfsdcb: bad name in upcall\n"); return; } break; case IC_IDNAME: im.im_conv = IDMAP_CONV_IDTONAME; if (getfield(&bp, buf1, sizeof(buf1)) == -1) { - idmapd_warnx("nfsdcb: bad id in upcall\n"); + xlog_warn("nfsdcb: bad id in upcall\n"); return; } tmp = strtoul(buf1, (char **)NULL, 10); im.im_id = (u_int32_t)tmp; if ((tmp == ULONG_MAX && errno == ERANGE) || (unsigned long)im.im_id != tmp) { - idmapd_warnx("nfsdcb: id '%s' too big!\n", buf1); + xlog_warn("nfsdcb: id '%s' too big!\n", buf1); return; } break; default: - idmapd_warnx("nfsdcb: Unknown which type %d", ic->ic_which); + xlog_warn("nfsdcb: Unknown which type %d", ic->ic_which); return; } imconv(ic, &im); buf[0] = '\0'; - bp = buf; + bp = (char *)buf; bsiz = sizeof(buf); /* Authentication name */ @@ -625,10 +569,18 @@ nfsdcb(int fd, short which, void *data) snprintf(buf1, sizeof(buf1), "%lu", time(NULL) + cache_entry_expiration); addfield(&bp, &bsiz, buf1); - /* ID */ - snprintf(buf1, sizeof(buf1), "%u", im.im_id); - addfield(&bp, &bsiz, buf1); + /* Note that we don't want to write the id if the mapping + * failed; instead, by leaving it off, we write a negative + * cache entry which will result in an error returned to + * the client. We don't want a chown or setacl referring + * to an unknown user to result in giving permissions to + * "nobody"! */ + if (im.im_status == IDMAP_STATUS_SUCCESS) { + /* ID */ + snprintf(buf1, sizeof(buf1), "%u", im.im_id); + addfield(&bp, &bsiz, buf1); + } //if (bsiz == sizeof(buf)) /* XXX */ bp[-1] = '\n'; @@ -645,6 +597,8 @@ nfsdcb(int fd, short which, void *data) snprintf(buf1, sizeof(buf1), "%lu", time(NULL) + cache_entry_expiration); addfield(&bp, &bsiz, buf1); + /* Note we're ignoring the status field in this case; we'll + * just map to nobody instead. */ /* Name */ addfield(&bp, &bsiz, im.im_name); @@ -652,14 +606,14 @@ nfsdcb(int fd, short which, void *data) break; default: - idmapd_warnx("nfsdcb: Unknown which type %d", ic->ic_which); + xlog_warn("nfsdcb: Unknown which type %d", ic->ic_which); return; } bsiz = sizeof(buf) - bsiz; - if (atomicio(write, ic->ic_fd, buf, bsiz) != bsiz) - idmapd_warnx("nfsdcb: write(%s) failed: errno %d (%s)", + if (atomicio((void*)write, ic->ic_fd, buf, bsiz) != bsiz) + xlog_warn("nfsdcb: write(%s) failed: errno %d (%s)", ic->ic_path, errno, strerror(errno)); out: @@ -673,7 +627,7 @@ imconv(struct idmap_client *ic, struct idmap_msg *im) case IDMAP_CONV_IDTONAME: idtonameres(im); if (verbose > 1) - idmapd_warnx("%s %s: (%s) id \"%d\" -> name \"%s\"", + xlog_warn("%s %s: (%s) id \"%d\" -> name \"%s\"", ic->ic_id, ic->ic_clid, im->im_type == IDMAP_TYPE_USER ? "user" : "group", im->im_id, im->im_name); @@ -685,13 +639,13 @@ imconv(struct idmap_client *ic, struct idmap_msg *im) } nametoidres(im); if (verbose > 1) - idmapd_warnx("%s %s: (%s) name \"%s\" -> id \"%d\"", + xlog_warn("%s %s: (%s) name \"%s\" -> id \"%d\"", ic->ic_id, ic->ic_clid, im->im_type == IDMAP_TYPE_USER ? "user" : "group", im->im_name, im->im_id); break; default: - idmapd_warnx("imconv: Invalid conversion type (%d) in message", + xlog_warn("imconv: Invalid conversion type (%d) in message", im->im_conv); im->im_status |= IDMAP_STATUS_INVALIDMSG; break; @@ -709,7 +663,7 @@ nfscb(int fd, short which, void *data) if (atomicio(read, ic->ic_fd, &im, sizeof(im)) != sizeof(im)) { if (verbose > 0) - idmapd_warn("nfscb: read(%s)", ic->ic_path); + xlog_warn("nfscb: read(%s): %s", ic->ic_path, strerror(errno)); if (errno == EPIPE) return; goto out; @@ -717,8 +671,15 @@ nfscb(int fd, short which, void *data) imconv(ic, &im); - if (atomicio(write, ic->ic_fd, &im, sizeof(im)) != sizeof(im)) - idmapd_warn("nfscb: write(%s)", ic->ic_path); + /* XXX: I don't like ignoring this error in the id->name case, + * but we've never returned it, and I need to check that the client + * can handle it gracefully before starting to return it now. */ + + if (im.im_status == IDMAP_STATUS_LOOKUPFAIL) + im.im_status = IDMAP_STATUS_SUCCESS; + + if (atomicio((void*)write, ic->ic_fd, &im, sizeof(im)) != sizeof(im)) + xlog_warn("nfscb: write(%s): %s", ic->ic_path, strerror(errno)); out: event_add(&ic->ic_event, NULL); } @@ -729,7 +690,7 @@ nfsdreopen_one(struct idmap_client *ic) int fd; if (verbose > 0) - idmapd_warnx("ReOpening %s", ic->ic_path); + xlog_warn("ReOpening %s", ic->ic_path); if ((fd = open(ic->ic_path, O_RDWR, 0)) != -1) { if ((ic->ic_event.ev_flags & EVLIST_INIT)) @@ -741,7 +702,7 @@ nfsdreopen_one(struct idmap_client *ic) event_set(&ic->ic_event, ic->ic_fd, EV_READ, nfsdcb, ic); event_add(&ic->ic_event, NULL); } else { - idmapd_warnx("nfsdreopen: Opening '%s' failed: errno %d (%s)", + xlog_warn("nfsdreopen: Opening '%s' failed: errno %d (%s)", ic->ic_path, errno, strerror(errno)); } } @@ -755,7 +716,7 @@ nfsdreopen() } static int -nfsdopen() +nfsdopen(void) { return ((nfsdopenone(&nfsd_ic[IC_NAMEID]) == 0 && nfsdopenone(&nfsd_ic[IC_IDNAME]) == 0) ? 0 : -1); @@ -766,7 +727,7 @@ nfsdopenone(struct idmap_client *ic) { if ((ic->ic_fd = open(ic->ic_path, O_RDWR, 0)) == -1) { if (verbose > 0) - idmapd_warnx("nfsdopenone: Opening %s failed: " + xlog_warn("nfsdopenone: Opening %s failed: " "errno %d (%s)", ic->ic_path, errno, strerror(errno)); return (-1); @@ -776,7 +737,7 @@ nfsdopenone(struct idmap_client *ic) event_add(&ic->ic_event, NULL); if (verbose > 0) - idmapd_warnx("Opened %s", ic->ic_path); + xlog_warn("Opened %s", ic->ic_path); return (0); } @@ -792,7 +753,7 @@ nfsopen(struct idmap_client *ic) DN_CREATE | DN_DELETE | DN_MULTISHOT); break; default: - idmapd_warn("nfsopen: open(%s)", ic->ic_path); + xlog_warn("nfsopen: open(%s): %s", ic->ic_path, strerror(errno)); return (-1); } } else { @@ -801,7 +762,7 @@ nfsopen(struct idmap_client *ic) fcntl(ic->ic_dirfd, F_SETSIG, 0); fcntl(ic->ic_dirfd, F_NOTIFY, 0); if (verbose > 0) - idmapd_warnx("Opened %s", ic->ic_path); + xlog_warn("Opened %s", ic->ic_path); } return (0); @@ -836,8 +797,10 @@ idtonameres(struct idmap_msg *im) } break; } - /* XXX Hack? */ - im->im_status = IDMAP_STATUS_SUCCESS; + if (ret) + im->im_status = IDMAP_STATUS_LOOKUPFAIL; + else + im->im_status = IDMAP_STATUS_SUCCESS; } static void @@ -847,30 +810,29 @@ nametoidres(struct idmap_msg *im) gid_t gid; int ret = 0; - /* XXX: nobody fallbacks shouldn't always happen: - * server id -> name should be OK - * client name -> id should be OK - * but not otherwise */ /* XXX: move nobody stuff to library calls * (nfs4_get_nobody_user(domain), nfs4_get_nobody_group(domain)) */ - /* XXX: should make this call higher up in the call chain (so we'd - * have a chance on looking up server/whatever. */ + + im->im_status = IDMAP_STATUS_SUCCESS; + switch (im->im_type) { case IDMAP_TYPE_USER: ret = nfs4_name_to_uid(im->im_name, &uid); im->im_id = (u_int32_t) uid; - if (ret) + if (ret) { + im->im_status = IDMAP_STATUS_LOOKUPFAIL; im->im_id = nobodyuid; - break; + } + return; case IDMAP_TYPE_GROUP: ret = nfs4_name_to_gid(im->im_name, &gid); im->im_id = (u_int32_t) gid; - if (ret) + if (ret) { + im->im_status = IDMAP_STATUS_LOOKUPFAIL; im->im_id = nobodygid; - break; + } + return; } - /* XXX? */ - im->im_status = IDMAP_STATUS_SUCCESS; } static int @@ -886,7 +848,7 @@ validateascii(char *string, u_int32_t len) return (-1); } - if (string[i] != '\0') + if ((i >= len) || string[i] != '\0') return (-1); return (i + 1); @@ -1005,16 +967,21 @@ mydaemon(int nochdir, int noclose) if (noclose == 0) { tempfd = open("/dev/null", O_RDWR); - dup2(tempfd, 0); - dup2(tempfd, 1); - dup2(tempfd, 2); - closeall(3); + if (tempfd < 0) + tempfd = open("/", O_RDONLY); + if (tempfd >= 0) { + dup2(tempfd, 0); + dup2(tempfd, 1); + dup2(tempfd, 2); + closeall(3); + } else + closeall(0); } return; } void -release_parent() +release_parent(void) { int status;