X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=daemon.c;h=08e3b15225691ac0077ed222552ec09875f56d51;hb=750a09a7de63c92868cff41a3151eac320c77fa0;hp=fb3f25c48665596f41ebcee66037bdd1be2dd30a;hpb=10d781b9caa4f71495c7b34963bef137216f86a8;p=git.git diff --git a/daemon.c b/daemon.c index fb3f25c4..08e3b152 100644 --- a/daemon.c +++ b/daemon.c @@ -6,15 +6,140 @@ #include #include #include +#include +#include -static const char daemon_usage[] = "git-daemon [--inetd | --port=n]"; +static int log_syslog; +static int verbose; -static int upload(char *dir, int dirlen) +static const char daemon_usage[] = "git-daemon [--verbose] [--syslog] [--inetd | --port=n] [--export-all] [directory...]"; + +/* List of acceptable pathname prefixes */ +static char **ok_paths = NULL; + +/* If this is set, git-daemon-export-ok is not required */ +static int export_all_trees = 0; + + +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. */ + char buf[1024]; + int buflen; + int maxlen, msglen; + + /* sizeof(buf) should be big enough for "[pid] \n" */ + 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 + * message, so truncate it at maxlen - 1. + */ + if (msglen > maxlen - 1) + msglen = maxlen - 1; + else if (msglen < 0) + msglen = 0; /* Protect against weird return values. */ + buflen += msglen; + + buf[buflen++] = '\n'; + buf[buflen] = '\0'; + + write(2, buf, buflen); +} + +static void logerror(const char *err, ...) +{ + va_list params; + va_start(params, err); + logreport(LOG_ERR, err, params); + va_end(params); +} + +static void loginfo(const char *err, ...) +{ + va_list params; + if (!verbose) + return; + va_start(params, err); + logreport(LOG_INFO, err, params); + va_end(params); +} + +static int path_ok(const char *dir) +{ + const char *p = dir; + char **pp; + int sl, ndot; + + /* The pathname here should be an absolute path. */ + if ( *p++ != '/' ) + return 0; + + sl = 1; ndot = 0; + + for (;;) { + if ( *p == '.' ) { + ndot++; + } else if ( *p == '\0' ) { + /* Reject "." and ".." at the end of the path */ + if ( sl && ndot > 0 && ndot < 3 ) + return 0; + + /* Otherwise OK */ + break; + } else if ( *p == '/' ) { + /* Refuse "", "." or ".." */ + if ( sl && ndot < 3 ) + return 0; + sl = 1; + ndot = 0; + } else { + sl = ndot = 0; + } + p++; + } + + if ( ok_paths && *ok_paths ) { + int ok = 0; + int dirlen = strlen(dir); + + 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 ( !ok ) + return 0; /* Path not in whitelist */ + } + + return 1; /* Path acceptable */ +} + +static int set_dir(const char *dir) { - if (chdir(dir) < 0) + if (!path_ok(dir)) { + errno = EACCES; return -1; - chdir(".git"); + } + if ( chdir(dir) ) + return -1; + /* * Security on the cheap. * @@ -22,10 +147,41 @@ static int upload(char *dir, int dirlen) * a "git-daemon-export-ok" flag that says that the other side * is ok with us doing this. */ - if (access("git-daemon-export-ok", F_OK) || - access("objects/00", X_OK) || - access("HEAD", R_OK)) + if (!export_all_trees && access("git-daemon-export-ok", F_OK)) { + errno = EACCES; + return -1; + } + + if (access("objects/", X_OK) || access("HEAD", R_OK)) { + errno = EINVAL; + return -1; + } + + /* If all this passed, we're OK */ + return 0; +} + +static int upload(char *dir) +{ + /* Try paths in this order */ + static const char *paths[] = { "%s", "%s/.git", "%s.git", "%s.git/.git", NULL }; + const char **pp; + /* Enough for the longest path above including final null */ + int buflen = strlen(dir)+10; + char *dirbuf = xmalloc(buflen); + + loginfo("Request for '%s'", dir); + + for ( pp = paths ; *pp ; pp++ ) { + snprintf(dirbuf, buflen, *pp, dir); + if ( !set_dir(dirbuf) ) + break; + } + + if ( !*pp ) { + logerror("Cannot set directory '%s': %s", dir, strerror(errno)); return -1; + } /* * We'll ignore SIGTERM from now on, we have a @@ -49,9 +205,9 @@ static int execute(void) line[--len] = 0; if (!strncmp("git-upload-pack /", line, 17)) - return upload(line + 16, len - 16); + return upload(line+16); - fprintf(stderr, "got bad connection '%s'\n", line); + logerror("Protocol error: '%s'", line); return -1; } @@ -80,11 +236,11 @@ static unsigned int children_deleted = 0; static struct child { pid_t pid; - socklen_t addrlen; + int addrlen; struct sockaddr_storage address; } live_child[MAX_CHILDREN]; -static void add_child(int idx, pid_t pid, struct sockaddr *addr, socklen_t addrlen) +static void add_child(int idx, pid_t pid, struct sockaddr *addr, int addrlen) { live_child[idx].pid = pid; live_child[idx].addrlen = addrlen; @@ -178,9 +334,11 @@ static void check_max_connections(void) } } -static void handle(int incoming, struct sockaddr *addr, socklen_t addrlen) +static void handle(int incoming, struct sockaddr *addr, int addrlen) { pid_t pid = fork(); + char addrbuf[256] = ""; + int port = -1; if (pid) { unsigned idx; @@ -200,18 +358,47 @@ static void handle(int incoming, struct sockaddr *addr, socklen_t addrlen) dup2(incoming, 0); dup2(incoming, 1); close(incoming); + + if (addr->sa_family == AF_INET) { + struct sockaddr_in *sin_addr = (void *) addr; + inet_ntop(AF_INET, &sin_addr->sin_addr, addrbuf, sizeof(addrbuf)); + port = sin_addr->sin_port; + + } else if (addr->sa_family == AF_INET6) { + struct sockaddr_in6 *sin6_addr = (void *) addr; + + char *buf = addrbuf; + *buf++ = '['; *buf = '\0'; /* stpcpy() is cool */ + inet_ntop(AF_INET6, &sin6_addr->sin6_addr, buf, sizeof(addrbuf) - 1); + strcat(buf, "]"); + + port = sin6_addr->sin6_port; + } + loginfo("Connection from %s:%d", addrbuf, port); + exit(execute()); } 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) { + 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; @@ -308,7 +495,7 @@ static int serve(int port) if (FD_ISSET(sockfd, &fds)) { struct sockaddr_storage ss; - socklen_t sslen = sizeof(ss); + int sslen = sizeof(ss); int incoming = accept(sockfd, (struct sockaddr *)&ss, &sslen); if (incoming < 0) { switch (errno) { @@ -344,17 +531,38 @@ int main(int argc, char **argv) continue; } } - if (!strcmp(arg, "--inetd")) { inetd_mode = 1; continue; } + if (!strcmp(arg, "--verbose")) { + verbose = 1; + continue; + } + 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 (!strcmp(arg, "--")) { + ok_paths = &argv[i+1]; + break; + } else if (arg[0] != '-') { + ok_paths = &argv[i]; + break; + } usage(daemon_usage); } - if (inetd_mode) + if (inetd_mode) { + fclose(stderr); //FIXME: workaround return execute(); + } return serve(port); }