X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/34937987a6ec0ab6d0585c650c2d7114f8929b4b..ba2133d6add082b059728074febdac6c520a4351:/clientserver.c diff --git a/clientserver.c b/clientserver.c index 4b4a08f9..786c4bed 100644 --- a/clientserver.c +++ b/clientserver.c @@ -1,39 +1,36 @@ -/* -*- 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-2007 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * 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 verbose; +extern int quiet; +extern int output_motd; extern int list_only; extern int am_sender; extern int am_server; extern int am_daemon; extern int am_root; extern int rsync_port; +extern int ignore_errors; extern int kluge_around_eof; extern int daemon_over_rsh; extern int sanitize_paths; @@ -41,25 +38,32 @@ 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 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 struct filter_list_struct server_filter_list; 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 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(). @@ -106,7 +110,7 @@ int start_socket_client(char *host, char *path, int argc, char *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 start_inband_exchange(const char *user, char *path, int f_in, int f_out, int argc) { int i; @@ -202,7 +206,10 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, return -1; } - rprintf(FINFO, "%s\n", line); + /* This might be a MOTD line or a module listing, but there is + * no way to differentiate it. The manpage mentions this. */ + if (output_motd) + rprintf(FINFO, "%s\n", line); } kluge_around_eof = 0; @@ -237,7 +244,9 @@ static char *finish_pre_exec(pid_t pid, int fd, char *request, 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) + if (asprintf(&e, "pre-xfer exec returned failure (%d)%s%s\n", + status, status < 0 ? ": " : "", + status < 0 ? strerror(errno) : "") < 0) out_of_memory("finish_pre_exec"); return e; } @@ -261,7 +270,7 @@ static int read_arg_from_pipe(int fd, char *buf, int limit) return bp - buf; } -static int rsync_module(int f_in, int f_out, int i) +static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) { int argc = 0; int maxargs; @@ -270,8 +279,6 @@ static int rsync_module(int f_in, int f_out, int i) uid_t uid = (uid_t)-2; /* canonically "nobody" */ gid_t gid = (gid_t)-2; char *p, *err_msg = NULL; - char *addr = client_addr(f_in); - char *host = client_name(f_in); char *name = lp_name(i); int use_chroot = lp_use_chroot(i); int start_glob = 0; @@ -323,20 +330,19 @@ static int rsync_module(int f_in, int f_out, int i) if (lp_read_only(i)) read_only = 1; - if (lp_transfer_logging(i)) { - if (log_format_has(lp_log_format(i), 'i')) - daemon_log_format_has_i = 1; - if (daemon_log_format_has_i - || log_format_has(lp_log_format(i), 'o')) - daemon_log_format_has_o_or_i = 1; - } + if (lp_transfer_logging(i) && !logfile_format) + 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)) { + if (!isDigit(p)) { rprintf(FLOG, "Invalid uid %s\n", p); io_printf(f_out, "@ERROR: invalid uid %s\n", p); return -1; @@ -346,7 +352,7 @@ 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)) { + if (!isDigit(p)) { rprintf(FLOG, "Invalid gid %s\n", p); io_printf(f_out, "@ERROR: invalid gid %s\n", p); return -1; @@ -389,7 +395,7 @@ static int rsync_module(int f_in, int f_out, int i) parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT, XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES); - log_init(); + log_init(1); #ifdef HAVE_PUTENV if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) { @@ -418,17 +424,18 @@ static int rsync_module(int f_in, int f_out, int i) return -1; } if (pid) { - char *ret1, *ret2; + if (asprintf(&p, "RSYNC_PID=%ld", (long)pid) > 0) + putenv(p); if (wait_process(pid, &status, 0) < 0) status = -1; - if (asprintf(&ret1, "RSYNC_RAW_STATUS=%d", status) > 0) - putenv(ret1); + if (asprintf(&p, "RSYNC_RAW_STATUS=%d", status) > 0) + putenv(p); if (WIFEXITED(status)) status = WEXITSTATUS(status); else status = -1; - if (asprintf(&ret2, "RSYNC_EXIT_STATUS=%d", status) > 0) - putenv(ret2); + if (asprintf(&p, "RSYNC_EXIT_STATUS=%d", status) > 0) + putenv(p); system(lp_postxfer_exec(i)); _exit(status); } @@ -438,6 +445,8 @@ static int rsync_module(int f_in, int f_out, int i) * 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) { rsyserr(FLOG, errno, "pre-xfer exec preparation failed"); io_printf(f_out, "@ERROR: pre-xfer exec preparation failed\n"); @@ -451,9 +460,8 @@ static int rsync_module(int f_in, int f_out, int i) 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); + if (asprintf(&p, "RSYNC_REQUEST=%s", buf) > 0) + putenv(p); for (j = 0; ; j++) { len = read_arg_from_pipe(fds[0], buf, BIGPATHBUFLEN); @@ -462,9 +470,8 @@ static int rsync_module(int f_in, int f_out, int i) break; _exit(1); } - if (asprintf(&p, "RSYNC_ARG%d=%s", j, buf) < 0) - out_of_memory("rsync_module"); - putenv(p); + if (asprintf(&p, "RSYNC_ARG%d=%s", j, buf) > 0) + putenv(p); } close(fds[0]); close(STDIN_FILENO); @@ -502,7 +509,7 @@ static int rsync_module(int f_in, int f_out, int i) return -1; } - if (!push_dir("/")) { + if (!push_dir("/", 0)) { rsyserr(FLOG, errno, "chdir %s failed\n", lp_path(i)); io_printf(f_out, "@ERROR: chdir failed\n"); @@ -510,7 +517,7 @@ static int rsync_module(int f_in, int f_out, int i) } } else { - if (!push_dir(lp_path(i))) { + if (!push_dir(lp_path(i), 0)) { rsyserr(FLOG, errno, "chdir %s failed\n", lp_path(i)); io_printf(f_out, "@ERROR: chdir failed\n"); @@ -618,6 +625,9 @@ static int rsync_module(int f_in, int f_out, int i) 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 (lp_ignore_errors(module_id)) + ignore_errors = 1; if (filesfrom_fd == 0) filesfrom_fd = f_in; @@ -672,7 +682,7 @@ static int rsync_module(int f_in, int f_out, int i) if (!ret || err_msg) { if (err_msg) - rprintf(FERROR, err_msg); + rwrite(FERROR, err_msg, strlen(err_msg)); else option_error(); msleep(400); @@ -682,6 +692,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; @@ -709,15 +732,21 @@ 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"); @@ -760,6 +789,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; } @@ -771,15 +802,18 @@ 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) @@ -811,7 +845,7 @@ int daemon_main(void) if (bind_address == NULL && *lp_bind_address()) bind_address = lp_bind_address(); - log_init(); + log_init(0); rprintf(FLOG, "rsyncd version %s starting, listening on port %d\n", RSYNC_VERSION, rsync_port);