X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=daemon.c;h=d788167ae0bbce0995329e0263e7082513087441;hb=3dd94e3b2e2f5b00512273f96ab5628c742c112c;hp=b6006c78291d1376a057f5a41f5f07b0f6b24111;hpb=d6b89e7bf882648c23bd7fd4598696087487329d;p=git.git diff --git a/daemon.c b/daemon.c index b6006c78..d788167a 100644 --- a/daemon.c +++ b/daemon.c @@ -1,5 +1,3 @@ -#include "cache.h" -#include "pkt-line.h" #include #include #include @@ -9,18 +7,26 @@ #include #include #include +#include "pkt-line.h" +#include "cache.h" static int log_syslog; static int verbose; -static const char daemon_usage[] = "git-daemon [--verbose] [--syslog] [--inetd | --port=n] [--export-all] [directory...]"; +static const char daemon_usage[] = +"git-daemon [--verbose] [--syslog] [--inetd | --port=n] [--export-all]\n" +" [--timeout=n] [--init-timeout=n] [--strict-paths] [directory...]"; /* List of acceptable pathname prefixes */ static char **ok_paths = NULL; +static int strict_paths = 0; /* If this is set, git-daemon-export-ok is not required */ static int export_all_trees = 0; +/* Timeout, and initial timeout */ +static unsigned int timeout = 0; +static unsigned int init_timeout = 0; static void logreport(int priority, const char *err, va_list params) { @@ -76,75 +82,68 @@ static void loginfo(const char *err, ...) va_end(params); } -static int path_ok(const char *dir) +static char *path_ok(char *dir) { - const char *p = dir; - char **pp; - int sl = 1, ndot = 0; + char *path = enter_repo(dir, strict_paths); - for (;;) { - if ( *p == '.' ) { - ndot++; - } else if ( *p == '/' || *p == '\0' ) { - if ( sl && ndot > 0 && ndot < 3 ) - return 0; /* . or .. in path */ - sl = 1; - if ( *p == '\0' ) - break; /* End of string and all is good */ - } else { - sl = ndot = 0; - } - p++; + if (!path) { + logerror("'%s': unable to chdir or not a git archive", dir); + return NULL; } if ( ok_paths && *ok_paths ) { - int ok = 0; - int dirlen = strlen(dir); /* read_packet_line can return embedded \0 */ - + char **pp; + int pathlen = strlen(path); + + /* The validation is done on the paths after enter_repo + * canonicalization, so whitelist should be written in + * terms of real pathnames (i.e. after ~user is expanded + * and symlinks resolved). + */ for ( pp = ok_paths ; *pp ; pp++ ) { int len = strlen(*pp); - if ( len <= dirlen && - !strncmp(*pp, dir, len) && - (dir[len] == '/' || dir[len] == '\0') ) { - ok = 1; - break; - } + if (len <= pathlen && + !memcmp(*pp, path, len) && + (path[len] == '\0' || + (!strict_paths && path[len] == '/'))) + return path; } - - if ( !ok ) - return 0; /* Path not in whitelist */ + } + else { + /* be backwards compatible */ + if (!strict_paths) + return path; } - return 1; /* Path acceptable */ + logerror("'%s': not in whitelist", path); + return NULL; /* Fallthrough. Deny by default */ } -static int upload(char *dir, int dirlen) +static int upload(char *dir) { - loginfo("Request for '%s'", dir); + /* Timeout as string */ + char timeout_buf[64]; + const char *path; - if (!path_ok(dir)) { - logerror("Forbidden directory: %s\n", dir); - return -1; - } + loginfo("Request for '%s'", dir); - if (chdir(dir) < 0) { - logerror("Cannot chdir('%s'): %s", dir, strerror(errno)); + if (!(path = path_ok(dir))) return -1; - } - - chdir(".git"); /* * Security on the cheap. * - * We want a readable HEAD, usable "objects" directory, and + * We want a readable HEAD, usable "objects" directory, and * a "git-daemon-export-ok" flag that says that the other side * is ok with us doing this. + * + * path_ok() uses enter_repo() and does whitelist checking. + * We only need to make sure the repository is exported. */ - if ((!export_all_trees && access("git-daemon-export-ok", F_OK)) || - access("objects/00", X_OK) || - access("HEAD", R_OK)) { - logerror("Not a valid git-daemon-enabled repository: '%s'", dir); + + if (!export_all_trees && access("git-daemon-export-ok", F_OK)) { + logerror("'%s': repository not exported.", path); + errno = EACCES; return -1; } @@ -154,8 +153,10 @@ static int upload(char *dir, int dirlen) */ signal(SIGTERM, SIG_IGN); + snprintf(timeout_buf, sizeof timeout_buf, "--timeout=%u", timeout); + /* git-upload-pack only ever reads stuff, so this is safe */ - execlp("git-upload-pack", "git-upload-pack", ".", NULL); + execlp("git-upload-pack", "git-upload-pack", "--strict", timeout_buf, ".", NULL); return -1; } @@ -164,13 +165,15 @@ static int execute(void) static char line[1000]; int len; + alarm(init_timeout ? init_timeout : timeout); len = packet_read_line(0, line, sizeof(line)); + alarm(0); if (len && line[len-1] == '\n') line[--len] = 0; - if (!strncmp("git-upload-pack /", line, 17)) - return upload(line + 16, len - 16); + if (!strncmp("git-upload-pack ", line, 16)) + return upload(line+16); logerror("Protocol error: '%s'", line); return -1; @@ -463,9 +466,7 @@ static int socksetup(int port, int **socklist_p) return 0; } - *socklist_p = malloc(sizeof(int)); - if ( !*socklist_p ) - die("memory allocation failed: %s", strerror(errno)); + *socklist_p = xmalloc(sizeof(int)); **socklist_p = sockfd; } @@ -476,19 +477,19 @@ static int service_loop(int socknum, int *socklist) struct pollfd *pfd; int i; - pfd = calloc(socknum, sizeof(struct pollfd)); - if (!pfd) - die("memory allocation failed: %s", strerror(errno)); + pfd = xcalloc(socknum, sizeof(struct pollfd)); for (i = 0; i < socknum; i++) { pfd[i].fd = socklist[i]; pfd[i].events = POLLIN; } - + + signal(SIGCHLD, child_handler); + for (;;) { int i; - if (poll(pfd, socknum, 0) < 0) { + if (poll(pfd, socknum, -1) < 0) { if (errno != EINTR) { error("poll failed, resuming: %s", strerror(errno)); @@ -500,7 +501,7 @@ static int service_loop(int socknum, int *socklist) for (i = 0; i < socknum; i++) { if (pfd[i].revents & POLLIN) { struct sockaddr_storage ss; - int sslen = sizeof(ss); + unsigned int sslen = sizeof(ss); int incoming = accept(pfd[i].fd, (struct sockaddr *)&ss, &sslen); if (incoming < 0) { switch (errno) { @@ -521,15 +522,13 @@ static int service_loop(int socknum, int *socklist) static int serve(int port) { int socknum, *socklist; - - signal(SIGCHLD, child_handler); - + socknum = socksetup(port, &socklist); if (socknum == 0) die("unable to allocate any listen sockets on port %u", port); - + return service_loop(socknum, socklist); -} +} int main(int argc, char **argv) { @@ -551,6 +550,7 @@ int main(int argc, char **argv) } if (!strcmp(arg, "--inetd")) { inetd_mode = 1; + log_syslog = 1; continue; } if (!strcmp(arg, "--verbose")) { @@ -559,13 +559,24 @@ int main(int argc, char **argv) } if (!strcmp(arg, "--syslog")) { log_syslog = 1; - openlog("git-daemon", 0, LOG_DAEMON); continue; } if (!strcmp(arg, "--export-all")) { export_all_trees = 1; continue; } + if (!strncmp(arg, "--timeout=", 10)) { + timeout = atoi(arg+10); + continue; + } + if (!strncmp(arg, "--init-timeout=", 15)) { + init_timeout = atoi(arg+15); + continue; + } + if (!strcmp(arg, "--strict-paths")) { + strict_paths = 1; + continue; + } if (!strcmp(arg, "--")) { ok_paths = &argv[i+1]; break; @@ -577,10 +588,21 @@ int main(int argc, char **argv) usage(daemon_usage); } + if (log_syslog) + openlog("git-daemon", 0, LOG_DAEMON); + + if (strict_paths && (!ok_paths || !*ok_paths)) { + if (!inetd_mode) + die("git-daemon: option --strict-paths requires a whitelist"); + + logerror("option --strict-paths requires a whitelist"); + exit (1); + } + if (inetd_mode) { fclose(stderr); //FIXME: workaround return execute(); - } else { - return serve(port); } + + return serve(port); }