*
* Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
* Copyright (C) 2001-2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2002-2008 Wayne Davison
+ * Copyright (C) 2002-2009 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
extern char *files_from;
extern char *tmpdir;
extern struct chmod_mode_struct *chmod_modes;
-extern struct filter_list_struct server_filter_list;
+extern struct filter_list_struct daemon_filter_list;
extern char curr_dir[];
#ifdef ICONV_OPTION
extern char *iconv_opt;
char *module_dir = NULL;
unsigned int module_dirlen = 0;
+char *full_module_path;
+
static int rl_nulls = 0;
#ifdef HAVE_SIGACTION
if (fd == -1)
exit_cleanup(RERR_SOCKETIO);
- set_socket_options(fd, sockopts);
-
#ifdef ICONV_CONST
setup_iconv();
#endif
int sargc = 0;
char *p, *modname;
- assert(argc > 0);
+ assert(argc > 0 && *argv != NULL);
if (**argv == '/') {
rprintf(FERROR,
return bp - buf;
}
+static int path_failure(int f_out, const char *dir, BOOL was_chdir)
+{
+ if (was_chdir)
+ rsyserr(FLOG, errno, "chdir %s failed\n", dir);
+ else
+ rprintf(FLOG, "normalize_path(%s) failed\n", dir);
+ io_printf(f_out, "@ERROR: chdir failed\n");
+ return -1;
+}
+
static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
{
int argc;
- char **argv, **orig_argv, **orig_early_argv, *chroot_path = NULL;
+ char **argv, **orig_argv, **orig_early_argv, *module_chdir;
char line[BIGPATHBUFLEN];
uid_t uid = (uid_t)-2; /* canonically "nobody" */
gid_t gid = (gid_t)-2;
module_dir = lp_path(i);
if (use_chroot) {
if ((p = strstr(module_dir, "/./")) != NULL) {
- *p = '\0';
- p += 2;
- } else if ((p = strdup("/")) == NULL)
- out_of_memory("rsync_module");
- }
-
- /* We do a push_dir() that doesn't actually call chdir()
- * just to make a relative path absolute. */
- 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)) == NULL)
- out_of_memory("rsync_module");
- push_dir(line, 1); /* Restore curr_dir. */
-
- if (use_chroot) {
- chroot_path = module_dir;
- module_dir = p; /* p is "/" or our inside-chroot path */
+ *p = '\0'; /* Temporary... */
+ if (!(module_chdir = normalize_path(module_dir, True, NULL)))
+ return path_failure(f_out, module_dir, False);
+ *p = '/';
+ if (!(p = normalize_path(p + 2, True, &module_dirlen)))
+ return path_failure(f_out, strstr(module_dir, "/./"), False);
+ if (!(full_module_path = normalize_path(module_dir, False, NULL)))
+ full_module_path = module_dir;
+ module_dir = p;
+ } else {
+ if (!(module_chdir = normalize_path(module_dir, False, NULL)))
+ return path_failure(f_out, module_dir, False);
+ full_module_path = module_chdir;
+ module_dir = "/";
+ module_dirlen = 1;
+ }
+ } else {
+ if (!(module_chdir = normalize_path(module_dir, False, &module_dirlen)))
+ return path_failure(f_out, module_dir, False);
+ full_module_path = module_dir = module_chdir;
}
- module_dirlen = clean_fname(module_dir, CFN_COLLAPSE_DOT_DOT_DIRS | CFN_DROP_TRAILING_DOT_DIR);
if (module_dirlen == 1) {
module_dirlen = 0;
set_filter_dir(module_dir, module_dirlen);
p = lp_filter(i);
- parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
- XFLG_ABS_IF_SLASH);
+ parse_rule(&daemon_filter_list, p, MATCHFLG_WORD_SPLIT,
+ XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3);
p = lp_include_from(i);
- parse_filter_file(&server_filter_list, p, MATCHFLG_INCLUDE,
- XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
+ parse_filter_file(&daemon_filter_list, p, MATCHFLG_INCLUDE,
+ XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_include(i);
- parse_rule(&server_filter_list, p,
+ parse_rule(&daemon_filter_list, p,
MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT,
- XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES);
+ XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES);
p = lp_exclude_from(i);
- parse_filter_file(&server_filter_list, p, 0,
- XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
+ parse_filter_file(&daemon_filter_list, p, 0,
+ XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_exclude(i);
- parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
- XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES);
+ parse_rule(&daemon_filter_list, p, MATCHFLG_WORD_SPLIT,
+ XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES);
log_init(1);
char *modname, *modpath, *hostaddr, *hostname, *username;
int status;
- if (!use_chroot)
- p = module_dir;
- else if (module_dirlen) {
- pathjoin(line, sizeof line, chroot_path, module_dir+1);
- p = line;
- } else
- p = chroot_path;
-
if (asprintf(&modname, "RSYNC_MODULE_NAME=%s", name) < 0
- || asprintf(&modpath, "RSYNC_MODULE_PATH=%s", p) < 0
+ || asprintf(&modpath, "RSYNC_MODULE_PATH=%s", full_module_path) < 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)
status = -1;
if (asprintf(&p, "RSYNC_EXIT_STATUS=%d", status) > 0)
putenv(p);
- system(lp_postxfer_exec(i));
+ if (system(lp_postxfer_exec(i)) < 0)
+ status = -1;
_exit(status);
}
}
* a warning, unless a "require chroot" flag is set,
* in which case we fail.
*/
- if (chroot(chroot_path)) {
- rsyserr(FLOG, errno, "chroot %s failed", chroot_path);
+ if (chroot(module_chdir)) {
+ rsyserr(FLOG, errno, "chroot %s failed", module_chdir);
io_printf(f_out, "@ERROR: chroot failed\n");
return -1;
}
- if (!push_dir(module_dir, 0))
- goto chdir_failed;
- if (module_dirlen)
- sanitize_paths = 1;
- } else {
- 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;
- }
- sanitize_paths = 1;
+ module_chdir = module_dir;
}
+ if (!change_dir(module_chdir, CD_NORMAL))
+ return path_failure(f_out, module_chdir, True);
+ if (module_dirlen || !use_chroot)
+ sanitize_paths = 1;
+
if ((munge_symlinks = lp_munge_symlinks(i)) < 0)
munge_symlinks = !use_chroot || module_dirlen;
if (munge_symlinks) {
&& (use_chroot ? lp_numeric_ids(i) != False : lp_numeric_ids(i) == True))
numeric_ids = -1; /* Set --numeric-ids w/o breaking protocol. */
- if (lp_timeout(i) && lp_timeout(i) > io_timeout)
+ if (lp_timeout(i) && (!io_timeout || lp_timeout(i) < io_timeout))
set_io_timeout(lp_timeout(i));
/* If we have some incoming/outgoing chmod changes, append them to
if (!am_server) {
set_socket_options(f_in, "SO_KEEPALIVE");
- if (sockopts)
- set_socket_options(f_in, sockopts);
- else
- set_socket_options(f_in, lp_socket_options());
set_nonblocking(f_in);
}
char *pid_file = lp_pid_file();
char pidbuf[16];
pid_t pid = getpid();
- int fd;
+ int fd, len;
if (!pid_file || !*pid_file)
return;
cleanup_set_pid(pid);
if ((fd = do_open(pid_file, O_WRONLY|O_CREAT|O_EXCL, 0666 & ~orig_umask)) == -1) {
+ failure:
cleanup_set_pid(0);
fprintf(stderr, "failed to create pid file %s: %s\n", pid_file, strerror(errno));
rsyserr(FLOG, errno, "failed to create pid file %s", pid_file);
exit_cleanup(RERR_FILEIO);
}
snprintf(pidbuf, sizeof pidbuf, "%ld\n", (long)pid);
- write(fd, pidbuf, strlen(pidbuf));
+ len = strlen(pidbuf);
+ if (write(fd, pidbuf, len) != len)
+ goto failure;
close(fd);
}
git.samba.org / rsync.git / blobdiff