Turn on blocking_io when starting client of rsync server daemon.
[rsync.git] / clientserver.c
index debc4fec310bd3ffcb07b9c120157df65ba13eeb..459e222783d50bdaec49677a3c2fb3b271a6367f 100644 (file)
@@ -24,6 +24,8 @@ extern int module_id;
 extern int read_only;
 extern int verbose;
 extern int rsync_port;
+char *auth_user;
+int sanitize_paths = 0;
 
 int start_socket_client(char *host, char *path, int argc, char *argv[])
 {
@@ -33,8 +35,9 @@ 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 struct in_addr socket_address;
+       extern int blocking_io;
 
        if (*path == '/') {
                rprintf(FERROR,"ERROR: The remote path must start with a module name\n");
@@ -51,11 +54,11 @@ 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;
+       blocking_io = 1;
 
-       fd = open_socket_out(host, rsync_port);
+       fd = open_socket_out(host, rsync_port, &socket_address);
        if (fd == -1) {
-               exit_cleanup(1);
+               exit_cleanup(RERR_SOCKETIO);
        }
        
        server_options(sargs,&sargc);
@@ -101,8 +104,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);
 }
@@ -121,7 +126,6 @@ static int rsync_module(int fd, int i)
        char *addr = client_addr(fd);
        char *host = client_name(fd);
        char *name = lp_name(i);
-       char *user;
        int use_chroot = lp_use_chroot(i);
        int start_glob=0;
        int ret;
@@ -138,24 +142,24 @@ static int rsync_module(int fd, int i)
                return -1;
        }
 
-       if (!claim_connection(lp_lock_file(), lp_max_connections())) {
+       if (!claim_connection(lp_lock_file(i), lp_max_connections(i))) {
                if (errno) {
                        rprintf(FERROR,"failed to open lock file %s : %s\n",
-                               lp_lock_file(), strerror(errno));
+                               lp_lock_file(i), strerror(errno));
                        io_printf(fd,"@ERROR: failed to open lock file %s : %s\n",
-                                 lp_lock_file(), strerror(errno));
+                                 lp_lock_file(i), strerror(errno));
                } else {
                        rprintf(FERROR,"max connections (%d) reached\n",
-                               lp_max_connections());
-                       io_printf(fd,"@ERROR: max connections (%d) reached - try again later\n", lp_max_connections());
+                               lp_max_connections(i));
+                       io_printf(fd,"@ERROR: max connections (%d) reached - try again later\n", lp_max_connections(i));
                }
                return -1;
        }
 
        
-       user = auth_server(fd, i, addr, "@RSYNCD: AUTHREQD ");
+       auth_user = auth_server(fd, i, addr, "@RSYNCD: AUTHREQD ");
 
