#include <netdb.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <syslog.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] [directory...]";
+/* List of acceptable pathname prefixes */
+static char **ok_paths = NULL;
-static void logreport(const char *err, va_list params)
+/* 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. */
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
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 int path_ok(const char *dir)
+{
+ const char *p = dir;
+ char **pp;
+ int sl = 1, ndot = 0;
+
+ 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 ( ok_paths && *ok_paths ) {
+ int ok = 0;
+ int dirlen = strlen(dir); /* read_packet_line can return embedded \0 */
+
+ 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 upload(char *dir, int dirlen)
{
- lognotice("Request for '%s'", dir);
+ loginfo("Request for '%s'", dir);
+
+ if (!path_ok(dir)) {
+ logerror("Forbidden directory: %s\n", dir);
+ return -1;
+ }
+
if (chdir(dir) < 0) {
logerror("Cannot chdir('%s'): %s", dir, strerror(errno));
return -1;
}
+
chdir(".git");
/*
* 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) ||
+ if ((!export_all_trees && 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);
+ logerror("Not a valid git-daemon-enabled repository: '%s'", dir);
return -1;
}
port = sin6_addr->sin6_port;
}
- lognotice("Connection from %s:%d", addrbuf, 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)
- 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;
continue;
}
}
-
if (!strcmp(arg, "--inetd")) {
inetd_mode = 1;
continue;
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);
}
projects / git.git / blobdiff