*/
#include "rsync.h"
-#include "ifuncs.h"
+#include "itypes.h"
extern int quiet;
extern int dry_run;
extern int preserve_xattrs;
extern int kluge_around_eof;
extern int daemon_over_rsh;
+extern int munge_symlinks;
extern int sanitize_paths;
extern int numeric_ids;
extern int filesfrom_fd;
extern int logfile_format_has_o_or_i;
extern mode_t orig_umask;
extern char *bind_address;
-extern char *sockopts;
extern char *config_file;
extern char *logfile_format;
extern char *files_from;
extern char *tmpdir;
extern struct chmod_mode_struct *chmod_modes;
extern struct filter_list_struct daemon_filter_list;
-extern char curr_dir[];
+extern char curr_dir[MAXPATHLEN];
#ifdef ICONV_OPTION
extern char *iconv_opt;
extern iconv_t ic_send, ic_recv;
char *auth_user;
int read_only = 0;
int module_id = -1;
-int munge_symlinks = 0;
struct chmod_mode_struct *daemon_chmod_modes;
/* module_dirlen is the length of the module_dir string when in daemon
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;
char *name = lp_name(i);
int use_chroot = lp_use_chroot(i);
int ret, pre_exec_fd = -1;
+ int save_munge_symlinks;
pid_t pre_exec_pid = 0;
char *request = NULL;
module_dir = lp_path(i);
if (use_chroot) {
if ((p = strstr(module_dir, "/./")) != NULL) {
- *p = '\0';
- p += 2;
- } else if ((p = strdup("/")) == NULL) /* MEMORY LEAK */
- out_of_memory("rsync_module");
- }
+ int len = p - module_dir + 1;
+ if (!(module_chdir = new_array(char, len))) /* MEMORY LEAK */
+ out_of_memory("rsync_module");
+ strlcpy(module_chdir, module_dir, len);
+ if (!(p = strdup(p + 2)))
+ out_of_memory("rsync_module");
+ clean_fname(module_dir, CFN_COLLAPSE_DOT_DOT_DIRS | CFN_DROP_TRAILING_DOT_DIR);
+ module_dir = p;
+ } else {
+ module_chdir = module_dir;
+ if ((module_dir = strdup("/")) == NULL)
+ out_of_memory("rsync_module");
+ }
+ } else
+ module_chdir = module_dir;
/* We do a change_dir() that doesn't actually call chdir()
* just to make a relative path absolute. */
strlcpy(line, curr_dir, sizeof line);
- if (!change_dir(module_dir, CD_SKIP_CHDIR))
+ if (!change_dir(module_chdir, CD_SKIP_CHDIR))
goto chdir_failed;
- if (strcmp(curr_dir, module_dir) != 0
- && (module_dir = strdup(curr_dir)) == NULL)
+ if (strcmp(curr_dir, module_chdir) != 0
+ && (module_chdir = strdup(curr_dir)) == NULL) /* MEMORY LEAK */
out_of_memory("rsync_module");
change_dir(line, CD_SKIP_CHDIR); /* Restore curr_dir. */
- if (use_chroot) {
- chroot_path = module_dir;
- module_dir = p; /* p is "/" or our inside-chroot path */
- }
module_dirlen = clean_fname(module_dir, CFN_COLLAPSE_DOT_DOT_DIRS | CFN_DROP_TRAILING_DOT_DIR);
if (module_dirlen == 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", lp_path(i)) < 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(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 (!change_dir(module_dir, CD_NORMAL))
- goto chdir_failed;
- if (module_dirlen)
- sanitize_paths = 1;
- } else {
- if (!change_dir(module_dir, CD_NORMAL)) {
- 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)) {
+ chdir_failed:
+ rsyserr(FLOG, errno, "chdir %s failed\n", module_chdir);
+ io_printf(f_out, "@ERROR: chdir failed\n");
+ return -1;
+ }
+ 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) {
STRUCT_STAT st;
- if (do_stat(SYMLINK_PREFIX, &st) == 0 && S_ISDIR(st.st_mode)) {
- rprintf(FLOG, "Symlink munging is unsupported when a %s directory exists.\n",
- SYMLINK_PREFIX);
+ char prefix[SYMLINK_PREFIX_LEN]; /* NOT +1 ! */
+ strlcpy(prefix, SYMLINK_PREFIX, sizeof prefix); /* trim the trailing slash */
+ if (do_stat(prefix, &st) == 0 && S_ISDIR(st.st_mode)) {
+ rprintf(FLOG, "Symlink munging is unsafe when a %s directory exists.\n",
+ prefix);
io_printf(f_out, "@ERROR: daemon security issue -- contact admin\n", name);
exit_cleanup(RERR_UNSUPPORTED);
}
read_args(f_in, name, line, sizeof line, rl_nulls, &argv, &argc, &request);
orig_argv = argv;
+ save_munge_symlinks = munge_symlinks;
+
reset_output_levels(); /* future verbosity is controlled by client options */
ret = parse_arguments(&argc, (const char ***) &argv);
if (protect_args && ret) {
} else
orig_early_argv = NULL;
+ munge_symlinks = save_munge_symlinks; /* The client mustn't control this. */
+
if (pre_exec_pid) {
err_msg = finish_pre_exec(pre_exec_pid, pre_exec_fd, request,
orig_early_argv, orig_argv);
with "list = False". */
static void send_listing(int fd)
{
- int n = lp_numservices();
+ int n = lp_num_modules();
int i;
for (i = 0; i < n; i++) {
fprintf(stderr, "Failed to parse config file: %s\n", config_file);
exit_cleanup(RERR_SYNTAX);
}
+ set_dparams(0);
if (no_detach)
create_pid_file();
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff