/*
* uhttpd - Tiny single-threaded httpd
*
- * Copyright (C) 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
- * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2010-2013 Jo-Philipp Wich <xm@subsignal.org>
+ * Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <libubox/blobmsg.h>
#include <ctype.h>
#include "uhttpd.h"
+#include "tls.h"
static LIST_HEAD(clients);
if (!type || !path || !version)
return CLIENT_STATE_DONE;
- memset(&cl->request, 0, sizeof(cl->request));
- req->url = path;
+ blobmsg_add_string(&cl->hdr, "URL", path);
+ memset(&cl->request, 0, sizeof(cl->request));
h_method = find_idx(http_methods, ARRAY_SIZE(http_methods), type);
h_version = find_idx(http_versions, ARRAY_SIZE(http_versions), version);
if (h_method < 0 || h_version < 0) {
*newline = 0;
blob_buf_init(&cl->hdr, 0);
- blobmsg_add_string(&cl->hdr, "REQUEST", buf);
+ cl->state = client_parse_request(cl, buf);
ustream_consume(cl->us, newline + 2 - buf);
- cl->state = client_parse_request(cl, (char *) blobmsg_data(blob_data(cl->hdr.head)));
if (cl->state == CLIENT_STATE_DONE)
uh_header_error(cl, 400, "Bad Request");
cl->state = CLIENT_STATE_HEADER;
}
-static bool client_data_cb(struct client *cl, char *buf, int len)
+void client_poll_post_data(struct client *cl)
{
struct dispatch *d = &cl->dispatch;
struct http_request *r = &cl->request;
- int consumed = 0;
- int cur_len = 0;
+ char *buf;
+ int len;
- if (!d->data_send)
- return false;
+ if (cl->state == CLIENT_STATE_DONE)
+ return;
- while (len) {
+ while (1) {
char *sep;
+ int offset = 0;
+ int cur_len;
- r->content_length -= cur_len;
- consumed += cur_len;
- buf += cur_len;
- len -= cur_len;
- cur_len = min(r->content_length, len);
+ buf = ustream_get_read_buf(cl->us, &len);
+ if (!buf || !len)
+ break;
+
+ if (!d->data_send)
+ return;
+ cur_len = min(r->content_length, len);
if (cur_len) {
+ if (d->data_blocked)
+ break;
+
if (d->data_send)
- d->data_send(cl, buf, cur_len);
+ cur_len = d->data_send(cl, buf, cur_len);
+
+ r->content_length -= cur_len;
+ ustream_consume(cl->us, cur_len);
continue;
}
if (!r->transfer_chunked)
break;
- sep = strstr(buf, "\r\n");
+ if (r->transfer_chunked > 1)
+ offset = 2;
+
+ sep = strstr(buf + offset, "\r\n");
if (!sep)
break;
*sep = 0;
- cur_len = sep + 2 - buf;
- r->content_length = strtoul(buf, &sep, 16);
+ r->content_length = strtoul(buf + offset, &sep, 16);
+ r->transfer_chunked++;
+ ustream_consume(cl->us, sep + 2 - buf);
/* invalid chunk length */
- if (sep && *sep)
- return false;
+ if (sep && *sep) {
+ r->content_length = 0;
+ r->transfer_chunked = 0;
+ break;
+ }
/* empty chunk == eof */
if (!r->content_length) {
r->transfer_chunked = false;
- continue;
+ break;
}
}
- ustream_consume(cl->us, consumed);
- return r->content_length || r->transfer_chunked;
+ buf = ustream_get_read_buf(cl->us, &len);
+ if (!r->content_length && !r->transfer_chunked &&
+ cl->state != CLIENT_STATE_DONE) {
+ if (cl->dispatch.data_done)
+ cl->dispatch.data_done(cl);
+
+ cl->state = CLIENT_STATE_DONE;
+ }
+}
+
+static bool client_data_cb(struct client *cl, char *buf, int len)
+{
+ client_poll_post_data(cl);
+ return false;
}
static bool client_header_cb(struct client *cl, char *buf, int len)
[CLIENT_STATE_DATA] = client_data_cb,
};
-static void client_read_cb(struct client *cl)
+void uh_client_read_cb(struct client *cl)
{
struct ustream *us = cl->us;
char *str;
break;
if (!read_cbs[cl->state](cl, str, len)) {
- if (len == us->r.buffer_len)
+ if (len == us->r.buffer_len &&
+ cl->state != CLIENT_STATE_DATA)
uh_header_error(cl, 413, "Request Entity Too Large");
- if (cl->dispatch.data_done)
- cl->dispatch.data_done(cl);
break;
}
} while(1);
n_clients--;
uh_dispatch_done(cl);
uloop_timeout_cancel(&cl->timeout);
+ if (cl->tls)
+ uh_tls_client_detach(cl);
ustream_free(&cl->sfd.stream);
close(cl->sfd.fd.fd);
list_del(&cl->list);
uh_unblock_listeners();
}
+void uh_client_notify_state(struct client *cl)
+{
+ struct ustream *s = cl->us;
+
+ if (!s->write_error) {
+ if (cl->state == CLIENT_STATE_DATA)
+ return;
+
+ if (!s->eof || s->w.data_bytes)
+ return;
+ }
+
+ return client_close(cl);
+}
+
static void client_ustream_read_cb(struct ustream *s, int bytes)
{
struct client *cl = container_of(s, struct client, sfd);
- client_read_cb(cl);
+ uh_client_read_cb(cl);
}
static void client_ustream_write_cb(struct ustream *s, int bytes)
{
struct client *cl = container_of(s, struct client, sfd);
- if (!s->write_error) {
- if (cl->state == CLIENT_STATE_DATA)
- return;
-
- if (!s->eof || s->w.data_bytes)
- return;
- }
-
- return client_close(cl);
+ uh_client_notify_state(cl);
}
static void set_addr(struct uh_addr *addr, void *src)
}
}
-void uh_accept_client(int fd)
+bool uh_accept_client(int fd, bool tls)
{
static struct client *next_client;
struct client *cl;
sl = sizeof(addr);
sfd = accept(fd, (struct sockaddr *) &addr, &sl);
if (sfd < 0)
- return;
+ return false;
set_addr(&cl->peer_addr, &addr);
sl = sizeof(addr);
- getsockname(fd, (struct sockaddr *) &addr, &sl);
+ getsockname(sfd, (struct sockaddr *) &addr, &sl);
set_addr(&cl->srv_addr, &addr);
+
cl->us = &cl->sfd.stream;
+ if (tls) {
+ uh_tls_client_attach(cl);
+ } else {
+ cl->us->notify_read = client_ustream_read_cb;
+ cl->us->notify_write = client_ustream_write_cb;
+ cl->us->notify_state = client_notify_state;
+ }
+
cl->us->string_data = true;
- cl->us->notify_read = client_ustream_read_cb;
- cl->us->notify_write = client_ustream_write_cb;
- cl->us->notify_state = client_notify_state;
ustream_fd_init(&cl->sfd, sfd);
cl->timeout.cb = client_timeout;
next_client = NULL;
n_clients++;
cl->id = client_id++;
+
+ return true;
}
void uh_close_fds(void)