X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8ef4ffd6987bb566c268d2a353d5fea1cfd9e430..654175798bdbdd6403e10c8fa74e8586b3612ea1:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 95ca7b6c..4b8ed53b 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -24,19 +24,39 @@ extern int module_id;
 extern int read_only;
 extern int verbose;
 extern int rsync_port;
+char *auth_user;
 
 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 *p;
-	int version;
+	char line[MAXPATHLEN];
+	char *p, *user=NULL;
+	extern int remote_version;
+	extern int am_client;
+	extern int am_sender;
+
+	if (*path == '/') {
+		rprintf(FERROR,"ERROR: The remote path must start with a module name\n");
+		return -1;
+	}
+
+	p = strchr(host, '@');
+	if (p) {
+		user = host;
+		host = p+1;
+		*p = 0;
+	}
+
+	if (!user) user = getenv("USER");
+	if (!user) user = getenv("LOGNAME");
+
+	am_client = 1;
 
 	fd = open_socket_out(host, rsync_port);
 	if (fd == -1) {
-		exit_cleanup(1);
+		exit_cleanup(RERR_SOCKETIO);
 	}
 	
 	server_options(sargs,&sargc);
@@ -48,16 +68,16 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
 
 	sargs[sargc] = NULL;
 
+	io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
+
 	if (!read_line(fd, line, sizeof(line)-1)) {
 		return -1;
 	}
 
-	if (sscanf(line,"@RSYNCD: %d", &version) != 1) {
+	if (sscanf(line,"@RSYNCD: %d", &remote_version) != 1) {
 		return -1;
 	}
 
-	io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
-
 	p = strchr(path,'/');
 	if (p) *p = 0;
 	io_printf(fd,"%s\n",path);
@@ -67,6 +87,12 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
 		if (!read_line(fd, line, sizeof(line)-1)) {
 			return -1;
 		}
+
+		if (strncmp(line,"@RSYNCD: AUTHREQD ",18) == 0) {
+			auth_client(fd, user, line+18);
+			continue;
+		}
+
 		if (strcmp(line,"@RSYNCD: OK") == 0) break;
 		rprintf(FINFO,"%s\n", line);
 	}
@@ -76,14 +102,8 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
 	}
 	io_printf(fd,"\n");
 
-#if 0
-	while (1) {
-		if (!read_line(fd, line, sizeof(line)-1)) {
-			return -1;
-		}
-		rprintf(FINFO,"%s\n", line);
-	}
-#endif
+	if (remote_version > 17 && !am_sender)
+		io_start_multiplex_in(fd);
 
 	return client_run(fd, fd, -1, argc, argv);
 }
@@ -95,10 +115,52 @@ 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 *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",
+			name, client_name(fd), client_addr(fd));
+		io_printf(fd,"@ERROR: access denied to %s from %s (%s)\n",
+			  name, client_name(fd), client_addr(fd));
+		return -1;
+	}
+
+	if (!claim_connection(lp_lock_file(), lp_max_connections())) {
+		if (errno) {
+			rprintf(FERROR,"failed to open lock file %s : %s\n",
+				lp_lock_file(), strerror(errno));
+			io_printf(fd,"@ERROR: failed to open lock file %s : %s\n",
+				  lp_lock_file(), 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());
+		}
+		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;		
+	}
 
 	module_id = i;
 
@@ -109,6 +171,7 @@ static int rsync_module(int fd, int 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);
@@ -118,33 +181,55 @@ static int rsync_module(int fd, int 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(FERROR,"rsyncd starting\n");
+	p = lp_exclude_from(i);
+	add_exclude_file(p, 1, 0);
 
-	if (chroot(lp_path(i))) {
-		io_printf(fd,"@ERROR: chroot failed\n");
-		return -1;
-	}
+	p = lp_exclude(i);
+	add_exclude_line(p);
 
-	if (chdir("/")) {
-		io_printf(fd,"@ERROR: chdir failed\n");
-		return -1;
-	}
+	log_open();
 
-	if (setgid(gid)) {
-		io_printf(fd,"@ERROR: setgid failed\n");
-		return -1;
-	}
+	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;
+		}
 
