*
* Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
* Copyright (C) 2001-2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2002, 2003, 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2002-2007 Wayne Davison
*
* 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
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* 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.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
*/
#include "rsync.h"
+#include "ifuncs.h"
extern int verbose;
extern int quiet;
extern int am_daemon;
extern int am_root;
extern int rsync_port;
+extern int ignore_errors;
extern int kluge_around_eof;
extern int daemon_over_rsh;
extern int sanitize_paths;
extern char *tmpdir;
extern struct chmod_mode_struct *chmod_modes;
extern struct filter_list_struct server_filter_list;
+extern char curr_dir[];
char *auth_user;
int read_only = 0;
int module_id = -1;
struct chmod_mode_struct *daemon_chmod_modes;
-/* Length of lp_path() string when in daemon mode & not chrooted, else 0. */
+/* module_dirlen is the length of the module_dir string when in daemon
+ * mode, not chrooted, and the path is not "/"; otherwise 0. */
+char *module_dir = NULL;
unsigned int module_dirlen = 0;
+static int rl_nulls = 0;
+
#ifdef HAVE_SIGACTION
static struct sigaction sigact;
#endif
* @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 start_socket_client(char *host, int remote_argc, char *remote_argv[],
+ int argc, char *argv[])
{
int fd, ret;
char *p, *user = NULL;
/* This is redundant with code in start_inband_exchange(), but this
* short-circuits a problem in the client before we open a socket,
* and the extra check won't hurt. */
- if (*path == '/') {
+ if (**remote_argv == '/') {
rprintf(FERROR,
"ERROR: The remote path must start with a module name not a /\n");
return -1;
set_socket_options(fd, sockopts);
- ret = start_inband_exchange(user, path, fd, fd, argc);
+ ret = start_inband_exchange(fd, fd, user, remote_argc, remote_argv);
return ret ? ret : client_run(fd, fd, -1, argc, argv);
}
-int start_inband_exchange(const char *user, char *path, int f_in, int f_out,
- int argc)
+static int exchange_protocols(int f_in, int f_out, char *buf, size_t bufsiz, int am_client)
+{
+ int remote_sub = -1;
+#if SUBPROTOCOL_VERSION != 0
+ int our_sub = protocol_version < PROTOCOL_VERSION ? 0 : SUBPROTOCOL_VERSION;
+#else
+ int our_sub = 0;
+#endif
+ char *motd;
+
+ io_printf(f_out, "@RSYNCD: %d.%d\n", protocol_version, our_sub);
+
+ if (!am_client) {
+ motd = lp_motd_file();
+ if (motd && *motd) {
+ FILE *f = fopen(motd,"r");
+ while (f && !feof(f)) {
+ int len = fread(buf, 1, bufsiz - 1, f);
+ if (len > 0)
+ write_buf(f_out, buf, len);
+ }
+ if (f)
+ fclose(f);
+ write_sbuf(f_out, "\n");
+ }
+ }
+
+ /* This strips the \n. */
+ if (!read_line_old(f_in, buf, bufsiz)) {
+ if (am_client)
+ rprintf(FERROR, "rsync: did not see server greeting\n");
+ return -1;
+ }
+
+ if (sscanf(buf, "@RSYNCD: %d.%d", &remote_protocol, &remote_sub) < 1) {
+ if (am_client)
+ rprintf(FERROR, "rsync: server sent \"%s\" rather than greeting\n", buf);
+ else
+ io_printf(f_out, "@ERROR: protocol startup error\n");
+ return -1;
+ }
+
+ if (remote_sub < 0) {
+ if (remote_protocol == 30) {
+ if (am_client)
+ rprintf(FERROR, "rsync: server is speaking an incompatible beta of protocol 30\n");
+ else
+ io_printf(f_out, "@ERROR: your client is speaking an incompatible beta of protocol 30\n");
+ return -1;
+ }
+ remote_sub = 0;
+ }
+
+ if (protocol_version > remote_protocol) {
+ protocol_version = remote_protocol;
+ if (remote_sub)
+ protocol_version--;
+ } else if (protocol_version == remote_protocol) {
+ if (remote_sub != our_sub)
+ protocol_version--;
+ }
+#if SUBPROTOCOL_VERSION != 0
+ else if (protocol_version < remote_protocol) {
+ if (our_sub)
+ protocol_version--;
+ }
+#endif
+
+ if (protocol_version >= 30)
+ rl_nulls = 1;
+
+ return 0;
+}
+
+int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char *argv[])
{
int i;
+ char line[BIGPATHBUFLEN];
char *sargs[MAX_ARGS];
int sargc = 0;
- char line[BIGPATHBUFLEN];
- char *p;
+ char *p, *path = *argv;
if (argc == 0 && !am_sender)
list_only |= 1;
if (!user)
user = getenv("LOGNAME");
- io_printf(f_out, "@RSYNCD: %d\n", protocol_version);
-
- if (!read_line(f_in, line, sizeof line - 1)) {
- rprintf(FERROR, "rsync: did not see server greeting\n");
+ if (exchange_protocols(f_in, f_out, line, sizeof line, 1) < 0)
return -1;
- }
-
- if (sscanf(line,"@RSYNCD: %d", &remote_protocol) != 1) {
- /* note that read_line strips of \n or \r */
- rprintf(FERROR, "rsync: server sent \"%s\" rather than greeting\n",
- line);
- return -1;
- }
- if (protocol_version > remote_protocol)
- protocol_version = remote_protocol;
if (list_only && protocol_version >= 29)
list_only |= 2;
daemon_over_rsh = 0;
server_options(sargs, &sargc);
+ if (sargc >= MAX_ARGS - 2)
+ goto arg_overflow;
+
sargs[sargc++] = ".";
- if (path && *path)
- sargs[sargc++] = path;
+ while (argc > 0) {
+ if (sargc >= MAX_ARGS - 1) {
+ arg_overflow:
+ rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
+ exit_cleanup(RERR_SYNTAX);
+ }
+ sargs[sargc++] = *argv++;
+ argc--;
+ }
sargs[sargc] = NULL;
if (verbose > 1)
- print_child_argv(sargs);
+ print_child_argv("sending daemon args:", sargs);
- p = strchr(path,'/');
- if (p) *p = 0;
+ p = strchr(path, '/');
+ if (p) *p = '\0';
io_printf(f_out, "%s\n", path);
if (p) *p = '/';
kluge_around_eof = list_only && protocol_version < 25 ? 1 : 0;
while (1) {
- if (!read_line(f_in, line, sizeof line - 1)) {
+ if (!read_line_old(f_in, line, sizeof line)) {
rprintf(FERROR, "rsync: didn't get server startup line\n");
return -1;
}
}
kluge_around_eof = 0;
- for (i = 0; i < sargc; i++) {
- io_printf(f_out, "%s\n", sargs[i]);
+ if (rl_nulls) {
+ for (i = 0; i < sargc; i++) {
+ write_sbuf(f_out, sargs[i]);
+ write_byte(f_out, 0);
+ }
+ write_byte(f_out, 0);
+ } else {
+ for (i = 0; i < sargc; i++)
+ io_printf(f_out, "%s\n", sargs[i]);
+ write_sbuf(f_out, "\n");
}
- io_printf(f_out, "\n");
if (protocol_version < 23) {
if (protocol_version == 22 || !am_sender)
{
int j, status = -1;
- if (request) {
- write_buf(fd, request, strlen(request)+1);
- for (j = 0; j < argc; j++)
- write_buf(fd, argv[j], strlen(argv[j])+1);
- }
+ if (!request)
+ request = "(NONE)";
+ write_buf(fd, request, strlen(request)+1);
+ for (j = 0; j < argc; j++)
+ write_buf(fd, argv[j], strlen(argv[j])+1);
write_byte(fd, 0);
close(fd);
if (wait_process(pid, &status, 0) < 0
|| !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
char *e;
- if (asprintf(&e, "pre-xfer exec returned failure (%d)\n", status) < 0)
+ if (asprintf(&e, "pre-xfer exec returned failure (%d)%s%s\n",
+ status, status < 0 ? ": " : "",
+ status < 0 ? strerror(errno) : "") < 0)
out_of_memory("finish_pre_exec");
return e;
}
static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
{
- int argc = 0;
- int maxargs;
+ int argc, opt_cnt;
char **argv;
char line[BIGPATHBUFLEN];
uid_t uid = (uid_t)-2; /* canonically "nobody" */
char *p, *err_msg = NULL;
char *name = lp_name(i);
int use_chroot = lp_use_chroot(i);
- int start_glob = 0;
int ret, pre_exec_fd = -1;
pid_t pre_exec_pid = 0;
char *request = NULL;
/* TODO: Perhaps take a list of gids, and make them into the
* supplementary groups. */
- if (use_chroot || (module_dirlen = strlen(lp_path(i))) == 1) {
+ /* We do a push_dir() without actually calling chdir() in order
+ * to make sure that the module's path is absolute. After this
+ * check, module_dir will be set to an absolute path. */
+ module_dir = lp_path(i);
+ strlcpy(line, curr_dir, sizeof line);
+ if (!push_dir(module_dir, 1))
+ goto chdir_failed;
+ if (strcmp(curr_dir, module_dir) != 0)
+ module_dir = strdup(curr_dir);
+ push_dir(line, 1); /* Restore curr_dir. */
+
+ if (use_chroot || (module_dirlen = strlen(module_dir)) == 1) {
module_dirlen = 0;
set_filter_dir("/", 1);
} else
- set_filter_dir(lp_path(i), module_dirlen);
+ set_filter_dir(module_dir, module_dirlen);
p = lp_filter(i);
parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
char *modname, *modpath, *hostaddr, *hostname, *username;
int status;
if (asprintf(&modname, "RSYNC_MODULE_NAME=%s", name) < 0
- || asprintf(&modpath, "RSYNC_MODULE_PATH=%s", lp_path(i)) < 0
+ || asprintf(&modpath, "RSYNC_MODULE_PATH=%s", module_dir) < 0
|| asprintf(&hostaddr, "RSYNC_HOST_ADDR=%s", addr) < 0
|| asprintf(&hostname, "RSYNC_HOST_NAME=%s", host) < 0
|| asprintf(&username, "RSYNC_USER_NAME=%s", auth_user) < 0)
* a warning, unless a "require chroot" flag is set,
* in which case we fail.
*/
- if (chroot(lp_path(i))) {
- rsyserr(FLOG, errno, "chroot %s failed",
- lp_path(i));
+ if (chroot(module_dir)) {
+ rsyserr(FLOG, errno, "chroot %s failed", module_dir);
io_printf(f_out, "@ERROR: chroot failed\n");
return -1;
}
-
- if (!push_dir("/", 0)) {
- rsyserr(FLOG, errno, "chdir %s failed\n",
- lp_path(i));
- io_printf(f_out, "@ERROR: chdir failed\n");
- return -1;
- }
-
+ if (!push_dir("/", 0))
+ goto chdir_failed;
} else {
- if (!push_dir(lp_path(i), 0)) {
- rsyserr(FLOG, errno, "chdir %s failed\n",
- lp_path(i));
+ if (!push_dir(module_dir, 0)) {
+ chdir_failed:
+ rsyserr(FLOG, errno, "chdir %s failed\n", module_dir);
io_printf(f_out, "@ERROR: chdir failed\n");
return -1;
}
io_printf(f_out, "@RSYNCD: OK\n");
- maxargs = MAX_ARGS;
- if (!(argv = new_array(char *, maxargs)))
- out_of_memory("rsync_module");
- argv[argc++] = "rsyncd";
-
- while (1) {
- if (!read_line(f_in, line, sizeof line - 1))
- return -1;
-
- if (!*line)
- break;
-
- p = line;
-
- if (argc == maxargs) {
- maxargs += MAX_ARGS;
- if (!(argv = realloc_array(argv, char *, maxargs)))
- out_of_memory("rsync_module");
- }
- if (!(argv[argc] = strdup(p)))
- out_of_memory("rsync_module");
-
- switch (start_glob) {
- case 0:
- argc++;
- if (strcmp(line, ".") == 0)
- start_glob = 1;
- break;
- case 1:
- if (pre_exec_pid) {
- err_msg = finish_pre_exec(pre_exec_pid,
- pre_exec_fd, p,
- argc, argv);
- pre_exec_pid = 0;
- }
- request = strdup(p);
- start_glob = 2;
- /* FALL THROUGH */
- default:
- if (!err_msg)
- glob_expand(name, &argv, &argc, &maxargs);
- break;
- }
- }
+ opt_cnt = read_args(f_in, name, line, sizeof line, rl_nulls, &argv, &argc, &request);
if (pre_exec_pid) {
err_msg = finish_pre_exec(pre_exec_pid, pre_exec_fd, request,
- argc, argv);
+ opt_cnt, argv);
}
verbose = 0; /* future verbosity is controlled by client options */
ret = parse_arguments(&argc, (const char ***) &argv, 0);
- quiet = 0; /* Don't let someone try to be tricky. */
+ am_server = 1; /* Don't let someone try to be tricky. */
+ if (lp_ignore_errors(module_id))
+ ignore_errors = 1;
+
+ if (lp_fake_super(i))
+ am_root = -1;
+ else if (am_root < 0) /* Treat --fake-super from client as --super. */
+ am_root = 2;
if (filesfrom_fd == 0)
filesfrom_fd = f_in;
if (!ret || err_msg) {
if (err_msg)
- rprintf(FERROR, err_msg);
+ rwrite(FERROR, err_msg, strlen(err_msg), 0);
else
option_error();
msleep(400);
int start_daemon(int f_in, int f_out)
{
char line[1024];
- char *motd, *addr, *host;
+ char *addr, *host;
int i;
io_set_sock_fds(f_in, f_out);
set_nonblocking(f_in);
}
- io_printf(f_out, "@RSYNCD: %d\n", protocol_version);
-
- motd = lp_motd_file();
- if (motd && *motd) {
- FILE *f = fopen(motd,"r");
- while (f && !feof(f)) {
- int len = fread(line, 1, sizeof line - 1, f);
- if (len > 0) {
- line[len] = 0;
- io_printf(f_out, "%s", line);
- }
- }
- if (f)
- fclose(f);
- io_printf(f_out, "\n");
- }
-
- if (!read_line(f_in, line, sizeof line - 1))
+ if (exchange_protocols(f_in, f_out, line, sizeof line, 0) < 0)
return -1;
- if (sscanf(line,"@RSYNCD: %d", &remote_protocol) != 1) {
- io_printf(f_out, "@ERROR: protocol startup error\n");
- return -1;
- }
- if (protocol_version > remote_protocol)
- protocol_version = remote_protocol;
-
line[0] = 0;
- if (!read_line(f_in, line, sizeof line - 1))
+ if (!read_line_old(f_in, line, sizeof line))
return -1;
if (!*line || strcmp(line, "#list") == 0) {
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff