X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/19531e1f7444358c7c99726dfac6088b6df69b1e..b3bf9b9df95137a3a43248be9599d919b04877af:/clientserver.c diff --git a/clientserver.c b/clientserver.c index bef2e2ff..09fd315a 100644 --- a/clientserver.c +++ b/clientserver.c @@ -3,7 +3,7 @@ * * Copyright (C) 1998-2001 Andrew Tridgell * Copyright (C) 2001-2002 Martin Pool - * Copyright (C) 2002-2007 Wayne Davison + * Copyright (C) 2002-2009 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 @@ -20,9 +20,10 @@ */ #include "rsync.h" -#include "ifuncs.h" +#include "itypes.h" -extern int verbose; +extern int quiet; +extern int dry_run; extern int output_motd; extern int list_only; extern int am_sender; @@ -30,28 +31,36 @@ extern int am_server; extern int am_daemon; extern int am_root; extern int rsync_port; +extern int protect_args; extern int ignore_errors; +extern int preserve_xattrs; extern int kluge_around_eof; extern int daemon_over_rsh; +extern int munge_symlinks; extern int sanitize_paths; +extern int numeric_ids; extern int filesfrom_fd; extern int remote_protocol; extern int protocol_version; extern int io_timeout; extern int no_detach; +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 *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; -extern char curr_dir[]; +extern struct filter_list_struct daemon_filter_list; +extern char curr_dir[MAXPATHLEN]; +#ifdef ICONV_OPTION +extern char *iconv_opt; +extern iconv_t ic_send, ic_recv; +#endif char *auth_user; int read_only = 0; @@ -59,10 +68,13 @@ int module_id = -1; struct chmod_mode_struct *daemon_chmod_modes; /* module_dirlen is the length of the module_dir string when in daemon - * mode, not chrooted, and the path is not "/"; otherwise 0. */ + * mode and module_dir is not "/"; otherwise 0. (Note that a chroot- + * enabled module can have a non-"/" module_dir these days.) */ char *module_dir = NULL; unsigned int module_dirlen = 0; +char *full_module_path; + static int rl_nulls = 0; #ifdef HAVE_SIGACTION @@ -109,7 +121,9 @@ int start_socket_client(char *host, int remote_argc, char *remote_argv[], if (fd == -1) exit_cleanup(RERR_SOCKETIO); - set_socket_options(fd, sockopts); +#ifdef ICONV_CONST + setup_iconv(); +#endif ret = start_inband_exchange(fd, fd, user, remote_argc, remote_argv); @@ -192,21 +206,31 @@ static int exchange_protocols(int f_in, int f_out, char *buf, size_t bufsiz, int int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char *argv[]) { - int i; + int i, modlen; char line[BIGPATHBUFLEN]; char *sargs[MAX_ARGS]; int sargc = 0; - char *p, *path = *argv; + char *p, *modname; - if (argc == 0 && !am_sender) - list_only |= 1; + assert(argc > 0 && *argv != NULL); - if (*path == '/') { + if (**argv == '/') { rprintf(FERROR, "ERROR: The remote path must start with a module name\n"); return -1; } + if (!(p = strchr(*argv, '/'))) + modlen = strlen(*argv); + else + modlen = p - *argv; + + if (!(modname = new_array(char, modlen+1+1))) /* room for '/' & '\0' */ + out_of_memory("start_inband_exchange"); + strlcpy(modname, *argv, modlen + 1); + modname[modlen] = '/'; + modname[modlen+1] = '\0'; + if (!user) user = getenv("USER"); if (!user) @@ -215,9 +239,6 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char if (exchange_protocols(f_in, f_out, line, sizeof line, 1) < 0) return -1; - 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 */ @@ -235,19 +256,21 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n"); exit_cleanup(RERR_SYNTAX); } - sargs[sargc++] = *argv++; + if (strncmp(*argv, modname, modlen) == 0 + && argv[0][modlen] == '\0') + sargs[sargc++] = modname; /* we send "modname/" */ + else + sargs[sargc++] = *argv; + argv++; argc--; } sargs[sargc] = NULL; - if (verbose > 1) + if (DEBUG_GTE(CMD, 1)) print_child_argv("sending daemon args:", sargs); - p = strchr(path, '/'); - if (p) *p = '\0'; - io_printf(f_out, "%s\n", path); - if (p) *p = '/'; + io_printf(f_out, "%.*s\n", modlen, modname); /* Old servers may just drop the connection here, rather than sending a proper EXIT command. Yuck. */ @@ -291,6 +314,8 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char if (rl_nulls) { for (i = 0; i < sargc; i++) { + if (!sargs[i]) /* stop at --protect-args NULL */ + break; write_sbuf(f_out, sargs[i]); write_byte(f_out, 0); } @@ -301,25 +326,38 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char write_sbuf(f_out, "\n"); } + if (protect_args) + send_protected_args(f_out, sargs); + if (protocol_version < 23) { if (protocol_version == 22 || !am_sender) io_start_multiplex_in(); } + free(modname); + return 0; } static char *finish_pre_exec(pid_t pid, int fd, char *request, - int argc, char *argv[]) + char **early_argv, char **argv) { - int j, status = -1; + int j = 0, status = -1; if (!request) request = "(NONE)"; write_buf(fd, request, strlen(request)+1); - for (j = 0; j < argc; j++) + if (early_argv) { + for ( ; *early_argv; early_argv++) + write_buf(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); + if (argv[j][0] == '.' && argv[j][1] == '\0') + break; + } write_byte(fd, 0); close(fd); @@ -341,8 +379,12 @@ 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) + int got = read(fd, bp, 1); + if (got != 1) { + if (got < 0 && errno == EINTR) + continue; return -1; + } if (*bp == '\0') break; if (bp < eob) @@ -353,10 +395,20 @@ static int read_arg_from_pipe(int fd, char *buf, int limit) return bp - buf; } +static int path_failure(int f_out, const char *dir, BOOL was_chdir) +{ + if (was_chdir) + rsyserr(FLOG, errno, "chdir %s failed\n", dir); + else + rprintf(FLOG, "normalize_path(%s) failed\n", dir); + io_printf(f_out, "@ERROR: chdir failed\n"); + return -1; +} + static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) { - int argc, opt_cnt; - char **argv; + int argc; + char **argv, **orig_argv, **orig_early_argv, *module_chdir; char line[BIGPATHBUFLEN]; uid_t uid = (uid_t)-2; /* canonically "nobody" */ gid_t gid = (gid_t)-2; @@ -364,9 +416,17 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) char *name = lp_name(i); int use_chroot = lp_use_chroot(i); int ret, pre_exec_fd = -1; + int save_munge_symlinks; pid_t pre_exec_pid = 0; char *request = NULL; +#ifdef ICONV_OPTION + iconv_opt = lp_charset(i); + if (*iconv_opt) + setup_iconv(); + iconv_opt = NULL; +#endif + if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) { rprintf(FLOG, "rsync denied on module %s from %s (%s)\n", name, host, addr); @@ -449,43 +509,57 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) /* TODO: Perhaps take a list of gids, and make them into the * supplementary groups. */ - /* We do a push_dir() without actually calling chdir() in order - * to make sure that the module's path is absolute. After this - * check, module_dir will be set to an absolute path. */ module_dir = lp_path(i); - strlcpy(line, curr_dir, sizeof line); - if (!push_dir(module_dir, 1)) - goto chdir_failed; - if (strcmp(curr_dir, module_dir) != 0) - module_dir = strdup(curr_dir); - push_dir(line, 1); /* Restore curr_dir. */ - - if (use_chroot || (module_dirlen = strlen(module_dir)) == 1) { + if (use_chroot) { + if ((p = strstr(module_dir, "/./")) != NULL) { + *p = '\0'; /* Temporary... */ + if (!(module_chdir = normalize_path(module_dir, True, NULL))) + return path_failure(f_out, module_dir, False); + *p = '/'; + if (!(p = normalize_path(p + 2, True, &module_dirlen))) + return path_failure(f_out, strstr(module_dir, "/./"), False); + if (!(full_module_path = normalize_path(module_dir, False, NULL))) + full_module_path = module_dir; + module_dir = p; + } else { + if (!(module_chdir = normalize_path(module_dir, False, NULL))) + return path_failure(f_out, module_dir, False); + full_module_path = module_chdir; + module_dir = "/"; + module_dirlen = 1; + } + } else { + if (!(module_chdir = normalize_path(module_dir, False, &module_dirlen))) + return path_failure(f_out, module_dir, False); + full_module_path = module_dir = module_chdir; + } + + if (module_dirlen == 1) { module_dirlen = 0; set_filter_dir("/", 1); } else set_filter_dir(module_dir, module_dirlen); p = lp_filter(i); - parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT, - XFLG_ABS_IF_SLASH); + parse_rule(&daemon_filter_list, p, MATCHFLG_WORD_SPLIT, + XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3); p = lp_include_from(i); - parse_filter_file(&server_filter_list, p, MATCHFLG_INCLUDE, - XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS); + parse_filter_file(&daemon_filter_list, p, MATCHFLG_INCLUDE, + XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS); p = lp_include(i); - parse_rule(&server_filter_list, p, + parse_rule(&daemon_filter_list, p, MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT, - XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES); + XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES); p = lp_exclude_from(i); - parse_filter_file(&server_filter_list, p, 0, - XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS); + parse_filter_file(&daemon_filter_list, p, 0, + XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS); p = lp_exclude(i); - parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT, - XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES); + parse_rule(&daemon_filter_list, p, MATCHFLG_WORD_SPLIT, + XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES); log_init(1); @@ -493,8 +567,9 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) 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", module_dir) < 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) @@ -528,7 +603,8 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) status = -1; if (asprintf(&p, "RSYNC_EXIT_STATUS=%d", status) > 0) putenv(p); - system(lp_postxfer_exec(i)); + if (system(lp_postxfer_exec(i)) < 0) + status = -1; _exit(status); } } @@ -594,21 +670,31 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) * a warning, unless a "require chroot" flag is set, * in which case we fail. */ - if (chroot(module_dir)) { - rsyserr(FLOG, errno, "chroot %s failed", module_dir); + if (chroot(module_chdir)) { + rsyserr(FLOG, errno, "chroot %s failed", module_chdir); io_printf(f_out, "@ERROR: chroot failed\n"); return -1; } - if (!push_dir("/", 0)) - goto chdir_failed; - } else { - if (!push_dir(module_dir, 0)) { - chdir_failed: - rsyserr(FLOG, errno, "chdir %s failed\n", module_dir); - io_printf(f_out, "@ERROR: chdir failed\n"); - return -1; - } + module_chdir = module_dir; + } + + if (!change_dir(module_chdir, CD_NORMAL)) + return path_failure(f_out, module_chdir, True); + if (module_dirlen || !use_chroot) sanitize_paths = 1; + + if ((munge_symlinks = lp_munge_symlinks(i)) < 0) + munge_symlinks = !use_chroot || module_dirlen; + if (munge_symlinks) { + STRUCT_STAT st; + char prefix[SYMLINK_PREFIX_LEN]; /* NOT +1 ! */ + strlcpy(prefix, SYMLINK_PREFIX, sizeof prefix); /* trim the trailing slash */ + if (do_stat(prefix, &st) == 0 && S_ISDIR(st.st_mode)) { + rprintf(FLOG, "Symlink munging is unsafe when a %s directory exists.\n", + prefix); + io_printf(f_out, "@ERROR: daemon security issue -- contact admin\n", name); + exit_cleanup(RERR_UNSUPPORTED); + } } if (am_root) { @@ -658,22 +744,44 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) io_printf(f_out, "@RSYNCD: OK\n"); - opt_cnt = read_args(f_in, name, line, sizeof line, rl_nulls, &argv, &argc, &request); + read_args(f_in, name, line, sizeof line, rl_nulls, &argv, &argc, &request); + orig_argv = argv; + + save_munge_symlinks = munge_symlinks; + + reset_output_levels(); /* future verbosity is controlled by client options */ + ret = parse_arguments(&argc, (const char ***) &argv); + if (protect_args && ret) { + orig_early_argv = orig_argv; + protect_args = 2; + read_args(f_in, name, line, sizeof line, 1, &argv, &argc, &request); + orig_argv = argv; + ret = parse_arguments(&argc, (const char ***) &argv); + } else + orig_early_argv = NULL; + + 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, - opt_cnt, argv); + orig_early_argv, orig_argv); } - verbose = 0; /* future verbosity is controlled by client options */ - ret = parse_arguments(&argc, (const char ***) &argv, 0); + if (orig_early_argv) + free(orig_early_argv); + am_server = 1; /* Don't let someone try to be tricky. */ + quiet = 0; if (lp_ignore_errors(module_id)) ignore_errors = 1; + if (write_batch < 0) + dry_run = 1; - if (lp_fake_super(i)) + if (lp_fake_super(i)) { + if (preserve_xattrs > 1) + preserve_xattrs = 1; am_root = -1; - else if (am_root < 0) /* Treat --fake-super from client as --super. */ + } else if (am_root < 0) /* Treat --fake-super from client as --super. */ am_root = 2; if (filesfrom_fd == 0) @@ -694,8 +802,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) #ifndef DEBUG /* don't allow the logs to be flooded too fast */ - if (verbose > lp_max_verbosity(i)) - verbose = lp_max_verbosity(i); + limit_output_verbosity(lp_max_verbosity(i)); #endif if (protocol_version < 23 @@ -736,6 +843,23 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) exit_cleanup(RERR_UNSUPPORTED); } +#ifdef ICONV_OPTION + if (!iconv_opt) { + if (ic_send != (iconv_t)-1) { + iconv_close(ic_send); + ic_send = (iconv_t)-1; + } + if (ic_recv != (iconv_t)-1) { + iconv_close(ic_recv); + ic_recv = (iconv_t)-1; + } + } +#endif + + if (!numeric_ids + && (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) set_io_timeout(lp_timeout(i)); @@ -761,7 +885,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) with "list = False". */ static void send_listing(int fd) { - int n = lp_numservices(); + int n = lp_num_modules(); int i; for (i = 0; i < n; i++) { @@ -773,6 +897,17 @@ static void send_listing(int fd) io_printf(fd,"@RSYNCD: EXIT\n"); } +static int load_config(int globals_only) +{ + if (!config_file) { + if (am_server && am_root <= 0) + config_file = RSYNCD_USERCONF; + else + config_file = RSYNCD_SYSCONF; + } + return lp_load(config_file, globals_only); +} + /* this is called when a connection is established to a client and we want to start talking. The setup of the system is done from here */ @@ -788,7 +923,7 @@ int start_daemon(int f_in, int f_out) * 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)) + if (!load_config(0)) exit_cleanup(RERR_SYNTAX); addr = client_addr(f_in); @@ -797,10 +932,6 @@ int start_daemon(int f_in, int f_out) if (!am_server) { set_socket_options(f_in, "SO_KEEPALIVE"); - if (sockopts) - set_socket_options(f_in, sockopts); - else - set_socket_options(f_in, lp_socket_options()); set_nonblocking(f_in); } @@ -839,10 +970,67 @@ int start_daemon(int f_in, int f_out) return rsync_module(f_in, f_out, i, addr, host); } -int daemon_main(void) +static void create_pid_file(void) +{ + char *pid_file = lp_pid_file(); + char pidbuf[16]; + pid_t pid = getpid(); + int fd, len; + + if (!pid_file || !*pid_file) + return; + + cleanup_set_pid(pid); + if ((fd = do_open(pid_file, O_WRONLY|O_CREAT|O_EXCL, 0666 & ~orig_umask)) == -1) { + failure: + cleanup_set_pid(0); + fprintf(stderr, "failed to create pid file %s: %s\n", pid_file, strerror(errno)); + rsyserr(FLOG, errno, "failed to create pid file %s", pid_file); + exit_cleanup(RERR_FILEIO); + } + snprintf(pidbuf, sizeof pidbuf, "%ld\n", (long)pid); + len = strlen(pidbuf); + if (write(fd, pidbuf, len) != len) + goto failure; + close(fd); +} + +/* Become a daemon, discarding the controlling terminal. */ +static void become_daemon(void) { - char *pid_file; + int i; + pid_t pid = fork(); + if (pid) { + if (pid < 0) { + fprintf(stderr, "failed to fork: %s\n", strerror(errno)); + exit_cleanup(RERR_FILEIO); + } + _exit(0); + } + + create_pid_file(); + + /* detach from the terminal */ +#ifdef HAVE_SETSID + setsid(); +#elif defined TIOCNOTTY + i = open("/dev/tty", O_RDWR); + if (i >= 0) { + ioctl(i, (int)TIOCNOTTY, (char *)0); + close(i); + } +#endif + /* make sure that stdin, stdout an stderr don't stuff things + * up (library functions, for example) */ + for (i = 0; i < 3; i++) { + close(i); + open("/dev/null", O_RDWR); + } +} + +int daemon_main(void) +{ if (is_a_socket(STDIN_FILENO)) { int i; @@ -857,11 +1045,16 @@ int daemon_main(void) return start_daemon(STDIN_FILENO, STDIN_FILENO); } - if (!no_detach) - become_daemon(); - - if (!lp_load(config_file, 1)) + if (!load_config(1)) { + fprintf(stderr, "Failed to parse config file: %s\n", config_file); exit_cleanup(RERR_SYNTAX); + } + set_dparams(0); + + if (no_detach) + create_pid_file(); + else + become_daemon(); if (rsync_port == 0 && (rsync_port = lp_rsync_port()) == 0) rsync_port = RSYNC_PORT; @@ -876,23 +1069,6 @@ int daemon_main(void) * address too. In fact, why not just do inet_ntop on the * local address??? */ - if (((pid_file = lp_pid_file()) != NULL) && (*pid_file != '\0')) { - char pidbuf[16]; - int fd; - 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); - exit_cleanup(RERR_FILEIO); - } - snprintf(pidbuf, sizeof pidbuf, "%ld\n", (long)pid); - write(fd, pidbuf, strlen(pidbuf)); - close(fd); - } - start_accept_loop(rsync_port, start_daemon); return -1; }