5 files changed, 121 insertions, 41 deletions

diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index e06ae993..4fe66805 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -1,6 +1,6 @@
 /*
      This file is part of libmicrohttpd
-     Copyright (C) 2007-2017 Daniel Pittman and Christian Grothoff
+     Copyright (C) 2007-2019 Daniel Pittman and Christian Grothoff
 
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Lesser General Public
@@ -706,7 +706,8 @@ MHD_get_connection_values (struct MHD_Connection *connection,
              (MHD_YES != iterator (iterator_cls,
                                    pos->kind,
                                    pos->header,
-                                   pos->value)) )
+                                   pos->value,
+                                   pos->value_size)) )
           return ret;
       }
   return ret;
@@ -733,16 +734,18 @@ MHD_get_connection_values (struct MHD_Connection *connection,
  * @param kind kind of the value
  * @param key key for the value
  * @param value the value itself
+ * @param value_size number of bytes in @a value
  * @return #MHD_NO if the operation could not be
  *         performed due to insufficient memory;
  *         #MHD_YES on success
  * @ingroup request
  */
 int
-MHD_set_connection_value (struct MHD_Connection *connection,
-                          enum MHD_ValueKind kind,
-                          const char *key,
-                          const char *value)
+MHD_set_connection_value2 (struct MHD_Connection *connection,
+                           enum MHD_ValueKind kind,
+                           const char *key,
+                           const char *value,
+                           size_t value_size)
 {
   struct MHD_HTTP_Header *pos;
 
@@ -753,6 +756,7 @@ MHD_set_connection_value (struct MHD_Connection *connection,
     return MHD_NO;
   pos->header = (char *) key;
   pos->value = (char *) value;
+  pos->value_size = value_size;
   pos->kind = kind;
   pos->next = NULL;
   /* append 'pos' to the linked list of headers */
@@ -771,6 +775,47 @@ MHD_set_connection_value (struct MHD_Connection *connection,
 
 
 /**
+ * This function can be used to add an entry to the HTTP headers of a
+ * connection (so that the #MHD_get_connection_values function will
+ * return them -- and the `struct MHD_PostProcessor` will also see
+ * them).  This maybe required in certain situations (see Mantis
+ * #1399) where (broken) HTTP implementations fail to supply values
+ * needed by the post processor (or other parts of the application).
+ *
+ * This function MUST only be called from within the
+ * #MHD_AccessHandlerCallback (otherwise, access maybe improperly
+ * synchronized).  Furthermore, the client must guarantee that the key
+ * and value arguments are 0-terminated strings that are NOT freed
+ * until the connection is closed.  (The easiest way to do this is by
+ * passing only arguments to permanently allocated strings.).
+ *
+ * @param connection the connection for which a
+ *  value should be set
+ * @param kind kind of the value
+ * @param key key for the value
+ * @param value the value itself
+ * @return #MHD_NO if the operation could not be
+ *         performed due to insufficient memory;
+ *         #MHD_YES on success
+ * @ingroup request
+ */
+int
+MHD_set_connection_value (struct MHD_Connection *connection,
+                          enum MHD_ValueKind kind,
+                          const char *key,
+                          const char *value)
+{
+  return MHD_set_connection_value2 (connection,
+                                    kind,
+                                    key,
+                                    value,
+                                    NULL != value
+                                    ? strlen (value)
+                                    : 0);
+}
+
+
+/**
  * Get a particular header value.  If multiple
  * values match the kind, return any one of them.
  *
@@ -2061,19 +2106,22 @@ get_next_header_line (struct MHD_Connection *connection,
  * @param kind kind of the value
  * @param key key for the value
  * @param value the value itself
+ * @param value_size number of bytes in @a value
  * @return #MHD_NO on failure (out of memory), #MHD_YES for success
  */
 static int
 connection_add_header (struct MHD_Connection *connection,
                        const char *key,
                        const char *value,
+                       size_t value_size,
                        enum MHD_ValueKind kind)
 {
   if (MHD_NO ==
-      MHD_set_connection_value (connection,
-                                kind,
-                                key,
-                                value))
+      MHD_set_connection_value2 (connection,
+                                 kind,
+                                 key,
+                                 value,
+                                 value_size))
     {
 #ifdef HAVE_MESSAGES
       MHD_DLOG (connection->daemon,
@@ -2104,6 +2152,7 @@ parse_cookie_header (struct MHD_Connection *connection)
   char *semicolon;
   char *equals;
   char *ekill;
+  char *end;
   char old;
   int quotes;
 
@@ -2155,6 +2204,7 @@ parse_cookie_header (struct MHD_Connection *connection)
               connection_add_header (connection,
                                      pos,
                                      "",
+                                     0,
                                      MHD_COOKIE_KIND))
             return MHD_NO;
           if (old == '\0')
@@ -2174,6 +2224,7 @@ parse_cookie_header (struct MHD_Connection *connection)
             quotes = (quotes + 1) & 1;
           semicolon++;
         }
+      end = semicolon;
       if ('\0' == semicolon[0])
         semicolon = NULL;
       if (NULL != semicolon)
@@ -2183,15 +2234,17 @@ parse_cookie_header (struct MHD_Connection *connection)
         }
       /* remove quotes */
       if ( ('"' == equals[0]) &&
-           ('"' == equals[strlen (equals) - 1]) )
+           ('"' == end[-1]) )
         {
-          equals[strlen (equals) - 1] = '\0';
           equals++;
+          end--;
+          *end = '\0';
         }
       if (MHD_NO ==
           connection_add_header (connection,
                                  pos,
                                  equals,
+                                 end - equals,
                                  MHD_COOKIE_KIND))
         return MHD_NO;
       pos = semicolon;
@@ -2257,7 +2310,7 @@ parse_initial_message_line (struct MHD_Connection *connection,
         http_version--;
       if (http_version > uri)
         {
-          /* http_version points to string before HTTP version string */
+          /* http_version points to character before HTTP version string */
           http_version[0] = '\0';
           connection->version = http_version + 1;
           uri_len = http_version - uri;
@@ -2277,24 +2330,21 @@ parse_initial_message_line (struct MHD_Connection *connection,
           return MHD_NO;
         }
 
-      /* unescape URI before searching for arguments */
-      daemon->unescape_callback (daemon->unescape_callback_cls,
-                                 connection,
-                                 uri);
-      uri_len = strlen (uri); /* recalculate: may have changed! */
       args = memchr (uri,
                      '?',
                      uri_len);
     }
 
+  /* log callback before we modify URI *or* args */
   if (NULL != daemon->uri_log_callback)
     {
       connection->client_aware = true;
       connection->client_context
         = daemon->uri_log_callback (daemon->uri_log_callback_cls,
-                                    curi,
+                                    uri,
                                     connection);
     }
+  
   if (NULL != args)
     {
       args[0] = '\0';
@@ -2306,6 +2356,12 @@ parse_initial_message_line (struct MHD_Connection *connection,
                             &connection_add_header,
                             &unused_num_headers);
     }
+  
+  /* unescape URI *after* searching for arguments and log callback */
+  if (NULL != uri)
+    daemon->unescape_callback (daemon->unescape_callback_cls,
+                               connection,
+                               uri);
   connection->url = curi;
   return MHD_YES;
 }
@@ -2708,16 +2764,20 @@ process_broken_line (struct MHD_Connection *connection,
                                    REQUEST_TOO_BIG);
           return MHD_NO;
         }
