Turn on blocking_io when starting client of rsync server daemon.
[rsync.git] / clientserver.c
index 8a0ef15d0100c69c17188791dd6379a72e40ded7..459e222783d50bdaec49677a3c2fb3b271a6367f 100644 (file)
@@ -24,15 +24,25 @@ 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[])
 {
        int fd, i;
        char *sargs[MAX_ARGS];
        int sargc=0;
-       char line[1024];
+       char line[MAXPATHLEN];
        char *p, *user=NULL;
        extern int remote_version;
+       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");
+               return -1;
+       }
 
        p = strchr(host, '@');
        if (p) {
@@ -44,9 +54,11 @@ 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);
+       blocking_io = 1;
+
+       fd = open_socket_out(host, rsync_port, &socket_address);
        if (fd == -1) {
-               exit_cleanup(1);
+               exit_cleanup(RERR_SOCKETIO);
        }
        
        server_options(sargs,&sargc);
@@ -92,6 +104,11 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
        }
        io_printf(fd,"\n");
 
+       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);
 }
 
@@ -102,15 +119,20 @@ static int rsync_module(int fd, int i)
        int argc=0;
        char *argv[MAX_ARGS];
        char **argp;
-       char line[1024];
-       uid_t uid;
-       gid_t gid;
+       char line[MAXPATHLEN];
+       uid_t uid = (uid_t)-2;
+       gid_t gid = (gid_t)-2;
        char *p;
        char *addr = client_addr(fd);
        char *host = client_name(fd);
-       char *auth;
        char *name = lp_name(i);
+       int use_chroot = lp_use_chroot(i);
        int start_glob=0;
+       int ret;
+       char *request=NULL;
+       extern int am_sender;
+       extern int remote_version;
+       extern int am_root;
 
        if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) {
                rprintf(FERROR,"rsync denied on module %s from %s (%s)\n",
@@ -120,66 +142,106 @@ static int rsync_module(int fd, int i)
                return -1;
        }
 
-       if (!auth_server(fd, i, addr, "@RSYNCD: AUTHREQD ")) {
+       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(i), strerror(errno));
+                       io_printf(fd,"@ERROR: failed to open lock file %s : %s\n",
+                                 lp_lock_file(i), strerror(errno));
+               } else {
+                       rprintf(FERROR,"max connections (%d) reached\n",
+                               lp_max_connections(i));
+                       io_printf(fd,"@ERROR: max connections (%d) reached - try again later\n", lp_max_connections(i));
+               }
+               return -1;
+       }
+
+       
+       auth_user = auth_server(fd, i, addr, "@RSYNCD: AUTHREQD ");
+
+       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);
                return -1;              
        }
 
-       if (!claim_connection(lp_lock_file(), lp_max_connections())) {
-               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());
-               return -1;
+       module_id = i;
+
+       am_root = (getuid() == 0);
+
+       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);
+               }
        }
 
-       rprintf(FINFO,"rsync on module %s from %s (%s)\n",
-               name, host, addr);
-       
-       module_id = i;
+       p = lp_include_from(i);
+       add_exclude_file(p, 1, 1);
+
+       p = lp_include(i);
+       add_include_line(p);
 
