X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e8d6fe62614f1bd21a41aa779188d9d0ec57de22..820f7a7b57c566f8f1fb25e7e9a96542d2d8c4aa:/clientserver.c diff --git a/clientserver.c b/clientserver.c index b6afe005..8fedbe66 100644 --- a/clientserver.c +++ b/clientserver.c @@ -48,15 +48,13 @@ extern int write_batch; extern int default_af_hint; extern int logfile_format_has_i; extern int logfile_format_has_o_or_i; -extern mode_t orig_umask; extern char *bind_address; extern char *config_file; extern char *logfile_format; extern char *files_from; extern char *tmpdir; extern struct chmod_mode_struct *chmod_modes; -extern struct filter_list_struct daemon_filter_list; -extern char curr_dir[MAXPATHLEN]; +extern filter_rule_list daemon_filter_list; #ifdef ICONV_OPTION extern char *iconv_opt; extern iconv_t ic_send, ic_recv; @@ -166,7 +164,7 @@ static int exchange_protocols(int f_in, int f_out, char *buf, size_t bufsiz, int } /* This strips the \n. */ - if (!read_line_old(f_in, buf, bufsiz)) { + if (!read_line_old(f_in, buf, bufsiz, 0)) { if (am_client) rprintf(FERROR, "rsync: did not see server greeting\n"); return -1; @@ -267,7 +265,10 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char if (strncmp(*argv, modname, modlen) == 0 && argv[0][modlen] == '\0') sargs[sargc++] = modname; /* we send "modname/" */ - else + else if (**argv == '-') { + if (asprintf(sargs + sargc++, "./%s", *argv) < 0) + out_of_memory("start_inband_exchange"); + } else sargs[sargc++] = *argv; argv++; argc--; @@ -285,7 +286,7 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char kluge_around_eof = list_only && protocol_version < 25 ? 1 : 0; while (1) { - if (!read_line_old(f_in, line, sizeof line)) { + if (!read_line_old(f_in, line, sizeof line, 0)) { rprintf(FERROR, "rsync: didn't get server startup line\n"); return -1; } @@ -339,7 +340,7 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char if (protocol_version < 23) { if (protocol_version == 22 || !am_sender) - io_start_multiplex_in(); + io_start_multiplex_in(f_in); } free(modname); @@ -347,41 +348,57 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char return 0; } -static char *finish_pre_exec(pid_t pid, int fd, char *request, +static char *finish_pre_exec(pid_t pid, int write_fd, int read_fd, char *request, char **early_argv, char **argv) { - int j = 0, status = -1; + char buf[BIGPATHBUFLEN], *bp; + int j = 0, status = -1, msglen = sizeof buf - 1; if (!request) request = "(NONE)"; - write_buf(fd, request, strlen(request)+1); + write_buf(write_fd, request, strlen(request)+1); if (early_argv) { for ( ; *early_argv; early_argv++) - write_buf(fd, *early_argv, strlen(*early_argv)+1); + write_buf(write_fd, *early_argv, strlen(*early_argv)+1); j = 1; /* Skip arg0 name in argv. */ } for ( ; argv[j]; j++) { - write_buf(fd, argv[j], strlen(argv[j])+1); + write_buf(write_fd, argv[j], strlen(argv[j])+1); if (argv[j][0] == '.' && argv[j][1] == '\0') break; } - write_byte(fd, 0); + write_byte(write_fd, 0); + + close(write_fd); + + /* Read the stdout from the pre-xfer exec program. This it is only + * displayed to the user if the script also returns an error status. */ + for (bp = buf; msglen > 0 && (j = read(read_fd, bp, msglen)) > 0; msglen -= j) { + bp += j; + if (j > 1 && bp[-1] == '\n' && bp[-2] == '\r') { + bp--; + j--; + bp[-1] = '\n'; + } + } + *bp = '\0'; - close(fd); + close(read_fd); if (wait_process(pid, &status, 0) < 0 || !WIFEXITED(status) || WEXITSTATUS(status) != 0) { char *e; - if (asprintf(&e, "pre-xfer exec returned failure (%d)%s%s\n", + if (asprintf(&e, "pre-xfer exec returned failure (%d)%s%s\n%s", status, status < 0 ? ": " : "", - status < 0 ? strerror(errno) : "") < 0) - out_of_memory("finish_pre_exec"); + status < 0 ? strerror(errno) : "", buf) < 0) + return "out_of_memory in finish_pre_exec\n"; return e; } return NULL; } +#ifdef HAVE_PUTENV static int read_arg_from_pipe(int fd, char *buf, int limit) { char *bp = buf, *eob = buf + limit - 1; @@ -402,6 +419,7 @@ static int read_arg_from_pipe(int fd, char *buf, int limit) return bp - buf; } +#endif static int path_failure(int f_out, const char *dir, BOOL was_chdir) { @@ -416,13 +434,10 @@ static int path_failure(int f_out, const char *dir, BOOL was_chdir) static int add_a_group(int f_out, const char *gname) { gid_t gid; - if (!name_to_gid(gname, &gid)) { - if (!isDigit(gname)) { - rprintf(FLOG, "Invalid gid %s\n", gname); - io_printf(f_out, "@ERROR: invalid gid %s\n", gname); - return -1; - } - gid = atol(gname); + if (!group_to_gid(gname, &gid, True)) { + rprintf(FLOG, "Invalid gid %s\n", gname); + io_printf(f_out, "@ERROR: invalid gid %s\n", gname); + return -1; } if (gid_count == MAX_GID_LIST) { rprintf(FLOG, "Too many groups specified via gid parameter.\n"); @@ -433,63 +448,74 @@ static int add_a_group(int f_out, const char *gname) return 0; } +#ifdef HAVE_GETGROUPLIST +static int want_all_groups(int f_out, uid_t uid) +{ + const char *err; + gid_count = MAX_GID_LIST; + if ((err = getallgroups(uid, gid_list, &gid_count)) != NULL) { + rsyserr(FLOG, errno, "%s", err); + io_printf(f_out, "@ERROR: %s\n", err); + return -1; + } + return 0; +} +#elif defined HAVE_INITGROUPS static struct passwd *want_all_groups(int f_out, uid_t uid) { -#if defined HAVE_GETGROUPLIST || defined HAVE_INITGROUPS struct passwd *pw; if ((pw = getpwuid(uid)) == NULL) { rsyserr(FLOG, errno, "getpwuid failed"); io_printf(f_out, "@ERROR: getpwuid failed\n"); return NULL; } -# ifdef HAVE_GETGROUPLIST - /* Get all the process's groups, with the pw_gid group first. */ - gid_count = MAX_GID_LIST; - if (getgrouplist(pw->pw_name, pw->pw_gid, gid_list, &gid_count) < 0) { - rsyserr(FLOG, errno, "getgrouplist failed"); - io_printf(f_out, "@ERROR: getgrouplist failed\n"); - return NULL; - } - /* Paranoia: is the default group not first in the list? */ - if (gid_list[0] != pw->pw_gid) { - int j; - for (j = 0; j < gid_count; j++) { - if (gid_list[j] == pw->pw_gid) { - gid_list[j] = gid_list[0]; - gid_list[0] = pw->pw_gid; - break; - } - } - } -# else /* Start with the default group and initgroups() will add the reset. */ gid_count = 1; gid_list[0] = pw->pw_gid; -# endif return pw; -#else - rprintf(FLOG, "This rsync does not support a gid of \"*\"\n"); - io_printf(f_out, "@ERROR: invalid gid setting.\n"); - return NULL; +} +#endif + +static void set_env_str(const char *var, const char *str) +{ +#ifdef HAVE_PUTENV + char *mem; + if (asprintf(&mem, "%s=%s", var, str) < 0) + out_of_memory("set_env_str"); + putenv(mem); #endif } +#ifdef HAVE_PUTENV +static void set_env_num(const char *var, long num) +{ + char *mem; + if (asprintf(&mem, "%s=%ld", var, num) < 0) + out_of_memory("set_env_num"); + putenv(mem); +} +#endif + static int rsync_module(int f_in, int f_out, int i, const char *addr, const char *host) { int argc; char **argv, **orig_argv, **orig_early_argv, *module_chdir; char line[BIGPATHBUFLEN]; +#if defined HAVE_INITGROUPS && !defined HAVE_GETGROUPLIST struct passwd *pw = NULL; +#endif uid_t uid; int set_uid; char *p, *err_msg = NULL; char *name = lp_name(i); int use_chroot = lp_use_chroot(i); - int ret, pre_exec_fd = -1; + int ret, pre_exec_arg_fd = -1, pre_exec_error_fd = -1; int save_munge_symlinks; pid_t pre_exec_pid = 0; char *request = NULL; + set_env_str("RSYNC_MODULE_NAME", name); + #ifdef ICONV_OPTION iconv_opt = lp_charset(i); if (*iconv_opt) @@ -501,8 +527,10 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char * we need to do it now before the access check. */ if (host == undetermined_hostname && lp_reverse_lookup(i)) host = client_name(f_in); + set_env_str("RSYNC_HOST_NAME", host); + set_env_str("RSYNC_HOST_ADDR", addr); - if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) { + if (!allow_access(addr, &host, i)) { rprintf(FLOG, "rsync denied on module %s from %s (%s)\n", name, host, addr); if (!lp_list(i)) @@ -534,18 +562,17 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char return -1; } + read_only = lp_read_only(i); /* may also be overridden by auth_server() */ auth_user = auth_server(f_in, f_out, i, host, addr, "@RSYNCD: AUTHREQD "); if (!auth_user) { io_printf(f_out, "@ERROR: auth failed on module %s\n", name); return -1; } + set_env_str("RSYNC_USER_NAME", auth_user); module_id = i; - if (lp_read_only(i)) - read_only = 1; - if (lp_transfer_logging(i) && !logfile_format) logfile_format = lp_log_format(i); if (log_format_has(logfile_format, 'i')) @@ -558,13 +585,10 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char p = *lp_uid(i) ? lp_uid(i) : am_root ? NOBODY_USER : NULL; if (p) { - if (!name_to_uid(p, &uid)) { - if (!isDigit(p)) { - rprintf(FLOG, "Invalid uid %s\n", p); - io_printf(f_out, "@ERROR: invalid uid %s\n", p); - return -1; - } - uid = atol(p); + if (!user_to_uid(p, &uid, True)) { + rprintf(FLOG, "Invalid uid %s\n", p); + io_printf(f_out, "@ERROR: invalid uid %s\n", p); + return -1; } set_uid = 1; } else @@ -574,8 +598,17 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char if (p) { /* The "*" gid must be the first item in the list. */ if (strcmp(p, "*") == 0) { +#ifdef HAVE_GETGROUPLIST + if (want_all_groups(f_out, uid) < 0) + return -1; +#elif defined HAVE_INITGROUPS if ((pw = want_all_groups(f_out, uid)) == NULL) return -1; +#else + rprintf(FLOG, "This rsync does not support a gid of \"*\"\n"); + io_printf(f_out, "@ERROR: invalid gid setting.\n"); + return -1; +#endif } else if (add_a_group(f_out, p) < 0) return -1; while ((p = strtok(NULL, ", ")) != NULL) { @@ -595,6 +628,11 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char } module_dir = lp_path(i); + if (*module_dir == '\0') { + rprintf(FLOG, "No path specified for module %s\n", name); + io_printf(f_out, "@ERROR: no path setting.\n"); + return -1; + } if (use_chroot) { if ((p = strstr(module_dir, "/./")) != NULL) { *p = '\0'; /* Temporary... */ @@ -618,6 +656,7 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char return path_failure(f_out, module_dir, False); full_module_path = module_dir = module_chdir; } + set_env_str("RSYNC_MODULE_PATH", full_module_path); if (module_dirlen == 1) { module_dirlen = 0; @@ -626,45 +665,32 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char set_filter_dir(module_dir, module_dirlen); p = lp_filter(i); - parse_rule(&daemon_filter_list, p, MATCHFLG_WORD_SPLIT, + parse_filter_str(&daemon_filter_list, p, rule_template(FILTRULE_WORD_SPLIT), XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3); p = lp_include_from(i); - parse_filter_file(&daemon_filter_list, p, MATCHFLG_INCLUDE, + parse_filter_file(&daemon_filter_list, p, rule_template(FILTRULE_INCLUDE), XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS); p = lp_include(i); - parse_rule(&daemon_filter_list, p, - MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT, + parse_filter_str(&daemon_filter_list, p, + rule_template(FILTRULE_INCLUDE | FILTRULE_WORD_SPLIT), XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES); p = lp_exclude_from(i); - parse_filter_file(&daemon_filter_list, p, 0, + parse_filter_file(&daemon_filter_list, p, rule_template(0), XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS); p = lp_exclude(i); - parse_rule(&daemon_filter_list, p, MATCHFLG_WORD_SPLIT, + parse_filter_str(&daemon_filter_list, p, rule_template(FILTRULE_WORD_SPLIT), XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES); log_init(1); #ifdef HAVE_PUTENV if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) { - char *modname, *modpath, *hostaddr, *hostname, *username; int status; - if (asprintf(&modname, "RSYNC_MODULE_NAME=%s", name) < 0 - || asprintf(&modpath, "RSYNC_MODULE_PATH=%s", full_module_path) < 0 - || asprintf(&hostaddr, "RSYNC_HOST_ADDR=%s", addr) < 0 - || asprintf(&hostname, "RSYNC_HOST_NAME=%s", host) < 0 - || asprintf(&username, "RSYNC_USER_NAME=%s", auth_user) < 0) - out_of_memory("rsync_module"); - putenv(modname); - putenv(modpath); - putenv(hostaddr); - putenv(hostname); - putenv(username); - umask(orig_umask); /* For post-xfer exec, fork a new process to run the rsync * daemon while this process waits for the exit status and * runs the indicated command at that point. */ @@ -676,18 +702,18 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char return -1; } if (pid) { - if (asprintf(&p, "RSYNC_PID=%ld", (long)pid) > 0) - putenv(p); + close(f_in); + if (f_out != f_in) + close(f_out); + set_env_num("RSYNC_PID", (long)pid); if (wait_process(pid, &status, 0) < 0) status = -1; - if (asprintf(&p, "RSYNC_RAW_STATUS=%d", status) > 0) - putenv(p); + set_env_num("RSYNC_RAW_STATUS", status); if (WIFEXITED(status)) status = WEXITSTATUS(status); else status = -1; - if (asprintf(&p, "RSYNC_EXIT_STATUS=%d", status) > 0) - putenv(p); + set_env_num("RSYNC_EXIT_STATUS", status); if (system(lp_postxfer_exec(i)) < 0) status = -1; _exit(status); @@ -697,10 +723,9 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char * command, though it first waits for the parent process to * send us the user's request via a pipe. */ if (*lp_prexfer_exec(i)) { - int fds[2]; - if (asprintf(&p, "RSYNC_PID=%ld", (long)getpid()) > 0) - putenv(p); - if (pipe(fds) < 0 || (pre_exec_pid = fork()) < 0) { + int arg_fds[2], error_fds[2]; + set_env_num("RSYNC_PID", (long)getpid()); + if (pipe(arg_fds) < 0 || pipe(error_fds) < 0 || (pre_exec_pid = fork()) < 0) { rsyserr(FLOG, errno, "pre-xfer exec preparation failed"); io_printf(f_out, "@ERROR: pre-xfer exec preparation failed\n"); return -1; @@ -708,15 +733,18 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char if (pre_exec_pid == 0) { char buf[BIGPATHBUFLEN]; int j, len; - close(fds[1]); - set_blocking(fds[0]); - len = read_arg_from_pipe(fds[0], buf, BIGPATHBUFLEN); + close(arg_fds[1]); + close(error_fds[0]); + pre_exec_arg_fd = arg_fds[0]; + pre_exec_error_fd = error_fds[1]; + set_blocking(pre_exec_arg_fd); + set_blocking(pre_exec_error_fd); + len = read_arg_from_pipe(pre_exec_arg_fd, buf, BIGPATHBUFLEN); if (len <= 0) _exit(1); - if (asprintf(&p, "RSYNC_REQUEST=%s", buf) > 0) - putenv(p); + set_env_str("RSYNC_REQUEST", buf); for (j = 0; ; j++) { - len = read_arg_from_pipe(fds[0], buf, + len = read_arg_from_pipe(pre_exec_arg_fd, buf, BIGPATHBUFLEN); if (len <= 0) { if (!len) @@ -726,19 +754,22 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char if (asprintf(&p, "RSYNC_ARG%d=%s", j, buf) > 0) putenv(p); } - close(fds[0]); + close(pre_exec_arg_fd); close(STDIN_FILENO); - close(STDOUT_FILENO); + dup2(pre_exec_error_fd, STDOUT_FILENO); + close(pre_exec_error_fd); status = system(lp_prexfer_exec(i)); if (!WIFEXITED(status)) _exit(1); _exit(WEXITSTATUS(status)); } - close(fds[0]); - set_blocking(fds[1]); - pre_exec_fd = fds[1]; + close(arg_fds[0]); + close(error_fds[1]); + pre_exec_arg_fd = arg_fds[1]; + pre_exec_error_fd = error_fds[0]; + set_blocking(pre_exec_arg_fd); + set_blocking(pre_exec_error_fd); } - umask(0); } #endif @@ -807,7 +838,11 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char } if (set_uid) { - if (setuid(uid)) { + if (setuid(uid) < 0 +#ifdef HAVE_SETEUID + || seteuid(uid) < 0 +#endif + ) { rsyserr(FLOG, errno, "setuid %ld failed", (long)uid); io_printf(f_out, "@ERROR: setuid failed\n"); return -1; @@ -847,8 +882,8 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char munge_symlinks = save_munge_symlinks; /* The client mustn't control this. */ if (pre_exec_pid) { - err_msg = finish_pre_exec(pre_exec_pid, pre_exec_fd, request, - orig_early_argv, orig_argv); + err_msg = finish_pre_exec(pre_exec_pid, pre_exec_arg_fd, pre_exec_error_fd, + request, orig_early_argv, orig_argv); } if (orig_early_argv) @@ -891,7 +926,7 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char if (protocol_version < 23 && (protocol_version == 22 || am_sender)) - io_start_multiplex_out(); + io_start_multiplex_out(f_out); else if (!ret || err_msg) { /* We have to get I/O multiplexing started so that we can * get the error back to the client. This means getting @@ -915,13 +950,19 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char if (files_from) write_byte(f_out, 0); } - io_start_multiplex_out(); + io_start_multiplex_out(f_out); } if (!ret || err_msg) { - if (err_msg) - rwrite(FERROR, err_msg, strlen(err_msg), 0); - else + if (err_msg) { + while ((p = strchr(err_msg, '\n')) != NULL) { + int len = p - err_msg + 1; + rwrite(FERROR, err_msg, len, 0); + err_msg += len; + } + if (*err_msg) + rprintf(FERROR, "%s\n", err_msg); + } else option_error(); msleep(400); exit_cleanup(RERR_UNSUPPORTED); @@ -944,7 +985,7 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char && (use_chroot ? lp_numeric_ids(i) != False : lp_numeric_ids(i) == True)) numeric_ids = -1; /* Set --numeric-ids w/o breaking protocol. */ - if (lp_timeout(i) && lp_timeout(i) > io_timeout) + if (lp_timeout(i) && (!io_timeout || lp_timeout(i) < io_timeout)) set_io_timeout(lp_timeout(i)); /* If we have some incoming/outgoing chmod changes, append them to @@ -1023,7 +1064,7 @@ int start_daemon(int f_in, int f_out) return -1; line[0] = 0; - if (!read_line_old(f_in, line, sizeof line)) + if (!read_line_old(f_in, line, sizeof line, 0)) return -1; if (!*line || strcmp(line, "#list") == 0) { @@ -1065,7 +1106,7 @@ static void create_pid_file(void) return; cleanup_set_pid(pid); - if ((fd = do_open(pid_file, O_WRONLY|O_CREAT|O_EXCL, 0666 & ~orig_umask)) == -1) { + if ((fd = do_open(pid_file, O_WRONLY|O_CREAT|O_EXCL, 0666)) == -1) { failure: cleanup_set_pid(0); fprintf(stderr, "failed to create pid file %s: %s\n", pid_file, strerror(errno));