-      memcpy (&last[last_len], tmp, tmp_len + 1);
+      memcpy (&last[last_len],
+              tmp,
+              tmp_len + 1);
       connection->last = last;
       return MHD_YES;           /* possibly more than 2 lines... */
     }
   mhd_assert ( (NULL != last) &&
                 (NULL != connection->colon) );
-  if ((MHD_NO == connection_add_header (connection,
-                                        last,
-                                        connection->colon,
-                                        kind)))
+  if (MHD_NO ==
+      connection_add_header (connection,
+                             last,
+                             connection->colon,
+                             strlen (connection->colon),
+                             kind))
     {
       transmit_error_response (connection,
                                MHD_HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE,
diff --git a/src/microhttpd/digestauth.c b/src/microhttpd/digestauth.c
index d4e23fef..8f04bf38 100644
--- a/src/microhttpd/digestauth.c
+++ b/src/microhttpd/digestauth.c
@@ -732,6 +732,7 @@ calculate_nonce (uint32_t nonce_time,
  * @param connection the connection
  * @param key the key
  * @param value the value, can be NULL
+ * @param value_size number of bytes in @a value
  * @param kind type of the header
  * @return #MHD_YES if the key-value pair is in the headers,
  *         #MHD_NO if not
@@ -740,6 +741,7 @@ static int
 test_header (struct MHD_Connection *connection,
              const char *key,
              const char *value,
+             size_t value_size,
              enum MHD_ValueKind kind)
 {
   struct MHD_HTTP_Header *pos;
@@ -748,6 +750,8 @@ test_header (struct MHD_Connection *connection,
     {
       if (kind != pos->kind)
         continue;
+      if (value_size != pos->value_size)
+        continue;
       if (0 != strcmp (key,
                        pos->header))
         continue;
@@ -756,8 +760,9 @@ test_header (struct MHD_Connection *connection,
         return MHD_YES;
       if ( (NULL == value) ||
            (NULL == pos->value) ||
-           (0 != strcmp (value,
-                         pos->value)) )
+           (0 != memcmp (value,
+                         pos->value,
+                         value_size)) )
         continue;
       return MHD_YES;
     }
@@ -862,6 +867,7 @@ digest_auth_check_all (struct MHD_Connection *connection,
   uint32_t t;
   size_t left; /* number of characters left in 'header' for 'uri' */
   uint64_t nci;
+  char *qmark;
 
   VLA_CHECK_LEN_DIGEST(da->digest_size);
   header = MHD_lookup_connection_value (connection,
@@ -1072,15 +1078,17 @@ digest_auth_check_all (struct MHD_Connection *connection,
                           uri,
                           hentity,
                           da);
-
+    qmark = strchr (uri,
+                    '?');
+    if (NULL != qmark)
+      *qmark = '\0';
 
     /* Need to unescape URI before comparing with connection->url */
     daemon->unescape_callback (daemon->unescape_callback_cls,
                                connection,
                                uri);
-    if (0 != strncmp (uri,
-                      connection->url,
-                      strlen (connection->url)))
+    if (0 != strcmp (uri,
+                     connection->url))
     {
 #ifdef HAVE_MESSAGES
       MHD_DLOG (daemon,
@@ -1091,8 +1099,7 @@ digest_auth_check_all (struct MHD_Connection *connection,
     }
 
     {
-      const char *args = strchr (uri,
-                                 '?');
+      const char *args = qmark;
 
       if (NULL == args)
         args = "";
diff --git a/src/microhttpd/internal.c b/src/microhttpd/internal.c
index d2532c54..8e9e0aac 100644
--- a/src/microhttpd/internal.c
+++ b/src/microhttpd/internal.c
@@ -162,7 +162,7 @@ MHD_http_unescape (char *val)
         }
     }
   *wpos = '\0'; /* add 0-terminator */
-  return wpos - val; /* = strlen(val) */
+  return wpos - val;
 }
 
 
@@ -190,6 +190,7 @@ MHD_parse_arguments_ (struct MHD_Connection *connection,
   struct MHD_Daemon *daemon = connection->daemon;
   char *equals;
   char *amper;
+  size_t len;
 
   *num_headers = 0;
   while ( (NULL != args) &&
@@ -210,6 +211,7 @@ MHD_parse_arguments_ (struct MHD_Connection *connection,
               if (MHD_YES != cb (connection,
                                  args,
                                  NULL,
+                                 0,
                                  kind))
                 return MHD_NO;
               (*num_headers)++;
@@ -223,12 +225,13 @@ MHD_parse_arguments_ (struct MHD_Connection *connection,
                                      connection,
                                      args);
           MHD_unescape_plus (equals);
-          daemon->unescape_callback (daemon->unescape_callback_cls,
-                                     connection,
-                                     equals);
+          len = daemon->unescape_callback (daemon->unescape_callback_cls,
+                                           connection,
+                                           equals);
           if (MHD_YES != cb (connection,
                              args,
                              equals,
+                             len,
                              kind))
             return MHD_NO;
           (*num_headers)++;
@@ -248,6 +251,7 @@ MHD_parse_arguments_ (struct MHD_Connection *connection,
           if (MHD_YES != cb (connection,
                              args,
                              NULL,
+                             0,
                              kind))
             return MHD_NO;
           /* continue with 'bar' */
@@ -264,12 +268,13 @@ MHD_parse_arguments_ (struct MHD_Connection *connection,
                                  connection,
                                  args);
       MHD_unescape_plus (equals);
-      daemon->unescape_callback (daemon->unescape_callback_cls,
-                                 connection,
-                                 equals);
+      len = daemon->unescape_callback (daemon->unescape_callback_cls,
+                                       connection,
+                                       equals);
       if (MHD_YES != cb (connection,
                          args,
                          equals,
+                         len,
                          kind))
         return MHD_NO;
       (*num_headers)++;
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h
index d09de610..f77ebd10 100644
--- a/src/microhttpd/internal.h
+++ b/src/microhttpd/internal.h
@@ -276,6 +276,11 @@ struct MHD_HTTP_Header
   char *value;
 
   /**
+   * Number of bytes in @a value.
+   */
+  size_t value_size;
+
+  /**
    * Type of the header (where in the HTTP protocol is this header
    * from).
    */
@@ -1881,7 +1886,8 @@ MHD_unescape_plus (char *arg);
  *
  * @param connection context of the iteration
  * @param key 0-terminated key string, never NULL
- * @param value 0-terminated value string, may be NULL
+ * @param value 0-terminated binary data, may include binary zeros, may be NULL
+ * @param value_size number of bytes in value
  * @param kind origin of the key-value pair
  * @return #MHD_YES on success (continue to iterate)
  *         #MHD_NO to signal failure (and abort iteration)
@@ -1890,6 +1896,7 @@ typedef int
 (*MHD_ArgumentIterator_)(struct MHD_Connection *connection,
                          const char *key,
                          const char *value,
+                         size_t value_size,
                          enum MHD_ValueKind kind);
 
 
diff --git a/src/microhttpd/response.c b/src/microhttpd/response.c
index 263f8303..9f328eef 100644
--- a/src/microhttpd/response.c
+++ b/src/microhttpd/response.c
@@ -240,7 +240,8 @@ MHD_get_response_headers (struct MHD_Response *response,
           (MHD_YES != iterator (iterator_cls,
                                 pos->kind,
                                 pos->header,
-                                pos->value)))
+                                pos->value,
+                                pos->value_size)))
         break;
     }
   return numHeaders;