-	if (setuid(uid)) {
-		io_printf(fd,"@ERROR: setuid failed\n");
-		return -1;
+		if (chdir("/")) {
+			rprintf(FERROR,"chdir %s failed\n", lp_path(i));
+			io_printf(fd,"@ERROR: chdir failed\n");
+			return -1;
+		}
+
+		if (setgid(gid) || getgid() != gid) {
+			rprintf(FERROR,"setgid %d failed\n", gid);
+			io_printf(fd,"@ERROR: setgid failed\n");
+			return -1;
+		}
+
+		if (setuid(uid) || getuid() != 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);
+
 	io_printf(fd,"@RSYNCD: OK\n");
 
 	argv[argc++] = "rsyncd";
@@ -156,26 +241,79 @@ static int rsync_module(int fd, int i)
 
 		if (!*line) break;
 
-		argv[argc] = strdup(line);
+		p = line;
+
+		argv[argc] = strdup(p);
 		if (!argv[argc]) {
 			return -1;
 		}
 
-		argc++;
+		if (start_glob) {
+			if (start_glob == 1) {
+				request = strdup(p);
+				start_glob++;
+			}
+			glob_expand(name, argv, &argc, MAX_ARGS);
+		} else {
+			argc++;
+		}
+
+		if (strcmp(line,".") == 0) {
+			start_glob = 1;
+		}
+
 		if (argc == MAX_ARGS) {
 			return -1;
 		}
 	}
 
-	parse_arguments(argc, argv);
+	if (!use_chroot) {
+		/*
+		 * 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++) {
+			char *copy = sanitize_path(argv[i]);
+			free((void *)argv[i]);
+			argv[i] = copy;
+		}
+	}
+
+	ret = parse_arguments(argc, argv);
+
+	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 > 17 && am_sender)
+		io_start_multiplex_out(fd);
+
+	if (!ret) {
+		rprintf(FERROR,"Error parsing options (unsupported option?) - aborting\n");
+		exit_cleanup(RERR_SYNTAX);
+	}
+
 	start_server(fd, fd, argc, argp);
 
 	return 0;
@@ -200,23 +338,22 @@ static int start_daemon(int fd)
 {
 	char line[200];
 	char *motd;
-	int version;
 	int i = -1;
+	extern char *config_file;
+	extern int remote_version;
+
+	if (!lp_load(config_file, 0)) {
+		exit_cleanup(RERR_SYNTAX);
+	}
 
 	set_socket_options(fd,"SO_KEEPALIVE");
+	set_socket_options(fd,lp_socket_options());
+	
 
 	io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
 
-	if (!read_line(fd, line, sizeof(line)-1)) {
-		return -1;
-	}
-
-	if (sscanf(line,"@RSYNCD: %d", &version) != 1) {
-		return -1;
-	}	
-
 	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);
@@ -229,8 +366,16 @@ static int start_daemon(int fd)
 		io_printf(fd,"\n");
 	}
 
-	while (i == -1) {
+	if (!read_line(fd, line, sizeof(line)-1)) {
+		return -1;
+	}
+
+	if (sscanf(line,"@RSYNCD: %d", &remote_version) != 1) {
+		io_printf(fd,"@ERROR: protocol startup error\n");
+		return -1;
+	}	
 
+	while (i == -1) {
 		line[0] = 0;
 		if (!read_line(fd, line, sizeof(line)-1)) {
 			return -1;
@@ -243,13 +388,13 @@ static int start_daemon(int fd)
 
 		if (*line == '#') {
 			/* it's some sort of command that I don't understand */
-			io_printf(fd,"ERROR: Unknown command '%s'\n", line);
+			io_printf(fd,"@ERROR: Unknown command '%s'\n", line);
 			return -1;
 		}
 
 		i = lp_number(line);
 		if (i == -1) {
-			io_printf(fd,"ERROR: Unknown module '%s'\n", line);
+			io_printf(fd,"@ERROR: Unknown module '%s'\n", line);
 			return -1;
 		}
 	}
@@ -261,18 +406,53 @@ static int start_daemon(int fd)
 int daemon_main(void)
 {
 	extern char *config_file;
+	char *pid_file;
 
-	if (!lp_load(config_file)) {
-		exit_cleanup(1);
-	}
+	/* 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)) {
-		/* 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);
+		}
+
+		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);
+	}
+
+	log_open();
+
+	rprintf(FINFO,"rsyncd version %s starting\n",VERSION);
+
+	if (((pid_file = lp_pid_file()) != NULL) && (*pid_file != '\0')) {
+		FILE *f;
+		int pid = (int) getpid();
+		cleanup_set_pid(pid);
+		if ((f = fopen(lp_pid_file(), "w")) == NULL) {
+		    cleanup_set_pid(0);
+		    fprintf(stderr,"failed to create pid file %s\n", pid_file);
+		    exit_cleanup(RERR_FILEIO);
+		}
+		fprintf(f, "%d\n", pid);
+		fclose(f);
+	}
+
 	start_accept_loop(rsync_port, start_daemon);
 	return -1;
 }