X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp.c;h=642465f8f2321e11f99b0ed569db3be1fdc9df5e;hb=5fdac8e7a282d625568f5768bd3ae9367dd4acaf;hp=71cddf3e749332682293cd9d921f2e57a6b35a4c;hpb=eeeac3dc5704fa9e9af4e51dee8b3a256b080e0e;p=pazpar2-moved-to-github.git diff --git a/src/http.c b/src/http.c index 71cddf3..642465f 100644 --- a/src/http.c +++ b/src/http.c @@ -1,7 +1,5 @@ -/* $Id: http.c,v 1.38 2007-09-23 15:39:24 adam Exp $ - Copyright (c) 2006-2007, Index Data. - -This file is part of Pazpar2. +/* This file is part of Pazpar2. + Copyright (C) 2006-2008 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 @@ -14,38 +12,56 @@ 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. - */ +along with this program; if not, write to the Free Software +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 "cconfig.h" #include "util.h" #include "eventl.h" #include "pazpar2.h" @@ -67,7 +83,8 @@ static struct http_channel *http_channel_freelist = 0; struct http_channel_observer_s { void *data; - void (*destroy)(void *data, struct http_channel *chan); + void *data2; + http_channel_destroy_t destroy; struct http_channel_observer_s *next; struct http_channel *chan; }; @@ -116,17 +133,6 @@ static void http_buf_destroy_queue(struct http_buf *b) } } -#ifdef GAGA -// Calculate length of chain -static int http_buf_len(struct http_buf *b) -{ - int sum = 0; - for (; b; b = b->next) - sum += b->len; - return sum; -} -#endif - static struct http_buf *http_buf_bybuf(char *b, int len) { struct http_buf *res = 0; @@ -291,30 +297,52 @@ struct http_response *http_create_response(struct http_channel *c) r->channel = c; r->headers = 0; r->payload = 0; + r->content_type = "text/xml"; return r; } + +static const char *next_crlf(const char *cp, size_t *skipped) +{ + const char *next_cp = strchr(cp, '\n'); + if (next_cp) + { + if (next_cp > cp && next_cp[-1] == '\r') + *skipped = next_cp - cp - 1; + else + *skipped = next_cp - cp; + next_cp++; + } + return next_cp; +} + // Check if buf contains a package (minus payload) static int package_check(const char *buf, int sz) { int content_len = 0; int len = 0; - while (*buf) // Check if we have a sequence of lines terminated by an empty line + while (*buf) { - const char *b = strstr(buf, "\r\n"); + size_t skipped = 0; + const char *b = next_crlf(buf, &skipped); if (!b) - return 0; - - len += (b - buf) + 2; - if (b == buf) { + // we did not find CRLF.. See if buffer is too large.. + if (sz >= MAX_HTTP_HEADER-1) + return MAX_HTTP_HEADER-1; // yes. Return that (will fail later) + break; + } + len += (b - buf); + if (skipped == 0) + { + // CRLF CRLF , i.e. end of header if (len + content_len <= sz) return len + content_len; - return 0; + break; } - buf = b + 2; + buf = b; // following first skip of \r\n so that we don't consider Method if (!strncasecmp(buf, "Content-Length:", 15)) { @@ -328,18 +356,17 @@ static int package_check(const char *buf, int sz) content_len = 0; } } - return 0; + return 0; // incomplete request } // 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[MAX_HTTP_HEADER]; + // only peek at the header.. http_buf_peek(queue, tmp, MAX_HTTP_HEADER-1); + // still we only return non-zero if the complete request is received.. return package_check(tmp, http_buf_size(queue)); } @@ -462,13 +489,13 @@ struct http_request *http_parse_request(struct http_channel *c, if (!(buf = strchr(buf, ' '))) { - yaz_log(YLOG_WARN, "Syntax error in request (1)"); + yaz_log(YLOG_WARN, "Missing Request-URI in HTTP request"); return 0; } buf++; if (!(p = strchr(buf, ' '))) { - yaz_log(YLOG_WARN, "Syntax error in request (2)"); + yaz_log(YLOG_WARN, "HTTP Request-URI not terminated (too long?)"); return 0; } *(p++) = '\0'; @@ -487,15 +514,15 @@ struct http_request *http_parse_request(struct http_channel *c, strcpy(r->http_version, "1.0"); else { - buf += 5; - if (!(p = strstr(buf, "\r\n"))) - { - yaz_log(YLOG_WARN, "Did not see \\r\\n (1)"); + size_t skipped; + buf += 5; // strlen("HTTP/") + + p = (char*) next_crlf(buf, &skipped); + if (!p || skipped < 3 || skipped > 5) return 0; - } - *(p++) = '\0'; - p++; - strcpy(r->http_version, buf); + + memcpy(r->http_version, buf, skipped); + r->http_version[skipped] = '\0'; buf = p; } strcpy(c->version, r->http_version); @@ -503,38 +530,57 @@ struct http_request *http_parse_request(struct http_channel *c, r->headers = 0; while (*buf) { - if (!(p = strstr(buf, "\r\n"))) + size_t skipped; + + p = (char *) next_crlf(buf, &skipped); + if (!p) { - yaz_log(YLOG_WARN, "Did not see \\r\\n (2)"); return 0; } - if (p == buf) + else if (skipped == 0) { - buf += 2; + buf = p; break; } else { + char *cp; + char *n_v = nmem_malloc(c->nmem, skipped+1); struct http_header *h = nmem_malloc(c->nmem, sizeof(*h)); - if (!(p2 = strchr(buf, ':'))) + + memcpy(n_v, buf, skipped); + n_v[skipped] = '\0'; + + if (!(cp = strchr(n_v, ':'))) return 0; - *(p2++) = '\0'; - h->name = nmem_strdup(c->nmem, buf); - while (isspace(*p2)) - p2++; - if (p2 >= p) // Empty header? - { - buf = p + 2; - continue; - } - *p = '\0'; - h->value = nmem_strdup(c->nmem, p2); + h->name = nmem_strdupn(c->nmem, n_v, cp - n_v); + cp++; + while (isspace(*cp)) + cp++; + h->value = nmem_strdup(c->nmem, cp); h->next = r->headers; r->headers = h; - buf = p + 2; + buf = p; } } + // determine if we do keep alive + if (!strcmp(c->version, "1.0")) + { + const char *v = http_lookup_header(r->headers, "Connection"); + if (v && !strcmp(v, "Keep-Alive")) + c->keep_alive = 1; + else + c->keep_alive = 0; + } + else + { + const char *v = http_lookup_header(r->headers, "Connection"); + if (v && !strcmp(v, "close")) + c->keep_alive = 0; + else + c->keep_alive = 1; + } if (buf < start + len) { const char *content_type = http_lookup_header(r->headers, @@ -556,15 +602,15 @@ static struct http_buf *http_serialize_response(struct http_channel *c, struct http_header *h; wrbuf_rewind(c->wrbuf); - wrbuf_printf(c->wrbuf, "HTTP/1.1 %s %s\r\n", r->code, r->msg); + wrbuf_printf(c->wrbuf, "HTTP/%s %s %s\r\n", c->version, r->code, r->msg); for (h = r->headers; h; h = h->next) wrbuf_printf(c->wrbuf, "%s: %s\r\n", h->name, h->value); if (r->payload) { - wrbuf_printf(c->wrbuf, "Content-length: %d\r\n", 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"); - if (1) + wrbuf_printf(c->wrbuf, "Content-Type: %s\r\n", r->content_type); + if (!strcmp(r->content_type, "text/xml")) { xmlDoc *doc = xmlParseMemory(r->payload, strlen(r->payload)); if (doc) @@ -651,7 +697,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) { @@ -668,7 +740,6 @@ static int http_proxy(struct http_request *rq) int sock; struct protoent *pe; int one = 1; - int flags; if (!(pe = getprotobyname("tcp"))) { abort(); @@ -681,18 +752,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"); + enable_nonblock(sock); if (connect(sock, (struct sockaddr *) proxy_addr, sizeof(*proxy_addr)) < 0) - if (errno != EINPROGRESS) + { + 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; @@ -755,6 +824,22 @@ void http_send_response(struct http_channel *ch) } } +static void http_error(struct http_channel *hc, int no, const char *msg) +{ + struct http_response *rs = http_create_response(hc); + + hc->response = rs; + hc->keep_alive = 0; // not keeping this HTTP session alive + + sprintf(rs->code, "%d", no); + + rs->msg = nmem_strdup(hc->nmem, msg); + rs->payload = nmem_malloc(hc->nmem, 100); + yaz_snprintf(rs->payload, 99, "HTTP Error %d: %s\n", + no, msg); + http_send_response(hc); +} + static void http_io(IOCHAN i, int event) { struct http_channel *hc = iochan_getdata(i); @@ -766,7 +851,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); @@ -786,14 +871,15 @@ static void http_io(IOCHAN i, int event) { if (hc->state == Http_Busy) return; - if ((reqlen = request_check(hc->iqueue)) <= 2) + reqlen = request_check(hc->iqueue); + if (reqlen <= 2) return; // we have a complete HTTP request nmem_reset(hc->nmem); if (!(hc->request = http_parse_request(hc, &hc->iqueue, reqlen))) { yaz_log(YLOG_WARN, "Failed to parse request"); - http_destroy(i); + http_error(hc, 400, "Bad Request"); return; } hc->response = 0; @@ -815,7 +901,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"); @@ -833,7 +919,7 @@ static void http_io(IOCHAN i, int event) wb->offset += res; } if (!hc->oqueue) { - if (!strcmp(hc->version, "1.0")) + if (!hc->keep_alive) { http_destroy(i); return; @@ -856,25 +942,6 @@ 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) -{ - 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; -} -#endif - // Handles I/O on a client connection to a backend web server (proxy mode) static void proxy_io(IOCHAN pi, int event) { @@ -888,15 +955,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; } @@ -911,33 +982,6 @@ 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; - if ((len = package_check(htbuf->buf))) - { - struct http_response *res = http_parse_response_buf(hc, htbuf->buf, len); - if (res) - { - const char *location = http_lookup_header( - res->header, "Location"); - if (location) - { - // We found a location header. Rewrite it. - struct http_buf *buf; - h->value = sub_hostname(hc, location); - 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; - } -#endif // Write any remaining payload if (htbuf->len - htbuf->offset > 0) http_buf_enqueue(&hc->oqueue, htbuf); @@ -950,7 +994,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"); @@ -958,7 +1002,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; @@ -991,7 +1035,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); @@ -1003,7 +1051,11 @@ 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); } @@ -1027,6 +1079,7 @@ static struct http_channel *http_create(const char *addr) r->iochan = 0; r->iqueue = r->oqueue = 0; r->state = Http_Idle; + r->keep_alive = 0; r->request = 0; r->response = 0; if (!addr) @@ -1048,7 +1101,6 @@ static void http_accept(IOCHAN i, int event) socklen_t len; int s; IOCHAN c; - int flags; struct http_channel *ch; len = sizeof addr; @@ -1057,10 +1109,7 @@ 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); @@ -1072,8 +1121,10 @@ static void http_accept(IOCHAN i, int event) pazpar2_add_channel(c); } +static int listener_socket = 0; + /* Create a http-channel listener, syntax [host:]port */ -void http_init(const char *addr) +int http_init(const char *addr) { IOCHAN c; int l; @@ -1081,7 +1132,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); @@ -1098,7 +1149,7 @@ void http_init(const char *addr) hostname[len] = '\0'; if (!(he = gethostbyname(hostname))){ yaz_log(YLOG_FATAL, "Unable to resolve '%s'", hostname); - exit(1); + return 1; } memcpy(&myaddr.sin_addr.s_addr, he->h_addr_list[0], he->h_length); @@ -1113,33 +1164,49 @@ 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; } + listener_socket = l; + c = iochan_create(l, http_accept, EVENT_INPUT | EVENT_EXCEPT); pazpar2_add_channel(c); + return 0; +} + +void http_close_server(void) +{ + /* break the event_loop (select) by closing down the HTTP listener sock */ + if (listener_socket) + { +#ifdef WIN32 + closesocket(listener_socket); +#else + close(listener_socket); +#endif + } } void http_set_proxyaddr(char *host, char *base_url) { char *p; - int port; + short port; struct hostent *he; strcpy(myurl, base_url); @@ -1169,7 +1236,7 @@ static void http_fire_observers(struct http_channel *c) http_channel_observer_t p = c->observers; while (p) { - p->destroy(p->data, c); + p->destroy(p->data, c, p->data2); p = p->next; } } @@ -1190,6 +1257,7 @@ http_channel_observer_t http_add_observer(struct http_channel *c, void *data, http_channel_observer_t obs = xmalloc(sizeof(*obs)); obs->chan = c; obs->data = data; + obs->data2 = 0; obs->destroy= des; obs->next = c->observers; c->observers = obs; @@ -1213,6 +1281,12 @@ struct http_channel *http_channel_observer_chan(http_channel_observer_t obs) return obs->chan; } +void http_observer_set_data2(http_channel_observer_t obs, void *data2) +{ + obs->data2 = data2; +} + + /* * Local variables: * c-basic-offset: 4