[GNUnet-SVN] r23524 - in libmicrohttpd: . src/daemon

[gnunet]

Author: grothoff
Date: 2012-08-30 21:17:17 +0200 (Thu, 30 Aug 2012)
New Revision: 23524

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/daemon/connection.c
   libmicrohttpd/src/daemon/digestauth.c
   libmicrohttpd/src/daemon/postprocessor.c
   libmicrohttpd/src/daemon/response.c
Log:
fixing #2531

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2012-08-30 18:48:06 UTC (rev 23523)
+++ libmicrohttpd/ChangeLog     2012-08-30 19:17:17 UTC (rev 23524)
@@ -1,3 +1,9 @@
+Thu Aug 30 21:12:56 CEST 2012
+       Fixing URI argument parsing when string contained keys without
+       equals sign (i.e. '&bar&') in the middle of the argument (#2531).
+       Also replacing 'strstr' with more efficient 'strchr' when
+       possible. -CG
+
 Tue Aug 21 14:36:17 CEST 2012
        Use "int" instead of "enum X" in 'va_arg' calls to be nice to
        compilers that use 'short' (i.e. 8 or 16 bit) enums but pass

Modified: libmicrohttpd/src/daemon/connection.c
===================================================================
--- libmicrohttpd/src/daemon/connection.c       2012-08-30 18:48:06 UTC (rev 
23523)
+++ libmicrohttpd/src/daemon/connection.c       2012-08-30 19:17:17 UTC (rev 
23524)
@@ -1123,26 +1123,58 @@
 
   while (NULL != args)
     {
-      if (NULL == (equals = strstr (args, "=")))
+      equals = strchr (args, '=');
+      amper = strchr (args, '&');
+      if (NULL == amper)
        {
-         /* add with 'value' NULL */
+         /* last argument */
+         if (NULL == equals)
+           {
+             /* got 'foo', add key 'foo' with NULL for value */
+             connection->daemon->unescape_callback 
(connection->daemon->unescape_callback_cls,
+                                                    connection,
+                                                    args);
+             return connection_add_header (connection,
+                                           args,
+                                           NULL,
+                                           kind);            
+           }
+         /* got 'foo=bar' */
+         equals[0] = '\0';
+         equals++;
          connection->daemon->unescape_callback 
(connection->daemon->unescape_callback_cls,
                                                 connection,
                                                 args);
-         
-         return connection_add_header (connection,
-                                       args,
-                                       NULL,
-                                       kind);
+         connection->daemon->unescape_callback 
(connection->daemon->unescape_callback_cls,
+                                                connection,
+                                                equals);
+         return connection_add_header (connection, args, equals, kind);
        }
+      /* amper is non-NULL here */
+      amper[0] = '\0';
+      amper++;
+      if ( (NULL == equals) ||
+          (equals >= amper) )
+       {
+         /* got 'foo&bar' or 'foo&bar=val', add key 'foo' with NULL for value 
*/
+         connection->daemon->unescape_callback 
(connection->daemon->unescape_callback_cls,
+                                                connection,
+                                                args);
+         if (MHD_NO ==
+             connection_add_header (connection,
+                                    args,
+                                    NULL,
+                                    kind))
+           return MHD_NO;
+         /* continue with 'bar' */
+         args = amper;
+         continue;
+
+       }
+      /* equals and amper are non-NULL here, and equals < amper,
+        so we got regular 'foo=value&bar...'-kind of argument */
       equals[0] = '\0';
       equals++;
-      amper = strstr (equals, "&");
-      if (amper != NULL)
-        {
-          amper[0] = '\0';
-          amper++;
-        }
       connection->daemon->unescape_callback 
(connection->daemon->unescape_callback_cls,
                                             connection,
                                             args);
@@ -1265,14 +1297,14 @@
   char *httpVersion;
   char *args;
 
-  if (NULL == (uri = strstr (line, " ")))
+  if (NULL == (uri = strchr (line, ' ')))
     return MHD_NO;              /* serious error */
   uri[0] = '\0';
   connection->method = line;
   uri++;
   while (uri[0] == ' ')
     uri++;
-  httpVersion = strstr (uri, " ");
+  httpVersion = strchr (uri, ' ');
   if (httpVersion != NULL)
     {
       httpVersion[0] = '\0';
@@ -1283,7 +1315,7 @@
       =
       connection->daemon->uri_log_callback (connection->daemon->
                                             uri_log_callback_cls, uri);
-  args = strstr (uri, "?");
+  args = strchr (uri, '?');
   if (NULL != args)
     {
       args[0] = '\0';
@@ -1638,7 +1670,7 @@
   char *colon;
 
   /* line should be normal header line, find colon */
-  colon = strstr (line, ":");
+  colon = strchr (line, ':');
   if (colon == NULL)
     {
       /* error in header line, die hard */

Modified: libmicrohttpd/src/daemon/digestauth.c
===================================================================
--- libmicrohttpd/src/daemon/digestauth.c       2012-08-30 18:48:06 UTC (rev 
23523)
+++ libmicrohttpd/src/daemon/digestauth.c       2012-08-30 19:17:17 UTC (rev 
23524)
@@ -225,20 +225,20 @@
     return 0;
   while ('\0' != *ptr)
     {
-      if (NULL == (eq = strstr (ptr, "=")))
+      if (NULL == (eq = strchr (ptr, '=')))
        return 0;
       q1 = eq + 1;
       while (' ' == *q1)
        q1++;      
       if ('\"' != *q1)
        {
-         q2 = strstr (q1, ",");
+         q2 = strchr (q1, ',');
          qn = q2;
        }
       else
        {
          q1++;
-         q2 = strstr (q1, "\"");
+         q2 = strchr (q1, '\"');
          if (NULL == q2)
            return 0; /* end quote not found */
          qn = q2 + 1;
@@ -274,7 +274,7 @@
        }
       if (NULL == qn)
        return 0;
-      ptr = strstr (qn, ",");
+      ptr = strchr (qn, ',');
       if (NULL == ptr)
        return 0;
       ptr++;
@@ -490,7 +490,7 @@
   while ( (argp != NULL) &&
          (argp[0] != '\0') )
     {
-      equals = strstr (argp, "=");
+      equals = strchr (argp, '=');
       if (equals == NULL) 
        {         
          /* add with 'value' NULL */
@@ -504,7 +504,7 @@
        }
       equals[0] = '\0';
       equals++;
-      amper = strstr (equals, "&");
+      amper = strchr (equals, '&');
       if (amper != NULL)
        {
          amper[0] = '\0';
@@ -639,7 +639,7 @@
       return MHD_NO;
     }
     {
-      const char *args = strstr (uri, "?");
+      const char *args = strchr (uri, '?');
       if (args == NULL)
        args = "";
       else
@@ -830,7 +830,7 @@
       return NULL;
     }
   /* Find user:password pattern */
-  separator = strstr(decode, ":");
+  separator = strchr (decode, ':');
   if (separator == NULL) 
     {
 #if HAVE_MESSAGES

Modified: libmicrohttpd/src/daemon/postprocessor.c
===================================================================
--- libmicrohttpd/src/daemon/postprocessor.c    2012-08-30 18:48:06 UTC (rev 
23523)
+++ libmicrohttpd/src/daemon/postprocessor.c    2012-08-30 19:17:17 UTC (rev 
23524)
@@ -539,7 +539,7 @@
         }
       if (spos[klen + 1] != '"')
         return;                 /* not quoted */
-      if (NULL == (endv = strstr (&spos[klen + 2], "\"")))
+      if (NULL == (endv = strchr (&spos[klen + 2], '\"')))
         return;                 /* no end-quote */
       vlen = endv - spos - klen - 1;
       *destination = malloc (vlen);

Modified: libmicrohttpd/src/daemon/response.c
===================================================================
--- libmicrohttpd/src/daemon/response.c 2012-08-30 18:48:06 UTC (rev 23523)
+++ libmicrohttpd/src/daemon/response.c 2012-08-30 19:17:17 UTC (rev 23524)
@@ -50,12 +50,12 @@
        (NULL == content) ||
        (0 == strlen (header)) ||
        (0 == strlen (content)) ||
-       (NULL != strstr (header, "\t")) ||
-       (NULL != strstr (header, "\r")) ||
-       (NULL != strstr (header, "\n")) ||
-       (NULL != strstr (content, "\t")) ||
-       (NULL != strstr (content, "\r")) || 
-       (NULL != strstr (content, "\n")) )
+       (NULL != strchr (header, '\t')) ||
+       (NULL != strchr (header, '\r')) ||
+       (NULL != strchr (header, '\n')) ||
+       (NULL != strchr (content, '\t')) ||
+       (NULL != strchr (content, '\r')) || 
+       (NULL != strchr (content, '\n')) )
     return MHD_NO;
   if (NULL == (hdr = malloc (sizeof (struct MHD_HTTP_Header))))
     return MHD_NO;