clean up pathspec matching
[gitweb.git] / daemon.c
index b9ba44c582b3b6cfac0f150f7f8901d60b48bbb3..60bf6c743c559676f0c9e0ff8dc6d9a5dfede195 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -1,7 +1,6 @@
 #include "cache.h"
 #include "pkt-line.h"
 #include "exec_cmd.h"
-#include "interpolate.h"
 
 #include <syslog.h>
 
@@ -54,26 +53,10 @@ static const char *user_path;
 static unsigned int timeout;
 static unsigned int init_timeout;
 
-/*
- * Static table for now.  Ugh.
- * Feel free to make dynamic as needed.
- */
-#define INTERP_SLOT_HOST       (0)
-#define INTERP_SLOT_CANON_HOST (1)
-#define INTERP_SLOT_IP         (2)
-#define INTERP_SLOT_PORT       (3)
-#define INTERP_SLOT_DIR                (4)
-#define INTERP_SLOT_PERCENT    (5)
-
-static struct interp interp_table[] = {
-       { "%H", 0},
-       { "%CH", 0},
-       { "%IP", 0},
-       { "%P", 0},
-       { "%D", 0},
-       { "%%", 0},
-};
-
+static char *hostname;
+static char *canon_hostname;
+static char *ip_address;
+static char *tcp_port;
 
 static void logreport(int priority, const char *err, va_list params)
 {
@@ -163,15 +146,14 @@ static int avoid_alias(char *p)
        }
 }
 
-static char *path_ok(struct interp *itable)
+static char *path_ok(char *directory)
 {
        static char rpath[PATH_MAX];
        static char interp_path[PATH_MAX];
-       int retried_path = 0;
        char *path;
        char *dir;
 
-       dir = itable[INTERP_SLOT_DIR].value;
+       dir = directory;
 
        if (avoid_alias(dir)) {
                logerror("'%s': aliased", dir);
@@ -201,14 +183,27 @@ static char *path_ok(struct interp *itable)
                }
        }
        else if (interpolated_path && saw_extended_args) {
+               struct strbuf expanded_path = STRBUF_INIT;
+               struct strbuf_expand_dict_entry dict[] = {
+                       { "H", hostname },
+                       { "CH", canon_hostname },
+                       { "IP", ip_address },
+                       { "P", tcp_port },
+                       { "D", directory },
+                       { "%", "%" },
+                       { NULL }
+               };
+
                if (*dir != '/') {
                        /* Allow only absolute */
                        logerror("'%s': Non-absolute path denied (interpolated-path active)", dir);
                        return NULL;
                }
 
-               interpolate(interp_path, PATH_MAX, interpolated_path,
-                           interp_table, ARRAY_SIZE(interp_table));
+               strbuf_expand(&expanded_path, interpolated_path,
+                               strbuf_expand_dict_cb, &dict);
+               strlcpy(interp_path, expanded_path.buf, PATH_MAX);
+               strbuf_release(&expanded_path);
                loginfo("Interpolated dir '%s'", interp_path);
 
                dir = interp_path;
@@ -223,22 +218,15 @@ static char *path_ok(struct interp *itable)
                dir = rpath;
        }
 
-       do {
-               path = enter_repo(dir, strict_paths);
-               if (path)
-                       break;
-
+       path = enter_repo(dir, strict_paths);
+       if (!path && base_path && base_path_relaxed) {
                /*
                 * if we fail and base_path_relaxed is enabled, try without
                 * prefixing the base path
                 */
-               if (base_path && base_path_relaxed && !retried_path) {
-                       dir = itable[INTERP_SLOT_DIR].value;
-                       retried_path = 1;
-                       continue;
-               }
-               break;
-       } while (1);
+               dir = directory;
+               path = enter_repo(dir, strict_paths);
+       }
 
        if (!path) {
                logerror("'%s': unable to chdir or not a git archive", dir);
@@ -299,14 +287,12 @@ static int git_daemon_config(const char *var, const char *value, void *cb)
        return 0;
 }
 
-static int run_service(struct interp *itable, struct daemon_service *service)
+static int run_service(char *dir, struct daemon_service *service)
 {
        const char *path;
        int enabled = service->enabled;
 
-       loginfo("Request %s for '%s'",
-               service->name,
-               itable[INTERP_SLOT_DIR].value);
+       loginfo("Request %s for '%s'", service->name, dir);
 
        if (!enabled && !service->overridable) {
                logerror("'%s': service not enabled.", service->name);
@@ -314,7 +300,7 @@ static int run_service(struct interp *itable, struct daemon_service *service)
                return -1;
        }
 
-       if (!(path = path_ok(itable)))
+       if (!(path = path_ok(dir)))
                return -1;
 
        /*
@@ -411,11 +397,18 @@ static void make_service_overridable(const char *name, int ena)
        die("No such service %s", name);
 }
 
+static char *xstrdup_tolower(const char *str)
+{
+       char *p, *dup = xstrdup(str);
+       for (p = dup; *p; p++)
+               *p = tolower(*p);
+       return dup;
+}
+
 /*
  * Separate the "extra args" information as supplied by the client connection.
- * Any resulting data is squirreled away in the given interpolation table.
  */
-static void parse_extra_args(struct interp *table, char *extra_args, int buflen)
+static void parse_extra_args(char *extra_args, int buflen)
 {
        char *val;
        int vallen;
@@ -433,35 +426,23 @@ static void parse_extra_args(struct interp *table, char *extra_args, int buflen)
                                if (port) {
                                        *port = 0;
                                        port++;
-                                       interp_set_entry(table, INTERP_SLOT_PORT, port);
+                                       free(tcp_port);
+                                       tcp_port = xstrdup(port);
                                }
-                               interp_set_entry(table, INTERP_SLOT_HOST, host);
+                               free(hostname);
+                               hostname = xstrdup_tolower(host);
                        }
 
                        /* On to the next one */
                        extra_args = val + vallen;
                }
        }
