X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fhttp.c;h=189cbe357cb3c0ccccedf02f15e5decb8be0ebdb;hb=ef06d73e23b5fe681f2194090258602e2a287561;hp=1e5058a3bf2b6838cc1e6701f3164524c7e1dbee;hpb=9a660575bb51d190608e5cdec416bb8a9acf3389;p=pazpar2-moved-to-github.git diff --git a/src/http.c b/src/http.c index 1e5058a..189cbe3 100644 --- a/src/http.c +++ b/src/http.c @@ -1,5 +1,22 @@ -/* - * $Id: http.c,v 1.12 2007-03-15 16:50:56 quinn Exp $ +/* $Id: http.c,v 1.30 2007-04-23 08:56:52 marc Exp $ + Copyright (c) 2006-2007, Index Data. + +This file is part of Pazpar2. + +Pazpar2 is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Pazpar2; see the file LICENSE. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. */ #include @@ -14,17 +31,21 @@ #include #include #include +#include #if HAVE_CONFIG_H #include #endif #include +#include +#include #include #include -#include +#include +#include "cconfig.h" #include "util.h" #include "eventl.h" #include "pazpar2.h" @@ -32,12 +53,11 @@ #include "http_command.h" static void proxy_io(IOCHAN i, int event); -static struct http_channel *http_create(void); +static struct http_channel *http_create(const char *addr); static void http_destroy(IOCHAN i); -extern IOCHAN channel_list; - -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; @@ -509,12 +529,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 { @@ -538,7 +592,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"); @@ -553,11 +608,10 @@ static int http_proxy(struct http_request *rq) // We will add EVENT_OUTPUT below p->iochan = iochan_create(sock, proxy_io, EVENT_INPUT); iochan_setdata(p->iochan, p); - p->iochan->next = channel_list; - channel_list = p->iochan; + pazpar2_add_channel(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; @@ -566,7 +620,23 @@ 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, + "X-Pazpar2-Version", PACKAGE_VERSION); + hp = http_header_append(c, hp, + "X-Pazpar2-Server-Host", ser->host); + sprintf(server_port, "%d", ser->port); + hp = http_header_append(c, hp, + "X-Pazpar2-Server-Port", server_port); + sprintf(server_via, "1.1 %s:%s (%s/%s)", + ser->host, server_port, PACKAGE_NAME, PACKAGE_VERSION); + hp = http_header_append(c, hp, "Via" , server_via); + hp = http_header_append(c, hp, "X-Forwarded-For", c->addr); + } + requestbuf = http_serialize_request(rq); http_buf_enqueue(&p->oqueue, requestbuf); iochan_setflag(p->iochan, EVENT_OUTPUT); @@ -701,6 +771,7 @@ static void http_io(IOCHAN i, int event) } } +#ifdef GAGA // If this hostname contains our proxy host as a prefix, replace with myurl static char *sub_hostname(struct http_channel *c, char *buf) { @@ -717,6 +788,7 @@ static char *sub_hostname(struct http_channel *c, char *buf) } return buf; } +#endif // Handles I/O on a client connection to a backend web server (proxy mode) static void proxy_io(IOCHAN pi, int event) @@ -754,6 +826,7 @@ static void proxy_io(IOCHAN pi, int event) htbuf->buf[res] = '\0'; htbuf->offset = 0; htbuf->len = res; +#ifdef GAGA if (pc->first_response) // Check if this is a redirect { int len; @@ -779,6 +852,7 @@ static void proxy_io(IOCHAN pi, int event) } pc->first_response = 0; } +#endif // Write any remaining payload if (htbuf->len - htbuf->offset > 0) http_buf_enqueue(&hc->oqueue, htbuf); @@ -841,7 +915,7 @@ static void http_destroy(IOCHAN i) iochan_destroy(i); } -static struct http_channel *http_create(void) +static struct http_channel *http_create(const char *addr) { struct http_channel *r = http_channel_freelist; @@ -863,6 +937,12 @@ static struct http_channel *http_create(void) r->state = Http_Idle; r->request = 0; r->response = 0; + if (!addr) + { + yaz_log(YLOG_WARN, "Invalid HTTP forward address"); + exit(1); + } + strcpy(r->addr, addr); return r; } @@ -891,13 +971,12 @@ static void http_accept(IOCHAN i, int event) yaz_log(YLOG_DEBUG, "New command connection"); c = iochan_create(s, http_io, EVENT_INPUT | EVENT_EXCEPT); - - ch = http_create(); + + ch = http_create(inet_ntoa(addr.sin_addr)); ch->iochan = c; iochan_setdata(c, ch); - c->next = channel_list; - channel_list = c; + pazpar2_add_channel(c); } /* Create a http-channel listener, syntax [host:]port */ @@ -911,7 +990,7 @@ void http_init(const char *addr) const char *pp; int port; - yaz_log(YLOG_LOG, "HTTP listener is %s", addr); + yaz_log(YLOG_LOG, "HTTP listener %s", addr); memset(&myaddr, 0, sizeof myaddr); myaddr.sin_family = AF_INET; @@ -924,19 +1003,25 @@ void http_init(const char *addr) strncpy(hostname, addr, len); hostname[len] = '\0'; - if (!(he = gethostbyname(hostname))) - { + if (!(he = gethostbyname(hostname))){ yaz_log(YLOG_FATAL, "Unable to resolve '%s'", hostname); exit(1); } + memcpy(&myaddr.sin_addr.s_addr, he->h_addr_list[0], he->h_length); port = atoi(pp + 1); + + yaz_log(YLOG_LOG, "HTTP address %s:%d", + "" == he->h_addr_list[0] ? he->h_addr_list[0] : "127.0.0.1" , + port); + } else { port = atoi(addr); myaddr.sin_addr.s_addr = INADDR_ANY; } + myaddr.sin_port = htons(port); if (!(p = getprotobyname("tcp"))) { @@ -954,8 +1039,7 @@ void http_init(const char *addr) yaz_log(YLOG_FATAL|YLOG_ERRNO, "listen"); c = iochan_create(l, http_accept, EVENT_INPUT | EVENT_EXCEPT); - c->next = channel_list; - channel_list = c; + pazpar2_add_channel(c); } void http_set_proxyaddr(char *host, char *base_url) @@ -968,6 +1052,7 @@ void http_set_proxyaddr(char *host, char *base_url) strcpy(proxy_url, host); p = strchr(host, ':'); yaz_log(YLOG_DEBUG, "Proxying for %s", host); + yaz_log(YLOG_LOG, "HTTP backend %s", proxy_url); if (p) { port = atoi(p + 1); *p = '\0';