-/*
- * $Id: http.c,v 1.14 2007-03-28 12:05:18 marc Exp $
+/* $Id: http.c,v 1.32 2007-06-04 14:27:48 adam 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 <stdio.h>
#endif
#include <netinet/in.h>
+#include <arpa/inet.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 "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;
-//extern struct parameters global_parameters;
-
// If this is set, we proxy normal HTTP requests
static struct sockaddr_in *proxy_addr = 0;
static char proxy_url[256] = "";
return r;
}
-struct http_request *http_parse_request(struct http_channel *c, struct http_buf **queue,
- int len)
+struct http_request *http_parse_request(struct http_channel *c,
+ struct http_buf **queue,
+ int len)
{
struct http_request *r = nmem_malloc(c->nmem, sizeof(*r));
char *p, *p2;
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 (1)
+ {
+ xmlDoc *doc = xmlParseMemory(r->payload, strlen(r->payload));
+ if (doc)
+ {
+ yaz_log(YLOG_LOG, "payload: %s", r->payload);
+
+ xmlFreeDoc(doc);
+ }
+ else
+ {
+ yaz_log(YLOG_WARN, "Sending non-wellformed "
+ "response (bug #1162");
+ yaz_log(YLOG_WARN, "payload: %s", r->payload);
+ }
+ }
}
wrbuf_puts(c->wrbuf, "\r\n");
struct http_proxy *p = c->proxy;
struct http_header *hp;
struct http_buf *requestbuf;
- char server_host[64] = "";
+ 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
{
p->first_response = 1;
c->proxy = p;
// We will add EVENT_OUTPUT below
- p->iochan = iochan_create(sock, 0, proxy_io, EVENT_INPUT);
+ 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, but getting the host and port info first
+ // Do _not_ modify Host: header, just checking it's existence
for (hp = rq->headers; hp; hp = hp->next)
if (!strcmp(hp->name, "Host"))
break;
return -1;
}
- {
- char * colon = 0;
-
- if((colon = strchr(hp->value, ':'))){
- int collen = colon - hp->value;
- strncpy(server_host, hp->value, (collen < 64) ? collen : 64 );
- strncpy(server_port, colon + 1, 16);
- } else {
- strncpy(server_host, hp->value, 64);
- strncpy(server_port, hp->value, 16);
- }
- }
-
- 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);
+ "X-Pazpar2-Version", PACKAGE_VERSION);
hp = http_header_append(c, hp,
- PACKAGE_NAME "-server-host", server_host);
- //sprintf(server_port, "%d", ser->port);
+ "X-Pazpar2-Server-Host", ser->host);
+ sprintf(server_port, "%d", ser->port);
hp = http_header_append(c, hp,
- PACKAGE_NAME "-server-port", server_port);
- hp = http_header_append(c, hp,
- PACKAGE_NAME "-remote-addr",
- c->iochan->addr_str);
+ "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);
}
}
+#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);
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;
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;
}
yaz_log(YLOG_FATAL|YLOG_ERRNO, "fcntl2");
yaz_log(YLOG_DEBUG, "New command connection");
- c = iochan_create(s, &addr, http_io, EVENT_INPUT | EVENT_EXCEPT);
-
- ch = http_create();
+ c = iochan_create(s, http_io, EVENT_INPUT | EVENT_EXCEPT);
+
+ 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 */
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;
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"))) {
abort();
if (bind(l, (struct sockaddr *) &myaddr, sizeof myaddr) < 0)
+ {
yaz_log(YLOG_FATAL|YLOG_ERRNO, "bind");
+ exit(1);
+ }
if (listen(l, SOMAXCONN) < 0)
+ {
yaz_log(YLOG_FATAL|YLOG_ERRNO, "listen");
+ exit(1);
+ }
- c = iochan_create(l, &myaddr, http_accept, EVENT_INPUT | EVENT_EXCEPT);
- c->next = channel_list;
- channel_list = c;
+ c = iochan_create(l, http_accept, EVENT_INPUT | EVENT_EXCEPT);
+ pazpar2_add_channel(c);
}
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';
projects / pazpar2-moved-to-github.git / blobdiff