X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=daemon.c;h=d788167ae0bbce0995329e0263e7082513087441;hb=3dd94e3b2e2f5b00512273f96ab5628c742c112c;hp=4e63bb8d617bf39742ea10eccd4ccb13ad01f0ac;hpb=7fe2fc79358673a909d71e62d3f80ffe0f525fce;p=git.git diff --git a/daemon.c b/daemon.c index 4e63bb8d..d788167a 100644 --- a/daemon.c +++ b/daemon.c @@ -1,19 +1,34 @@ -#include "cache.h" -#include "pkt-line.h" #include #include #include #include +#include #include #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] [--inetd | --port=n]"; +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(const char *err, va_list params) +static void logreport(int priority, const char *err, va_list params) { /* We should do a single write so that it is atomic and output * of several processes do not get intermingled. */ @@ -22,11 +37,16 @@ static void logreport(const char *err, va_list params) int maxlen, msglen; /* sizeof(buf) should be big enough for "[pid] \n" */ - buflen = snprintf(buf, sizeof(buf), "[%d] ", getpid()); + buflen = snprintf(buf, sizeof(buf), "[%ld] ", (long) getpid()); maxlen = sizeof(buf) - buflen - 1; /* -1 for our own LF */ msglen = vsnprintf(buf + buflen, maxlen, err, params); + if (log_syslog) { + syslog(priority, "%s", buf); + return; + } + /* maxlen counted our own LF but also counts space given to * vsnprintf for the terminating NUL. We want to make sure that * we have space for our own LF and NUL after the "meat" of the @@ -44,45 +64,86 @@ static void logreport(const char *err, va_list params) write(2, buf, buflen); } -void logerror(const char *err, ...) +static void logerror(const char *err, ...) { va_list params; va_start(params, err); - logreport(err, params); + logreport(LOG_ERR, err, params); va_end(params); } -void lognotice(const char *err, ...) +static void loginfo(const char *err, ...) { va_list params; if (!verbose) return; va_start(params, err); - logreport(err, params); + logreport(LOG_INFO, err, params); va_end(params); } +static char *path_ok(char *dir) +{ + char *path = enter_repo(dir, strict_paths); -static int upload(char *dir, int dirlen) + if (!path) { + logerror("'%s': unable to chdir or not a git archive", dir); + return NULL; + } + + if ( ok_paths && *ok_paths ) { + 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 <= pathlen && + !memcmp(*pp, path, len) && + (path[len] == '\0' || + (!strict_paths && path[len] == '/'))) + return path; + } + } + else { + /* be backwards compatible */ + if (!strict_paths) + return path; + } + + logerror("'%s': not in whitelist", path); + return NULL; /* Fallthrough. Deny by default */ +} + +static int upload(char *dir) { - lognotice("Request for '%s'", dir); - if (chdir(dir) < 0) { - logerror("Cannot chdir('%s'): %s", dir, strerror(errno)); + /* Timeout as string */ + char timeout_buf[64]; + const char *path; + + loginfo("Request for '%s'", dir); + + 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 (access("git-daemon-export-ok", F_OK) || - access("objects/00", X_OK) || - access("HEAD", R_OK)) { - logerror("Not a valid gitd-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; } @@ -92,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; } @@ -102,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; @@ -267,6 +332,7 @@ static void handle(int incoming, struct sockaddr *addr, int addrlen) inet_ntop(AF_INET, &sin_addr->sin_addr, addrbuf, sizeof(addrbuf)); port = sin_addr->sin_port; +#ifndef NO_IPV6 } else if (addr->sa_family == AF_INET6) { struct sockaddr_in6 *sin6_addr = (void *) addr; @@ -276,8 +342,9 @@ static void handle(int incoming, struct sockaddr *addr, int addrlen) strcat(buf, "]"); port = sin6_addr->sin6_port; +#endif } - lognotice("Connection from %s:%d", addrbuf, port); + loginfo("Connection from %s:%d", addrbuf, port); exit(execute()); } @@ -285,31 +352,39 @@ static void handle(int incoming, struct sockaddr *addr, int addrlen) static void child_handler(int signo) { for (;;) { - pid_t pid = waitpid(-1, NULL, WNOHANG); + int status; + pid_t pid = waitpid(-1, &status, WNOHANG); if (pid > 0) { unsigned reaped = children_reaped; dead_child[reaped % MAX_CHILDREN] = pid; children_reaped = reaped + 1; /* XXX: Custom logging, since we don't wanna getpid() */ - if (verbose) - fprintf(stderr, "[%d] Disconnected\n", pid); + if (verbose) { + char *dead = ""; + if (!WIFEXITED(status) || WEXITSTATUS(status) > 0) + dead = " (with error)"; + if (log_syslog) + syslog(LOG_INFO, "[%d] Disconnected%s", pid, dead); + else + fprintf(stderr, "[%d] Disconnected%s\n", pid, dead); + } continue; } break; } } -static int serve(int port) +#ifndef NO_IPV6 + +static int socksetup(int port, int **socklist_p) { - struct addrinfo hints, *ai0, *ai; - int gai; int socknum = 0, *socklist = NULL; int maxfd = -1; - fd_set fds_init, fds; char pbuf[NI_MAXSERV]; - signal(SIGCHLD, child_handler); + struct addrinfo hints, *ai0, *ai; + int gai; sprintf(pbuf, "%d", port); memset(&hints, 0, sizeof(hints)); @@ -322,8 +397,6 @@ static int serve(int port) if (gai) die("getaddrinfo() failed: %s\n", gai_strerror(gai)); - FD_ZERO(&fds_init); - for (ai = ai0; ai; ai = ai->ai_next) { int sockfd; int *newlist; @@ -362,23 +435,63 @@ static int serve(int port) socklist = newlist; socklist[socknum++] = sockfd; - FD_SET(sockfd, &fds_init); if (maxfd < sockfd) maxfd = sockfd; } freeaddrinfo(ai0); - if (socknum == 0) - die("unable to allocate any listen sockets on port %u", port); + *socklist_p = socklist; + return socknum; +} + +#else /* NO_IPV6 */ + +static int socksetup(int port, int **socklist_p) +{ + struct sockaddr_in sin; + int sockfd; + + sockfd = socket(AF_INET, SOCK_STREAM, 0); + if (sockfd < 0) + return 0; + + memset(&sin, 0, sizeof sin); + sin.sin_family = AF_INET; + sin.sin_addr.s_addr = htonl(INADDR_ANY); + sin.sin_port = htons(port); + + if ( bind(sockfd, (struct sockaddr *)&sin, sizeof sin) < 0 ) { + close(sockfd); + return 0; + } + + *socklist_p = xmalloc(sizeof(int)); + **socklist_p = sockfd; +} + +#endif + +static int service_loop(int socknum, int *socklist) +{ + struct pollfd *pfd; + int i; + + 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; - fds = fds_init; - - if (select(maxfd + 1, &fds, NULL, NULL, NULL) < 0) { + + if (poll(pfd, socknum, -1) < 0) { if (errno != EINTR) { - error("select failed, resuming: %s", + error("poll failed, resuming: %s", strerror(errno)); sleep(1); } @@ -386,12 +499,10 @@ static int serve(int port) } for (i = 0; i < socknum; i++) { - int sockfd = socklist[i]; - - if (FD_ISSET(sockfd, &fds)) { + if (pfd[i].revents & POLLIN) { struct sockaddr_storage ss; - int sslen = sizeof(ss); - int incoming = accept(sockfd, (struct sockaddr *)&ss, &sslen); + unsigned int sslen = sizeof(ss); + int incoming = accept(pfd[i].fd, (struct sockaddr *)&ss, &sslen); if (incoming < 0) { switch (errno) { case EAGAIN: @@ -408,6 +519,17 @@ static int serve(int port) } } +static int serve(int port) +{ + int socknum, *socklist; + + 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) { int port = DEFAULT_GIT_PORT; @@ -426,19 +548,57 @@ int main(int argc, char **argv) continue; } } - if (!strcmp(arg, "--inetd")) { inetd_mode = 1; + log_syslog = 1; continue; } if (!strcmp(arg, "--verbose")) { verbose = 1; continue; } + if (!strcmp(arg, "--syslog")) { + log_syslog = 1; + 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; + } else if (arg[0] != '-') { + ok_paths = &argv[i]; + break; + } 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();