X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/716baed7ff23f949861f0eb369c013408e17f984..b35d0d8e9ae9c5407c9f781b545f8a66b9caa9d0:/clientserver.c diff --git a/clientserver.c b/clientserver.c index 557eb5fd..9cda2a0b 100644 --- a/clientserver.c +++ b/clientserver.c @@ -1,5 +1,7 @@ -/* - Copyright (C) Andrew Tridgell 1998 +/* -*- c-file-style: "linux"; -*- + + Copyright (C) 1998-2001 by Andrew Tridgell + Copyright (C) 2001-2002 by Martin Pool 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 @@ -16,7 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* the socket based protocol for setting up a connection wit rsyncd */ +/* the socket based protocol for setting up a connection with rsyncd */ #include "rsync.h" @@ -25,7 +27,16 @@ extern int read_only; extern int verbose; extern int rsync_port; char *auth_user; - +extern int sanitize_paths; + +/** + * Run a client connected to an rsyncd. The alternative to this + * function for remote-shell connections is do_cmd(). + * + * After initial server startup, hands over to client_run(). + * + * @return -1 for error in startup, or the result of client_run(). + **/ int start_socket_client(char *host, char *path, int argc, char *argv[]) { int fd, i; @@ -34,11 +45,32 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) char line[MAXPATHLEN]; char *p, *user=NULL; extern int remote_version; - extern int am_client; extern int am_sender; + extern char *shell_cmd; + extern int list_only; + extern int kludge_around_eof; + extern char *bind_address; + extern int default_af_hint; + + if (argc == 0 && !am_sender) { + extern int list_only; + list_only = 1; + } + /* This is just a friendliness enhancement: if the connection + * is to an rsyncd then there is no point specifying the -e option. + * Note that this is only set if the -e was explicitly specified, + * not if the environment variable just happens to be set. + * See http://lists.samba.org/pipermail/rsync/2000-September/002744.html + */ + if (shell_cmd) { + rprintf(FERROR, "WARNING: --rsh or -e option ignored when " + "connecting to rsync daemon\n"); + /* continue */ + } + 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 not a /\n"); return -1; } @@ -52,9 +84,15 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) if (!user) user = getenv("USER"); if (!user) user = getenv("LOGNAME"); - am_client = 1; - - fd = open_socket_out(host, rsync_port); + 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) { exit_cleanup(RERR_SOCKETIO); } @@ -71,10 +109,14 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION); if (!read_line(fd, line, sizeof(line)-1)) { + rprintf(FERROR, "rsync: did not see server greeting\n"); return -1; } if (sscanf(line,"@RSYNCD: %d", &remote_version) != 1) { + /* note that read_line strips of \n or \r */ + rprintf(FERROR, "rsync: server sent \"%s\" rather than greeting\n", + line); return -1; } @@ -83,8 +125,13 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) io_printf(fd,"%s\n",path); if (p) *p = '/'; + /* Old servers may just drop the connection here, + rather than sending a proper EXIT command. Yuck. */ + kludge_around_eof = list_only && (remote_version < 25); + while (1) { if (!read_line(fd, line, sizeof(line)-1)) { + rprintf(FERROR, "rsync: didn't get server startup line\n"); return -1; } @@ -94,16 +141,25 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) } if (strcmp(line,"@RSYNCD: OK") == 0) break; - rprintf(FINFO,"%s\n", line); + + if (strcmp(line,"@RSYNCD: EXIT") == 0) exit(0); + + if (strncmp(line, "@ERROR", 6) == 0) + rprintf(FERROR,"%s\n", line); + else + rprintf(FINFO,"%s\n", line); } + kludge_around_eof = False; for (i=0;i 17 && !am_sender) - io_start_multiplex_in(fd); + if (remote_version < 23) { + if (remote_version == 22 || (remote_version > 17 && !am_sender)) + io_start_multiplex_in(fd); + } return client_run(fd, fd, -1, argc, argv); } @@ -116,7 +172,7 @@ static int rsync_module(int fd, int i) char *argv[MAX_ARGS]; char **argp; char line[MAXPATHLEN]; - uid_t uid = (uid_t)-2; + uid_t uid = (uid_t)-2; /* canonically "nobody" */ gid_t gid = (gid_t)-2; char *p; char *addr = client_addr(fd); @@ -132,9 +188,9 @@ static int rsync_module(int fd, int i) if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) { rprintf(FERROR,"rsync denied on module %s from %s (%s)\n", - name, client_name(fd), client_addr(fd)); + name, host, addr); io_printf(fd,"@ERROR: access denied to %s from %s (%s)\n", - name, client_name(fd), client_addr(fd)); + name, host, addr); return -1; } @@ -164,9 +220,6 @@ static int rsync_module(int fd, int i) module_id = i; - if (lp_read_only(i)) - read_only = 1; - am_root = (getuid() == 0); if (am_root) { @@ -174,7 +227,7 @@ static int rsync_module(int fd, int i) if (!name_to_uid(p, &uid)) { if (!isdigit(*p)) { rprintf(FERROR,"Invalid uid %s\n", p); - io_printf(fd,"@ERROR: invalid uid\n"); + io_printf(fd,"@ERROR: invalid uid %s\n", p); return -1; } uid = atoi(p); @@ -184,12 +237,19 @@ static int rsync_module(int fd, int i) if (!name_to_gid(p, &gid)) { if (!isdigit(*p)) { rprintf(FERROR,"Invalid gid %s\n", p); - io_printf(fd,"@ERROR: invalid gid\n"); + io_printf(fd,"@ERROR: invalid gid %s\n", p); return -1; } gid = atoi(p); } } + + /* 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. */ p = lp_include_from(i); add_exclude_file(p, 1, 1); @@ -203,38 +263,71 @@ static int rsync_module(int fd, int i) p = lp_exclude(i); add_exclude_line(p); - log_open(); + log_init(); if (use_chroot) { + /* + * XXX: The 'use chroot' flag is a fairly reliable + * source of confusion, because it fails under two + * important circumstances: running as non-root, + * running on Win32 (or possibly others). On the + * other hand, if you are running as root, then it + * might be better to always use chroot. + * + * So, perhaps if we can't chroot we should just issue + * a warning, unless a "require chroot" flag is set, + * in which case we fail. + */ if (chroot(lp_path(i))) { - rprintf(FERROR,"chroot %s failed\n", lp_path(i)); + rsyserr(FERROR, errno, "chroot %s failed", lp_path(i)); io_printf(fd,"@ERROR: chroot failed\n"); return -1; } - if (chdir("/")) { - rprintf(FERROR,"chdir %s failed\n", lp_path(i)); + if (!push_dir("/", 0)) { + rsyserr(FERROR, errno, "chdir %s failed\n", lp_path(i)); io_printf(fd,"@ERROR: chdir failed\n"); return -1; } } else { if (!push_dir(lp_path(i), 0)) { - rprintf(FERROR,"chdir %s failed\n", lp_path(i)); + rsyserr(FERROR, errno, "chdir %s failed\n", lp_path(i)); io_printf(fd,"@ERROR: chdir failed\n"); return -1; } + sanitize_paths = 1; } if (am_root) { +#ifdef HAVE_SETGROUPS + /* Get rid of any supplementary groups this process + * might have inheristed. */ + if (setgroups(0, NULL)) { + rsyserr(FERROR, errno, "setgroups failed"); + io_printf(fd, "@ERROR: setgroups failed\n"); + return -1; + } +#endif + + /* 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)) { - rprintf(FERROR,"setgid %d failed\n", gid); + rsyserr(FERROR, errno, "setgid %d failed", (int) gid); io_printf(fd,"@ERROR: setgid failed\n"); return -1; } if (setuid(uid)) { - rprintf(FERROR,"setuid %d failed\n", uid); + rsyserr(FERROR, errno, "setuid %d failed", (int) uid); io_printf(fd,"@ERROR: setuid failed\n"); return -1; } @@ -265,7 +358,7 @@ static int rsync_module(int fd, int i) request = strdup(p); start_glob++; } - glob_expand(name, argv, &argc, MAX_ARGS, !use_chroot); + glob_expand(name, argv, &argc, MAX_ARGS); } else { argc++; } @@ -279,7 +372,7 @@ static int rsync_module(int fd, int i) } } - if (!use_chroot) { + if (sanitize_paths) { /* * Note that this is applied to all parameters, whether or not * they are filenames, but no other legal parameters contain @@ -288,11 +381,12 @@ static int rsync_module(int fd, int i) * and which aren't. */ for (i = 1; i < argc; i++) { - sanitize_path(argv[i]); + sanitize_path(argv[i], NULL); } } - ret = parse_arguments(argc, argv); + argp = argv; + ret = parse_arguments(&argc, (const char ***) &argp, 0); if (request) { if (*auth_user) { @@ -307,20 +401,27 @@ static int rsync_module(int fd, int i) free(request); } -#if !TRIDGE +#ifndef DEBUG /* don't allow the logs to be flooded too fast */ if (verbose > 1) verbose = 1; #endif - argc -= optind; - argp = argv + optind; - optind = 0; - - if (remote_version > 17 && am_sender) - io_start_multiplex_out(fd); - + if (remote_version < 23) { + if (remote_version == 22 || (remote_version > 17 && am_sender)) + io_start_multiplex_out(fd); + } + + /* 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(); + option_error(); + exit_cleanup(RERR_UNSUPPORTED); } if (lp_timeout(i)) { @@ -339,10 +440,14 @@ static void send_listing(int fd) { int n = lp_numservices(); int i; - + extern int remote_version; + for (i=0;i= 25) + io_printf(fd,"@RSYNCD: EXIT\n"); } /* this is called when a socket connection is established to a client @@ -362,7 +467,7 @@ static int start_daemon(int fd) set_socket_options(fd,"SO_KEEPALIVE"); set_socket_options(fd,lp_socket_options()); - + set_nonblocking(fd); io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION); @@ -420,12 +525,9 @@ static int start_daemon(int fd) int daemon_main(void) { extern char *config_file; + extern int orig_umask; char *pid_file; - - /* this ensures that we don't call getcwd after the chroot, - which doesn't work on platforms that use popen("pwd","r") - for getcwd */ - push_dir("/", 0); + extern int no_detach; if (is_a_socket(STDIN_FILENO)) { int i; @@ -438,33 +540,39 @@ int daemon_main(void) open("/dev/null", O_RDWR); } - set_nonblocking(STDIN_FILENO); - return start_daemon(STDIN_FILENO); } - become_daemon(); + if (!no_detach) + become_daemon(); if (!lp_load(config_file, 1)) { - fprintf(stderr,"failed to load config file %s\n", config_file); exit_cleanup(RERR_SYNTAX); } - log_open(); + log_init(); - rprintf(FINFO,"rsyncd version %s starting\n",VERSION); + rprintf(FINFO, "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 + * local address??? */ if (((pid_file = lp_pid_file()) != NULL) && (*pid_file != '\0')) { - FILE *f; + char pidbuf[16]; + int fd; int pid = (int) getpid(); cleanup_set_pid(pid); - if ((f = fopen(lp_pid_file(), "w")) == NULL) { + if ((fd = do_open(lp_pid_file(), O_WRONLY|O_CREAT|O_TRUNC, + 0666 & ~orig_umask)) == -1) { cleanup_set_pid(0); - fprintf(stderr,"failed to create pid file %s\n", pid_file); + rsyserr(FLOG, errno, "failed to create pid file %s", pid_file); exit_cleanup(RERR_FILEIO); } - fprintf(f, "%d\n", pid); - fclose(f); + snprintf(pidbuf, sizeof(pidbuf), "%d\n", pid); + write(fd, pidbuf, strlen(pidbuf)); + close(fd); } start_accept_loop(rsync_port, start_daemon);