X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp.c;h=05198d653b03e432458a1f4ff8e2b6c5e4580632;hb=e491ea665dc7ecea96e46cb242e633637f7b68a7;hp=e697b4e58b23c4ab33aeda047f72f6eddd42b926;hpb=5a145dc87e4756afc3e247cded32a9666457f065;p=pazpar2-moved-to-github.git diff --git a/src/http.c b/src/http.c index e697b4e..05198d6 100644 --- a/src/http.c +++ b/src/http.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2008 Index Data + Copyright (C) 2006-2010 Index Data 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 @@ -17,51 +17,68 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#if HAVE_CONFIG_H +#include +#endif + #include +#ifdef WIN32 +#include +typedef int socklen_t; +#endif + +#if HAVE_SYS_SOCKET_H #include +#endif + #include -#include + #include +#if HAVE_UNISTD_H #include +#endif + #include -#include +#include #include #include +#if HAVE_NETDB_H #include +#endif + #include #include #include -#if HAVE_CONFIG_H -#include +#if HAVE_NETINET_IN_H +#include #endif -#include +#if HAVE_ARPA_INET_H #include -#include +#endif #include #include #include -#include "util.h" -#include "eventl.h" #include "pazpar2.h" #include "http.h" -#include "http_command.h" #define MAX_HTTP_HEADER 4096 +#ifdef WIN32 +#define strncasecmp _strnicmp +#define strcasecmp _stricmp +#endif + static void proxy_io(IOCHAN i, int event); -static struct http_channel *http_create(const char *addr); +static struct http_channel *http_create(const char *addr, + struct conf_server *server); static void http_destroy(IOCHAN i); -// 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; -static struct http_channel *http_channel_freelist = 0; +static struct http_buf *http_buf_freelist = 0; /* thread pr */ +static struct http_channel *http_channel_freelist = 0; /* thread pr */ struct http_channel_observer_s { void *data; @@ -72,8 +89,8 @@ struct http_channel_observer_s { }; -static const char *http_lookup_header(struct http_header *header, - const char *name) +const char *http_lookup_header(struct http_header *header, + const char *name) { for (; header; header = header->next) if (!strcasecmp(name, header->name)) @@ -81,7 +98,7 @@ static const char *http_lookup_header(struct http_header *header, return 0; } -static struct http_buf *http_buf_create() +static struct http_buf *http_buf_create(void) { struct http_buf *r; @@ -212,12 +229,13 @@ static void urldecode(char *i, char *o) *(o++) = ' '; i++; } - else if (*i == '%') + else if (*i == '%' && i[1] && i[2]) { + int v; i++; - sscanf(i, "%2hhx", o); + sscanf(i, "%2x", &v); + *o++ = v; i += 2; - o++; } else *(o++) = *(i++); @@ -252,7 +270,7 @@ void http_addheader(struct http_response *r, const char *name, const char *value r->headers = h; } -char *http_argbyname(struct http_request *r, char *name) +const char *http_argbyname(struct http_request *r, const char *name) { struct http_argument *p; if (!name) @@ -263,7 +281,7 @@ char *http_argbyname(struct http_request *r, char *name) return 0; } -char *http_headerbyname(struct http_header *h, char *name) +const char *http_headerbyname(struct http_header *h, const char *name) { for (; h; h = h->next) if (!strcmp(h->name, name)) @@ -332,7 +350,7 @@ static int package_check(const char *buf, int sz) while (*cp == ' ') cp++; content_len = 0; - while (*cp && isdigit(*cp)) + while (*cp && isdigit(*(const unsigned char *)cp)) content_len = content_len*10 + (*cp++ - '0'); if (content_len < 0) /* prevent negative offsets */ content_len = 0; @@ -385,7 +403,7 @@ struct http_response *http_parse_response_buf(struct http_channel *c, const char return 0; *(value++) = '\0'; h->name = nmem_strdup(c->nmem, p); - while (isspace(*value)) + while (isspace(*(const unsigned char *) value)) value++; if (value >= p2) // Empty header; { @@ -570,7 +588,8 @@ struct http_request *http_parse_request(struct http_channel *c, r->content_len = start + len - buf; r->content_buf = buf; - if (!strcmp(content_type, "application/x-www-form-urlencoded")) + if (!yaz_strcmp_del("application/x-www-form-urlencoded", + content_type, "; ")) { http_parse_arguments(r, c->nmem, r->content_buf); } @@ -645,7 +664,8 @@ static struct http_buf *http_serialize_request(struct http_request *r) static int http_weshouldproxy(struct http_request *rq) { - if (proxy_addr && !strstr(rq->path, "search.pz2")) + struct http_channel *c = rq->channel; + if (c->server->proxy_addr && !strstr(rq->path, "search.pz2")) return 1; return 0; } @@ -679,7 +699,33 @@ struct http_header * http_header_append(struct http_channel *ch, return hp; } - + +static int is_inprogress(void) +{ +#ifdef WIN32 + if (WSAGetLastError() == WSAEWOULDBLOCK) + return 1; +#else + if (errno == EINPROGRESS) + return 1; +#endif + return 0; +} + +static void enable_nonblock(int sock) +{ + int flags; +#ifdef WIN32 + flags = (flags & CS_FLAGS_BLOCKING) ? 0 : 1; + if (ioctlsocket(sock, FIONBIO, &flags) < 0) + yaz_log(YLOG_FATAL|YLOG_ERRNO, "ioctlsocket"); +#else + if ((flags = fcntl(sock, F_GETFL, 0)) < 0) + yaz_log(YLOG_FATAL|YLOG_ERRNO, "fcntl"); + if (fcntl(sock, F_SETFL, flags | O_NONBLOCK) < 0) + yaz_log(YLOG_FATAL|YLOG_ERRNO, "fcntl2"); +#endif +} static int http_proxy(struct http_request *rq) { @@ -687,16 +733,14 @@ static int http_proxy(struct http_request *rq) 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; + struct conf_server *ser = c->server; if (!p) // This is a new connection. Create a proxy channel { int sock; struct protoent *pe; int one = 1; - int flags; if (!(pe = getprotobyname("tcp"))) { abort(); @@ -709,18 +753,16 @@ static int http_proxy(struct http_request *rq) if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char*) &one, sizeof(one)) < 0) abort(); - if ((flags = fcntl(sock, F_GETFL, 0)) < 0) - 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 (errno != EINPROGRESS) + enable_nonblock(sock); + if (connect(sock, (struct sockaddr *) c->server->proxy_addr, + sizeof(*c->server->proxy_addr)) < 0) + { + if (!is_inprogress()) { yaz_log(YLOG_WARN|YLOG_ERRNO, "Proxy connect"); return -1; } - + } p = xmalloc(sizeof(struct http_proxy)); p->oqueue = 0; p->channel = c; @@ -742,6 +784,8 @@ static int http_proxy(struct http_request *rq) // Add new header about paraz2 version, host, remote client address, etc. { + char server_via[128]; + hp = rq->headers; hp = http_header_append(c, hp, "X-Pazpar2-Version", PACKAGE_VERSION); @@ -750,8 +794,10 @@ static int http_proxy(struct http_request *rq) 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); + yaz_snprintf(server_via, sizeof(server_via), + "1.1 %s:%s (%s/%s)", + ser->host ? 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); } @@ -810,7 +856,7 @@ static void http_io(IOCHAN i, int event) case EVENT_INPUT: htbuf = http_buf_create(); - res = read(iochan_getfd(i), htbuf->buf, HTTP_BUF_SIZE -1); + res = recv(iochan_getfd(i), htbuf->buf, HTTP_BUF_SIZE -1, 0); if (res == -1 && errno == EAGAIN) { http_buf_destroy(htbuf); @@ -846,6 +892,8 @@ static void http_io(IOCHAN i, int event) hc->request->path, *hc->request->search ? "?" : "", hc->request->search); + if (hc->request->content_buf) + yaz_log(YLOG_LOG, "%s", hc->request->content_buf); if (http_weshouldproxy(hc->request)) http_proxy(hc->request); else @@ -860,7 +908,7 @@ static void http_io(IOCHAN i, int event) if (hc->oqueue) { struct http_buf *wb = hc->oqueue; - res = write(iochan_getfd(hc->iochan), wb->buf + wb->offset, wb->len); + res = send(iochan_getfd(hc->iochan), wb->buf + wb->offset, wb->len, 0); if (res <= 0) { yaz_log(YLOG_WARN|YLOG_ERRNO, "write"); @@ -914,15 +962,19 @@ static void proxy_io(IOCHAN pi, int event) case EVENT_INPUT: htbuf = http_buf_create(); - res = read(iochan_getfd(pi), htbuf->buf, HTTP_BUF_SIZE -1); - if (res == 0 || (res < 0 && errno != EINPROGRESS)) + res = recv(iochan_getfd(pi), htbuf->buf, HTTP_BUF_SIZE -1, 0); + if (res == 0 || (res < 0 && !is_inprogress())) { if (hc->oqueue) { yaz_log(YLOG_WARN, "Proxy read came up short"); // Close channel and alert client HTTP channel that we're gone http_buf_destroy(htbuf); +#ifdef WIN32 + closesocket(iochan_getfd(pi)); +#else close(iochan_getfd(pi)); +#endif iochan_destroy(pi); pc->iochan = 0; } @@ -949,7 +1001,7 @@ static void proxy_io(IOCHAN pi, int event) iochan_clearflag(pi, EVENT_OUTPUT); return; } - res = write(iochan_getfd(pi), htbuf->buf + htbuf->offset, htbuf->len); + res = send(iochan_getfd(pi), htbuf->buf + htbuf->offset, htbuf->len, 0); if (res <= 0) { yaz_log(YLOG_WARN|YLOG_ERRNO, "write"); @@ -957,7 +1009,7 @@ static void proxy_io(IOCHAN pi, int event) return; } if (res == htbuf->len) - { + { struct http_buf *np = htbuf->next; http_buf_destroy(htbuf); pc->oqueue = np; @@ -990,7 +1042,11 @@ static void http_destroy(IOCHAN i) { if (s->proxy->iochan) { +#ifdef WIN32 + closesocket(iochan_getfd(s->proxy->iochan)); +#else close(iochan_getfd(s->proxy->iochan)); +#endif iochan_destroy(s->proxy->iochan); } http_buf_destroy_queue(s->proxy->oqueue); @@ -1002,11 +1058,16 @@ static void http_destroy(IOCHAN i) http_destroy_observers(s); s->next = http_channel_freelist; http_channel_freelist = s; +#ifdef WIN32 + closesocket(iochan_getfd(i)); +#else close(iochan_getfd(i)); +#endif iochan_destroy(i); } -static struct http_channel *http_create(const char *addr) +static struct http_channel *http_create(const char *addr, + struct conf_server *server) { struct http_channel *r = http_channel_freelist; @@ -1022,6 +1083,7 @@ static struct http_channel *http_create(const char *addr) r->nmem = nmem_create(); r->wrbuf = wrbuf_alloc(); } + r->server = server; r->proxy = 0; r->iochan = 0; r->iqueue = r->oqueue = 0; @@ -1048,8 +1110,8 @@ static void http_accept(IOCHAN i, int event) socklen_t len; int s; IOCHAN c; - int flags; struct http_channel *ch; + struct conf_server *server = iochan_getdata(i); len = sizeof addr; if ((s = accept(fd, (struct sockaddr *) &addr, &len)) < 0) @@ -1057,15 +1119,12 @@ static void http_accept(IOCHAN i, int event) yaz_log(YLOG_WARN|YLOG_ERRNO, "accept"); return; } - if ((flags = fcntl(s, F_GETFL, 0)) < 0) - yaz_log(YLOG_FATAL|YLOG_ERRNO, "fcntl"); - if (fcntl(s, F_SETFL, flags | O_NONBLOCK) < 0) - yaz_log(YLOG_FATAL|YLOG_ERRNO, "fcntl2"); + enable_nonblock(s); yaz_log(YLOG_DEBUG, "New command connection"); c = iochan_create(s, http_io, EVENT_INPUT | EVENT_EXCEPT); - ch = http_create(inet_ntoa(addr.sin_addr)); + ch = http_create(inet_ntoa(addr.sin_addr), server); ch->iochan = c; iochan_setdata(c, ch); @@ -1073,7 +1132,7 @@ static void http_accept(IOCHAN i, int event) } /* Create a http-channel listener, syntax [host:]port */ -void http_init(const char *addr) +int http_init(const char *addr, struct conf_server *server) { IOCHAN c; int l; @@ -1081,7 +1140,7 @@ void http_init(const char *addr) struct sockaddr_in myaddr; int one = 1; const char *pp; - int port; + short port; yaz_log(YLOG_LOG, "HTTP listener %s", addr); @@ -1090,17 +1149,19 @@ void http_init(const char *addr) pp = strchr(addr, ':'); if (pp) { - int len = pp - addr; - char hostname[128]; + WRBUF w = wrbuf_alloc(); struct hostent *he; - strncpy(hostname, addr, len); - hostname[len] = '\0'; - if (!(he = gethostbyname(hostname))){ - yaz_log(YLOG_FATAL, "Unable to resolve '%s'", hostname); - exit(1); + wrbuf_write(w, addr, pp - addr); + wrbuf_puts(w, ""); + + he = gethostbyname(wrbuf_cstr(w)); + wrbuf_destroy(w); + if (!he) + { + yaz_log(YLOG_FATAL, "Unable to resolve '%s'", addr); + return 1; } - memcpy(&myaddr.sin_addr.s_addr, he->h_addr_list[0], he->h_length); port = atoi(pp + 1); } @@ -1113,55 +1174,78 @@ void http_init(const char *addr) myaddr.sin_port = htons(port); if (!(p = getprotobyname("tcp"))) { - abort(); + return 1; } if ((l = socket(PF_INET, SOCK_STREAM, p->p_proto)) < 0) yaz_log(YLOG_FATAL|YLOG_ERRNO, "socket"); if (setsockopt(l, SOL_SOCKET, SO_REUSEADDR, (char*) &one, sizeof(one)) < 0) - abort(); + return 1; if (bind(l, (struct sockaddr *) &myaddr, sizeof myaddr) < 0) { yaz_log(YLOG_FATAL|YLOG_ERRNO, "bind"); - exit(1); + return 1; } if (listen(l, SOMAXCONN) < 0) { yaz_log(YLOG_FATAL|YLOG_ERRNO, "listen"); - exit(1); + return 1; } + server->listener_socket = l; + c = iochan_create(l, http_accept, EVENT_INPUT | EVENT_EXCEPT); + iochan_setdata(c, server); pazpar2_add_channel(c); + return 0; } -void http_set_proxyaddr(char *host, char *base_url) +void http_close_server(struct conf_server *server) { - char *p; - int port; + /* break the event_loop (select) by closing down the HTTP listener sock */ + if (server->listener_socket) + { +#ifdef WIN32 + closesocket(server->listener_socket); +#else + close(server->listener_socket); +#endif + } +} + +void http_set_proxyaddr(const char *host, struct conf_server *server) +{ + const char *p; + short port; struct hostent *he; + WRBUF w = wrbuf_alloc(); + + yaz_log(YLOG_LOG, "HTTP backend %s", host); - strcpy(myurl, 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) { + if (p) + { port = atoi(p + 1); - *p = '\0'; + wrbuf_write(w, host, p - host); + wrbuf_puts(w, ""); } else + { port = 80; - if (!(he = gethostbyname(host))) + wrbuf_puts(w, host); + } + if (!(he = gethostbyname(wrbuf_cstr(w)))) { - fprintf(stderr, "Failed to lookup '%s'\n", host); + fprintf(stderr, "Failed to lookup '%s'\n", wrbuf_cstr(w)); exit(1); } - proxy_addr = xmalloc(sizeof(struct sockaddr_in)); - proxy_addr->sin_family = he->h_addrtype; - memcpy(&proxy_addr->sin_addr.s_addr, he->h_addr_list[0], he->h_length); - proxy_addr->sin_port = htons(port); + wrbuf_destroy(w); + + server->proxy_addr = xmalloc(sizeof(struct sockaddr_in)); + server->proxy_addr->sin_family = he->h_addrtype; + memcpy(&server->proxy_addr->sin_addr.s_addr, he->h_addr_list[0], he->h_length); + server->proxy_addr->sin_port = htons(port); } static void http_fire_observers(struct http_channel *c) @@ -1223,7 +1307,9 @@ void http_observer_set_data2(http_channel_observer_t obs, void *data2) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +