X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5e71c4446e10c27c1db0c7e7e5b71be68f3b88de..27e3e9c9063c49e5d35a2b682fc88c0be2a523d1:/clientserver.c diff --git a/clientserver.c b/clientserver.c index 49928d5b..95461106 100644 --- a/clientserver.c +++ b/clientserver.c @@ -25,6 +25,7 @@ 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[]) { @@ -34,8 +35,13 @@ 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; + + if (argc == 0 && !am_sender) { + extern int list_only; + list_only = 1; + } if (*path == '/') { rprintf(FERROR,"ERROR: The remote path must start with a module name\n"); @@ -52,9 +58,7 @@ 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; - - fd = open_socket_out(host, rsync_port); + fd = open_socket_out(host, rsync_port, &socket_address); if (fd == -1) { exit_cleanup(RERR_SOCKETIO); } @@ -102,8 +106,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); } @@ -164,27 +170,28 @@ 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); @@ -208,34 +215,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; + } + + } 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 (setgid(gid) || getgid() != gid) { + 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"; @@ -259,7 +269,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++; } @@ -273,7 +283,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 @@ -282,11 +292,11 @@ 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); + ret = parse_arguments(argc, argv, 0); if (request) { if (*auth_user) { @@ -310,8 +320,10 @@ 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) { option_error(); @@ -356,7 +368,7 @@ static int start_daemon(int fd) set_socket_options(fd,"SO_KEEPALIVE"); set_socket_options(fd,lp_socket_options()); - + set_nonblocking(fd); io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION); @@ -414,13 +426,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; @@ -432,15 +440,12 @@ 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(RERR_SYNTAX); } @@ -449,16 +454,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); + 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);