X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp.c;h=bc40aca6e6bf97a73f7d1ca9698bcacb6d92bef4;hb=b97798aabc2509f4a8e68e5714c59b0773dc4d1e;hp=48a264395f728a4e8830b5df51d60ca1cb54f554;hpb=0209815ecb67520622b4e11a6c15b28f4b1dce8f;p=pazpar2-moved-to-github.git diff --git a/src/http.c b/src/http.c index 48a2643..bc40aca 100644 --- a/src/http.c +++ b/src/http.c @@ -1,5 +1,5 @@ /* - * $Id: http.c,v 1.2 2006-12-20 23:31:24 adam Exp $ + * $Id: http.c,v 1.11 2007-02-05 16:35:18 quinn Exp $ */ #include @@ -15,11 +15,16 @@ #include #include +#if HAVE_CONFIG_H +#include +#endif + +#include + #include #include #include -#include "command.h" #include "util.h" #include "eventl.h" #include "pazpar2.h" @@ -34,6 +39,7 @@ extern IOCHAN channel_list; static struct sockaddr_in *proxy_addr = 0; // If this is set, we proxy normal HTTP requests static char proxy_url[256] = ""; +static char myurl[256] = ""; static struct http_buf *http_buf_freelist = 0; static struct http_channel *http_channel_freelist = 0; @@ -89,10 +95,10 @@ static struct http_buf *http_buf_bybuf(char *b, int len) while (len) { - *p = http_buf_create(); int tocopy = len; if (tocopy > HTTP_BUF_SIZE) tocopy = HTTP_BUF_SIZE; + *p = http_buf_create(); memcpy((*p)->buf, b, tocopy); (*p)->len = tocopy; len -= tocopy; @@ -205,12 +211,11 @@ char *http_argbyname(struct http_request *r, char *name) return 0; } -char *http_headerbyname(struct http_request *r, char *name) +char *http_headerbyname(struct http_header *h, char *name) { - struct http_header *p; - for (p = r->headers; p; p = p->next) - if (!strcmp(p->name, name)) - return p->value; + for (; h; h = h->next) + if (!strcmp(h->name, name)) + return h->value; return 0; } @@ -225,16 +230,10 @@ struct http_response *http_create_response(struct http_channel *c) return r; } -// Check if we have a complete request. Return 0 or length (including trailing newline) -// FIXME: Does not deal gracefully with requests carrying payload -// but this is kind of OK since we will reject anything other than an empty GET -static int request_check(struct http_buf *queue) +// Check if buf contains a package (minus payload) +static int package_check(const char *buf) { - char tmp[4096]; int len = 0; - char *buf = tmp; - - http_buf_peek(queue, tmp, 4096); while (*buf) // Check if we have a sequence of lines terminated by an empty line { char *b = strstr(buf, "\r\n"); @@ -250,6 +249,69 @@ static int request_check(struct http_buf *queue) return 0; } +// Check if we have a request. Return 0 or length +// (including trailing CRNL) FIXME: Does not deal gracefully with requests +// carrying payload but this is kind of OK since we will reject anything +// other than an empty GET +static int request_check(struct http_buf *queue) +{ + char tmp[4096]; + + http_buf_peek(queue, tmp, 4096); + return package_check(tmp); +} + +struct http_response *http_parse_response_buf(struct http_channel *c, const char *buf, int len) +{ + char tmp[4096]; + struct http_response *r = http_create_response(c); + char *p, *p2; + struct http_header **hp = &r->headers; + + if (len >= 4096) + return 0; + memcpy(tmp, buf, len); + for (p = tmp; *p && *p != ' '; p++) // Skip HTTP version + ; + p++; + // Response code + for (p2 = p; *p2 && *p2 != ' ' && p2 - p < 3; p2++) + r->code[p2 - p] = *p2; + if (!(p = strstr(tmp, "\r\n"))) + return 0; + p += 2; + while (*p) + { + if (!(p2 = strstr(p, "\r\n"))) + return 0; + if (p == p2) // End of headers + break; + else + { + struct http_header *h = *hp = nmem_malloc(c->nmem, sizeof(*h)); + char *value = strchr(p, ':'); + if (!value) + return 0; + *(value++) = '\0'; + h->name = nmem_strdup(c->nmem, p); + while (isspace(*value)) + value++; + if (value >= p2) // Empty header; + { + h->value = ""; + p = p2 + 2; + continue; + } + *p2 = '\0'; + h->value = nmem_strdup(c->nmem, value); + h->next = 0; + hp = &h->next; + p = p2 + 2; + } + } + return r; +} + struct http_request *http_parse_request(struct http_channel *c, struct http_buf **queue, int len) { @@ -263,6 +325,7 @@ struct http_request *http_parse_request(struct http_channel *c, struct http_buf if (http_buf_read(queue, buf, len) < len) return 0; + r->search = ""; r->channel = c; r->arguments = 0; r->headers = 0; @@ -293,6 +356,7 @@ struct http_request *http_parse_request(struct http_channel *c, struct http_buf r->path = nmem_strdup(c->nmem, buf); if (p2) { + r->search = nmem_strdup(c->nmem, p2); // Parse Arguments while (*p2) { @@ -366,18 +430,21 @@ struct http_request *http_parse_request(struct http_channel *c, struct http_buf return r; } - static struct http_buf *http_serialize_response(struct http_channel *c, struct http_response *r) { - wrbuf_rewind(c->wrbuf); struct http_header *h; + wrbuf_rewind(c->wrbuf); wrbuf_printf(c->wrbuf, "HTTP/1.1 %s %s\r\n", r->code, r->msg); for (h = r->headers; h; h = h->next) wrbuf_printf(c->wrbuf, "%s: %s\r\n", h->name, h->value); - wrbuf_printf(c->wrbuf, "Content-length: %d\r\n", r->payload ? (int) strlen(r->payload) : 0); - wrbuf_printf(c->wrbuf, "Content-type: text/xml\r\n"); + if (r->payload) + { + wrbuf_printf(c->wrbuf, "Content-length: %d\r\n", r->payload ? + (int) strlen(r->payload) : 0); + wrbuf_printf(c->wrbuf, "Content-type: text/xml\r\n"); + } wrbuf_puts(c->wrbuf, "\r\n"); if (r->payload) @@ -390,10 +457,10 @@ static struct http_buf *http_serialize_response(struct http_channel *c, static struct http_buf *http_serialize_request(struct http_request *r) { struct http_channel *c = r->channel; - wrbuf_rewind(c->wrbuf); struct http_header *h; struct http_argument *a; + wrbuf_rewind(c->wrbuf); wrbuf_printf(c->wrbuf, "%s %s", r->method, r->path); if (r->arguments) @@ -463,6 +530,7 @@ static int http_proxy(struct http_request *rq) p = xmalloc(sizeof(struct http_proxy)); p->oqueue = 0; p->channel = c; + p->first_response = 1; c->proxy = p; // We will add EVENT_OUTPUT below p->iochan = iochan_create(sock, proxy_io, EVENT_INPUT); @@ -490,8 +558,10 @@ static int http_proxy(struct http_request *rq) void http_send_response(struct http_channel *ch) { struct http_response *rs = ch->response; + struct http_buf *hb; + assert(rs); - struct http_buf *hb = http_serialize_response(ch, rs); + hb = http_serialize_response(ch, rs); if (!hb) { yaz_log(YLOG_WARN, "Failed to serialize HTTP response"); @@ -548,8 +618,10 @@ static void http_io(IOCHAN i, int event) return; } hc->response = 0; - yaz_log(YLOG_LOG, "Request: %s %s v %s", hc->request->method, - hc->request->path, hc->request->http_version); + yaz_log(YLOG_LOG, "Request: %s %s%s%s", hc->request->method, + hc->request->path, + *hc->request->search ? "?" : "", + hc->request->search); if (http_weshouldproxy(hc->request)) http_proxy(hc->request); else @@ -611,6 +683,23 @@ static void http_io(IOCHAN i, int event) } } +// If this hostname contains our proxy host as a prefix, replace with myurl +static char *sub_hostname(struct http_channel *c, char *buf) +{ + char tmp[1024]; + if (strlen(buf) > 1023) + return buf; + if (strncmp(buf, "http://", 7)) + return buf; + if (!strncmp(buf + 7, proxy_url, strlen(proxy_url))) + { + strcpy(tmp, myurl); + strcat(tmp, buf + strlen(proxy_url) + 7); + return nmem_strdup(c->nmem, tmp); + } + return buf; +} + // Handles I/O on a client connection to a backend web server (proxy mode) static void proxy_io(IOCHAN pi, int event) { @@ -645,8 +734,36 @@ static void proxy_io(IOCHAN pi, int event) else { htbuf->buf[res] = '\0'; + htbuf->offset = 0; htbuf->len = res; - http_buf_enqueue(&hc->oqueue, htbuf); + if (pc->first_response) // Check if this is a redirect + { + int len; + if ((len = package_check(htbuf->buf))) + { + struct http_response *res = http_parse_response_buf(hc, htbuf->buf, len); + if (res) + { + struct http_header *h; + for (h = res->headers; h; h = h->next) + if (!strcmp(h->name, "Location")) + { + // We found a location header. Rewrite it. + 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); + htbuf->offset = len; + break; + } + } + } + pc->first_response = 0; + } + // Write any remaining payload + if (htbuf->len - htbuf->offset > 0) + http_buf_enqueue(&hc->oqueue, htbuf); } iochan_setflag(hc->iochan, EVENT_OUTPUT); break; @@ -754,7 +871,7 @@ static void http_accept(IOCHAN i, int event) if (fcntl(s, F_SETFL, flags | O_NONBLOCK) < 0) yaz_log(YLOG_FATAL|YLOG_ERRNO, "fcntl2"); - yaz_log(YLOG_LOG, "New command connection"); + yaz_log(YLOG_DEBUG, "New command connection"); c = iochan_create(s, http_io, EVENT_INPUT | EVENT_EXCEPT); ch = http_create(); @@ -778,7 +895,7 @@ void http_init(const char *addr) yaz_log(YLOG_LOG, "HTTP listener is %s", addr); - bzero(&myaddr, sizeof myaddr); + memset(&myaddr, 0, sizeof myaddr); myaddr.sin_family = AF_INET; pp = strchr(addr, ':'); if (pp) @@ -823,12 +940,13 @@ void http_init(const char *addr) channel_list = c; } -void http_set_proxyaddr(char *host) +void http_set_proxyaddr(char *host, char *base_url) { char *p; int port; struct hostent *he; + strcpy(myurl, base_url); strcpy(proxy_url, host); p = strchr(host, ':'); yaz_log(YLOG_DEBUG, "Proxying for %s", host);