-       if (lp_read_only(i))
-               read_only = 1;
+       p = lp_exclude_from(i);
+       add_exclude_file(p, 1, 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");
+       p = lp_exclude(i);
+       add_exclude_line(p);
+
+       log_open();
+
+       if (use_chroot) {
+               if (chroot(lp_path(i))) {
+                       rprintf(FERROR,"chroot %s failed\n", lp_path(i));
+                       io_printf(fd,"@ERROR: chroot failed\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");
+               if (!push_dir("/", 0)) {
+                       rprintf(FERROR,"chdir %s failed\n", lp_path(i));
+                       io_printf(fd,"@ERROR: chdir failed\n");
                        return -1;
-               } 
-               gid = atoi(p);
-       }
+               }
 
-       if (chroot(lp_path(i))) {
-               io_printf(fd,"@ERROR: chroot 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;
+               }
+               sanitize_paths = 1;
        }
 
-       if (chdir("/")) {
-               io_printf(fd,"@ERROR: chdir failed\n");
-               return -1;
-       }
+       if (am_root) {
+               if (setgid(gid)) {
+                       rprintf(FERROR,"setgid %d failed\n", gid);
+                       io_printf(fd,"@ERROR: setgid failed\n");
+                       return -1;
+               }
 
-       if (setgid(gid)) {
-               io_printf(fd,"@ERROR: setgid failed\n");
-               return -1;
-       }
+               if (setuid(uid)) {
+                       rprintf(FERROR,"setuid %d failed\n", uid);
+                       io_printf(fd,"@ERROR: setuid failed\n");
+                       return -1;
+               }
 
-       if (setuid(uid)) {
-               io_printf(fd,"@ERROR: setuid failed\n");
-               return -1;
+               am_root = (getuid() == 0);
        }
 
        io_printf(fd,"@RSYNCD: OK\n");
@@ -195,18 +257,17 @@ static int rsync_module(int fd, int i)
 
                p = line;
 
-               if (start_glob && strncmp(p, name, strlen(name)) == 0) {
-                       p += strlen(name);
-                       if (!*p) p = ".";
-               }
-
                argv[argc] = strdup(p);
                if (!argv[argc]) {
                        return -1;
                }
 
                if (start_glob) {
-                       glob_expand(argv, &argc, MAX_ARGS);
+                       if (start_glob == 1) {
+                               request = strdup(p);
+                               start_glob++;
+                       }
+                       glob_expand(name, argv, &argc, MAX_ARGS);
                } else {
                        argc++;
                }
@@ -220,15 +281,57 @@ static int rsync_module(int fd, int i)
                }
        }
 
-       parse_arguments(argc, argv);
+       if (sanitize_paths) {
+               /*
+                * Note that this is applied to all parameters, whether or not
+                *    they are filenames, but no other legal parameters contain
+                *    the forms that need to be sanitized so it doesn't hurt;
+                *    it is not known at this point which parameters are files
+                *    and which aren't.
+                */
+               for (i = 1; i < argc; i++) {
+                       sanitize_path(argv[i], NULL);
+               }
+       }
+
+       ret = parse_arguments(argc, argv, 0);
+
+       if (request) {
+               if (*auth_user) {
+                       rprintf(FINFO,"rsync %s %s from %s@%s (%s)\n",
+                               am_sender?"on":"to",
+                               request, auth_user, host, addr);
+               } else {
+                       rprintf(FINFO,"rsync %s %s from %s (%s)\n",
+                               am_sender?"on":"to",
+                               request, host, addr);
+               }
+               free(request);
+       }
 
+#if !TRIDGE
        /* 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 < 23) {
+               if (remote_version == 22 || (remote_version > 17 && am_sender))
+                       io_start_multiplex_out(fd);
+       }
+
+       if (!ret) {
+               option_error();
+       }
+
+       if (lp_timeout(i)) {
+               extern int io_timeout;
+               io_timeout = lp_timeout(i);
+       }
+
        start_server(fd, fd, argc, argp);
 
        return 0;
@@ -257,16 +360,18 @@ static int start_daemon(int fd)
        extern char *config_file;
        extern int remote_version;
 
-       if (!lp_load(config_file)) {
-               exit_cleanup(1);
+       if (!lp_load(config_file, 0)) {
+               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);
@@ -318,13 +423,50 @@ static int start_daemon(int fd)
 
 int daemon_main(void)
 {
+       extern char *config_file;
+       extern int orig_umask;
+       char *pid_file;
+
        if (is_a_socket(STDIN_FILENO)) {
-               /* we are running via inetd */
+               int i;
+
+               /* we are running via inetd - close off stdout and
+                  stderr so that library functions (and getopt) don't
+                  try to use them. Redirect them to /dev/null */
+               for (i=1;i<3;i++) {
+                       close(i); 
+                       open("/dev/null", O_RDWR);
+               }
+
                return start_daemon(STDIN_FILENO);
        }
 
        become_daemon();
 
+       if (!lp_load(config_file, 1)) {
+               exit_cleanup(RERR_SYNTAX);
+       }
+
+       log_open();
+
+       rprintf(FINFO,"rsyncd version %s starting\n",VERSION);
+
+       if (((pid_file = lp_pid_file()) != NULL) && (*pid_file != '\0')) {
+               char pidbuf[16];
+               int fd;
+               int pid = (int) getpid();
+               cleanup_set_pid(pid);
+               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);
+                   exit_cleanup(RERR_FILEIO);
+               }
+               slprintf(pidbuf, sizeof(pidbuf), "%d\n", pid);
+               write(fd, pidbuf, strlen(pidbuf));
+               close(fd);
+       }
+
        start_accept_loop(rsync_port, start_daemon);
        return -1;
 }