use const for char buffer in uclient_write

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

diff --git a/uclient-http.c b/uclient-http.c
index e7d3ff0..9f9fac9 100644 (file)
--- a/uclient-http.c
+++ b/uclient-http.c
@@ -40,6 +40,7 @@ enum request_type {
        REQ_GET,
        REQ_HEAD,
        REQ_POST,
+       REQ_PUT,
        __REQ_MAX
 };
 
@@ -56,6 +57,7 @@ static const char * const request_types[__REQ_MAX] = {
        [REQ_GET] = "GET",
        [REQ_HEAD] = "HEAD",
        [REQ_POST] = "POST",
+       [REQ_PUT] = "PUT",
 };
 
 struct uclient_http {
@@ -68,10 +70,13 @@ struct uclient_http {
        struct ustream_fd ufd;
        struct ustream_ssl ussl;
 
+       struct uloop_timeout disconnect_t;
+
        bool ssl_require_validation;
        bool ssl;
        bool eof;
        bool connection_close;
+       bool disconnect;
        enum request_type req_type;
        enum http_state state;
 
@@ -125,6 +130,7 @@ static int uclient_do_connect(struct uclient_http *uh, const char *port)
 
 static void uclient_http_disconnect(struct uclient_http *uh)
 {
+       uloop_timeout_cancel(&uh->disconnect_t);
        if (!uh->us)
                return;
 
@@ -153,10 +159,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;
@@ -168,7 +189,7 @@ 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)
@@ -177,6 +198,7 @@ static void uclient_http_reset_state(struct uclient_http *uh)
        uh->read_chunked = -1;
        uh->content_length = -1;
        uh->eof = false;
+       uh->disconnect = false;
        uh->connection_close = false;
        uh->state = HTTP_STATE_INIT;
 
@@ -297,6 +319,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);
@@ -391,8 +429,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"))
@@ -403,8 +442,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);
        }
@@ -487,9 +536,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",
@@ -499,7 +545,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);
@@ -517,7 +563,8 @@ static void uclient_http_headers_complete(struct uclient_http *uh)
        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;
@@ -527,6 +574,9 @@ 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)
+               return;
+
        if (uh->req_type == REQ_HEAD || uh->uc.status_code == 204) {
                uh->eof = true;
                uclient_notify_eof(uh);
@@ -541,6 +591,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, " ");
 
@@ -623,6 +676,9 @@ static void __uclient_notify_read(struct uclient_http *uh)
                        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);
 
@@ -630,8 +686,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)
@@ -641,6 +713,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);
@@ -659,6 +738,7 @@ static int uclient_setup_http(struct uclient_http *uh)
        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)
@@ -674,6 +754,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);
@@ -727,6 +814,7 @@ static int uclient_setup_https(struct uclient_http *uh)
        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;
@@ -741,6 +829,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)
@@ -756,11 +847,19 @@ static int uclient_http_connect(struct uclient *cl)
        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;
@@ -832,7 +931,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);
 
@@ -859,7 +958,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;
 
@@ -901,8 +1000,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)
@@ -918,8 +1019,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) {
@@ -932,6 +1035,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;
 }
 
@@ -997,6 +1104,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,