-#include "cache.h"
-#include "pkt-line.h"
#include <signal.h>
#include <sys/wait.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <syslog.h>
+#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]\n"
-" [--timeout=n] [--init-timeout=n] [directory...]";
+" [--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;
va_end(params);
}
-static int path_ok(const char *dir)
+static char *path_ok(char *dir)
{
- const char *p = dir;
- char **pp;
- int sl, ndot;
+ char *path = enter_repo(dir, strict_paths);
- /* 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 (!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);
-
+ 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 set_dir(const char *dir)
+static int upload(char *dir)
{
- if (!path_ok(dir)) {
- errno = EACCES;
- return -1;
- }
+ /* Timeout as string */
+ char timeout_buf[64];
+ const char *path;
- if ( chdir(dir) )
+ loginfo("Request for '%s'", dir);
+
+ if (!(path = path_ok(dir)))
return -1;
-
+
/*
* 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)) {
+ logerror("'%s': repository not exported.", path);
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);
- /* Timeout as string */
- char timeout_buf[64];
-
- 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
* good client.
if (len && line[len-1] == '\n')
line[--len] = 0;
- if (!strncmp("git-upload-pack /", line, 17))
+ if (!strncmp("git-upload-pack ", line, 16))
return upload(line+16);
logerror("Protocol error: '%s'", line);
return 0;
}
+ if (listen(sockfd, 5) < 0) {
+ close(sockfd);
+ return 0;
+ }
+
*socklist_p = xmalloc(sizeof(int));
**socklist_p = sockfd;
+ return 1;
}
#endif
}
signal(SIGCHLD, child_handler);
-
+
for (;;) {
int i;
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)
{
}
if (!strcmp(arg, "--inetd")) {
inetd_mode = 1;
+ log_syslog = 1;
continue;
}
if (!strcmp(arg, "--verbose")) {
}
if (!strcmp(arg, "--syslog")) {
log_syslog = 1;
- openlog("git-daemon", 0, LOG_DAEMON);
continue;
}
if (!strcmp(arg, "--export-all")) {
}
if (!strncmp(arg, "--timeout=", 10)) {
timeout = atoi(arg+10);
+ continue;
}
- if (!strncmp(arg, "--init-timeout=", 10)) {
+ 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];
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);
}