Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
preparing for release of 2.0.4
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
7fca65e
..
121252b
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-30,7
+30,7
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
int fd, i;
char *sargs[MAX_ARGS];
int sargc=0;
int fd, i;
char *sargs[MAX_ARGS];
int sargc=0;
- char line[
1024
];
+ char line[
MAXPATHLEN
];
char *p, *user=NULL;
extern int remote_version;
char *p, *user=NULL;
extern int remote_version;
@@
-102,33
+102,37
@@
static int rsync_module(int fd, int i)
int argc=0;
char *argv[MAX_ARGS];
char **argp;
int argc=0;
char *argv[MAX_ARGS];
char **argp;
- char line[
1024
];
- uid_t uid;
- gid_t gid;
+ char line[
MAXPATHLEN
];
+ uid_t uid
= (uid_t)-2
;
+ gid_t gid
= (gid_t)-2
;
char *p;
char *addr = client_addr(fd);
char *host = client_name(fd);
char *p;
char *addr = client_addr(fd);
char *host = client_name(fd);
- char *auth;
+ 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",
if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) {
rprintf(FERROR,"rsync denied on module %s from %s (%s)\n",
- lp_name(i), client_name(fd), client_addr(fd));
+ 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",
return -1;
}
if (!auth_server(fd, i, addr, "@RSYNCD: AUTHREQD ")) {
rprintf(FERROR,"auth failed on module %s from %s (%s)\n",
- lp_name(i), client_name(fd), client_addr(fd));
+ 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())) {
return -1;
}
if (!claim_connection(lp_lock_file(), lp_max_connections())) {
- rprintf(FERROR,"ERROR: max connections reached\n");
+ 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;
}
return -1;
}
- rprintf(FINFO,"rsync on module %s from %s (%s)\n",
- lp_name(i), host, addr);
module_id = i;
module_id = i;
@@
-139,6
+143,7
@@
static int rsync_module(int fd, int i)
if (!name_to_uid(p, &uid)) {
if (!isdigit(*p)) {
rprintf(FERROR,"Invalid uid %s\n", p);
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);
return -1;
}
uid = atoi(p);
@@
-148,27
+153,40
@@
static int rsync_module(int fd, int i)
if (!name_to_gid(p, &gid)) {
if (!isdigit(*p)) {
rprintf(FERROR,"Invalid gid %s\n", p);
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);
}
return -1;
}
gid = atoi(p);
}
+ p = lp_exclude_from(i);
+ add_exclude_file(p, 1);
+
+ p = lp_exclude(i);
+ add_exclude_line(p);
+
+ log_open();
+
if (chroot(lp_path(i))) {
if (chroot(lp_path(i))) {
+ rprintf(FERROR,"chroot %s failed\n", lp_path(i));
io_printf(fd,"@ERROR: chroot failed\n");
return -1;
}
if (chdir("/")) {
io_printf(fd,"@ERROR: chroot failed\n");
return -1;
}
if (chdir("/")) {
+ rprintf(FERROR,"chdir %s failed\n", lp_path(i));
io_printf(fd,"@ERROR: chdir failed\n");
return -1;
}
io_printf(fd,"@ERROR: chdir failed\n");
return -1;
}
- if (setgid(gid)) {
+ if (setgid(gid) || getgid() != gid) {
+ rprintf(FERROR,"setgid %d failed\n", gid);
io_printf(fd,"@ERROR: setgid failed\n");
return -1;
}
io_printf(fd,"@ERROR: setgid failed\n");
return -1;
}
- if (setuid(uid)) {
+ if (setuid(uid) || getuid() != uid) {
+ rprintf(FERROR,"setuid %d failed\n", uid);
io_printf(fd,"@ERROR: setuid failed\n");
return -1;
}
io_printf(fd,"@ERROR: setuid failed\n");
return -1;
}
@@
-184,12
+202,28
@@
static int rsync_module(int fd, int i)
if (!*line) break;
if (!*line) break;
- argv[argc] = strdup(line);
+ p = line;
+
+ argv[argc] = strdup(p);
if (!argv[argc]) {
return -1;
}
if (!argv[argc]) {
return -1;
}
- argc++;
+ if (start_glob) {
+ if (start_glob == 1) {
+ rprintf(FINFO,"rsync on %s from %s (%s)\n",
+ p, host, addr);
+ start_glob++;
+ }
+ glob_expand(name, argv, &argc, MAX_ARGS);
+ } else {
+ argc++;
+ }
+
+ if (strcmp(line,".") == 0) {
+ start_glob = 1;
+ }
+
if (argc == MAX_ARGS) {
return -1;
}
if (argc == MAX_ARGS) {
return -1;
}
@@
-232,7
+266,7
@@
static int start_daemon(int fd)
extern char *config_file;
extern int remote_version;
extern char *config_file;
extern int remote_version;
- if (!lp_load(config_file)) {
+ if (!lp_load(config_file
, 0
)) {
exit_cleanup(1);
}
exit_cleanup(1);
}
@@
-259,6
+293,7
@@
static int start_daemon(int fd)
}
if (sscanf(line,"@RSYNCD: %d", &remote_version) != 1) {
}
if (sscanf(line,"@RSYNCD: %d", &remote_version) != 1) {
+ io_printf(fd,"@ERROR: protocol startup error\n");
return -1;
}
return -1;
}
@@
-275,13
+310,13
@@
static int start_daemon(int fd)
if (*line == '#') {
/* it's some sort of command that I don't understand */
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) {
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 -1;
}
}
@@
-292,6
+327,8
@@
static int start_daemon(int fd)
int daemon_main(void)
{
int daemon_main(void)
{
+ extern char *config_file;
+
if (is_a_socket(STDIN_FILENO)) {
/* we are running via inetd */
return start_daemon(STDIN_FILENO);
if (is_a_socket(STDIN_FILENO)) {
/* we are running via inetd */
return start_daemon(STDIN_FILENO);
@@
-299,6
+336,15
@@
int daemon_main(void)
become_daemon();
become_daemon();
+ if (!lp_load(config_file, 1)) {
+ fprintf(stderr,"failed to load config file %s\n", config_file);
+ exit_cleanup(1);
+ }
+
+ log_open();
+
+ rprintf(FINFO,"rsyncd version %s starting\n",VERSION);
+
start_accept_loop(rsync_port, start_daemon);
return -1;
}
start_accept_loop(rsync_port, start_daemon);
return -1;
}