-}
-
-static void fill_in_extra_table_entries(struct interp *itable)
-{
-       char *hp;
-
-       /*
-        * Replace literal host with lowercase-ized hostname.
-        */
-       hp = interp_table[INTERP_SLOT_HOST].value;
-       if (!hp)
-               return;
-       for ( ; *hp; hp++)
-               *hp = tolower(*hp);
 
        /*
         * Locate canonical hostname and its IP address.
         */
+       if (hostname) {
 #ifndef NO_IPV6
-       {
                struct addrinfo hints;
                struct addrinfo *ai, *ai0;
                int gai;
@@ -470,30 +451,28 @@ static void fill_in_extra_table_entries(struct interp *itable)
                memset(&hints, 0, sizeof(hints));
                hints.ai_flags = AI_CANONNAME;
 
-               gai = getaddrinfo(interp_table[INTERP_SLOT_HOST].value, 0, &hints, &ai0);
+               gai = getaddrinfo(hostname, 0, &hints, &ai0);
                if (!gai) {
                        for (ai = ai0; ai; ai = ai->ai_next) {
                                struct sockaddr_in *sin_addr = (void *)ai->ai_addr;
 
                                inet_ntop(AF_INET, &sin_addr->sin_addr,
                                          addrbuf, sizeof(addrbuf));
-                               interp_set_entry(interp_table,
-                                                INTERP_SLOT_CANON_HOST, ai->ai_canonname);
-                               interp_set_entry(interp_table,
-                                                INTERP_SLOT_IP, addrbuf);
+                               free(canon_hostname);
+                               canon_hostname = xstrdup(ai->ai_canonname);
+                               free(ip_address);
+                               ip_address = xstrdup(addrbuf);
                                break;
                        }
                        freeaddrinfo(ai0);
                }
-       }
 #else
-       {
                struct hostent *hent;
                struct sockaddr_in sa;
                char **ap;
                static char addrbuf[HOST_NAME_MAX + 1];
 
-               hent = gethostbyname(interp_table[INTERP_SLOT_HOST].value);
+               hent = gethostbyname(hostname);
 
                ap = hent->h_addr_list;
                memset(&sa, 0, sizeof sa);
@@ -504,10 +483,12 @@ static void fill_in_extra_table_entries(struct interp *itable)
                inet_ntop(hent->h_addrtype, &sa.sin_addr,
                          addrbuf, sizeof(addrbuf));
 
-               interp_set_entry(interp_table, INTERP_SLOT_CANON_HOST, hent->h_name);
-               interp_set_entry(interp_table, INTERP_SLOT_IP, addrbuf);
-       }
+               free(canon_hostname);
+               canon_hostname = xstrdup(hent->h_name);
+               free(ip_address);
+               ip_address = xstrdup(addrbuf);
 #endif
+       }
 }
 
 
@@ -557,16 +538,14 @@ static int execute(struct sockaddr *addr)
                pktlen--;
        }
 
-       /*
-        * Initialize the path interpolation table for this connection.
-        */
-       interp_clear_table(interp_table, ARRAY_SIZE(interp_table));
-       interp_set_entry(interp_table, INTERP_SLOT_PERCENT, "%");
+       free(hostname);
+       free(canon_hostname);
+       free(ip_address);
+       free(tcp_port);
+       hostname = canon_hostname = ip_address = tcp_port = NULL;
 
-       if (len != pktlen) {
-           parse_extra_args(interp_table, line + len + 1, pktlen - len - 1);
-           fill_in_extra_table_entries(interp_table);
-       }
+       if (len != pktlen)
+               parse_extra_args(line + len + 1, pktlen - len - 1);
 
        for (i = 0; i < ARRAY_SIZE(daemon_service); i++) {
                struct daemon_service *s = &(daemon_service[i]);
@@ -578,9 +557,7 @@ static int execute(struct sockaddr *addr)
                         * Note: The directory here is probably context sensitive,
                         * and might depend on the actual service being performed.
                         */
-                       interp_set_entry(interp_table,
-                                        INTERP_SLOT_DIR, line + namelen + 5);
-                       return run_service(interp_table, s);
+                       return run_service(line + namelen + 5, s);
                }
        }
 
@@ -964,12 +941,8 @@ int main(int argc, char **argv)
                char *arg = argv[i];
 
                if (!prefixcmp(arg, "--listen=")) {
-                   char *p = arg + 9;
-                   char *ph = listen_addr = xmalloc(strlen(arg + 9) + 1);
-                   while (*p)
-                       *ph++ = tolower(*p++);
-                   *ph = 0;
-                   continue;
+                       listen_addr = xstrdup_tolower(arg + 9);
+                       continue;
                }
                if (!prefixcmp(arg, "--port=")) {
                        char *end;
@@ -1129,7 +1102,9 @@ int main(int argc, char **argv)
                struct sockaddr *peer = (struct sockaddr *)&ss;
                socklen_t slen = sizeof(ss);
 
-               freopen("/dev/null", "w", stderr);
+               if (!freopen("/dev/null", "w", stderr))
+                       die("failed to redirect stderr to /dev/null: %s",
+                           strerror(errno));
 
                if (getpeername(0, peer, &slen))
                        peer = NULL;