-       if (!user) {
+       if (!auth_user) {
                rprintf(FERROR,"auth failed on module %s from %s (%s)\n",
                        name, client_name(fd), client_addr(fd));
                io_printf(fd,"@ERROR: auth failed on module %s\n",name);
@@ -164,29 +168,36 @@ static int rsync_module(int fd, int i)
 
        module_id = i;
 
-       if (lp_read_only(i))
-               read_only = 1;
+       am_root = (getuid() == 0);
 
-       p = lp_uid(i);
-       if (!name_to_uid(p, &uid)) {
-               if (!isdigit(*p)) {
-                       rprintf(FERROR,"Invalid uid %s\n", p);
-                       io_printf(fd,"@ERROR: invalid uid\n");
-                       return -1;
-               } 
-               uid = atoi(p);
-       }
+       if (am_root) {
+               p = lp_uid(i);
+               if (!name_to_uid(p, &uid)) {
+                       if (!isdigit(*p)) {
+                               rprintf(FERROR,"Invalid uid %s\n", p);
+                               io_printf(fd,"@ERROR: invalid uid\n");
+                               return -1;
+                       } 
+                       uid = atoi(p);
+               }
 
-       p = lp_gid(i);
-       if (!name_to_gid(p, &gid)) {
-               if (!isdigit(*p)) {
-                       rprintf(FERROR,"Invalid gid %s\n", p);
-                       io_printf(fd,"@ERROR: invalid gid\n");
-                       return -1;
-               } 
-               gid = atoi(p);
+               p = lp_gid(i);
+               if (!name_to_gid(p, &gid)) {
+                       if (!isdigit(*p)) {
+                               rprintf(FERROR,"Invalid gid %s\n", p);
+                               io_printf(fd,"@ERROR: invalid gid\n");
+                               return -1;
+                       } 
+                       gid = atoi(p);
+               }
        }
 
+       p = lp_include_from(i);
+       add_exclude_file(p, 1, 1);
+
+       p = lp_include(i);
+       add_include_line(p);
+
        p = lp_exclude_from(i);
        add_exclude_file(p, 1, 0);
 
@@ -202,34 +213,37 @@ static int rsync_module(int fd, int i)
                        return -1;
                }
 
-               if (chdir("/")) {
+               if (!push_dir("/", 0)) {
                        rprintf(FERROR,"chdir %s failed\n", lp_path(i));
                        io_printf(fd,"@ERROR: chdir failed\n");
                        return -1;
                }
 
-               if (setgid(gid) || getgid() != gid) {
+       } else {
+               if (!push_dir(lp_path(i), 0)) {
+                       rprintf(FERROR,"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);
                        io_printf(fd,"@ERROR: setgid failed\n");
                        return -1;
                }
 
-               if (setuid(uid) || getuid() != uid) {
+               if (setuid(uid)) {
                        rprintf(FERROR,"setuid %d failed\n", uid);
                        io_printf(fd,"@ERROR: setuid failed\n");
                        return -1;
                }
 
-       } else {
-               if (!push_dir(lp_path(i), 0)) {
-                       rprintf(FERROR,"chdir %s failed\n", lp_path(i));
-                       io_printf(fd,"@ERROR: chdir failed\n");
-                       return -1;
-               }
+               am_root = (getuid() == 0);
        }
 
-       am_root = (getuid() == 0);
-
        io_printf(fd,"@RSYNCD: OK\n");
 
        argv[argc++] = "rsyncd";
@@ -267,7 +281,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
@@ -276,19 +290,17 @@ static int rsync_module(int fd, int i)
                 *    and which aren't.
                 */
                for (i = 1; i < argc; i++) {
-                       char *copy = sanitize_path(argv[i]);
-                       free((void *)argv[i]);
-                       argv[i] = copy;
+                       sanitize_path(argv[i], NULL);
                }
        }
 
-       ret = parse_arguments(argc, argv);
+       ret = parse_arguments(argc, argv, 0);
 
        if (request) {
-               if (*user) {
+               if (*auth_user) {
                        rprintf(FINFO,"rsync %s %s from %s@%s (%s)\n",
                                am_sender?"on":"to",
-                               request, user, host, addr);
+                               request, auth_user, host, addr);
                } else {
                        rprintf(FINFO,"rsync %s %s from %s (%s)\n",
                                am_sender?"on":"to",
@@ -306,12 +318,18 @@ static int rsync_module(int fd, int i)
        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);
+       }
 
        if (!ret) {
-               rprintf(FERROR,"Error parsing options (unsupported option?) - aborting\n");
-               exit_cleanup(1);
+               option_error();
+       }
+
+       if (lp_timeout(i)) {
+               extern int io_timeout;
+               io_timeout = lp_timeout(i);
        }
 
        start_server(fd, fd, argc, argp);
@@ -343,17 +361,17 @@ static int start_daemon(int fd)
        extern int remote_version;
 
        if (!lp_load(config_file, 0)) {
-               exit_cleanup(1);
+               exit_cleanup(RERR_SYNTAX);
        }
 
        set_socket_options(fd,"SO_KEEPALIVE");
        set_socket_options(fd,lp_socket_options());
-       
+       set_nonblocking(fd);
 
        io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
 
        motd = lp_motd_file();
-       if (*motd) {
+       if (motd && *motd) {
                FILE *f = fopen(motd,"r");
                while (f && !feof(f)) {
                        int len = fread(line, 1, sizeof(line)-1, f);
@@ -406,13 +424,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);
-
        if (is_a_socket(STDIN_FILENO)) {
                int i;
 
@@ -424,16 +438,13 @@ int daemon_main(void)
                        open("/dev/null", O_RDWR);
                }
 
-               set_nonblocking(STDIN_FILENO);
-
                return start_daemon(STDIN_FILENO);
        }
 
        become_daemon();
 
        if (!lp_load(config_file, 1)) {
-               fprintf(stderr,"failed to load config file %s\n", config_file);
-               exit_cleanup(1);
+               exit_cleanup(RERR_SYNTAX);
        }
 
        log_open();
@@ -441,16 +452,19 @@ int daemon_main(void)
        rprintf(FINFO,"rsyncd version %s starting\n",VERSION);
 
        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);
-                   exit_cleanup(1);
+                   rprintf(FLOG,"failed to create pid file %s\n", pid_file);
+                   exit_cleanup(RERR_FILEIO);
                }
-               fprintf(f, "%d\n", pid);
-               fclose(f);
+               slprintf(pidbuf, sizeof(pidbuf), "%d\n", pid);
+               write(fd, pidbuf, strlen(pidbuf));
+               close(fd);
        }
 
        start_accept_loop(rsync_port, start_daemon);