X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a358449ab17f4e3c400d2a96acc900cfd0022f95..973007daac25a8cd64c617fe57f566a037fad179:/clientserver.c diff --git a/clientserver.c b/clientserver.c index 318a0ec9..43d9e541 100644 --- a/clientserver.c +++ b/clientserver.c @@ -1,24 +1,29 @@ /* -*- 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 - 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 with rsyncd */ + * + * 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" @@ -27,12 +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. - */ + * 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; @@ -43,8 +58,10 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) extern int remote_version; 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; @@ -58,7 +75,7 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) * See http://lists.samba.org/pipermail/rsync/2000-September/002744.html */ if (shell_cmd) { - rprintf(FERROR, "WARNING: --rsh or -e option ignored when " + rprintf(FINFO, "WARNING: --rsh or -e option ignored when " "connecting to rsync daemon\n"); /* continue */ } @@ -78,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_wrapped (host, rsync_port, bind_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); } @@ -95,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; } @@ -109,10 +138,11 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) /* Old servers may just drop the connection here, rather than sending a proper EXIT command. Yuck. */ - kludge_around_eof = remote_version < 25; + 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; } @@ -123,9 +153,22 @@ 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); + 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); + } - rprintf(FINFO,"%s\n", line); + 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; @@ -166,9 +209,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; } @@ -203,7 +246,7 @@ static int rsync_module(int fd, int i) if (am_root) { p = lp_uid(i); if (!name_to_uid(p, &uid)) { - if (!isdigit(*p)) { + if (!isdigit(* (unsigned char *) p)) { rprintf(FERROR,"Invalid uid %s\n", p); io_printf(fd,"@ERROR: invalid uid %s\n", p); return -1; @@ -213,7 +256,7 @@ static int rsync_module(int fd, int i) p = lp_gid(i); if (!name_to_gid(p, &gid)) { - if (!isdigit(*p)) { + if (!isdigit(* (unsigned char *) p)) { rprintf(FERROR,"Invalid gid %s\n", p); io_printf(fd,"@ERROR: invalid gid %s\n", p); return -1; @@ -278,6 +321,26 @@ static int rsync_module(int fd, int i) } 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)) { rsyserr(FERROR, errno, "setgid %d failed", (int) gid); io_printf(fd,"@ERROR: setgid failed\n"); @@ -485,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; @@ -500,7 +564,8 @@ 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); @@ -512,7 +577,8 @@ int daemon_main(void) RSYNC_VERSION, rsync_port); /* TODO: If listening on a particular address, then show that - * address too. */ + * 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];