1 files changed, 49 insertions, 32 deletions

diff --git a/ot_http.c b/ot_http.c
index 626547b..46ca5a9 100644
--- a/ot_http.c
+++ b/ot_http.c
@@ -15,15 +15,14 @@
 #include <unistd.h>
 
 /* Libowfat */
-#include "array.h"
 #include "iob.h"
-#include "ip6.h"
 
 /* Opentracker */
 #include "ot_accesslist.h"
 #include "ot_fullscrape.h"
 #include "ot_http.h"
 #include "ot_iovec.h"
+#include "ot_ip.h"
 #include "ot_mutex.h"
 #include "ot_scan.h"
 #include "ot_stats.h"
@@ -45,7 +44,7 @@ ssize_t      g_stats_path_len;
 
 enum { SUCCESS_HTTP_HEADER_LENGTH = 80, SUCCESS_HTTP_SIZE_OFF = 17 };
 
-static void http_senddata(const int64 sock, struct ot_workstruct *ws) {
+static void http_senddata(const int64_t sock, struct ot_workstruct *ws) {
   struct http_data *cookie = io_getcookie(sock);
   ssize_t           written_size;
 
@@ -54,20 +53,25 @@ static void http_senddata(const int64 sock, struct ot_workstruct *ws) {
     return;
   }
 
-  /* whoever sends data is not interested in its input-array */
+  /* whoever sends data is not interested in its input buffer */
   if (ws->keep_alive && ws->header_size != ws->request_size) {
     size_t rest = ws->request_size - ws->header_size;
-    if (array_start(&cookie->request)) {
-      memmove(array_start(&cookie->request), ws->request + ws->header_size, rest);
-      array_truncate(&cookie->request, 1, rest);
-    } else
-      array_catb(&cookie->request, ws->request + ws->header_size, rest);
+    if (cookie->request.data) {
+      memmove(cookie->request.data, ws->request + ws->header_size, rest);
+      buf_truncate(&cookie->request, rest);
+    } else if (buf_cat(&cookie->request, ws->request + ws->header_size, rest)) {
+      /* Without room for what the client pipelined behind this request, answer
+         this one and let the connection close, rather than keeping it open
+         around a request we have silently dropped */
+      buf_reset(&cookie->request);
+      ws->keep_alive = 0;
+    }
   } else
-    array_reset(&cookie->request);
+    buf_reset(&cookie->request);
 
   written_size = write(sock, ws->reply, ws->reply_size);
   if ((written_size < 0) || ((written_size == ws->reply_size) && !ws->keep_alive)) {
-    array_reset(&cookie->request);
+    buf_reset(&cookie->request);
     free(cookie);
     io_close(sock);
     return;
@@ -78,7 +82,7 @@ static void http_senddata(const int64 sock, struct ot_workstruct *ws) {
     tai6464 t;
 
     if (!(outbuf = malloc(ws->reply_size - written_size))) {
-      array_reset(&cookie->request);
+      buf_reset(&cookie->request);
       free(cookie);
       io_close(sock);
       return;
@@ -90,7 +94,7 @@ static void http_senddata(const int64 sock, struct ot_workstruct *ws) {
       if (!cookie->batch || OT_IOB_INIT(cookie->batch) == -1) {
         free(cookie->batch);
         free(outbuf);
-        array_reset(&cookie->request);
+        buf_reset(&cookie->request);
         free(cookie);
         io_close(sock);
         return;
@@ -120,7 +124,7 @@ static void http_senddata(const int64 sock, struct ot_workstruct *ws) {
 #define HTTPERROR_403_IP         return http_issue_error(sock, ws, CODE_HTTPERROR_403_IP)
 #define HTTPERROR_404            return http_issue_error(sock, ws, CODE_HTTPERROR_404)
 #define HTTPERROR_500            return http_issue_error(sock, ws, CODE_HTTPERROR_500)
-ssize_t http_issue_error(const int64 sock, struct ot_workstruct *ws, int code) {
+ssize_t http_issue_error(const int64_t sock, struct ot_workstruct *ws, int code) {
   char *error_code[] = {"302 Found",      "400 Invalid Request", "400 Invalid Request", "400 Invalid Request",      "402 Payment Required",
                         "403 Not Modest", "403 Access Denied",   "404 Not Found",       "500 Internal Server Error"};
   char *title        = error_code[code];
@@ -140,7 +144,7 @@ ssize_t http_issue_error(const int64 sock, struct ot_workstruct *ws, int code) {
   return ws->reply_size = -2;
 }
 
-ssize_t http_sendiovecdata(const int64 sock, struct ot_workstruct *ws, size_t iovec_entries, struct iovec *iovector, int is_partial) {
+ssize_t http_sendiovecdata(const int64_t sock, struct ot_workstruct *ws, size_t iovec_entries, struct iovec *iovector, int is_partial) {
   struct http_data *cookie = io_getcookie(sock);
   io_batch         *current;
   char             *header;
@@ -154,8 +158,15 @@ ssize_t http_sendiovecdata(const int64 sock, struct ot_workstruct *ws, size_t io
     HTTPERROR_500;
   }
 
+  /* Descriptor numbers get recycled, so a result can only belong to this
+     connection if this connection is in fact waiting for one. */
+  if (!(cookie->flag & (STRUCT_HTTP_FLAG_WAITINGFORTASK | STRUCT_HTTP_FLAG_CHUNKED_IN_TRANSFER))) {
+    iovec_free(&iovec_entries, &iovector);
+    return 0;
+  }
+
   /* If this socket collected request in a buffer, free it now */
-  array_reset(&cookie->request);
+  buf_reset(&cookie->request);
 
   /* If we came here, wait for the answer is over */
   if (cookie->flag & STRUCT_HTTP_FLAG_WAITINGFORTASK) {
@@ -232,7 +243,7 @@ ssize_t http_sendiovecdata(const int64 sock, struct ot_workstruct *ws, size_t io
   return 0;
 }
 
-static ssize_t http_handle_stats(const int64 sock, struct ot_workstruct *ws, char *read_ptr) {
+static ssize_t http_handle_stats(const int64_t sock, struct ot_workstruct *ws, char *read_ptr) {
   static const ot_keywords keywords_main[] = {{"mode", 1}, {"format", 2}, {"info_hash", 3}, {NULL, -3}};
   static const ot_keywords keywords_mode[] = {{"peer", TASK_STATS_PEERS},
                                               {"conn", TASK_STATS_CONNS},
@@ -263,12 +274,16 @@ static ssize_t http_handle_stats(const int64 sock, struct ot_workstruct *ws, cha
                                                 {"url", TASK_FULLSCRAPE_TPB_URLENCODED},  {"txt", TASK_FULLSCRAPE_TPB_ASCII},
                                                 {"txtp", TASK_FULLSCRAPE_TPB_ASCII_PLUS}, {NULL, -3}};
 
-  int mode = TASK_STATS_PEERS, scanon = 1, format = 0;
-
-#ifdef WANT_RESTRICT_STATS
   struct http_data *cookie = io_getcookie(sock);
+  int               mode = TASK_STATS_PEERS, scanon = 1, format = 0;
+
+  /* A socket without one is a dead socket, which is what http_sendiovecdata
+     already answers 500 to. */
+  if (!cookie)
+    HTTPERROR_500;
 
-  if (!cookie || !accesslist_is_blessed(cookie->ip, OT_PERMISSION_MAY_STAT))
+#ifdef WANT_RESTRICT_STATS
+  if (!accesslist_is_blessed(cookie->ip, OT_PERMISSION_MAY_STAT))
     HTTPERROR_403_IP;
 #endif
 
@@ -302,10 +317,9 @@ static ssize_t http_handle_stats(const int64 sock, struct ot_workstruct *ws, cha
   }
 
   if (mode == TASK_STATS_TPB) {
-    struct http_data *cookie = io_getcookie(sock);
-    tai6464           t;
+    tai6464 t;
 #ifdef WANT_COMPRESSION_GZIP
-    ws->request[ws->request_size] = 0;
+    ws->request[ws->request_size - 1] = 0;
 #ifndef WANT_COMPRESSION_GZIP_ALWAYS
     if (strstr(read_ptr - 1, "gzip")) {
 #endif
@@ -330,6 +344,9 @@ static ssize_t http_handle_stats(const int64 sock, struct ot_workstruct *ws, cha
   /* default format for now */
   if ((mode & TASK_CLASS_MASK) == TASK_STATS) {
     tai6464 t;
+
+    cookie->flag |= STRUCT_HTTP_FLAG_WAITINGFORTASK;
+
     /* Complex stats also include expensive memory debugging tools */
     taia_uint(&t, 0);
     io_timeout(sock, t);
@@ -351,7 +368,7 @@ typedef struct {
 #endif
 
 #ifdef WANT_FULLSCRAPE
-static ssize_t http_handle_fullscrape(const int64 sock, struct ot_workstruct *ws) {
+static ssize_t http_handle_fullscrape(const int64_t sock, struct ot_workstruct *ws) {
   struct http_data *cookie = io_getcookie(sock);
   int               format = 0;
   tai6464           t;
@@ -421,7 +438,7 @@ static ssize_t http_handle_fullscrape(const int64 sock, struct ot_workstruct *ws
 }
 #endif
 
-static ssize_t http_handle_scrape(const int64 sock, struct ot_workstruct *ws, char *read_ptr) {
+static ssize_t http_handle_scrape(const int64_t sock, struct ot_workstruct *ws, char *read_ptr) {
   static const ot_keywords keywords_scrape[] = {{"info_hash", 1}, {NULL, -3}};
 
   ot_hash *multiscrape_buf   = (ot_hash *)ws->request;
@@ -500,7 +517,7 @@ static ot_keywords keywords_announce[] = {{"port", 1},    {"left", 2}, {"event",
 #endif
                                           {"peer_id", 9}, {NULL, -3}};
 static ot_keywords keywords_announce_event[] = {{"completed", 1}, {"stopped", 2}, {NULL, -3}};
-static ssize_t     http_handle_announce(const int64 sock, struct ot_workstruct *ws, char *read_ptr) {
+static ssize_t     http_handle_announce(const int64_t sock, struct ot_workstruct *ws, char *read_ptr) {
   size_t            numwant;
   int               tmp, scanon;
   unsigned short    port = 0;
@@ -521,7 +538,7 @@ static ssize_t     http_handle_announce(const int64 sock, struct ot_workstruct *
   if (accesslist_is_blessed(cookie->ip, OT_PERMISSION_MAY_PROXY)) {
     ot_ip6 proxied_ip;
     char  *fwd = http_header(ws->request, ws->header_size, "x-forwarded-for");
-    if (fwd && scan_ip6(fwd, proxied_ip)) {
+    if (fwd && ip_scan(fwd, proxied_ip)) {
       OT_SETIP(ws->peer, proxied_ip);
     } else
       OT_SETIP(ws->peer, cookie->ip);
@@ -607,7 +624,7 @@ static ssize_t     http_handle_announce(const int64 sock, struct ot_workstruct *
       char *tmp_buf1 = ws->reply, *tmp_buf2 = ws->reply + 16;
       len           = scan_urlencoded_query(&read_ptr, tmp_buf2, SCAN_SEARCHPATH_VALUE);
       tmp_buf2[len] = 0;
-      if ((len <= 0) || !scan_ip6(tmp_buf2, tmp_buf1))
+      if ((len <= 0) || !ip_scan(tmp_buf2, tmp_buf1))
         HTTPERROR_400_PARAM;
       OT_SETIP(&ws->peer, tmp_buf1);
     } break;
@@ -629,7 +646,7 @@ static ssize_t     http_handle_announce(const int64 sock, struct ot_workstruct *
         loglist_reset();
         return ws->reply_size = sprintf(ws->reply, "Successfully removed.\n");
       }
-      parsed = scan_ip6(tmp_buf, net.address);
+      parsed = ip_scan(tmp_buf, net.address);
       if (!parsed)
         HTTPERROR_400_PARAM;
       if (tmp_buf[parsed++] != '/')
@@ -639,7 +656,7 @@ static ssize_t     http_handle_announce(const int64 sock, struct ot_workstruct *
         if (!parsed)
           HTTPERROR_400_PARAM;
         bits = (signed short)value;
-        if (ip6_isv4mapped(net.address))
+        if (ip_is_v4mapped(net.address))
           bits += 96;
       }
       net.bits = bits;
@@ -678,7 +695,7 @@ static ssize_t     http_handle_announce(const int64 sock, struct ot_workstruct *
   return ws->reply_size;
 }
 
-ssize_t http_handle_request(const int64 sock, struct ot_workstruct *ws) {
+ssize_t http_handle_request(const int64_t sock, struct ot_workstruct *ws) {
   ssize_t reply_off, len;
   char   *read_ptr = ws->request, *write_ptr;