X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c95ca2a228ba4ccb7085f481341c7b4a9e8cdc5e..fa3e4a0548699ccaac41df2428fe1ad9d3659435:/clientserver.c diff --git a/clientserver.c b/clientserver.c index c0ace0c5..3b1567bf 100644 --- a/clientserver.c +++ b/clientserver.c @@ -45,10 +45,12 @@ extern int orig_umask; extern int no_detach; extern int default_af_hint; extern char *bind_address; -extern struct filter_list_struct server_filter_list; +extern char *sockopts; extern char *config_file; extern char *files_from; extern char *tmpdir; +extern struct chmod_mode_struct *chmod_modes; +extern struct filter_list_struct server_filter_list; char *auth_user; int read_only = 0; @@ -59,8 +61,6 @@ int module_id = -1; /* Length of lp_path() string when in daemon mode & not chrooted, else 0. */ unsigned int module_dirlen = 0; -#define MAX_REQ_LEN (MAXPATHLEN + 255) - /** * Run a client connected to an rsyncd. The alternative to this * function for remote-shell connections is do_cmd(). @@ -100,6 +100,8 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) if (fd == -1) exit_cleanup(RERR_SOCKETIO); + set_socket_options(fd, sockopts); + ret = start_inband_exchange(user, path, fd, fd, argc); return ret ? ret : client_run(fd, fd, -1, argc, argv); @@ -218,16 +220,19 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, return 0; } -static char *finish_pre_exec(pid_t pid, int fd, char *request) +static char *finish_pre_exec(pid_t pid, int fd, char *request, + int argc, char *argv[]) { - int status = -1; + int j, status = -1; if (request) { - int len = strlen(request); - if (len > MAX_REQ_LEN) - len = MAX_REQ_LEN; - write(fd, request, len); + write_buf(fd, request, strlen(request)+1); + for (j = 0; j < argc; j++) + write_buf(fd, argv[j], strlen(argv[j])+1); } + + write_byte(fd, 0); + close(fd); if (wait_process(pid, &status, 0) < 0 @@ -240,6 +245,23 @@ static char *finish_pre_exec(pid_t pid, int fd, char *request) return NULL; } +static int read_arg_from_pipe(int fd, char *buf, int limit) +{ + char *bp = buf, *eob = buf + limit - 1; + + while (1) { + if (read(fd, bp, 1) != 1) + return -1; + if (*bp == '\0') + break; + if (bp < eob) + bp++; + } + *bp = '\0'; + + return bp - buf; +} + static int rsync_module(int f_in, int f_out, int i) { int argc = 0; @@ -279,7 +301,7 @@ static int rsync_module(int f_in, int f_out, int i) if (!claim_connection(lp_lock_file(i), lp_max_connections(i))) { if (errno) { rsyserr(FLOG, errno, "failed to open lock file %s", - safe_fname(lp_lock_file(i))); + lp_lock_file(i)); io_printf(f_out, "@ERROR: failed to open lock file\n"); } else { rprintf(FLOG, "max connections (%d) reached\n", @@ -423,18 +445,29 @@ static int rsync_module(int f_in, int f_out, int i) return -1; } if (pre_exec_pid == 0) { - char buf[MAX_REQ_LEN+1]; - int len; + char buf[BIGPATHBUFLEN]; + int j, len; close(fds[1]); set_blocking(fds[0]); - len = read(fds[0], buf, MAX_REQ_LEN); - close(fds[0]); + len = read_arg_from_pipe(fds[0], buf, BIGPATHBUFLEN); if (len <= 0) _exit(1); - buf[len] = '\0'; if (asprintf(&p, "RSYNC_REQUEST=%s", buf) < 0) out_of_memory("rsync_module"); putenv(p); + for (j = 0; ; j++) { + len = read_arg_from_pipe(fds[0], buf, + BIGPATHBUFLEN); + if (len <= 0) { + if (!len) + break; + _exit(1); + } + if (asprintf(&p, "RSYNC_ARG%d=%s", j, buf) < 0) + out_of_memory("rsync_module"); + putenv(p); + } + close(fds[0]); close(STDIN_FILENO); close(STDOUT_FILENO); status = system(lp_prexfer_exec(i)); @@ -465,14 +498,14 @@ static int rsync_module(int f_in, int f_out, int i) */ if (chroot(lp_path(i))) { rsyserr(FLOG, errno, "chroot %s failed", - safe_fname(lp_path(i))); + lp_path(i)); io_printf(f_out, "@ERROR: chroot failed\n"); return -1; } if (!push_dir("/")) { rsyserr(FLOG, errno, "chdir %s failed\n", - safe_fname(lp_path(i))); + lp_path(i)); io_printf(f_out, "@ERROR: chdir failed\n"); return -1; } @@ -480,7 +513,7 @@ static int rsync_module(int f_in, int f_out, int i) } else { if (!push_dir(lp_path(i))) { rsyserr(FLOG, errno, "chdir %s failed\n", - safe_fname(lp_path(i))); + lp_path(i)); io_printf(f_out, "@ERROR: chdir failed\n"); return -1; } @@ -565,7 +598,8 @@ static int rsync_module(int f_in, int f_out, int i) case 1: if (pre_exec_pid) { err_msg = finish_pre_exec(pre_exec_pid, - pre_exec_fd, p); + pre_exec_fd, p, + argc, argv); pre_exec_pid = 0; } request = strdup(p); @@ -578,8 +612,10 @@ static int rsync_module(int f_in, int f_out, int i) } } - if (pre_exec_pid) - err_msg = finish_pre_exec(pre_exec_pid, pre_exec_fd, request); + if (pre_exec_pid) { + err_msg = finish_pre_exec(pre_exec_pid, pre_exec_fd, request, + argc, argv); + } verbose = 0; /* future verbosity is controlled by client options */ ret = parse_arguments(&argc, (const char ***) &argv, 0); @@ -647,6 +683,16 @@ static int rsync_module(int f_in, int f_out, int i) if (lp_timeout(i) && lp_timeout(i) > io_timeout) set_io_timeout(lp_timeout(i)); + + if (am_sender) + p = lp_outgoing_chmod(i); + else + p = lp_incoming_chmod(i); + if (*p && !parse_chmod(p, &chmod_modes)) { + rprintf(FLOG, "Invalid \"%sing chmod\" directive: %s\n", + am_sender ? "outgo" : "incom", p); + } + start_server(f_in, f_out, argc, argv); return 0; @@ -686,7 +732,10 @@ int start_daemon(int f_in, int f_out) if (!am_server) { set_socket_options(f_in, "SO_KEEPALIVE"); - set_socket_options(f_in, lp_socket_options()); + if (sockopts) + set_socket_options(f_in, sockopts); + else + set_socket_options(f_in, lp_socket_options()); set_nonblocking(f_in); } @@ -790,7 +839,7 @@ int daemon_main(void) 0666 & ~orig_umask)) == -1) { cleanup_set_pid(0); rsyserr(FLOG, errno, "failed to create pid file %s", - safe_fname(pid_file)); + pid_file); exit_cleanup(RERR_FILEIO); } snprintf(pidbuf, sizeof pidbuf, "%ld\n", (long)pid);