X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f5aeb6ff9b04432a84b5c79f5baac26be1f3f4e9..7f367bb1b4348ba1edb863ee13f8281471785e09:/clientserver.c diff --git a/clientserver.c b/clientserver.c index 39a8cedf..49238b1e 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-2008 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,10 +20,9 @@ */ #include "rsync.h" -#include "ifuncs.h" +#include "itypes.h" extern int quiet; -extern int verbose; extern int dry_run; extern int output_motd; extern int list_only; @@ -37,6 +36,7 @@ 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; @@ -50,23 +50,23 @@ 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 daemon_filter_list; -extern char curr_dir[]; +extern char curr_dir[MAXPATHLEN]; #ifdef ICONV_OPTION extern char *iconv_opt; extern iconv_t ic_send, ic_recv; #endif +#define MAX_GID_LIST 32 + char *auth_user; int read_only = 0; int module_id = -1; -int munge_symlinks = 0; struct chmod_mode_struct *daemon_chmod_modes; /* module_dirlen is the length of the module_dir string when in daemon @@ -75,12 +75,20 @@ struct chmod_mode_struct *daemon_chmod_modes; char *module_dir = NULL; unsigned int module_dirlen = 0; +char *full_module_path; + static int rl_nulls = 0; #ifdef HAVE_SIGACTION static struct sigaction sigact; #endif +static gid_t gid_list[MAX_GID_LIST]; +static int gid_count = 0; + +/* Used when "reverse lookup" is off. */ +const char undetermined_hostname[] = "UNDETERMINED"; + /** * Run a client connected to an rsyncd. The alternative to this * function for remote-shell connections is do_cmd(). @@ -121,8 +129,6 @@ 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 @@ -269,7 +275,7 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char sargs[sargc] = NULL; - if (verbose > 1) + if (DEBUG_GTE(CMD, 1)) print_child_argv("sending daemon args:", sargs); io_printf(f_out, "%.*s\n", modlen, modname); @@ -397,17 +403,90 @@ 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, char *addr, char *host) +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 add_a_group(int f_out, const char *gname) +{ + gid_t gid; + if (!name_to_gid(gname, &gid)) { + if (!isDigit(gname)) { + rprintf(FLOG, "Invalid gid %s\n", gname); + io_printf(f_out, "@ERROR: invalid gid %s\n", gname); + return -1; + } + gid = atol(gname); + } + if (gid_count == MAX_GID_LIST) { + rprintf(FLOG, "Too many groups specified via gid parameter.\n"); + io_printf(f_out, "@ERROR: too many groups\n"); + return -1; + } + gid_list[gid_count++] = gid; + return 0; +} + +static struct passwd *want_all_groups(int f_out, uid_t uid) +{ +#if defined HAVE_GETGROUPLIST || defined HAVE_INITGROUPS + struct passwd *pw; + if ((pw = getpwuid(uid)) == NULL) { + rsyserr(FLOG, errno, "getpwuid failed"); + io_printf(f_out, "@ERROR: getpwuid failed\n"); + return NULL; + } +# ifdef HAVE_GETGROUPLIST + /* Get all the process's groups, with the pw_gid group first. */ + gid_count = MAX_GID_LIST; + if (getgrouplist(pw->pw_name, pw->pw_gid, gid_list, &gid_count) < 0) { + rsyserr(FLOG, errno, "getgrouplist failed"); + io_printf(f_out, "@ERROR: getgrouplist failed\n"); + return NULL; + } + /* Paranoia: is the default group not first in the list? */ + if (gid_list[0] != pw->pw_gid) { + int j; + for (j = 0; j < gid_count; j++) { + if (gid_list[j] == pw->pw_gid) { + gid_list[j] = gid_list[0]; + gid_list[0] = pw->pw_gid; + break; + } + } + } +# else + /* Start with the default group and initgroups() will add the reset. */ + gid_count = 1; + gid_list[0] = pw->pw_gid; +# endif + return pw; +#else + rprintf(FLOG, "This rsync does not support a gid of \"*\"\n"); + io_printf(f_out, "@ERROR: invalid gid setting.\n"); + return NULL; +#endif +} + +static int rsync_module(int f_in, int f_out, int i, const char *addr, const char *host) { int argc; - char **argv, **orig_argv, **orig_early_argv, *chroot_path = NULL; + 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; + struct passwd *pw = NULL; + uid_t uid; + int set_uid; char *p, *err_msg = NULL; 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; @@ -418,6 +497,11 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) iconv_opt = NULL; #endif + /* If reverse lookup is disabled globally but enabled for this module, + * we need to do it now before the access check. */ + if (host == undetermined_hostname && lp_reverse_lookup(i)) + host = client_name(f_in); + 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); @@ -469,61 +553,71 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) if (logfile_format_has_i || log_format_has(logfile_format, 'o')) logfile_format_has_o_or_i = 1; - am_root = (MY_UID() == 0); + uid = MY_UID(); + am_root = (uid == 0); - if (am_root) { - p = lp_uid(i); + p = *lp_uid(i) ? lp_uid(i) : am_root ? NOBODY_USER : NULL; + if (p) { if (!name_to_uid(p, &uid)) { if (!isDigit(p)) { rprintf(FLOG, "Invalid uid %s\n", p); io_printf(f_out, "@ERROR: invalid uid %s\n", p); return -1; } - uid = atoi(p); + uid = atol(p); } + set_uid = 1; + } else + set_uid = 0; - p = lp_gid(i); - if (!name_to_gid(p, &gid)) { - if (!isDigit(p)) { - rprintf(FLOG, "Invalid gid %s\n", p); - io_printf(f_out, "@ERROR: invalid gid %s\n", p); + p = *lp_gid(i) ? strtok(lp_gid(i), ", ") : NULL; + if (p) { + /* The "*" gid must be the first item in the list. */ + if (strcmp(p, "*") == 0) { + if ((pw = want_all_groups(f_out, uid)) == NULL) + return -1; + } else if (add_a_group(f_out, p) < 0) + return -1; + while ((p = strtok(NULL, ", ")) != NULL) { +#if defined HAVE_INITGROUPS && !defined HAVE_GETGROUPLIST + if (pw) { + rprintf(FLOG, "This rsync cannot add groups after \"*\".\n"); + io_printf(f_out, "@ERROR: invalid gid setting.\n"); return -1; } - gid = atoi(p); +#endif + if (add_a_group(f_out, p) < 0) + return -1; } + } else if (am_root) { + if (add_a_group(f_out, NOBODY_GROUP) < 0) + return -1; } - /* TODO: If we're not root, but the configuration requests - * that we change to some uid other than the current one, then - * log a warning. */ - - /* TODO: Perhaps take a list of gids, and make them into the - * supplementary groups. */ - module_dir = lp_path(i); if (use_chroot) { if ((p = strstr(module_dir, "/./")) != NULL) { - *p = '\0'; - p += 2; - } else if ((p = strdup("/")) == NULL) /* MEMORY LEAK */ - out_of_memory("rsync_module"); - } - - /* We do a push_dir() that doesn't actually call chdir() - * just to make a relative path absolute. */ - 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)) == NULL) - out_of_memory("rsync_module"); - push_dir(line, 1); /* Restore curr_dir. */ - - if (use_chroot) { - chroot_path = module_dir; - module_dir = p; /* p is "/" or our inside-chroot path */ + *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; } - module_dirlen = clean_fname(module_dir, CFN_COLLAPSE_DOT_DOT_DIRS | CFN_DROP_TRAILING_DOT_DIR); if (module_dirlen == 1) { module_dirlen = 0; @@ -559,16 +653,8 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) char *modname, *modpath, *hostaddr, *hostname, *username; int status; - if (!use_chroot) - p = module_dir; - else if (module_dirlen) { - pathjoin(line, sizeof line, chroot_path, module_dir+1); - p = line; - } else - p = chroot_path; - if (asprintf(&modname, "RSYNC_MODULE_NAME=%s", name) < 0 - || asprintf(&modpath, "RSYNC_MODULE_PATH=%s", p) < 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) @@ -602,7 +688,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); } } @@ -668,65 +755,60 @@ 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(chroot_path)) { - rsyserr(FLOG, errno, "chroot %s failed", chroot_path); + 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(module_dir, 0)) - goto chdir_failed; - if (module_dirlen) - sanitize_paths = 1; - } 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; - } - sanitize_paths = 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; - if (do_stat(SYMLINK_PREFIX, &st) == 0 && S_ISDIR(st.st_mode)) { - rprintf(FLOG, "Symlink munging is unsupported when a %s directory exists.\n", - SYMLINK_PREFIX); + 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) { - /* XXXX: You could argue that if the daemon is started - * by a non-root user and they explicitly specify a - * gid, then we should try to change to that gid -- - * this could be possible if it's already in their - * supplementary groups. */ - - /* TODO: Perhaps we need to document that if rsyncd is - * started by somebody other than root it will inherit - * all their supplementary groups. */ - - if (setgid(gid)) { - rsyserr(FLOG, errno, "setgid %d failed", (int)gid); + if (gid_count) { + if (setgid(gid_list[0])) { + rsyserr(FLOG, errno, "setgid %ld failed", (long)gid_list[0]); io_printf(f_out, "@ERROR: setgid failed\n"); return -1; } #ifdef HAVE_SETGROUPS - /* Get rid of any supplementary groups this process - * might have inheristed. */ - if (setgroups(1, &gid)) { + /* Set the group(s) we want to be active. */ + if (setgroups(gid_count, gid_list)) { rsyserr(FLOG, errno, "setgroups failed"); io_printf(f_out, "@ERROR: setgroups failed\n"); return -1; } #endif +#if defined HAVE_INITGROUPS && !defined HAVE_GETGROUPLIST + /* pw is set if the user wants all the user's groups. */ + if (pw && initgroups(pw->pw_name, pw->pw_gid) < 0) { + rsyserr(FLOG, errno, "initgroups failed"); + io_printf(f_out, "@ERROR: initgroups failed\n"); + return -1; + } +#endif + } + if (set_uid) { if (setuid(uid)) { - rsyserr(FLOG, errno, "setuid %d failed", (int)uid); + rsyserr(FLOG, errno, "setuid %ld failed", (long)uid); io_printf(f_out, "@ERROR: setuid failed\n"); return -1; } @@ -749,7 +831,9 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) read_args(f_in, name, line, sizeof line, rl_nulls, &argv, &argc, &request); orig_argv = argv; - verbose = 0; /* future verbosity is controlled by client options */ + 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; @@ -760,6 +844,8 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) } 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, orig_early_argv, orig_argv); @@ -800,8 +886,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 @@ -884,7 +969,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++) { @@ -913,7 +998,7 @@ static int load_config(int globals_only) int start_daemon(int f_in, int f_out) { char line[1024]; - char *addr, *host; + const char *addr, *host; int i; io_set_sock_fds(f_in, f_out); @@ -926,15 +1011,11 @@ int start_daemon(int f_in, int f_out) exit_cleanup(RERR_SYNTAX); addr = client_addr(f_in); - host = client_name(f_in); + host = lp_reverse_lookup(-1) ? client_name(f_in) : undetermined_hostname; rprintf(FLOG, "connect from %s (%s)\n", host, addr); 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); } @@ -978,20 +1059,23 @@ static void create_pid_file(void) char *pid_file = lp_pid_file(); char pidbuf[16]; pid_t pid = getpid(); - int fd; + 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); - write(fd, pidbuf, strlen(pidbuf)); + len = strlen(pidbuf); + if (write(fd, pidbuf, len) != len) + goto failure; close(fd); } @@ -1049,6 +1133,7 @@ int daemon_main(void) fprintf(stderr, "Failed to parse config file: %s\n", config_file); exit_cleanup(RERR_SYNTAX); } + set_dparams(0); if (no_detach) create_pid_file();