add missing n_clients decrement

[project/uhttpd.git] / client.c

diff --git a/client.c b/client.c
index 1b9c524..6a0c4bf 100644 (file)
--- a/client.c
+++ b/client.c
@@ -134,6 +134,7 @@ static int client_parse_request(struct client *cl, char *data)
 {
        struct http_request *req = &cl->request;
        char *type, *path, *version;
+       int h_method, h_version;
 
        type = strtok(data, " ");
        path = strtok(NULL, " ");
@@ -141,14 +142,18 @@ static int client_parse_request(struct client *cl, char *data)
        if (!type || !path || !version)
                return CLIENT_STATE_DONE;
 
+       memset(&cl->request, 0, sizeof(cl->request));
        req->url = path;
-       req->method = find_idx(http_methods, ARRAY_SIZE(http_methods), type);
-       if (req->method < 0)
-               return CLIENT_STATE_DONE;
 
-       req->version = find_idx(http_versions, ARRAY_SIZE(http_versions), version);
-       if (cl->request.version < 0)
+       h_method = find_idx(http_methods, ARRAY_SIZE(http_methods), type);
+       h_version = find_idx(http_versions, ARRAY_SIZE(http_versions), version);
+       if (h_method < 0 || h_version < 0) {
+               req->version = UH_HTTP_VER_1_0;
                return CLIENT_STATE_DONE;
+       }
+
+       req->method = h_method;
+       req->version = h_version;
 
        return CLIENT_STATE_HEADER;
 }
@@ -172,13 +177,35 @@ static bool client_init_cb(struct client *cl, char *buf, int len)
        return true;
 }
 
+static bool rfc1918_filter_check(struct client *cl)
+{
+       if (!conf.rfc1918_filter)
+               return true;
+
+       if (!uh_addr_rfc1918(&cl->peer_addr) || uh_addr_rfc1918(&cl->srv_addr))
+               return true;
+
+       uh_client_error(cl, 403, "Forbidden",
+                       "Rejected request from RFC1918 IP "
+                       "to public server address");
+       return false;
+}
+
 static void client_header_complete(struct client *cl)
 {
+       if (!rfc1918_filter_check(cl))
+               return;
+
+       if (cl->request.expect_cont)
+               ustream_printf(cl->us, "HTTP/1.1 100 Continue\r\n\r\n");
+
        uh_handle_request(cl);
 }
 
 static void client_parse_header(struct client *cl, char *data)
 {
+       struct http_request *r = &cl->request;
+       char *err;
        char *name;
        char *val;
 
@@ -199,6 +226,25 @@ static void client_parse_header(struct client *cl, char *data)
                if (isupper(*name))
                        *name = tolower(*name);
 
+       if (!strcmp(data, "expect")) {
+               if (!strcasecmp(val, "100-continue"))
+                       r->expect_cont = true;
+               else {
+                       uh_header_error(cl, 412, "Precondition Failed");
+                       return;
+               }
+       } else if (!strcmp(data, "content-length")) {
+               r->content_length = strtoul(val, &err, 0);
+               if (err && *err) {
+                       uh_header_error(cl, 400, "Bad Request");
+                       return;
+               }
+       } else if (!strcmp(data, "transfer-encoding")) {
+               if (!strcmp(val, "chunked"))
+                       r->transfer_chunked = true;
+       }
+
+
        blobmsg_add_string(&cl->hdr, data, val);
 
        cl->state = CLIENT_STATE_HEADER;
@@ -206,7 +252,54 @@ static void client_parse_header(struct client *cl, char *data)
 
 static bool client_data_cb(struct client *cl, char *buf, int len)
 {
-       return false;
+       struct dispatch *d = &cl->dispatch;
+       struct http_request *r = &cl->request;
+       int consumed = 0;
+       int cur_len = 0;
+
+       if (!d->data_send)
+               return false;
+
+       while (len) {
+               char *sep;
+
+               r->content_length -= cur_len;
+               consumed += cur_len;
+               buf += cur_len;
+               len -= cur_len;
+               cur_len = min(r->content_length, len);
+
+               if (cur_len) {
+                       if (d->data_send)
+                               d->data_send(cl, buf, cur_len);
+                       continue;
+               }
+
+               if (!r->transfer_chunked)
+                       break;
+
+               sep = strstr(buf, "\r\n");
+               if (!sep)
+                       break;
+
+               *sep = 0;
+               cur_len = sep + 2 - buf;
+
+               r->content_length = strtoul(buf, &sep, 16);
+
+               /* invalid chunk length */
+               if (sep && *sep)
+                       return false;
+
+               /* empty chunk == eof */
+               if (!r->content_length) {
+                       r->transfer_chunked = false;
+                       continue;
+               }
+       }
+
+       ustream_consume(cl->us, consumed);
+       return r->content_length || r->transfer_chunked;
 }
 
 static bool client_header_cb(struct client *cl, char *buf, int len)
@@ -223,7 +316,7 @@ static bool client_header_cb(struct client *cl, char *buf, int len)
        line_len = newline + 2 - buf;
        ustream_consume(cl->us, line_len);
        if (cl->state == CLIENT_STATE_DATA)
-               client_data_cb(cl, newline + 2, len - line_len);
+               return client_data_cb(cl, newline + 2, len - line_len);
 
        return true;
 }
@@ -243,7 +336,7 @@ static void client_read_cb(struct client *cl)
 
        do {
                str = ustream_get_read_buf(us, &len);
-               if (!str)
+               if (!str || !len)
                        break;
 
                if (cl->state >= array_size(read_cbs) || !read_cbs[cl->state])
@@ -252,6 +345,8 @@ static void client_read_cb(struct client *cl)
                if (!read_cbs[cl->state](cl, str, len)) {
                        if (len == us->r.buffer_len)
                                uh_header_error(cl, 413, "Request Entity Too Large");
+                       if (cl->dispatch.data_done)
+                               cl->dispatch.data_done(cl);
                        break;
                }
        } while(1);
@@ -259,6 +354,7 @@ static void client_read_cb(struct client *cl)
 
 static void client_close(struct client *cl)
 {
+       n_clients--;
        uh_dispatch_done(cl);
        uloop_timeout_cancel(&cl->timeout);
        ustream_free(&cl->sfd.stream);