/*
- * $Id: http.c,v 1.12 2007-03-15 16:50:56 quinn Exp $
+ * $Id: http.c,v 1.21 2007-04-02 09:43:08 marc Exp $
*/
#include <stdio.h>
#include <netdb.h>
#include <errno.h>
#include <assert.h>
+#include <string.h>
#if HAVE_CONFIG_H
#include <cconfig.h>
#endif
#include <netinet/in.h>
+#include <netdb.h>
#include <yaz/yaz-util.h>
#include <yaz/comstack.h>
-#include <netdb.h>
+#include <yaz/nmem.h>
+#include "cconfig.h"
#include "util.h"
#include "eventl.h"
#include "pazpar2.h"
static void http_destroy(IOCHAN i);
extern IOCHAN channel_list;
+extern struct parameters global_parameters;
+//extern NMEM nmem;
-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;
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
{
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");
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;
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->iochan->addr_str);
+ }
+
requestbuf = http_serialize_request(rq);
http_buf_enqueue(&p->oqueue, requestbuf);
iochan_setflag(p->iochan, EVENT_OUTPUT);
}
}
+#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)
{
}
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)
htbuf->buf[res] = '\0';
htbuf->offset = 0;
htbuf->len = res;
+#ifdef GAGA
if (pc->first_response) // Check if this is a redirect
{
int len;
}
pc->first_response = 0;
}
+#endif
// Write any remaining payload
if (htbuf->len - htbuf->offset > 0)
http_buf_enqueue(&hc->oqueue, htbuf);
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;
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;
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
{
+ //size_t len = 128;
+ //char h[len];
port = atoi(addr);
myaddr.sin_addr.s_addr = INADDR_ANY;
+
+#if 0
+ // get hostname from system - after deciding to bind to any
+ // IP address this box might have.
+ if (0 == gethostname(h, len)){
+ h[len - 1] = '\0';
+ global_parameters.server->host = nmem_strdup(nmem, h);
+ } else
+ yaz_log(YLOG_WARN, "Could not get host name");
+#endif
}
+
+
myaddr.sin_port = htons(port);
+
if (!(p = getprotobyname("tcp"))) {
abort();
}
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;
}
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';
projects / pazpar2-moved-to-github.git / blobdiff