uclient-fetch: add support for setting output directory

[project/uclient.git] / uclient-http.c

diff --git a/uclient-http.c b/uclient-http.c
index 7c5bc63..fa66f78 100644 (file)
--- a/uclient-http.c
+++ b/uclient-http.c
@@ -19,6 +19,7 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <stdint.h>
+#include <fcntl.h>
 
 #include <libubox/ustream.h>
 #include <libubox/ustream-ssl.h>
@@ -41,6 +42,7 @@ enum request_type {
        REQ_HEAD,
        REQ_POST,
        REQ_PUT,
+       REQ_DELETE,
        __REQ_MAX
 };
 
@@ -58,6 +60,7 @@ static const char * const request_types[__REQ_MAX] = {
        [REQ_HEAD] = "HEAD",
        [REQ_POST] = "POST",
        [REQ_PUT] = "PUT",
+       [REQ_DELETE] = "DELETE",
 };
 
 struct uclient_http {
@@ -71,6 +74,7 @@ struct uclient_http {
        struct ustream_ssl ussl;
 
        struct uloop_timeout disconnect_t;
+       unsigned int seq;
 
        bool ssl_require_validation;
        bool ssl;
@@ -112,18 +116,18 @@ static int uclient_do_connect(struct uclient_http *uh, const char *port)
        if (uh->uc.url->port)
                port = uh->uc.url->port;
 
-       fd = usock(USOCK_TCP | USOCK_NONBLOCK, uh->uc.url->host, port);
+       memset(&uh->uc.remote_addr, 0, sizeof(uh->uc.remote_addr));
+
+       fd = usock_inet(USOCK_TCP, uh->uc.url->host, port, &uh->uc.remote_addr);
        if (fd < 0)
                return -1;
 
+       fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);
        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);
+       memset(&uh->uc.local_addr, 0, sl);
        getsockname(fd, &uh->uc.local_addr.sa, &sl);
-       getpeername(fd, &uh->uc.remote_addr.sa, &sl);
 
        return 0;
 }
@@ -194,6 +198,7 @@ static void uclient_notify_eof(struct uclient_http *uh)
 
 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;
@@ -208,6 +213,7 @@ static void uclient_http_reset_state(struct uclient_http *uh)
 
 static void uclient_http_init_request(struct uclient_http *uh)
 {
+       uh->seq++;
        uclient_http_reset_state(uh);
        blob_buf_init(&uh->meta, 0);
 }
@@ -319,6 +325,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);
@@ -413,8 +435,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"))
@@ -425,8 +448,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);
        }
@@ -509,6 +542,9 @@ uclient_http_send_headers(struct uclient_http *uh)
        if (uh->state >= HTTP_STATE_HEADERS_SENT)
                return;
 
+       if (uh->uc.proxy_url)
+               url = uh->uc.proxy_url;
+
        ustream_printf(uh->us,
                "%s %s HTTP/1.1\r\n"
                "Host: %s\r\n",
@@ -516,7 +552,7 @@ uclient_http_send_headers(struct uclient_http *uh)
                url->location, url->host);
 
        blobmsg_for_each_attr(cur, uh->headers.head, rem)
-               ustream_printf(uh->us, "%s: %s\n", blobmsg_name(cur), (char *) blobmsg_data(cur));
+               ustream_printf(uh->us, "%s: %s\r\n", blobmsg_name(cur), (char *) blobmsg_data(cur));
 
        if (uh->req_type == REQ_POST || uh->req_type == REQ_PUT)
                ustream_printf(uh->us, "Transfer-Encoding: chunked\r\n");
@@ -531,6 +567,7 @@ 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;
+       int seq = uh->uc.seq;
 
        uh->state = HTTP_STATE_RECV_DATA;
        uh->uc.meta = uh->meta.head;
@@ -547,7 +584,7 @@ static void uclient_http_headers_complete(struct uclient_http *uh)
        if (uh->uc.cb->header_done)
                uh->uc.cb->header_done(&uh->uc);
 
-       if (uh->eof)
+       if (uh->eof || seq != uh->uc.seq)
                return;
 
        if (uh->req_type == REQ_HEAD || uh->uc.status_code == 204) {
@@ -612,6 +649,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;
 
@@ -646,6 +684,9 @@ 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;
 
@@ -662,8 +703,13 @@ static void __uclient_notify_read(struct uclient_http *uh)
        if (uh->eof)
                return;
 
-       if (uh->state == HTTP_STATE_RECV_DATA && uc->cb->data_read)
-               uc->cb->data_read(uc);
+       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)
@@ -692,6 +738,10 @@ static void uclient_notify_state(struct ustream *us)
 {
        struct uclient_http *uh = container_of(us, struct uclient_http, ufd.stream);
 
+       if (uh->ufd.stream.write_error) {
+               uclient_http_error(uh, UCLIENT_ERROR_CONNECT);
+               return;
+       }
        uclient_notify_eof(uh);
 }
 
@@ -786,6 +836,7 @@ static int uclient_setup_https(struct uclient_http *uh)
        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;
+       uh->ussl.server_name = 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);
 
@@ -899,7 +950,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);
 
@@ -1003,6 +1054,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;
 }
 
@@ -1070,6 +1125,7 @@ const struct uclient_backend uclient_backend_http = {
        .connect = uclient_http_connect,
        .disconnect = uclient_http_request_disconnect,
        .update_url = uclient_http_free_url_state,
+       .update_proxy_url = uclient_http_free_url_state,
 
        .read = uclient_http_read,
        .write = uclient_http_send_data,