X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fhttp.c;h=021d7305e7b146b9f6764b21289cc8167c477f4e;hb=023342b4f7a64379c65f40652dc25ef436952f3b;hp=291f0d9920d3bf4698aeaf5c6cddce572f92ca0b;hpb=a567f55ee47da94c337b232a3848d1c8bab254b2;p=pazpar2-moved-to-github.git diff --git a/src/http.c b/src/http.c index 291f0d9..021d730 100644 --- a/src/http.c +++ b/src/http.c @@ -1,5 +1,5 @@ /* - * $Id: http.c,v 1.10 2007-02-05 16:15:41 quinn Exp $ + * $Id: http.c,v 1.16 2007-03-29 15:23:17 quinn Exp $ */ #include @@ -14,6 +14,7 @@ #include #include #include +#include #if HAVE_CONFIG_H #include @@ -25,6 +26,7 @@ #include #include +#include "cconfig.h" #include "util.h" #include "eventl.h" #include "pazpar2.h" @@ -36,8 +38,10 @@ static struct http_channel *http_create(void); static void http_destroy(IOCHAN i); extern IOCHAN channel_list; +extern struct parameters global_parameters; -static struct sockaddr_in *proxy_addr = 0; // If this is set, we proxy normal HTTP requests +// If this is set, we proxy normal HTTP requests +static struct sockaddr_in *proxy_addr = 0; static char proxy_url[256] = ""; static char myurl[256] = ""; static struct http_buf *http_buf_freelist = 0; @@ -168,7 +172,8 @@ static int http_buf_read(struct http_buf **b, char *buf, int len) return rd; } -void static urldecode(char *i, char *o) +// Buffers may overlap. +static void urldecode(char *i, char *o) { while (*i) { @@ -190,6 +195,23 @@ void static urldecode(char *i, char *o) *o = '\0'; } +// Warning: Buffers may not overlap +void urlencode(const char *i, char *o) +{ + while (*i) + { + if (strchr(" /:", *i)) + { + sprintf(o, "%%%.2X", (int) *i); + o += 3; + } + else + *(o++) = *i; + i++; + } + *o = '\0'; +} + void http_addheader(struct http_response *r, const char *name, const char *value) { struct http_channel *c = r->channel; @@ -491,12 +513,46 @@ static int http_weshouldproxy(struct http_request *rq) return 0; } + +struct http_header * http_header_append(struct http_channel *ch, + struct http_header * hp, + const char *name, + const char *value) +{ + struct http_header *hpnew = 0; + + if (!hp | !ch) + return 0; + + while (hp && hp->next) + hp = hp->next; + + if(name && strlen(name)&& value && strlen(value)){ + hpnew = nmem_malloc(ch->nmem, sizeof *hpnew); + hpnew->name = nmem_strdup(ch->nmem, name); + hpnew->value = nmem_strdup(ch->nmem, value); + + hpnew->next = 0; + hp->next = hpnew; + hp = hp->next; + + return hpnew; + } + + return hp; +} + + + static int http_proxy(struct http_request *rq) { struct http_channel *c = rq->channel; struct http_proxy *p = c->proxy; struct http_header *hp; struct http_buf *requestbuf; + char server_via[128] = ""; + char server_port[16] = ""; + struct conf_server *ser = global_parameters.server; if (!p) // This is a new connection. Create a proxy channel { @@ -520,7 +576,8 @@ static int http_proxy(struct http_request *rq) yaz_log(YLOG_FATAL|YLOG_ERRNO, "fcntl"); if (fcntl(sock, F_SETFL, flags | O_NONBLOCK) < 0) yaz_log(YLOG_FATAL|YLOG_ERRNO, "fcntl2"); - if (connect(sock, (struct sockaddr *) proxy_addr, sizeof(*proxy_addr)) < 0) + if (connect(sock, (struct sockaddr *) proxy_addr, + sizeof(*proxy_addr)) < 0) if (errno != EINPROGRESS) { yaz_log(YLOG_WARN|YLOG_ERRNO, "Proxy connect"); @@ -533,13 +590,13 @@ static int http_proxy(struct http_request *rq) p->first_response = 1; c->proxy = p; // We will add EVENT_OUTPUT below - p->iochan = iochan_create(sock, proxy_io, EVENT_INPUT); + p->iochan = iochan_create(sock, 0, proxy_io, EVENT_INPUT); iochan_setdata(p->iochan, p); p->iochan->next = channel_list; channel_list = p->iochan; } - // Modify Host: header + // Do _not_ modify Host: header, just checking it's existence for (hp = rq->headers; hp; hp = hp->next) if (!strcmp(hp->name, "Host")) break; @@ -548,7 +605,27 @@ static int http_proxy(struct http_request *rq) yaz_log(YLOG_WARN, "Failed to find Host header in proxy"); return -1; } - hp->value = nmem_strdup(c->nmem, proxy_url); + + // Add new header about paraz2 version, host, remote client address, etc. + { + hp = rq->headers; + hp = http_header_append(c, hp, + PACKAGE_NAME "-version", PACKAGE_VERSION); + hp = http_header_append(c, hp, + PACKAGE_NAME "-server-host", ser->myurl); + sprintf(server_port, "%d", ser->port); + hp = http_header_append(c, hp, + PACKAGE_NAME "-server-port", server_port); + sprintf(server_via, "1.1 %s:%s (%s/%s)", + ser->myurl, server_port, PACKAGE_NAME, PACKAGE_VERSION); + hp = http_header_append(c, hp, + "Via" , server_via); + //hp = http_header_append(c, hp,"Client-ip", + // c->iochan->addr_str); + hp = http_header_append(c, hp,"X-Forwarded-For", + c->iochan->addr_str); + } + requestbuf = http_serialize_request(rq); http_buf_enqueue(&p->oqueue, requestbuf); iochan_setflag(p->iochan, EVENT_OUTPUT); @@ -734,8 +811,9 @@ static void proxy_io(IOCHAN pi, int event) else { htbuf->buf[res] = '\0'; + htbuf->offset = 0; htbuf->len = res; - int offset = 0; +#ifdef GAGA if (pc->first_response) // Check if this is a redirect { int len; @@ -752,24 +830,19 @@ static void proxy_io(IOCHAN pi, int event) struct http_buf *buf; h->value = sub_hostname(hc, h->value); buf = http_serialize_response(hc, res); + yaz_log(YLOG_LOG, "Proxy rewrite"); http_buf_enqueue(&hc->oqueue, buf); - offset = len; + htbuf->offset = len; break; } } } pc->first_response = 0; } +#endif // Write any remaining payload - if (htbuf->len - offset > 0) - { - if (offset > 0) - { - memmove(htbuf->buf, htbuf->buf + offset, htbuf->len - offset); - htbuf->len -= offset; - } - http_buf_enqueue(&hc->oqueue, htbuf + offset); - } + if (htbuf->len - htbuf->offset > 0) + http_buf_enqueue(&hc->oqueue, htbuf); } iochan_setflag(hc->iochan, EVENT_OUTPUT); break; @@ -878,7 +951,7 @@ static void http_accept(IOCHAN i, int event) yaz_log(YLOG_FATAL|YLOG_ERRNO, "fcntl2"); yaz_log(YLOG_DEBUG, "New command connection"); - c = iochan_create(s, http_io, EVENT_INPUT | EVENT_EXCEPT); + c = iochan_create(s, &addr, http_io, EVENT_INPUT | EVENT_EXCEPT); ch = http_create(); ch->iochan = c; @@ -941,7 +1014,7 @@ void http_init(const char *addr) if (listen(l, SOMAXCONN) < 0) yaz_log(YLOG_FATAL|YLOG_ERRNO, "listen"); - c = iochan_create(l, http_accept, EVENT_INPUT | EVENT_EXCEPT); + c = iochan_create(l, &myaddr, http_accept, EVENT_INPUT | EVENT_EXCEPT); c->next = channel_list; channel_list = c; }