#include "tls.h"
static LIST_HEAD(clients);
+static bool client_done = false;
int n_clients = 0;
struct config conf = {};
[UH_HTTP_MSG_GET] = "GET",
[UH_HTTP_MSG_POST] = "POST",
[UH_HTTP_MSG_HEAD] = "HEAD",
+ [UH_HTTP_MSG_OPTIONS] = "OPTIONS",
};
void uh_http_header(struct client *cl, int code, const char *summary)
{
struct http_request *r = &cl->request;
+ struct blob_attr *cur;
const char *enc = "Transfer-Encoding: chunked\r\n";
const char *conn;
+ int rem;
+
+ cl->http_code = code;
if (!uh_use_chunked(cl))
enc = "";
if (!r->connection_close)
ustream_printf(cl->us, "Keep-Alive: timeout=%d\r\n", conf.http_keepalive);
+
+ blobmsg_for_each_attr(cur, cl->hdr_response.head, rem)
+ ustream_printf(cl->us, "%s: %s\r\n", blobmsg_name(cur),
+ blobmsg_get_string(cur));
}
static void uh_connection_close(struct client *cl)
{
uh_chunk_eof(cl);
uh_dispatch_done(cl);
+ blob_buf_init(&cl->hdr_response, 0);
memset(&cl->dispatch, 0, sizeof(cl->dispatch));
if (!conf.http_keepalive || cl->request.connection_close)
req->method = h_method;
req->version = h_version;
- if (req->version < UH_HTTP_VER_1_1 || !conf.http_keepalive)
+ if (req->version < UH_HTTP_VER_1_1 || req->method == UH_HTTP_MSG_POST ||
+ !conf.http_keepalive)
req->connection_close = true;
return CLIENT_STATE_HEADER;
if (!newline)
return false;
- if (newline == buf)
+ if (newline == buf) {
+ ustream_consume(cl->us, 2);
return true;
+ }
*newline = 0;
blob_buf_init(&cl->hdr, 0);
return false;
}
+static bool tls_redirect_check(struct client *cl)
+{
+ int rem, port;
+ struct blob_attr *cur;
+ char *ptr, *url = NULL, *host = NULL;
+
+ if (cl->tls || !conf.tls_redirect)
+ return true;
+
+ if ((port = uh_first_tls_port(cl->srv_addr.family)) == -1)
+ return true;
+
+ blob_for_each_attr(cur, cl->hdr.head, rem) {
+ if (!strcmp(blobmsg_name(cur), "host"))
+ host = blobmsg_get_string(cur);
+
+ if (!strcmp(blobmsg_name(cur), "URL"))
+ url = blobmsg_get_string(cur);
+
+ if (url && host)
+ break;
+ }
+
+ if (!url || !host)
+ return true;
+
+ if ((ptr = strchr(host, ']')) != NULL)
+ *(ptr+1) = 0;
+ else if ((ptr = strchr(host, ':')) != NULL)
+ *ptr = 0;
+
+ cl->request.disable_chunked = true;
+ cl->request.connection_close = true;
+
+ uh_http_header(cl, 307, "Temporary Redirect");
+
+ if (port != 443)
+ ustream_printf(cl->us, "Location: https://%s:%d%s\r\n\r\n", host, port, url);
+ else
+ ustream_printf(cl->us, "Location: https://%s%s\r\n\r\n", host, url);
+
+ uh_request_done(cl);
+
+ return false;
+}
+
static void client_header_complete(struct client *cl)
{
struct http_request *r = &cl->request;
if (!rfc1918_filter_check(cl))
return;
+ if (!tls_redirect_check(cl))
+ return;
+
if (r->expect_cont)
ustream_printf(cl->us, "HTTP/1.1 100 Continue\r\n\r\n");
} else if (!strcmp(data, "connection")) {
if (!strcasecmp(val, "close"))
r->connection_close = true;
- else if (!strcasecmp(val, "keep-alive"))
- r->connection_close = false;
} else if (!strcmp(data, "user-agent")) {
char *str;
break;
}
}
- } else if (strstr(val, "Safari/") && strstr(val, "Mac OS X"))
- r->ua = UH_UA_SAFARI;
+ }
else if (strstr(val, "Chrome/"))
r->ua = UH_UA_CHROME;
+ else if (strstr(val, "Safari/") && strstr(val, "Mac OS X"))
+ r->ua = UH_UA_SAFARI;
else if (strstr(val, "Gecko/"))
r->ua = UH_UA_GECKO;
else if (strstr(val, "Konqueror"))
char *str;
int len;
+ client_done = false;
do {
str = ustream_get_read_buf(us, &len);
if (!str || !len)
uh_header_error(cl, 413, "Request Entity Too Large");
break;
}
- } while(1);
+ } while (!client_done);
}
static void client_close(struct client *cl)
{
+ if (cl->refcount) {
+ cl->state = CLIENT_STATE_CLEANUP;
+ return;
+ }
+
+ client_done = true;
n_clients--;
uh_dispatch_done(cl);
uloop_timeout_cancel(&cl->timeout);
close(cl->sfd.fd.fd);
list_del(&cl->list);
blob_buf_free(&cl->hdr);
+ blob_buf_free(&cl->hdr_response);
free(cl);
uh_unblock_listeners();
{
struct ustream *s = cl->us;
- if (!s->write_error) {
+ if (!s->write_error && cl->state != CLIENT_STATE_CLEANUP) {
if (cl->state == CLIENT_STATE_DATA)
return;
next_client = NULL;
n_clients++;
cl->id = client_id++;
+ cl->tls = tls;
return true;
}