X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuclient.git;a=blobdiff_plain;f=uclient-http.c;h=7e930d7e5ed019a66b8dbf901aab685b0f720d7d;hp=ee354c7af6b9f1c167e6cbb5c4a4e74de243015a;hb=d2d1a9c477abe660e01943b3fee069b28b6610e0;hpb=cb7867a867e45949950e03de0ea845e483ffc6eb

diff --git a/uclient-http.c b/uclient-http.c
index ee354c7..7e930d7 100644
--- a/uclient-http.c
+++ b/uclient-http.c
@@ -40,6 +40,8 @@ enum request_type {
 	REQ_GET,
 	REQ_HEAD,
 	REQ_POST,
+	REQ_PUT,
+	REQ_DELETE,
 	__REQ_MAX
 };
 
@@ -56,22 +58,28 @@ static const char * const request_types[__REQ_MAX] = {
 	[REQ_GET] = "GET",
 	[REQ_HEAD] = "HEAD",
 	[REQ_POST] = "POST",
+	[REQ_PUT] = "PUT",
+	[REQ_DELETE] = "DELETE",
 };
 
 struct uclient_http {
 	struct uclient uc;
 
+	const struct ustream_ssl_ops *ssl_ops;
 	struct ustream_ssl_ctx *ssl_ctx;
 	struct ustream *us;
 
 	struct ustream_fd ufd;
 	struct ustream_ssl ussl;
 
+	struct uloop_timeout disconnect_t;
+	unsigned int seq;
+
 	bool ssl_require_validation;
-	bool ssl_ctx_ext;
 	bool ssl;
 	bool eof;
 	bool connection_close;
+	bool disconnect;
 	enum request_type req_type;
 	enum http_state state;
 
@@ -101,6 +109,7 @@ static const char * const uclient_http_prefix[] = {
 
 static int uclient_do_connect(struct uclient_http *uh, const char *port)
 {
+	socklen_t sl;
 	int fd;
 
 	if (uh->uc.url->port)
@@ -111,11 +120,20 @@ static int uclient_do_connect(struct uclient_http *uh, const char *port)
 		return -1;
 
 	ustream_fd_init(&uh->ufd, fd);
+
+	memset(&uh->uc.local_addr, 0, sizeof(uh->uc.local_addr));
+	memset(&uh->uc.remote_addr, 0, sizeof(uh->uc.remote_addr));
+
+	sl = sizeof(uh->uc.local_addr);
+	getsockname(fd, &uh->uc.local_addr.sa, &sl);
+	getpeername(fd, &uh->uc.remote_addr.sa, &sl);
+
 	return 0;
 }
 
 static void uclient_http_disconnect(struct uclient_http *uh)
 {
+	uloop_timeout_cancel(&uh->disconnect_t);
 	if (!uh->us)
 		return;
 
@@ -144,10 +162,25 @@ static void uclient_http_error(struct uclient_http *uh, int code)
 	uclient_backend_set_error(&uh->uc, code);
 }
 
+static void uclient_http_request_disconnect(struct uclient *cl)
+{
+	struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
+
+	if (!uh->us)
+		return;
+
+	uh->eof = true;
+	uh->disconnect = true;
+	uloop_timeout_set(&uh->disconnect_t, 1);
+}
+
 static void uclient_notify_eof(struct uclient_http *uh)
 {
 	struct ustream *us = uh->us;
 
+	if (uh->disconnect)
+		return;
+
 	if (!uh->eof) {
 		if (!us->eof && !us->write_error)
 			return;
@@ -159,15 +192,17 @@ static void uclient_notify_eof(struct uclient_http *uh)
 	uclient_backend_set_eof(&uh->uc);
 
 	if (uh->connection_close)
-		uclient_http_disconnect(uh);
+		uclient_http_request_disconnect(&uh->uc);
 }
 
 static void uclient_http_reset_state(struct uclient_http *uh)
 {
+	uh->seq++;
 	uclient_backend_reset_state(&uh->uc);
 	uh->read_chunked = -1;
 	uh->content_length = -1;
 	uh->eof = false;
+	uh->disconnect = false;
 	uh->connection_close = false;
 	uh->state = HTTP_STATE_INIT;
 
@@ -288,6 +323,22 @@ static char *digest_unquote_sep(char **str)
 	return start;
 }
 
+static char *digest_sep(char **str)
+{
+	char *cur, *next;
+
+	cur = *str;
+	next = strchr(*str, ',');
+	if (next) {
+	    *str = next + 1;
+	    *next = 0;
+	} else {
+	    *str += strlen(*str);
+	}
+
+	return cur;
+}
+
 static bool strmatch(char **str, const char *prefix)
 {
 	int len = strlen(prefix);
@@ -382,8 +433,9 @@ uclient_http_add_auth_digest(struct uclient_http *uh)
 	next = buf;
 	while (*next) {
 		const char **dest = NULL;
+		const char *tmp;
 
-		while (isspace(*next))
+		while (*next && isspace(*next))
 			next++;
 
 		if (strmatch(&next, "realm"))
@@ -394,8 +446,18 @@ uclient_http_add_auth_digest(struct uclient_http *uh)
 			dest = &data.nonce;
 		else if (strmatch(&next, "opaque"))
 			dest = &opaque;
-		else
-			return;
+		else if (strmatch(&next, "stale") ||
+			 strmatch(&next, "algorithm") ||
+			 strmatch(&next, "auth-param")) {
+			digest_sep(&next);
+			continue;
+		} else if (strmatch(&next, "domain") ||
+			 strmatch(&next, "qop-options"))
+			dest = &tmp;
+		else {
+			digest_sep(&next);
+			continue;
+		}
 
 		*dest = digest_unquote_sep(&next);
 	}
@@ -478,9 +540,6 @@ uclient_http_send_headers(struct uclient_http *uh)
 	if (uh->state >= HTTP_STATE_HEADERS_SENT)
 		return;
 
-	if (uh->auth_type == AUTH_TYPE_UNKNOWN)
-		req_type = REQ_HEAD;
-
 	ustream_printf(uh->us,
 		"%s %s HTTP/1.1\r\n"
 		"Host: %s\r\n",
@@ -490,7 +549,7 @@ uclient_http_send_headers(struct uclient_http *uh)
 	blobmsg_for_each_attr(cur, uh->headers.head, rem)
 		ustream_printf(uh->us, "%s: %s\n", blobmsg_name(cur), (char *) blobmsg_data(cur));
 
-	if (uh->req_type == REQ_POST)
+	if (uh->req_type == REQ_POST || uh->req_type == REQ_PUT)
 		ustream_printf(uh->us, "Transfer-Encoding: chunked\r\n");
 
 	uclient_http_add_auth_header(uh);
@@ -503,29 +562,25 @@ uclient_http_send_headers(struct uclient_http *uh)
 static void uclient_http_headers_complete(struct uclient_http *uh)
 {
 	enum auth_type auth_type = uh->auth_type;
-	socklen_t sl;
 
 	uh->state = HTTP_STATE_RECV_DATA;
 	uh->uc.meta = uh->meta.head;
 	uclient_http_process_headers(uh);
 
-	if (auth_type == AUTH_TYPE_UNKNOWN) {
+	if (auth_type == AUTH_TYPE_UNKNOWN && uh->uc.status_code == 401 &&
+	    (uh->req_type == REQ_HEAD || uh->req_type == REQ_GET)) {
 		uclient_http_init_request(uh);
 		uclient_http_send_headers(uh);
 		uh->state = HTTP_STATE_REQUEST_DONE;
 		return;
 	}
 
-	memset(&uh->uc.local_addr, 0, sizeof(uh->uc.local_addr));
-	memset(&uh->uc.remote_addr, 0, sizeof(uh->uc.remote_addr));
-
-	sl = sizeof(uh->uc.local_addr);
-	getsockname(uh->ufd.fd.fd, &uh->uc.local_addr.sa, &sl);
-	getpeername(uh->ufd.fd.fd, &uh->uc.remote_addr.sa, &sl);
-
 	if (uh->uc.cb->header_done)
 		uh->uc.cb->header_done(&uh->uc);
 
+	if (uh->eof)
+		return;
+
 	if (uh->req_type == REQ_HEAD || uh->uc.status_code == 204) {
 		uh->eof = true;
 		uclient_notify_eof(uh);
@@ -540,6 +595,9 @@ static void uclient_parse_http_line(struct uclient_http *uh, char *data)
 	if (uh->state == HTTP_STATE_REQUEST_DONE) {
 		char *code;
 
+		if (!strlen(data))
+			return;
+
 		/* HTTP/1.1 */
 		strsep(&data, " ");
 
@@ -585,6 +643,7 @@ error:
 static void __uclient_notify_read(struct uclient_http *uh)
 {
 	struct uclient *uc = &uh->uc;
+	unsigned int seq = uh->seq;
 	char *data;
 	int len;
 
@@ -619,9 +678,15 @@ static void __uclient_notify_read(struct uclient_http *uh)
 			*sep = 0;
 			cur_len = sep + 2 - data;
 			uclient_parse_http_line(uh, data);
+			if (seq != uh->seq)
+				return;
+
 			ustream_consume(uh->us, cur_len);
 			len -= cur_len;
 
+			if (uh->eof)
+				return;
+
 			data = ustream_get_read_buf(uh->us, &len);
 		} while (data && uh->state < HTTP_STATE_RECV_DATA);
 
@@ -629,8 +694,24 @@ static void __uclient_notify_read(struct uclient_http *uh)
 			return;
 	}
 
-	if (uh->state == HTTP_STATE_RECV_DATA && uc->cb->data_read)
-		uc->cb->data_read(uc);
+	if (uh->eof)
+		return;
+
+	if (uh->state == HTTP_STATE_RECV_DATA) {
+		/* Now it's uclient user turn to read some data */
+		uloop_timeout_cancel(&uc->connection_timeout);
+
+		if (uc->cb->data_read)
+			uc->cb->data_read(uc);
+	}
+}
+
+static void __uclient_notify_write(struct uclient_http *uh)
+{
+	struct uclient *uc = &uh->uc;
+
+	if (uc->cb->data_sent)
+		uc->cb->data_sent(uc);
 }
 
 static void uclient_notify_read(struct ustream *us, int bytes)
@@ -640,6 +721,13 @@ static void uclient_notify_read(struct ustream *us, int bytes)
 	__uclient_notify_read(uh);
 }
 
+static void uclient_notify_write(struct ustream *us, int bytes)
+{
+	struct uclient_http *uh = container_of(us, struct uclient_http, ufd.stream);
+
+	__uclient_notify_write(uh);
+}
+
 static void uclient_notify_state(struct ustream *us)
 {
 	struct uclient_http *uh = container_of(us, struct uclient_http, ufd.stream);
@@ -653,13 +741,16 @@ static int uclient_setup_http(struct uclient_http *uh)
 	int ret;
 
 	uh->us = us;
+	uh->ssl = false;
+
 	us->string_data = true;
 	us->notify_state = uclient_notify_state;
 	us->notify_read = uclient_notify_read;
+	us->notify_write = uclient_notify_write;
 
 	ret = uclient_do_connect(uh, "80");
 	if (ret)
-		return ret;
+		return UCLIENT_ERROR_CONNECT;
 
 	return 0;
 }
@@ -671,6 +762,13 @@ static void uclient_ssl_notify_read(struct ustream *us, int bytes)
 	__uclient_notify_read(uh);
 }
 
+static void uclient_ssl_notify_write(struct ustream *us, int bytes)
+{
+	struct uclient_http *uh = container_of(us, struct uclient_http, ussl.stream);
+
+	__uclient_notify_write(uh);
+}
+
 static void uclient_ssl_notify_state(struct ustream *us)
 {
 	struct uclient_http *uh = container_of(us, struct uclient_http, ussl.stream);
@@ -714,21 +812,22 @@ static int uclient_setup_https(struct uclient_http *uh)
 	uh->ssl = true;
 	uh->us = us;
 
+	if (!uh->ssl_ctx)
+		return UCLIENT_ERROR_MISSING_SSL_CONTEXT;
+
 	ret = uclient_do_connect(uh, "443");
 	if (ret)
-		return ret;
-
-	if (!uh->ssl_ctx)
-		uh->ssl_ctx = ustream_ssl_context_new(false);
+		return UCLIENT_ERROR_CONNECT;
 
 	us->string_data = true;
 	us->notify_state = uclient_ssl_notify_state;
 	us->notify_read = uclient_ssl_notify_read;
+	us->notify_write = uclient_ssl_notify_write;
 	uh->ussl.notify_error = uclient_ssl_notify_error;
 	uh->ussl.notify_verify_error = uclient_ssl_notify_verify_error;
 	uh->ussl.notify_connected = uclient_ssl_notify_connected;
-	ustream_ssl_init(&uh->ussl, &uh->ufd.stream, uh->ssl_ctx, false);
-	ustream_ssl_set_peer_cn(&uh->ussl, uh->uc.url->host);
+	uh->ssl_ops->init(&uh->ussl, &uh->ufd.stream, uh->ssl_ctx, false);
+	uh->ssl_ops->set_peer_cn(&uh->ussl, uh->uc.url->host);
 
 	return 0;
 }
@@ -738,6 +837,9 @@ static int uclient_http_connect(struct uclient *cl)
 	struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
 	int ret;
 
+	if (!cl->eof || uh->disconnect)
+		uclient_http_disconnect(uh);
+
 	uclient_http_init_request(uh);
 
 	if (uh->us)
@@ -750,17 +852,22 @@ static int uclient_http_connect(struct uclient *cl)
 	else
 		ret = uclient_setup_http(uh);
 
-	if (ret)
-		uclient_http_error(uh, UCLIENT_ERROR_CONNECT);
-
 	return ret;
 }
 
+static void uclient_http_disconnect_cb(struct uloop_timeout *timeout)
+{
+	struct uclient_http *uh = container_of(timeout, struct uclient_http, disconnect_t);
+
+	uclient_http_disconnect(uh);
+}
+
 static struct uclient *uclient_http_alloc(void)
 {
 	struct uclient_http *uh;
 
 	uh = calloc_a(sizeof(*uh));
+	uh->disconnect_t.cb = uclient_http_disconnect_cb;
 	blob_buf_init(&uh->headers, 0);
 
 	return &uh->uc;
@@ -768,18 +875,16 @@ static struct uclient *uclient_http_alloc(void)
 
 static void uclient_http_free_ssl_ctx(struct uclient_http *uh)
 {
-	if (uh->ssl_ctx && !uh->ssl_ctx_ext)
-		ustream_ssl_context_free(uh->ssl_ctx);
-
-	uh->ssl_ctx_ext = false;
+	uh->ssl_ops = NULL;
+	uh->ssl_ctx = NULL;
 }
 
 static void uclient_http_free(struct uclient *cl)
 {
 	struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
 
-	uclient_http_free_ssl_ctx(uh);
 	uclient_http_free_url_state(cl);
+	uclient_http_free_ssl_ctx(uh);
 	blob_buf_free(&uh->headers);
 	blob_buf_free(&uh->meta);
 	free(uh);
@@ -834,7 +939,7 @@ uclient_http_set_header(struct uclient *cl, const char *name, const char *value)
 }
 
 static int
-uclient_http_send_data(struct uclient *cl, char *buf, unsigned int len)
+uclient_http_send_data(struct uclient *cl, const char *buf, unsigned int len)
 {
 	struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
 
@@ -861,7 +966,7 @@ uclient_http_request_done(struct uclient *cl)
 		return -1;
 
 	uclient_http_send_headers(uh);
-	if (uh->req_type == REQ_POST)
+	if (uh->req_type == REQ_POST || uh->req_type == REQ_PUT)
 		ustream_printf(uh->us, "0\r\n\r\n");
 	uh->state = HTTP_STATE_REQUEST_DONE;
 
@@ -903,8 +1008,10 @@ uclient_http_read(struct uclient *cl, char *buf, unsigned int len)
 		read_len += sep + 2 - data;
 		data = sep + 2;
 
-		if (!uh->read_chunked)
+		if (!uh->read_chunked) {
 			uh->eof = true;
+			uh->uc.data_eof = true;
+		}
 	}
 
 	if (len > data_end - data)
@@ -920,8 +1027,10 @@ uclient_http_read(struct uclient *cl, char *buf, unsigned int len)
 			len = uh->content_length;
 
 		uh->content_length -= len;
-		if (!uh->content_length)
+		if (!uh->content_length) {
 			uh->eof = true;
+			uh->uc.data_eof = true;
+		}
 	}
 
 	if (len > 0) {
@@ -934,6 +1043,10 @@ uclient_http_read(struct uclient *cl, char *buf, unsigned int len)
 
 	uclient_notify_eof(uh);
 
+	/* Now that we consumed something and if this isn't EOF, start timer again */
+	if (!uh->uc.eof && !cl->connection_timeout.pending)
+		uloop_timeout_set(&cl->connection_timeout, cl->timeout_msecs);
+
 	return len;
 }
 
@@ -975,7 +1088,8 @@ bool uclient_http_redirect(struct uclient *cl)
 	return true;
 }
 
-int uclient_http_set_ssl_ctx(struct uclient *cl, struct ustream_ssl_ctx *ctx, bool require_validation)
+int uclient_http_set_ssl_ctx(struct uclient *cl, const struct ustream_ssl_ops *ops,
+			     struct ustream_ssl_ctx *ctx, bool require_validation)
 {
 	struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
 
@@ -985,8 +1099,8 @@ int uclient_http_set_ssl_ctx(struct uclient *cl, struct ustream_ssl_ctx *ctx, bo
 	uclient_http_free_url_state(cl);
 
 	uclient_http_free_ssl_ctx(uh);
+	uh->ssl_ops = ops;
 	uh->ssl_ctx = ctx;
-	uh->ssl_ctx_ext = !!ctx;
 	uh->ssl_require_validation = !!ctx && require_validation;
 
 	return 0;
@@ -998,6 +1112,7 @@ const struct uclient_backend uclient_backend_http = {
 	.alloc = uclient_http_alloc,
 	.free = uclient_http_free,
 	.connect = uclient_http_connect,
+	.disconnect = uclient_http_request_disconnect,
 	.update_url = uclient_http_free_url_state,
 
 	.read = uclient_http_read,