mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

daemon: use strbuf_expand() instead of interpolate()

Browse Source 
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2008-11-23 00:15:01 +01:00
committed by Junio C Hamano
parent ced621b2c1
commit 9d7ca66746
1 changed files with 54 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
daemon.c
View File

@ -1,7 +1,6 @@
#include "cache.h" #include "cache.h"
#include "pkt-line.h" #include "pkt-line.h"
#include "exec_cmd.h" #include "exec_cmd.h"
#include "interpolate.h"
#include <syslog.h> #include <syslog.h>
@ -54,26 +53,11 @@ static const char *user_path;
static unsigned int timeout; static unsigned int timeout;
static unsigned int init_timeout; static unsigned int init_timeout;
/* static char *hostname;
* Static table for now. Ugh. static char *canon_hostname;
* Feel free to make dynamic as needed. static char *ip_address;
*/ static char *tcp_port;
#define INTERP_SLOT_HOST (0) static char *directory;
#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 void logreport(int priority, const char *err, va_list params) static void logreport(int priority, const char *err, va_list params)
{ {
@ -163,7 +147,7 @@ static int avoid_alias(char *p)
} }
} }
static char *path_ok(struct interp *itable) static char *path_ok(void)
{ {
static char rpath[PATH_MAX]; static char rpath[PATH_MAX];
static char interp_path[PATH_MAX]; static char interp_path[PATH_MAX];
@ -171,7 +155,7 @@ static char *path_ok(struct interp *itable)
char *path; char *path;
char *dir; char *dir;
dir = itable[INTERP_SLOT_DIR].value; dir = directory;
if (avoid_alias(dir)) { if (avoid_alias(dir)) {
logerror("'%s': aliased", dir); logerror("'%s': aliased", dir);
@ -201,14 +185,27 @@ static char *path_ok(struct interp *itable)
} }
} }
else if (interpolated_path && saw_extended_args) { 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 != '/') { if (*dir != '/') {
/* Allow only absolute */ /* Allow only absolute */
logerror("'%s': Non-absolute path denied (interpolated-path active)", dir); logerror("'%s': Non-absolute path denied (interpolated-path active)", dir);
return NULL; return NULL;
} }
interpolate(interp_path, PATH_MAX, interpolated_path, strbuf_expand(&expanded_path, interpolated_path,
interp_table, ARRAY_SIZE(interp_table)); strbuf_expand_dict_cb, &dict);
strlcpy(interp_path, expanded_path.buf, PATH_MAX);
strbuf_release(&expanded_path);
loginfo("Interpolated dir '%s'", interp_path); loginfo("Interpolated dir '%s'", interp_path);
dir = interp_path; dir = interp_path;
@ -233,7 +230,7 @@ static char *path_ok(struct interp *itable)
* prefixing the base path * prefixing the base path
*/ */
if (base_path && base_path_relaxed && !retried_path) { if (base_path && base_path_relaxed && !retried_path) {
dir = itable[INTERP_SLOT_DIR].value; dir = directory;
retried_path = 1; retried_path = 1;
continue; continue;
} }
@ -299,14 +296,12 @@ static int git_daemon_config(const char *var, const char *value, void *cb)
return 0; return 0;
} }
static int run_service(struct interp *itable, struct daemon_service *service) static int run_service(struct daemon_service *service)
{ {
const char *path; const char *path;
int enabled = service->enabled; int enabled = service->enabled;
loginfo("Request %s for '%s'", loginfo("Request %s for '%s'", service->name, directory);
service->name,
itable[INTERP_SLOT_DIR].value);
if (!enabled && !service->overridable) { if (!enabled && !service->overridable) {
logerror("'%s': service not enabled.", service->name); logerror("'%s': service not enabled.", service->name);
@ -314,7 +309,7 @@ static int run_service(struct interp *itable, struct daemon_service *service)
return -1; return -1;
} }
if (!(path = path_ok(itable))) if (!(path = path_ok()))
return -1; return -1;
/* /*
@ -413,9 +408,8 @@ static void make_service_overridable(const char *name, int ena)
/* /*
* Separate the "extra args" information as supplied by the client connection. * 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; char *val;
int vallen; int vallen;
@ -433,9 +427,11 @@ static void parse_extra_args(struct interp *table, char *extra_args, int buflen)
if (port) { if (port) {
*port = 0; *port = 0;
port++; 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(host);
} }
/* On to the next one */ /* On to the next one */
@ -444,14 +440,14 @@ static void parse_extra_args(struct interp *table, char *extra_args, int buflen)
} }
} }
static void fill_in_extra_table_entries(struct interp *itable) static void fill_in_extra_table_entries(void)
{ {
char *hp; char *hp;
/* /*
* Replace literal host with lowercase-ized hostname. * Replace literal host with lowercase-ized hostname.
*/ */
hp = interp_table[INTERP_SLOT_HOST].value; hp = hostname;
if (!hp) if (!hp)
return; return;
for ( ; *hp; hp++) for ( ; *hp; hp++)
@ -470,17 +466,17 @@ static void fill_in_extra_table_entries(struct interp *itable)
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
hints.ai_flags = AI_CANONNAME; hints.ai_flags = AI_CANONNAME;
gai = getaddrinfo(interp_table[INTERP_SLOT_HOST].value, 0, &hints, &ai0); gai = getaddrinfo(hostname, 0, &hints, &ai0);
if (!gai) { if (!gai) {
for (ai = ai0; ai; ai = ai->ai_next) { for (ai = ai0; ai; ai = ai->ai_next) {
struct sockaddr_in *sin_addr = (void *)ai->ai_addr; struct sockaddr_in *sin_addr = (void *)ai->ai_addr;
inet_ntop(AF_INET, &sin_addr->sin_addr, inet_ntop(AF_INET, &sin_addr->sin_addr,
addrbuf, sizeof(addrbuf)); addrbuf, sizeof(addrbuf));
interp_set_entry(interp_table, free(canon_hostname);
INTERP_SLOT_CANON_HOST, ai->ai_canonname); canon_hostname = xstrdup(ai->ai_canonname);
interp_set_entry(interp_table, free(ip_address);
INTERP_SLOT_IP, addrbuf); ip_address = xstrdup(addrbuf);
break; break;
} }
freeaddrinfo(ai0); freeaddrinfo(ai0);
@ -493,7 +489,7 @@ static void fill_in_extra_table_entries(struct interp *itable)
char **ap; char **ap;
static char addrbuf[HOST_NAME_MAX + 1]; static char addrbuf[HOST_NAME_MAX + 1];
hent = gethostbyname(interp_table[INTERP_SLOT_HOST].value); hent = gethostbyname(hostname);
ap = hent->h_addr_list; ap = hent->h_addr_list;
memset(&sa, 0, sizeof sa); memset(&sa, 0, sizeof sa);
@ -504,8 +500,10 @@ static void fill_in_extra_table_entries(struct interp *itable)
inet_ntop(hent->h_addrtype, &sa.sin_addr, inet_ntop(hent->h_addrtype, &sa.sin_addr,
addrbuf, sizeof(addrbuf)); addrbuf, sizeof(addrbuf));
interp_set_entry(interp_table, INTERP_SLOT_CANON_HOST, hent->h_name); free(canon_hostname);
interp_set_entry(interp_table, INTERP_SLOT_IP, addrbuf); canon_hostname = xstrdup(hent->h_name);
free(ip_address);
ip_address = xstrdup(addrbuf);
} }
#endif #endif
} }
@ -557,15 +555,16 @@ static int execute(struct sockaddr *addr)
pktlen--; pktlen--;
} }
/* free(hostname);
* Initialize the path interpolation table for this connection. free(canon_hostname);
*/ free(ip_address);
interp_clear_table(interp_table, ARRAY_SIZE(interp_table)); free(tcp_port);
interp_set_entry(interp_table, INTERP_SLOT_PERCENT, "%"); free(directory);
hostname = canon_hostname = ip_address = tcp_port = directory = NULL;
if (len != pktlen) { if (len != pktlen) {
parse_extra_args(interp_table, line + len + 1, pktlen - len - 1); parse_extra_args(line + len + 1, pktlen - len - 1);
fill_in_extra_table_entries(interp_table); fill_in_extra_table_entries();
} }
for (i = 0; i < ARRAY_SIZE(daemon_service); i++) { for (i = 0; i < ARRAY_SIZE(daemon_service); i++) {
@ -578,9 +577,9 @@ static int execute(struct sockaddr *addr)
* Note: The directory here is probably context sensitive, * Note: The directory here is probably context sensitive,
* and might depend on the actual service being performed. * and might depend on the actual service being performed.
*/ */
interp_set_entry(interp_table, free(directory);
INTERP_SLOT_DIR, line + namelen + 5); directory = xstrdup(line + namelen + 5);
return run_service(interp_table, s); return run_service(s);
} }
} }