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;
+
+ p = strchr(host, '@');
+ if (p) {
+ user = host;
+ host = p+1;
+ *p = 0;
+ }
+
+ if (!user) user = getenv("USER");
+ if (!user) user = getenv("LOGNAME");
fd = open_socket_out(host, rsync_port);
if (fd == -1) {
sargs[sargc] = NULL;
- p = strchr(path,'/');
- if (p) *p = 0;
- io_printf(fd,"%s\n",path);
- if (p) *p = '/';
+ 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;
}
+ p = strchr(path,'/');
+ if (p) *p = 0;
+ io_printf(fd,"%s\n",path);
+ if (p) *p = '/';
+
while (1) {
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);
}
}
io_printf(fd,"\n");
-#if 0
- while (1) {
- if (!read_line(fd, line, sizeof(line)-1)) {
- return -1;
- }
- rprintf(FINFO,"%s\n", line);
- }
-#endif
-
return client_run(fd, fd, -1, argc, argv);
}
int argc=0;
char *argv[MAX_ARGS];
char **argp;
- char line[1024];
+ char line[MAXPATHLEN];
+ uid_t uid;
+ gid_t gid;
+ char *p;
+ char *addr = client_addr(fd);
+ char *host = client_name(fd);
+ char *name = lp_name(i);
+ int start_glob=0;
+
+ 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 (!auth_server(fd, i, addr, "@RSYNCD: AUTHREQD ")) {
+ 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;
+ }
+
+ if (!claim_connection(lp_lock_file(), lp_max_connections())) {
+ 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;
+ }
+ rprintf(FINFO,"rsync on module %s from %s (%s)\n",
+ name, host, addr);
+
module_id = i;
if (lp_read_only(i))
read_only = 1;
- rprintf(FERROR,"rsyncd starting\n");
+ p = lp_uid(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);
+ }
+
+ p = lp_gid(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);
+ }
+
+ p = lp_exclude_from(i);
+ add_exclude_file(p, 1);
+
+ p = lp_exclude(i);
+ add_exclude_line(p);
if (chroot(lp_path(i))) {
io_printf(fd,"@ERROR: chroot failed\n");
return -1;
}
- if (setgid(lp_gid(i))) {
+ if (setgid(gid)) {
io_printf(fd,"@ERROR: setgid failed\n");
return -1;
}
- if (setuid(lp_uid(i))) {
+ if (setuid(uid)) {
io_printf(fd,"@ERROR: setuid failed\n");
return -1;
}
if (!*line) break;
- argv[argc] = strdup(line);
+ p = line;
+
+ argv[argc] = strdup(p);
if (!argv[argc]) {
return -1;
}
- argc++;
+ if (start_glob) {
+ rprintf(FINFO,"transferring %s\n",p);
+ glob_expand(name, argv, &argc, MAX_ARGS);
+ } else {
+ argc++;
+ }
+
+ if (strcmp(line,".") == 0) {
+ start_glob = 1;
+ }
+
if (argc == MAX_ARGS) {
return -1;
}
return 0;
}
+/* send a list of available modules to the client. Don't list those
+ with "list = False". */
static void send_listing(int fd)
{
int n = lp_numservices();
here */
static int start_daemon(int fd)
{
- char line[1024];
+ char line[200];
char *motd;
+ int i = -1;
+ extern char *config_file;
+ extern int remote_version;
+
+ if (!lp_load(config_file)) {
+ exit_cleanup(1);
+ }
set_socket_options(fd,"SO_KEEPALIVE");
io_printf(fd,"\n");
}
- /* read a single line indicating the resource that is wanted */
- while (1) {
- int i;
+ 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;
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;
}
-
- return rsync_module(fd, i);
}
- return 0;
+ return rsync_module(fd, i);
}
int daemon_main(void)
{
- if (!lp_load(RSYNCD_CONF)) {
- exit_cleanup(1);
- }
-
if (is_a_socket(STDIN_FILENO)) {
/* we are running via inetd */
return start_daemon(STDIN_FILENO);
become_daemon();
- return start_accept_loop(rsync_port, start_daemon);
+ rprintf(FINFO,"rsyncd version %s starting\n",VERSION);
+
+ start_accept_loop(rsync_port, start_daemon);
+ return -1;
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff