X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/fed1f3f4fe6e91c64912eb3dfb6a095735b5da6e..0f78b81511be65d8fe21af1e6ac674f9e80ac29d:/clientserver.c diff --git a/clientserver.c b/clientserver.c index a3767255..c370e213 100644 --- a/clientserver.c +++ b/clientserver.c @@ -1,7 +1,9 @@ -/* -*- c-file-style: "linux"; -*- +/* + * The socket based protocol for setting up a connection with rsyncd. * - * Copyright (C) 1998-2001 by Andrew Tridgell - * Copyright (C) 2001-2002 by Martin Pool + * Copyright (C) 1998-2001 Andrew Tridgell + * Copyright (C) 2001-2002 Martin Pool + * Copyright (C) 2002, 2003, 2004, 2005, 2006 Wayne Davison * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,19 +17,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/** - * @file - * - * The socket based protocol for setting up a connection with - * rsyncd. - **/ - #include "rsync.h" extern int verbose; +extern int quiet; extern int list_only; extern int am_sender; extern int am_server; @@ -41,24 +37,31 @@ extern int filesfrom_fd; extern int remote_protocol; extern int protocol_version; extern int io_timeout; -extern int orig_umask; extern int no_detach; extern int default_af_hint; +extern mode_t orig_umask; 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; int daemon_log_format_has_i = 0; int daemon_log_format_has_o_or_i = 0; int module_id = -1; +struct chmod_mode_struct *daemon_chmod_modes; /* Length of lp_path() string when in daemon mode & not chrooted, else 0. */ unsigned int module_dirlen = 0; +#ifdef HAVE_SIGACTION +static struct sigaction sigact; +#endif + /** * Run a client connected to an rsyncd. The alternative to this * function for remote-shell connections is do_cmd(). @@ -98,12 +101,14 @@ 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); } -int start_inband_exchange(char *user, char *path, int f_in, int f_out, +int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc) { int i; @@ -216,9 +221,49 @@ 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, + int argc, char *argv[]) +{ + int j, status = -1; + + if (request) { + 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 + || !WIFEXITED(status) || WEXITSTATUS(status) != 0) { + char *e; + if (asprintf(&e, "pre-xfer exec returned failure (%d)\n", status) < 0) + out_of_memory("finish_pre_exec"); + return e; + } + return NULL; +} -static int rsync_module(int f_in, int f_out, int i) +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, char *addr, char *host) { int argc = 0; int maxargs; @@ -226,16 +271,12 @@ static int rsync_module(int f_in, int f_out, int i) char line[BIGPATHBUFLEN]; uid_t uid = (uid_t)-2; /* canonically "nobody" */ gid_t gid = (gid_t)-2; - char *p; -#ifdef HAVE_PUTENV - char *s; -#endif - char *addr = client_addr(f_in); - char *host = client_name(f_in); + char *p, *err_msg = NULL; char *name = lp_name(i); int use_chroot = lp_use_chroot(i); int start_glob = 0; - int ret; + int ret, pre_exec_fd = -1; + pid_t pre_exec_pid = 0; char *request = NULL; if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) { @@ -259,7 +300,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", @@ -329,31 +370,29 @@ static int rsync_module(int f_in, int f_out, int i) p = lp_filter(i); parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT, - XFLG_ANCHORED2ABS); + XFLG_ABS_IF_SLASH); p = lp_include_from(i); parse_filter_file(&server_filter_list, p, MATCHFLG_INCLUDE, - XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS); + XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS); p = lp_include(i); parse_rule(&server_filter_list, p, MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT, - XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES); + XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES); p = lp_exclude_from(i); parse_filter_file(&server_filter_list, p, 0, - XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS); + XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS); p = lp_exclude(i); parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT, - XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES); + XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES); log_init(); #ifdef HAVE_PUTENV - s = lp_prexfer_exec(i); - p = lp_postxfer_exec(i); - if ((s && *s) || (p && *p)) { + 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 @@ -368,15 +407,10 @@ static int rsync_module(int f_in, int f_out, int i) putenv(hostname); putenv(username); umask(orig_umask); - if (s && *s) { - status = system(s); - if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { - rprintf(FLOG, "prexfer-exec failed\n"); - io_printf(f_out, "@ERROR: prexfer-exec failed\n"); - return -1; - } - } - if (p && *p) { + /* 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. */ + if (*lp_postxfer_exec(i)) { pid_t pid = fork(); if (pid < 0) { rsyserr(FLOG, errno, "fork failed"); @@ -385,7 +419,8 @@ static int rsync_module(int f_in, int f_out, int i) } if (pid) { char *ret1, *ret2; - waitpid(pid, &status, 0); + if (wait_process(pid, &status, 0) < 0) + status = -1; if (asprintf(&ret1, "RSYNC_RAW_STATUS=%d", status) > 0) putenv(ret1); if (WIFEXITED(status)) @@ -394,10 +429,55 @@ static int rsync_module(int f_in, int f_out, int i) status = -1; if (asprintf(&ret2, "RSYNC_EXIT_STATUS=%d", status) > 0) putenv(ret2); - system(p); + system(lp_postxfer_exec(i)); _exit(status); } } + /* For pre-xfer exec, fork a child process to run the indicated + * 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 (pipe(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; + } + 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); + if (len <= 0) + _exit(1); + 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)); + if (!WIFEXITED(status)) + _exit(1); + _exit(WEXITSTATUS(status)); + } + close(fds[0]); + set_blocking(fds[1]); + pre_exec_fd = fds[1]; + } umask(0); } #endif @@ -417,14 +497,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; } @@ -432,7 +512,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; } @@ -515,17 +595,30 @@ static int rsync_module(int f_in, int f_out, int i) start_glob = 1; break; case 1: + if (pre_exec_pid) { + err_msg = finish_pre_exec(pre_exec_pid, + pre_exec_fd, p, + argc, argv); + pre_exec_pid = 0; + } request = strdup(p); start_glob = 2; /* FALL THROUGH */ default: - glob_expand(name, &argv, &argc, &maxargs); + if (!err_msg) + glob_expand(name, &argv, &argc, &maxargs); break; } } + 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); + quiet = 0; /* Don't let someone try to be tricky. */ if (filesfrom_fd == 0) filesfrom_fd = f_in; @@ -552,7 +645,7 @@ static int rsync_module(int f_in, int f_out, int i) if (protocol_version < 23 && (protocol_version == 22 || am_sender)) io_start_multiplex_out(); - else if (!ret) { + 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 * the protocol setup finished first in later versions. */ @@ -578,8 +671,11 @@ static int rsync_module(int f_in, int f_out, int i) io_start_multiplex_out(); } - if (!ret) { - option_error(); + if (!ret || err_msg) { + if (err_msg) + rprintf(FERROR, err_msg); + else + option_error(); msleep(400); exit_cleanup(RERR_UNSUPPORTED); } @@ -587,6 +683,19 @@ 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 we have some incoming/outgoing chmod changes, append them to + * any user-specified changes (making our changes have priority). + * We also get a pointer to just our changes so that a receiver + * process can use them separately if --perms wasn't specified. */ + if (am_sender) + p = lp_outgoing_chmod(i); + else + p = lp_incoming_chmod(i); + if (*p && !(daemon_chmod_modes = 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; @@ -614,19 +723,28 @@ static void send_listing(int fd) int start_daemon(int f_in, int f_out) { char line[1024]; - char *motd; + char *motd, *addr, *host; int i; io_set_sock_fds(f_in, f_out); + /* We must load the config file before calling any function that + * might cause log-file output to occur. This ensures that the + * "log file" param gets honored for the 2 non-forked use-cases + * (when rsync is run by init and run by a remote shell). */ if (!lp_load(config_file, 0)) exit_cleanup(RERR_SYNTAX); - log_init(); + addr = client_addr(f_in); + host = client_name(f_in); + rprintf(FLOG, "connect from %s (%s)\n", host, addr); 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); } @@ -662,6 +780,8 @@ int start_daemon(int f_in, int f_out) return -1; if (!*line || strcmp(line, "#list") == 0) { + rprintf(FLOG, "module-list request from %s (%s)\n", + host, addr); send_listing(f_out); return -1; } @@ -673,17 +793,19 @@ int start_daemon(int f_in, int f_out) } if ((i = lp_number(line)) < 0) { - char *addr = client_addr(f_in); - char *host = client_name(f_in); rprintf(FLOG, "unknown module '%s' tried from %s (%s)\n", line, host, addr); io_printf(f_out, "@ERROR: Unknown module '%s'\n", line); return -1; } - return rsync_module(f_in, f_out, i); -} +#ifdef HAVE_SIGACTION + sigact.sa_flags = SA_NOCLDSTOP; +#endif + SIGACTION(SIGCHLD, remember_children); + return rsync_module(f_in, f_out, i, addr, host); +} int daemon_main(void) { @@ -731,7 +853,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);