X-Git-Url: http://git.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=client.c;h=92f760937a12ea207b10fc872401cab05f475e6b;hp=15f3d8c1922da6e0223fc85d2e2c5356149a467d;hb=5f9ae5738372aaa3a6be2f0a278933563d3f191a;hpb=2dbbb64b4a8ea4aa982c5728b8a267038e2e33d0

diff --git a/client.c b/client.c
index 15f3d8c..92f7609 100644
--- a/client.c
+++ b/client.c
@@ -24,6 +24,7 @@
 #include "tls.h"
 
 static LIST_HEAD(clients);
+static bool client_done = false;
 
 int n_clients = 0;
 struct config conf = {};
@@ -38,13 +39,21 @@ const char * const http_methods[] = {
 	[UH_HTTP_MSG_GET] = "GET",
 	[UH_HTTP_MSG_POST] = "POST",
 	[UH_HTTP_MSG_HEAD] = "HEAD",
+	[UH_HTTP_MSG_OPTIONS] = "OPTIONS",
+	[UH_HTTP_MSG_PUT] = "PUT",
+	[UH_HTTP_MSG_PATCH] = "PATCH",
+	[UH_HTTP_MSG_DELETE] = "DELETE",
 };
 
 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 = "";
@@ -60,6 +69,10 @@ void uh_http_header(struct client *cl, int code, const char *summary)
 
 	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)
@@ -110,6 +123,7 @@ void uh_request_done(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)
@@ -224,6 +238,52 @@ static bool rfc1918_filter_check(struct client *cl)
 	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;
@@ -231,6 +291,9 @@ static void client_header_complete(struct client *cl)
 	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");
 
@@ -283,7 +346,7 @@ static void client_parse_header(struct client *cl, char *data)
 		}
 	} else if (!strcmp(data, "content-length")) {
 		r->content_length = strtoul(val, &err, 0);
-		if (err && *err) {
+		if ((err && *err) || r->content_length < 0) {
 			uh_header_error(cl, 400, "Bad Request");
 			return;
 		}
@@ -293,8 +356,6 @@ static void client_parse_header(struct client *cl, char *data)
 	} 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;
 
@@ -314,10 +375,11 @@ static void client_parse_header(struct client *cl, char *data)
 					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"))
@@ -382,7 +444,7 @@ void client_poll_post_data(struct client *cl)
 		ustream_consume(cl->us, sep + 2 - buf);
 
 		/* invalid chunk length */
-		if (sep && *sep) {
+		if ((sep && *sep) || r->content_length < 0) {
 			r->content_length = 0;
 			r->transfer_chunked = 0;
 			break;
@@ -443,6 +505,7 @@ void uh_client_read_cb(struct client *cl)
 	char *str;
 	int len;
 
+	client_done = false;
 	do {
 		str = ustream_get_read_buf(us, &len);
 		if (!str || !len)
@@ -457,11 +520,17 @@ void uh_client_read_cb(struct client *cl)
 				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);
@@ -471,6 +540,7 @@ static void client_close(struct client *cl)
 	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();
@@ -480,12 +550,20 @@ void uh_client_notify_state(struct client *cl)
 {
 	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;
 
 		if (!s->eof || s->w.data_bytes)
 			return;
+
+#ifdef HAVE_TLS
+		if (cl->tls && cl->ssl.conn && cl->ssl.conn->w.data_bytes) {
+			cl->ssl.conn->eof = s->eof;
+			if (!ustream_write_pending(cl->ssl.conn))
+				return;
+		}
+#endif
 	}
 
 	return client_close(cl);