X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b6a30afc9812ddf685caf7d06dcf102e9e8073e9..973007daac25a8cd64c617fe57f566a037fad179:/clientserver.c diff --git a/clientserver.c b/clientserver.c index 7518e3e1..43d9e541 100644 --- a/clientserver.c +++ b/clientserver.c @@ -1,22 +1,29 @@ -/* - Copyright (C) Andrew Tridgell 1998 - - 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. - - 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. -*/ - -/* the socket based protocol for setting up a connection wit rsyncd */ +/* -*- 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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. + */ + +/** + * @file + * + * The socket based protocol for setting up a connection with + * rsyncd. + **/ #include "rsync.h" @@ -25,8 +32,22 @@ extern int read_only; extern int verbose; extern int rsync_port; char *auth_user; -int sanitize_paths = 0; - +extern int sanitize_paths; + +/** + * Run a client connected to an rsyncd. The alternative to this + * function for remote-shell connections is do_cmd(). + * + * After negotiating which module to use and reading the server's + * motd, this hands over to client_run(). Telling the server the + * module will cause it to chroot/setuid/etc. + * + * Instead of doing a transfer, the client may at this stage instead + * get a listing of remote modules and exit. + * + * @return -1 for error in startup, or the result of client_run(). + * Either way, it eventually gets passed to exit_cleanup(). + **/ int start_socket_client(char *host, char *path, int argc, char *argv[]) { int fd, i; @@ -36,10 +57,31 @@ 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; + 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(FINFO, "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; } @@ -53,7 +95,15 @@ 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, &socket_address); + 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); } @@ -70,10 +120,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; } @@ -82,8 +136,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; } @@ -93,8 +152,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) { + /* This is sent by recent versions of the + * server to terminate the listing of modules. + * We don't want to go on and transfer + * anything; just exit. */ + exit(0); + } + + if (strncmp(line, "@ERROR", 6) == 0) { + rprintf(FERROR,"%s\n", line); + /* This is always fatal; the server will now + * close the socket. */ + return RERR_STARTCLIENT; + } else { + rprintf(FINFO,"%s\n", line); + } } + kludge_around_eof = False; for (i=0;i 1) verbose = 1; #endif - argc -= optind; - argp = argv + optind; - optind = 0; - 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,10 +461,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 @@ -423,6 +548,7 @@ int daemon_main(void) extern char *config_file; extern int orig_umask; char *pid_file; + extern int no_detach; if (is_a_socket(STDIN_FILENO)) { int i; @@ -438,15 +564,21 @@ int daemon_main(void) return start_daemon(STDIN_FILENO); } - become_daemon(); + if (!no_detach) + become_daemon(); if (!lp_load(config_file, 1)) { 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')) { char pidbuf[16]; @@ -456,10 +588,10 @@ int daemon_main(void) if ((fd = do_open(lp_pid_file(), O_WRONLY|O_CREAT|O_TRUNC, 0666 & ~orig_umask)) == -1) { cleanup_set_pid(0); - rprintf(FLOG,"failed to create pid file %s\n", pid_file); + rsyserr(FLOG, errno, "failed to create pid file %s", pid_file); exit_cleanup(RERR_FILEIO); } - slprintf(pidbuf, sizeof(pidbuf), "%d\n", pid); + snprintf(pidbuf, sizeof(pidbuf), "%d\n", pid); write(fd, pidbuf, strlen(pidbuf)); close(fd); }