extern int default_af_hint;
extern int logfile_format_has_i;
extern int logfile_format_has_o_or_i;
-extern mode_t orig_umask;
extern char *bind_address;
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[MAXPATHLEN];
+extern filter_rule_list daemon_filter_list;
#ifdef ICONV_OPTION
extern char *iconv_opt;
extern iconv_t ic_send, ic_recv;
#endif
+#define MAX_GID_LIST 32
+
char *auth_user;
int read_only = 0;
int module_id = -1;
static struct sigaction sigact;
#endif
+static gid_t gid_list[MAX_GID_LIST];
+static int gid_count = 0;
+
/* Used when "reverse lookup" is off. */
const char undetermined_hostname[] = "UNDETERMINED";
}
/* This strips the \n. */
- if (!read_line_old(f_in, buf, bufsiz)) {
+ if (!read_line_old(f_in, buf, bufsiz, 0)) {
if (am_client)
rprintf(FERROR, "rsync: did not see server greeting\n");
return -1;
if (strncmp(*argv, modname, modlen) == 0
&& argv[0][modlen] == '\0')
sargs[sargc++] = modname; /* we send "modname/" */
- else
+ else if (**argv == '-') {
+ if (asprintf(sargs + sargc++, "./%s", *argv) < 0)
+ out_of_memory("start_inband_exchange");
+ } else
sargs[sargc++] = *argv;
argv++;
argc--;
kluge_around_eof = list_only && protocol_version < 25 ? 1 : 0;
while (1) {
- if (!read_line_old(f_in, line, sizeof line)) {
+ if (!read_line_old(f_in, line, sizeof line, 0)) {
rprintf(FERROR, "rsync: didn't get server startup line\n");
return -1;
}
if (protocol_version < 23) {
if (protocol_version == 22 || !am_sender)
- io_start_multiplex_in();
+ io_start_multiplex_in(f_in);
}
free(modname);
return NULL;
}
+#ifdef HAVE_PUTENV
static int read_arg_from_pipe(int fd, char *buf, int limit)
{
char *bp = buf, *eob = buf + limit - 1;
while (1) {
- int got = read(fd, bp, 1);
- if (got != 1) {
- if (got < 0 && errno == EINTR)
- continue;
- return -1;
- }
- if (*bp == '\0')
- break;
- if (bp < eob)
- bp++;
+ int got = read(fd, bp, 1);
+ if (got != 1) {
+ if (got < 0 && errno == EINTR)
+ continue;
+ return -1;
+ }
+ if (*bp == '\0')
+ break;
+ if (bp < eob)
+ bp++;
}
*bp = '\0';
return bp - buf;
}
+#endif
static int path_failure(int f_out, const char *dir, BOOL was_chdir)
{
return -1;
}
+static int add_a_group(int f_out, const char *gname)
+{
+ gid_t gid;
+ if (!group_to_gid(gname, &gid, True)) {
+ rprintf(FLOG, "Invalid gid %s\n", gname);
+ io_printf(f_out, "@ERROR: invalid gid %s\n", gname);
+ return -1;
+ }
+ if (gid_count == MAX_GID_LIST) {
+ rprintf(FLOG, "Too many groups specified via gid parameter.\n");
+ io_printf(f_out, "@ERROR: too many groups\n");
+ return -1;
+ }
+ gid_list[gid_count++] = gid;
+ return 0;
+}
+
+#ifdef HAVE_GETGROUPLIST
+static int want_all_groups(int f_out, uid_t uid)
+{
+ const char *err;
+ gid_count = MAX_GID_LIST;
+ if ((err = getallgroups(uid, gid_list, &gid_count)) != NULL) {
+ rsyserr(FLOG, errno, "%s", err);
+ io_printf(f_out, "@ERROR: %s\n", err);
+ return -1;
+ }
+ return 0;
+}
+#elif defined HAVE_INITGROUPS
+static struct passwd *want_all_groups(int f_out, uid_t uid)
+{
+ struct passwd *pw;
+ if ((pw = getpwuid(uid)) == NULL) {
+ rsyserr(FLOG, errno, "getpwuid failed");
+ io_printf(f_out, "@ERROR: getpwuid failed\n");
+ return NULL;
+ }
+ /* Start with the default group and initgroups() will add the reset. */
+ gid_count = 1;
+ gid_list[0] = pw->pw_gid;
+ return pw;
+}
+#endif
+
+static void set_env_str(const char *var, const char *str)
+{
+#ifdef HAVE_PUTENV
+ char *mem;
+ if (asprintf(&mem, "%s=%s", var, str) < 0)
+ out_of_memory("set_env_str");
+ putenv(mem);
+#endif
+}
+
+#ifdef HAVE_PUTENV
+static void set_env_num(const char *var, long num)
+{
+ char *mem;
+ if (asprintf(&mem, "%s=%ld", var, num) < 0)
+ out_of_memory("set_env_num");
+ putenv(mem);
+}
+#endif
+
static int rsync_module(int f_in, int f_out, int i, const char *addr, const char *host)
{
int argc;
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;
+#if defined HAVE_INITGROUPS && !defined HAVE_GETGROUPLIST
+ struct passwd *pw = NULL;
+#endif
+ uid_t uid;
+ int set_uid;
char *p, *err_msg = NULL;
char *name = lp_name(i);
int use_chroot = lp_use_chroot(i);
pid_t pre_exec_pid = 0;
char *request = NULL;
+ set_env_str("RSYNC_MODULE_NAME", name);
+
#ifdef ICONV_OPTION
iconv_opt = lp_charset(i);
if (*iconv_opt)
* we need to do it now before the access check. */
if (host == undetermined_hostname && lp_reverse_lookup(i))
host = client_name(f_in);
+ set_env_str("RSYNC_HOST_NAME", host);
+ set_env_str("RSYNC_HOST_ADDR", addr);
- if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) {
+ if (!allow_access(addr, &host, i)) {
rprintf(FLOG, "rsync denied on module %s from %s (%s)\n",
name, host, addr);
if (!lp_list(i))
return -1;
}
+ read_only = lp_read_only(i); /* may also be overridden by auth_server() */
auth_user = auth_server(f_in, f_out, i, host, addr, "@RSYNCD: AUTHREQD ");
if (!auth_user) {
io_printf(f_out, "@ERROR: auth failed on module %s\n", name);
return -1;
}
+ set_env_str("RSYNC_USER_NAME", auth_user);
module_id = i;
- if (lp_read_only(i))
- read_only = 1;
-
if (lp_transfer_logging(i) && !logfile_format)
logfile_format = lp_log_format(i);
if (log_format_has(logfile_format, 'i'))
if (logfile_format_has_i || log_format_has(logfile_format, 'o'))
logfile_format_has_o_or_i = 1;
- am_root = (MY_UID() == 0);
+ uid = MY_UID();
+ am_root = (uid == 0);
- if (am_root) {
- p = lp_uid(i);
- if (!name_to_uid(p, &uid)) {
- if (!isDigit(p)) {
- rprintf(FLOG, "Invalid uid %s\n", p);
- io_printf(f_out, "@ERROR: invalid uid %s\n", p);
- return -1;
- }
- uid = atoi(p);
+ p = *lp_uid(i) ? lp_uid(i) : am_root ? NOBODY_USER : NULL;
+ if (p) {
+ if (!user_to_uid(p, &uid, True)) {
+ rprintf(FLOG, "Invalid uid %s\n", p);
+ io_printf(f_out, "@ERROR: invalid uid %s\n", p);
+ return -1;
}
-
- p = lp_gid(i);
- if (!name_to_gid(p, &gid)) {
- if (!isDigit(p)) {
- rprintf(FLOG, "Invalid gid %s\n", p);
- io_printf(f_out, "@ERROR: invalid gid %s\n", p);
+ set_uid = 1;
+ } else
+ set_uid = 0;
+
+ p = *lp_gid(i) ? strtok(lp_gid(i), ", ") : NULL;
+ if (p) {
+ /* The "*" gid must be the first item in the list. */
+ if (strcmp(p, "*") == 0) {
+#ifdef HAVE_GETGROUPLIST
+ if (want_all_groups(f_out, uid) < 0)
+ return -1;
+#elif defined HAVE_INITGROUPS
+ if ((pw = want_all_groups(f_out, uid)) == NULL)
+ return -1;
+#else
+ rprintf(FLOG, "This rsync does not support a gid of \"*\"\n");
+ io_printf(f_out, "@ERROR: invalid gid setting.\n");
+ return -1;
+#endif
+ } else if (add_a_group(f_out, p) < 0)
+ return -1;
+ while ((p = strtok(NULL, ", ")) != NULL) {
+#if defined HAVE_INITGROUPS && !defined HAVE_GETGROUPLIST
+ if (pw) {
+ rprintf(FLOG, "This rsync cannot add groups after \"*\".\n");
+ io_printf(f_out, "@ERROR: invalid gid setting.\n");
return -1;
}
- gid = atoi(p);
+#endif
+ if (add_a_group(f_out, p) < 0)
+ return -1;
}
+ } else if (am_root) {
+ if (add_a_group(f_out, NOBODY_GROUP) < 0)
+ return -1;
}
- /* TODO: If we're not root, but the configuration requests
- * that we change to some uid other than the current one, then
- * log a warning. */
-
- /* TODO: Perhaps take a list of gids, and make them into the
- * supplementary groups. */
-
module_dir = lp_path(i);
+ if (*module_dir == '\0') {
+ rprintf(FLOG, "No path specified for module %s\n", name);
+ io_printf(f_out, "@ERROR: no path setting.\n");
+ return -1;
+ }
if (use_chroot) {
if ((p = strstr(module_dir, "/./")) != NULL) {
*p = '\0'; /* Temporary... */
return path_failure(f_out, module_dir, False);
full_module_path = module_dir = module_chdir;
}
+ set_env_str("RSYNC_MODULE_PATH", full_module_path);
if (module_dirlen == 1) {
module_dirlen = 0;
set_filter_dir(module_dir, module_dirlen);
p = lp_filter(i);
- parse_rule(&daemon_filter_list, p, MATCHFLG_WORD_SPLIT,
+ parse_filter_str(&daemon_filter_list, p, rule_template(FILTRULE_WORD_SPLIT),
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3);
p = lp_include_from(i);
- parse_filter_file(&daemon_filter_list, p, MATCHFLG_INCLUDE,
+ parse_filter_file(&daemon_filter_list, p, rule_template(FILTRULE_INCLUDE),
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_include(i);
- parse_rule(&daemon_filter_list, p,
- MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT,
+ parse_filter_str(&daemon_filter_list, p,
+ rule_template(FILTRULE_INCLUDE | FILTRULE_WORD_SPLIT),
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES);
p = lp_exclude_from(i);
- parse_filter_file(&daemon_filter_list, p, 0,
+ parse_filter_file(&daemon_filter_list, p, rule_template(0),
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_exclude(i);
- parse_rule(&daemon_filter_list, p, MATCHFLG_WORD_SPLIT,
+ parse_filter_str(&daemon_filter_list, p, rule_template(FILTRULE_WORD_SPLIT),
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES);
log_init(1);
#ifdef HAVE_PUTENV
if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) {
- char *modname, *modpath, *hostaddr, *hostname, *username;
int status;
- if (asprintf(&modname, "RSYNC_MODULE_NAME=%s", name) < 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)
- out_of_memory("rsync_module");
- putenv(modname);
- putenv(modpath);
- putenv(hostaddr);
- putenv(hostname);
- putenv(username);
- umask(orig_umask);
/* For post-xfer exec, fork a new process to run the rsync
* daemon while this process waits for the exit status and
* runs the indicated command at that point. */
return -1;
}
if (pid) {
- if (asprintf(&p, "RSYNC_PID=%ld", (long)pid) > 0)
- putenv(p);
+ close(f_in);
+ if (f_out != f_in)
+ close(f_out);
+ set_env_num("RSYNC_PID", (long)pid);
if (wait_process(pid, &status, 0) < 0)
status = -1;
- if (asprintf(&p, "RSYNC_RAW_STATUS=%d", status) > 0)
- putenv(p);
+ set_env_num("RSYNC_RAW_STATUS", status);
if (WIFEXITED(status))
status = WEXITSTATUS(status);
else
status = -1;
- if (asprintf(&p, "RSYNC_EXIT_STATUS=%d", status) > 0)
- putenv(p);
+ set_env_num("RSYNC_EXIT_STATUS", status);
if (system(lp_postxfer_exec(i)) < 0)
status = -1;
_exit(status);
* send us the user's request via a pipe. */
if (*lp_prexfer_exec(i)) {
int fds[2];
- if (asprintf(&p, "RSYNC_PID=%ld", (long)getpid()) > 0)
- putenv(p);
+ set_env_num("RSYNC_PID", (long)getpid());
if (pipe(fds) < 0 || (pre_exec_pid = fork()) < 0) {
rsyserr(FLOG, errno, "pre-xfer exec preparation failed");
io_printf(f_out, "@ERROR: pre-xfer exec preparation failed\n");
len = read_arg_from_pipe(fds[0], buf, BIGPATHBUFLEN);
if (len <= 0)
_exit(1);
- if (asprintf(&p, "RSYNC_REQUEST=%s", buf) > 0)
- putenv(p);
+ set_env_str("RSYNC_REQUEST", buf);
for (j = 0; ; j++) {
len = read_arg_from_pipe(fds[0], buf,
BIGPATHBUFLEN);
set_blocking(fds[1]);
pre_exec_fd = fds[1];
}
- umask(0);
}
#endif
}
}
- if (am_root) {
- /* XXXX: You could argue that if the daemon is started
- * by a non-root user and they explicitly specify a
- * gid, then we should try to change to that gid --
- * this could be possible if it's already in their
- * supplementary groups. */
-
- /* TODO: Perhaps we need to document that if rsyncd is
- * started by somebody other than root it will inherit
- * all their supplementary groups. */
-
- if (setgid(gid)) {
- rsyserr(FLOG, errno, "setgid %d failed", (int)gid);
+ if (gid_count) {
+ if (setgid(gid_list[0])) {
+ rsyserr(FLOG, errno, "setgid %ld failed", (long)gid_list[0]);
io_printf(f_out, "@ERROR: setgid failed\n");
return -1;
}
#ifdef HAVE_SETGROUPS
- /* Get rid of any supplementary groups this process
- * might have inheristed. */
- if (setgroups(1, &gid)) {
+ /* Set the group(s) we want to be active. */
+ if (setgroups(gid_count, gid_list)) {
rsyserr(FLOG, errno, "setgroups failed");
io_printf(f_out, "@ERROR: setgroups failed\n");
return -1;
}
#endif
+#if defined HAVE_INITGROUPS && !defined HAVE_GETGROUPLIST
+ /* pw is set if the user wants all the user's groups. */
+ if (pw && initgroups(pw->pw_name, pw->pw_gid) < 0) {
+ rsyserr(FLOG, errno, "initgroups failed");
+ io_printf(f_out, "@ERROR: initgroups failed\n");
+ return -1;
+ }
+#endif
+ }
- if (setuid(uid)) {
- rsyserr(FLOG, errno, "setuid %d failed", (int)uid);
+ if (set_uid) {
+ if (setuid(uid) < 0
+#ifdef HAVE_SETEUID
+ || seteuid(uid) < 0
+#endif
+ ) {
+ rsyserr(FLOG, errno, "setuid %ld failed", (long)uid);
io_printf(f_out, "@ERROR: setuid failed\n");
return -1;
}
if (protocol_version < 23
&& (protocol_version == 22 || am_sender))
- io_start_multiplex_out();
+ io_start_multiplex_out(f_out);
else if (!ret || err_msg) {
/* We have to get I/O multiplexing started so that we can
* get the error back to the client. This means getting
if (files_from)
write_byte(f_out, 0);
}
- io_start_multiplex_out();
+ io_start_multiplex_out(f_out);
}
if (!ret || err_msg) {
&& (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
return -1;
line[0] = 0;
- if (!read_line_old(f_in, line, sizeof line))
+ if (!read_line_old(f_in, line, sizeof line, 0))
return -1;
if (!*line || strcmp(line, "#list") == 0) {
return;
cleanup_set_pid(pid);
- if ((fd = do_open(pid_file, O_WRONLY|O_CREAT|O_EXCL, 0666 & ~orig_umask)) == -1) {
+ if ((fd = do_open(pid_file, O_WRONLY|O_CREAT|O_EXCL, 0666)) == -1) {
failure:
cleanup_set_pid(0);
fprintf(stderr, "failed to create pid file %s: %s\n", pid_file, strerror(errno));