Adjusted paramhandling to accept parameters with empty values (which is legal)

[citadel.git] / webcit / paramhandling.c

diff --git a/webcit/paramhandling.c b/webcit/paramhandling.c
index f5cc22bbc3faefbd0b19e27b3223395d6f1708c0..f7d1a325d21fd85b83c02b83449628411b2814ec 100644 (file)
--- a/webcit/paramhandling.c
+++ b/webcit/paramhandling.c
@@ -1,7 +1,7 @@
 /*
  * parse urlparts and post data
  *
- * Copyright (c) 1996-2012 by the citadel.org team
+ * Copyright (c) 1996-2013 by the citadel.org team
  *
  * This program is open source software.  You can redistribute it and/or
  * modify it under the terms of the GNU General Public License, version 3.
@@ -15,6 +15,10 @@
 #include "webcit.h"
 #include "webserver.h"
 
+/* uncomment to see all parameters sent to the server by the browser. */
+/* #define DEBUG_URLSTRINGS */
+
+
 void free_url(void *U)
 {
        urlcontent *u = (urlcontent*) U;
@@ -27,19 +31,21 @@ void free_url(void *U)
  */
 void ParseURLParams(StrBuf *url)
 {
-       const char *aptr, *bptr, *eptr, *up;
-       int len, keylen;
-       urlcontent *u;
+       const char *aptr, *bptr, *eptr, *up = NULL;
+       int len, keylen = 0;
+       urlcontent *u = NULL;
        wcsession *WCC = WC;
 
-       if (WCC->Hdr->urlstrings == NULL)
+       if (WCC->Hdr->urlstrings == NULL) {
                WCC->Hdr->urlstrings = NewHash(1, NULL);
+       }
        eptr = ChrPtr(url) + StrLength(url);
        up = ChrPtr(url);
        while ((up < eptr) && (!IsEmptyStr(up))) {
                aptr = up;
-               while ((aptr < eptr) && (*aptr != '\0') && (*aptr != '='))
+               while ((aptr < eptr) && (*aptr != '\0') && (*aptr != '=')) {
                        aptr++;
+               }
                if (*aptr != '=') {
                        return;
                }
@@ -50,16 +56,17 @@ void ParseURLParams(StrBuf *url)
                        bptr++;
                }
                keylen = aptr - up - 1; /* -1 -> '=' */
-               if(keylen >= sizeof(u->url_key)) {
-                       syslog(1, "invalid url_key from %s", ChrPtr(WCC->Hdr->HR.browser_host));
-                       return;
+               if (keylen > sizeof(u->url_key)) {
+                       syslog(LOG_WARNING, "%s:%d: invalid url_key of size %d in string size %d",
+                               __FILE__, __LINE__, keylen, sizeof(u->url_key)
+                       );
                }
 
                u = (urlcontent *) malloc(sizeof(urlcontent));
                memcpy(u->url_key, up, keylen);
                u->url_key[keylen] = '\0';
                if (keylen < 0) {
-                       syslog(1, "invalid url_key from %s", ChrPtr(WCC->Hdr->HR.browser_host));
+                       syslog(LOG_WARNING, "%s:%d: invalid url_key of size %d", __FILE__, __LINE__, keylen);
                        free(u);
                        return;
                }
@@ -71,7 +78,7 @@ void ParseURLParams(StrBuf *url)
                        u->url_data = NewStrBufPlain(aptr, len);
                        StrBufUnescape(u->url_data, 1);
 #ifdef DEBUG_URLSTRINGS
-                       syslog(9, "%s = [%d]  %s\n", 
+                       syslog(LOG_DEBUG, "%s = [%d]  %s\n", 
                                u->url_key, 
                                StrLength(u->url_data), 
                                ChrPtr(u->url_data)); 
@@ -81,7 +88,7 @@ void ParseURLParams(StrBuf *url)
                        len = bptr - aptr;
                        u->url_data = NewStrBufPlain(aptr, len);
                        StrBufUnescape(u->url_data, 1);
-                       syslog(1, "REJECTED because of __ is internal only: %s = [%d]  %s\n", 
+                       syslog(LOG_WARNING, "REJECTED because of __ is internal only: %s = [%d]  %s\n", 
                                u->url_key, 
                                StrLength(u->url_data), 
                                ChrPtr(u->url_data)); 
@@ -318,7 +325,7 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp,
        long keylen;
 
 #ifdef DEBUG_URLSTRINGS
-       syslog(9, "upload_handler() name=%s, type=%s, len="SIZE_T_FMT, name, cbtype, length);
+       syslog(LOG_DEBUG, "upload_handler() name=%s, type=%s, len="SIZE_T_FMT, name, cbtype, length);
 #endif
        if (WCC->Hdr->urlstrings == NULL)
                WCC->Hdr->urlstrings = NewHash(1, NULL);
@@ -335,7 +342,7 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp,
                        Put(WCC->Hdr->urlstrings, u->url_key, keylen, u, free_url);
                }
                else {
-                       syslog(1, "REJECTED because of __ is internal only: %s = [%d]  %s\n", 
+                       syslog(LOG_INFO, "REJECTED because of __ is internal only: %s = [%d]  %s\n", 
                                u->url_key, 
                                StrLength(u->url_data), 
                                ChrPtr(u->url_data)); 
@@ -343,7 +350,7 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp,
                        free_url(u);
                }
 #ifdef DEBUG_URLSTRINGS
-               syslog(9, "Key: <%s> len: [%d] Data: <%s>", 
+               syslog(LOG_DEBUG, "Key: <%s> len: [%d] Data: <%s>", 
                        u->url_key, 
                        StrLength(u->url_data), 
                        ChrPtr(u->url_data));
@@ -357,7 +364,7 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp,
                WCC->upload_filename = NewStrBufPlain(filename, -1);
                safestrncpy(WCC->upload_content_type, cbtype, sizeof(WC->upload_content_type));
 #ifdef DEBUG_URLSTRINGS
-               syslog(9, "File: <%s> len: [%ld]", filename, length);
+               syslog(LOG_DEBUG, "File: <%s> len: [%ld]", filename, (long int)length);
 #endif
                
        }
@@ -367,10 +374,9 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp,
 void PutBstr(const char *key, long keylen, StrBuf *Value)
 {
        urlcontent *u;
-       wcsession *WCC = WC;
 
        if(keylen >= sizeof(u->url_key)) {
-               syslog(1, "invalid url_key from %s", ChrPtr(WCC->Hdr->HR.browser_host));
+               syslog(LOG_WARNING, "%s:%d: invalid url_key of size %ld", __FILE__, __LINE__, keylen);
                FreeStrBuf(&Value);
                return;
        }