X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5a8543b8b8cb5944f9fd689899d3b230cd48c70a..ecc7623e7faf75f6ba3dd7b5a416c52e2346ac7d:/clientserver.c diff --git a/clientserver.c b/clientserver.c index f38a495f..8c42631e 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 @@ -13,31 +15,53 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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. + * 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., + * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -/** - * @file - * - * The socket based protocol for setting up a connection with - * rsyncd. - **/ - #include "rsync.h" -extern int module_id; -extern int read_only; extern int verbose; +extern int quiet; +extern int list_only; +extern int am_sender; +extern int am_server; +extern int am_daemon; +extern int am_root; extern int rsync_port; -char *auth_user; +extern int kluge_around_eof; +extern int daemon_over_rsh; extern int sanitize_paths; extern int filesfrom_fd; extern int remote_protocol; extern int protocol_version; -extern struct exclude_struct **server_exclude_list; -extern char *exclude_path_prefix; +extern int io_timeout; +extern int no_detach; +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 *sockopts; +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 server_filter_list; + +char *auth_user; +int read_only = 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 @@ -56,82 +80,61 @@ extern char *exclude_path_prefix; int start_socket_client(char *host, char *path, int argc, char *argv[]) { int fd, ret; - char *p, *user=NULL; - extern char *bind_address; - extern int default_af_hint; + char *p, *user = NULL; - /* this is redundant with code in start_inband_exchange(), but - * this short-circuits a problem before we open a socket, and - * the extra check won't hurt */ + /* This is redundant with code in start_inband_exchange(), but this + * short-circuits a problem in the client before we open a socket, + * and the extra check won't hurt. */ if (*path == '/') { - rprintf(FERROR,"ERROR: The remote path must start with a module name not a /\n"); + rprintf(FERROR, + "ERROR: The remote path must start with a module name not a /\n"); return -1; } - p = strchr(host, '@'); - if (p) { + if ((p = strrchr(host, '@')) != NULL) { user = host; host = p+1; - *p = 0; + *p = '\0'; } - if (verbose >= 2) { - /* FIXME: If we're going to use a socket program for - * testing, then this message is wrong. We need to - * say something like "(except really using %s)" */ - rprintf(FINFO, "opening tcp connection to %s port %d\n", - host, rsync_port); - } fd = open_socket_out_wrapped(host, rsync_port, bind_address, default_af_hint); - if (fd == -1) { + if (fd == -1) exit_cleanup(RERR_SOCKETIO); - } + + set_socket_options(fd, sockopts); ret = start_inband_exchange(user, path, fd, fd, argc); - return ret < 0? ret : client_run(fd, fd, -1, argc, argv); + 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 argc) +int start_inband_exchange(char *user, char *path, int f_in, int f_out, + int argc) { int i; char *sargs[MAX_ARGS]; int sargc = 0; - char line[MAXPATHLEN]; + char line[BIGPATHBUFLEN]; char *p; - extern int kludge_around_eof; - extern int am_sender; - extern int daemon_over_rsh; - extern int list_only; if (argc == 0 && !am_sender) - list_only = 1; + list_only |= 1; if (*path == '/') { - rprintf(FERROR, "ERROR: The remote path must start with a module name\n"); + rprintf(FERROR, + "ERROR: The remote path must start with a module name\n"); return -1; } - if (!user) user = getenv("USER"); - if (!user) user = getenv("LOGNAME"); - - /* set daemon_over_rsh to false since we need to build the - * true set of args passed through the rsh/ssh connection; - * this is a no-op for direct-socket-connection mode */ - daemon_over_rsh = 0; - server_options(sargs, &sargc); - - sargs[sargc++] = "."; - - if (path && *path) - sargs[sargc++] = path; - - sargs[sargc] = NULL; + if (!user) + user = getenv("USER"); + if (!user) + user = getenv("LOGNAME"); io_printf(f_out, "@RSYNCD: %d\n", protocol_version); - if (!read_line(f_in, line, sizeof(line)-1)) { + if (!read_line(f_in, line, sizeof line - 1)) { rprintf(FERROR, "rsync: did not see server greeting\n"); return -1; } @@ -145,6 +148,25 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc) if (protocol_version > remote_protocol) protocol_version = remote_protocol; + if (list_only && protocol_version >= 29) + list_only |= 2; + + /* set daemon_over_rsh to false since we need to build the + * true set of args passed through the rsh/ssh connection; + * this is a no-op for direct-socket-connection mode */ + daemon_over_rsh = 0; + server_options(sargs, &sargc); + + sargs[sargc++] = "."; + + if (path && *path) + sargs[sargc++] = path; + + sargs[sargc] = NULL; + + if (verbose > 1) + print_child_argv(sargs); + p = strchr(path,'/'); if (p) *p = 0; io_printf(f_out, "%s\n", path); @@ -152,10 +174,10 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc) /* Old servers may just drop the connection here, rather than sending a proper EXIT command. Yuck. */ - kludge_around_eof = list_only && (protocol_version < 25); + kluge_around_eof = list_only && protocol_version < 25 ? 1 : 0; while (1) { - if (!read_line(f_in, line, sizeof(line)-1)) { + if (!read_line(f_in, line, sizeof line - 1)) { rprintf(FERROR, "rsync: didn't get server startup line\n"); return -1; } @@ -165,7 +187,8 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc) continue; } - if (strcmp(line,"@RSYNCD: OK") == 0) break; + if (strcmp(line,"@RSYNCD: OK") == 0) + break; if (strcmp(line,"@RSYNCD: EXIT") == 0) { /* This is sent by recent versions of the @@ -176,15 +199,15 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc) } if (strncmp(line, "@ERROR", 6) == 0) { - rprintf(FERROR,"%s\n", line); + rprintf(FERROR, "%s\n", line); /* This is always fatal; the server will now * close the socket. */ - return RERR_STARTCLIENT; - } else { - rprintf(FINFO,"%s\n", line); + return -1; } + + rprintf(FINFO, "%s\n", line); } - kludge_around_eof = False; + kluge_around_eof = 0; for (i = 0; i < sargc; i++) { io_printf(f_out, "%s\n", sargs[i]); @@ -193,82 +216,130 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc) if (protocol_version < 23) { if (protocol_version == 22 || !am_sender) - io_start_multiplex_in(f_in); + io_start_multiplex_in(); } 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); -static int rsync_module(int f_in, int f_out, int i) + 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 read_arg_from_pipe(int fd, char *buf, int limit) { - int argc=0; - char *argv[MAX_ARGS]; - char **argp; - char line[MAXPATHLEN]; + 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; + char **argv; + char line[BIGPATHBUFLEN]; uid_t uid = (uid_t)-2; /* canonically "nobody" */ gid_t gid = (gid_t)-2; - char *p; - 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; - char *request=NULL; - extern int am_sender; - extern int am_server; - extern int am_daemon; - extern int am_root; + int start_glob = 0; + 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))) { - rprintf(FERROR,"rsync denied on module %s from %s (%s)\n", + rprintf(FLOG, "rsync denied on module %s from %s (%s)\n", name, host, addr); - io_printf(f_out, "@ERROR: access denied to %s from %s (%s)\n", - name, host, addr); + if (!lp_list(i)) + io_printf(f_out, "@ERROR: Unknown module '%s'\n", name); + else { + io_printf(f_out, + "@ERROR: access denied to %s from %s (%s)\n", + name, host, addr); + } return -1; } if (am_daemon && am_server) { - rprintf(FINFO, "rsync allowed access on module %s from %s (%s)\n", + rprintf(FLOG, "rsync allowed access on module %s from %s (%s)\n", name, host, addr); } if (!claim_connection(lp_lock_file(i), lp_max_connections(i))) { if (errno) { - rprintf(FERROR,"failed to open lock file %s : %s\n", - lp_lock_file(i), strerror(errno)); - io_printf(f_out, "@ERROR: failed to open lock file %s : %s\n", - lp_lock_file(i), strerror(errno)); + rsyserr(FLOG, errno, "failed to open lock file %s", + lp_lock_file(i)); + io_printf(f_out, "@ERROR: failed to open lock file\n"); } else { - rprintf(FERROR,"max connections (%d) reached\n", + rprintf(FLOG, "max connections (%d) reached\n", lp_max_connections(i)); - io_printf(f_out, "@ERROR: max connections (%d) reached - try again later\n", + io_printf(f_out, "@ERROR: max connections (%d) reached -- try again later\n", lp_max_connections(i)); } return -1; } - - auth_user = auth_server(f_in, f_out, i, addr, "@RSYNCD: AUTHREQD "); + auth_user = auth_server(f_in, f_out, i, host, addr, "@RSYNCD: AUTHREQD "); if (!auth_user) { - rprintf(FERROR,"auth failed on module %s from %s (%s)\n", - name, host, addr); io_printf(f_out, "@ERROR: auth failed on module %s\n", name); return -1; } module_id = i; - am_root = (getuid() == 0); + if (lp_read_only(i)) + read_only = 1; + + if (lp_transfer_logging(i)) { + logfile_format = lp_log_format(i); + if (log_format_has(logfile_format, 'i')) + logfile_format_has_i = 1; + if (logfile_format_has_i + || log_format_has(logfile_format, 'o')) + logfile_format_has_o_or_i = 1; + } + + am_root = (MY_UID() == 0); if (am_root) { p = lp_uid(i); if (!name_to_uid(p, &uid)) { - if (!isdigit(* (unsigned char *) p)) { - rprintf(FERROR,"Invalid uid %s\n", p); + if (!isdigit(*(unsigned char *)p)) { + rprintf(FLOG, "Invalid uid %s\n", p); io_printf(f_out, "@ERROR: invalid uid %s\n", p); return -1; } @@ -277,8 +348,8 @@ static int rsync_module(int f_in, int f_out, int i) p = lp_gid(i); if (!name_to_gid(p, &gid)) { - if (!isdigit(* (unsigned char *) p)) { - rprintf(FERROR,"Invalid gid %s\n", p); + if (!isdigit(*(unsigned char *)p)) { + rprintf(FLOG, "Invalid gid %s\n", p); io_printf(f_out, "@ERROR: invalid gid %s\n", p); return -1; } @@ -293,26 +364,126 @@ static int rsync_module(int f_in, int f_out, int i) /* TODO: Perhaps take a list of gids, and make them into the * supplementary groups. */ - exclude_path_prefix = use_chroot? "" : lp_path(i); - if (*exclude_path_prefix == '/' && !exclude_path_prefix[1]) - exclude_path_prefix = ""; + if (use_chroot || (module_dirlen = strlen(lp_path(i))) == 1) { + module_dirlen = 0; + set_filter_dir("/", 1); + } else + set_filter_dir(lp_path(i), module_dirlen); + + p = lp_filter(i); + parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT, + XFLG_ABS_IF_SLASH); p = lp_include_from(i); - add_exclude_file(&server_exclude_list, p, MISSING_FATAL, ADD_INCLUDE); + parse_filter_file(&server_filter_list, p, MATCHFLG_INCLUDE, + XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS); p = lp_include(i); - add_exclude_line(&server_exclude_list, p, ADD_INCLUDE); + parse_rule(&server_filter_list, p, + MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT, + XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES); p = lp_exclude_from(i); - add_exclude_file(&server_exclude_list, p, MISSING_FATAL, ADD_EXCLUDE); + parse_filter_file(&server_filter_list, p, 0, + XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS); p = lp_exclude(i); - add_exclude_line(&server_exclude_list, p, ADD_EXCLUDE); - - exclude_path_prefix = NULL; + parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT, + XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES); log_init(); +#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", lp_path(i)) < 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. */ + if (*lp_postxfer_exec(i)) { + pid_t pid = fork(); + if (pid < 0) { + rsyserr(FLOG, errno, "fork failed"); + io_printf(f_out, "@ERROR: fork failed\n"); + return -1; + } + if (pid) { + char *ret1, *ret2; + if (wait_process(pid, &status, 0) < 0) + status = -1; + if (asprintf(&ret1, "RSYNC_RAW_STATUS=%d", status) > 0) + putenv(ret1); + if (WIFEXITED(status)) + status = WEXITSTATUS(status); + else + status = -1; + if (asprintf(&ret2, "RSYNC_EXIT_STATUS=%d", status) > 0) + putenv(ret2); + 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 + if (use_chroot) { /* * XXX: The 'use chroot' flag is a fairly reliable @@ -327,20 +498,23 @@ static int rsync_module(int f_in, int f_out, int i) * in which case we fail. */ if (chroot(lp_path(i))) { - rsyserr(FERROR, errno, "chroot %s failed", lp_path(i)); + rsyserr(FLOG, errno, "chroot %s failed", + lp_path(i)); io_printf(f_out, "@ERROR: chroot failed\n"); return -1; } - if (!push_dir("/", 0)) { - rsyserr(FERROR, errno, "chdir %s failed\n", lp_path(i)); + if (!push_dir("/")) { + rsyserr(FLOG, errno, "chdir %s failed\n", + lp_path(i)); io_printf(f_out, "@ERROR: chdir failed\n"); return -1; } } else { - if (!push_dir(lp_path(i), 0)) { - rsyserr(FERROR, errno, "chdir %s failed\n", lp_path(i)); + if (!push_dir(lp_path(i))) { + rsyserr(FLOG, errno, "chdir %s failed\n", + lp_path(i)); io_printf(f_out, "@ERROR: chdir failed\n"); return -1; } @@ -359,7 +533,7 @@ static int rsync_module(int f_in, int f_out, int i) * all their supplementary groups. */ if (setgid(gid)) { - rsyserr(FERROR, errno, "setgid %d failed", (int) gid); + rsyserr(FLOG, errno, "setgid %d failed", (int)gid); io_printf(f_out, "@ERROR: setgid failed\n"); return -1; } @@ -367,85 +541,98 @@ static int rsync_module(int f_in, int f_out, int i) /* Get rid of any supplementary groups this process * might have inheristed. */ if (setgroups(1, &gid)) { - rsyserr(FERROR, errno, "setgroups failed"); + rsyserr(FLOG, errno, "setgroups failed"); io_printf(f_out, "@ERROR: setgroups failed\n"); return -1; } #endif if (setuid(uid)) { - rsyserr(FERROR, errno, "setuid %d failed", (int) uid); + rsyserr(FLOG, errno, "setuid %d failed", (int)uid); io_printf(f_out, "@ERROR: setuid failed\n"); return -1; } - am_root = (getuid() == 0); + am_root = (MY_UID() == 0); + } + + if (lp_temp_dir(i) && *lp_temp_dir(i)) { + tmpdir = lp_temp_dir(i); + if (strlen(tmpdir) >= MAXPATHLEN - 10) { + rprintf(FLOG, + "the 'temp dir' value for %s is WAY too long -- ignoring.\n", + name); + tmpdir = NULL; + } } io_printf(f_out, "@RSYNCD: OK\n"); + maxargs = MAX_ARGS; + if (!(argv = new_array(char *, maxargs))) + out_of_memory("rsync_module"); argv[argc++] = "rsyncd"; while (1) { - if (!read_line(f_in, line, sizeof(line)-1)) { + if (!read_line(f_in, line, sizeof line - 1)) return -1; - } - if (!*line) break; + if (!*line) + break; p = line; - argv[argc] = strdup(p); - if (!argv[argc]) { - return -1; + if (argc == maxargs) { + maxargs += MAX_ARGS; + if (!(argv = realloc_array(argv, char *, maxargs))) + out_of_memory("rsync_module"); } + if (!(argv[argc] = strdup(p))) + out_of_memory("rsync_module"); - if (start_glob) { - if (start_glob == 1) { - request = strdup(p); - start_glob++; - } - glob_expand(name, argv, &argc, MAX_ARGS); - } else { + switch (start_glob) { + case 0: argc++; - } - - if (strcmp(line,".") == 0) { - start_glob = 1; - } - - if (argc == MAX_ARGS) { - return -1; + if (strcmp(line, ".") == 0) + 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: + if (!err_msg) + glob_expand(name, &argv, &argc, &maxargs); + break; } } - if (sanitize_paths) { - /* - * Note that this is applied to all parameters, whether or not - * they are filenames, but no other legal parameters contain - * the forms that need to be sanitized so it doesn't hurt; - * it is not known at this point which parameters are files - * and which aren't. - */ - for (i = 1; i < argc; i++) { - sanitize_path(argv[i], NULL); - } + if (pre_exec_pid) { + err_msg = finish_pre_exec(pre_exec_pid, pre_exec_fd, request, + argc, argv); } - argp = argv; - ret = parse_arguments(&argc, (const char ***) &argp, 0); + 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; if (request) { if (*auth_user) { - rprintf(FINFO,"rsync %s %s from %s@%s (%s)\n", - am_sender?"on":"to", + rprintf(FLOG, "rsync %s %s from %s@%s (%s)\n", + am_sender ? "on" : "to", request, auth_user, host, addr); } else { - rprintf(FINFO,"rsync %s %s from %s (%s)\n", - am_sender?"on":"to", + rprintf(FLOG, "rsync %s %s from %s (%s)\n", + am_sender ? "on" : "to", request, host, addr); } free(request); @@ -453,33 +640,65 @@ static int rsync_module(int f_in, int f_out, int i) #ifndef DEBUG /* don't allow the logs to be flooded too fast */ - if (verbose > 1) verbose = 1; + if (verbose > lp_max_verbosity(i)) + verbose = lp_max_verbosity(i); #endif - if (protocol_version < 23) { - if (protocol_version == 22 || am_sender) - io_start_multiplex_out(f_out); + if (protocol_version < 23 + && (protocol_version == 22 || am_sender)) + io_start_multiplex_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 + * the protocol setup finished first in later versions. */ + setup_protocol(f_out, f_in); + if (!am_sender) { + /* Since we failed in our option parsing, we may not + * have finished parsing that the client sent us a + * --files-from option, so look for it manually. + * Without this, the socket would be in the wrong + * state for the upcoming error message. */ + if (!files_from) { + int i; + for (i = 0; i < argc; i++) { + if (strncmp(argv[i], "--files-from", 12) == 0) { + files_from = ""; + break; + } + } + } + if (files_from) + write_byte(f_out, 0); + } + io_start_multiplex_out(); } - /* For later protocol versions, we don't start multiplexing - * until we've configured nonblocking in start_server. That - * means we're in a sticky situation now: there's no way to - * convey errors to the client. */ - - /* FIXME: Hold off on reporting option processing errors until - * we've set up nonblocking and multiplexed IO and can get the - * message back to them. */ - if (!ret) { - option_error(); + if (!ret || err_msg) { + if (err_msg) + rprintf(FERROR, err_msg); + else + option_error(); + msleep(400); exit_cleanup(RERR_UNSUPPORTED); } - if (lp_timeout(i)) { - extern int io_timeout; - io_timeout = lp_timeout(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, argp); + start_server(f_in, f_out, argc, argv); return 0; } @@ -491,9 +710,10 @@ static void send_listing(int fd) int n = lp_numservices(); int i; - for (i=0;i= 25) io_printf(fd,"@RSYNCD: EXIT\n"); @@ -504,21 +724,29 @@ static void send_listing(int fd) here */ int start_daemon(int f_in, int f_out) { - char line[200]; - char *motd; - int i = -1; - extern char *config_file; - extern int am_server; + char line[1024]; + char *motd, *addr, *host; + int i; - if (!lp_load(config_file, 0)) { + 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); } @@ -528,19 +756,19 @@ int start_daemon(int f_in, int f_out) if (motd && *motd) { FILE *f = fopen(motd,"r"); while (f && !feof(f)) { - int len = fread(line, 1, sizeof(line)-1, f); + int len = fread(line, 1, sizeof line - 1, f); if (len > 0) { line[len] = 0; io_printf(f_out, "%s", line); } } - if (f) fclose(f); + if (f) + fclose(f); io_printf(f_out, "\n"); } - if (!read_line(f_in, line, sizeof(line)-1)) { + if (!read_line(f_in, line, sizeof line - 1)) return -1; - } if (sscanf(line,"@RSYNCD: %d", &remote_protocol) != 1) { io_printf(f_out, "@ERROR: protocol startup error\n"); @@ -549,40 +777,41 @@ int start_daemon(int f_in, int f_out) if (protocol_version > remote_protocol) protocol_version = remote_protocol; - while (i == -1) { - line[0] = 0; - if (!read_line(f_in, line, sizeof(line)-1)) { - return -1; - } + line[0] = 0; + if (!read_line(f_in, line, sizeof line - 1)) + return -1; - if (!*line || strcmp(line,"#list")==0) { - send_listing(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; + } - if (*line == '#') { - /* it's some sort of command that I don't understand */ - io_printf(f_out, "@ERROR: Unknown command '%s'\n", line); - return -1; - } + if (*line == '#') { + /* it's some sort of command that I don't understand */ + io_printf(f_out, "@ERROR: Unknown command '%s'\n", line); + return -1; + } - i = lp_number(line); - if (i == -1) { - io_printf(f_out, "@ERROR: Unknown module '%s'\n", line); - return -1; - } + if ((i = lp_number(line)) < 0) { + 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) { - extern char *config_file; - extern int orig_umask; char *pid_file; - extern int no_detach; if (is_a_socket(STDIN_FILENO)) { int i; @@ -590,7 +819,7 @@ int daemon_main(void) /* we are running via inetd - close off stdout and * stderr so that library functions (and getopt) don't * try to use them. Redirect them to /dev/null */ - for (i=1;i<3;i++) { + for (i = 1; i < 3; i++) { close(i); open("/dev/null", O_RDWR); } @@ -601,13 +830,17 @@ int daemon_main(void) if (!no_detach) become_daemon(); - if (!lp_load(config_file, 1)) { + if (!lp_load(config_file, 1)) exit_cleanup(RERR_SYNTAX); - } + + if (rsync_port == 0 && (rsync_port = lp_rsync_port()) == 0) + rsync_port = RSYNC_PORT; + if (bind_address == NULL && *lp_bind_address()) + bind_address = lp_bind_address(); log_init(); - rprintf(FINFO, "rsyncd version %s starting, listening on port %d\n", + rprintf(FLOG, "rsyncd version %s starting, listening on port %d\n", RSYNC_VERSION, rsync_port); /* TODO: If listening on a particular address, then show that * address too. In fact, why not just do inet_ntop on the @@ -616,15 +849,16 @@ int daemon_main(void) if (((pid_file = lp_pid_file()) != NULL) && (*pid_file != '\0')) { char pidbuf[16]; int fd; - int pid = (int) getpid(); + pid_t pid = getpid(); cleanup_set_pid(pid); if ((fd = do_open(lp_pid_file(), O_WRONLY|O_CREAT|O_TRUNC, 0666 & ~orig_umask)) == -1) { cleanup_set_pid(0); - rsyserr(FLOG, errno, "failed to create pid file %s", pid_file); + rsyserr(FLOG, errno, "failed to create pid file %s", + pid_file); exit_cleanup(RERR_FILEIO); } - snprintf(pidbuf, sizeof(pidbuf), "%d\n", pid); + snprintf(pidbuf, sizeof pidbuf, "%ld\n", (long)pid); write(fd, pidbuf, strlen(pidbuf)); close(fd); }