X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ad517ce5b33eb59873ec8468af704f43867cd8cb..08a740ff436a4c0dc1aa53d671f6f14b8bf2348a:/clientserver.c diff --git a/clientserver.c b/clientserver.c index ace360b4..dd383d0b 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 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,12 @@ extern int read_only; extern int verbose; extern int rsync_port; char *auth_user; +int sanitize_paths = 0; +/* + * Run a client connected to an rsyncd. The alternative to this + * function for remote-shell connections is do_cmd. + */ int start_socket_client(char *host, char *path, int argc, char *argv[]) { int fd, i; @@ -35,9 +42,28 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) char *p, *user=NULL; extern int remote_version; extern int am_sender; + extern struct in_addr socket_address; + extern char *shell_cmd; + + 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; } @@ -51,7 +77,7 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) if (!user) user = getenv("USER"); if (!user) user = getenv("LOGNAME"); - fd = open_socket_out(host, rsync_port); + fd = open_socket_out(host, rsync_port, &socket_address); if (fd == -1) { exit_cleanup(RERR_SOCKETIO); } @@ -91,6 +117,9 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) } if (strcmp(line,"@RSYNCD: OK") == 0) break; + + if (strcmp(line,"@RSYNCD: EXIT") == 0) exit(0); + rprintf(FINFO,"%s\n", line); } @@ -99,8 +128,10 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) } io_printf(fd,"\n"); - if (remote_version > 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); } @@ -113,7 +144,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); @@ -161,9 +192,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) { @@ -171,7 +199,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); @@ -181,12 +209,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); @@ -200,38 +235,39 @@ static int rsync_module(int fd, int i) p = lp_exclude(i); add_exclude_line(p); - log_open(); + log_init(); if (use_chroot) { 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 (!push_dir("/", 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; } } 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) { 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; } @@ -262,7 +298,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++; } @@ -276,7 +312,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 @@ -285,11 +321,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, 0); + argp = argv; + ret = parse_arguments(&argc, (const char ***) &argp, 0); if (request) { if (*auth_user) { @@ -304,20 +341,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)) { @@ -340,6 +384,8 @@ static void send_listing(int fd) for (i=0;i