URL-Parsing: fix off by one when checking the length of URL params

[citadel.git] / webcit / paramhandling.c

diff --git a/webcit/paramhandling.c b/webcit/paramhandling.c
index 453ac052a065408706613c801470dd1767ffa260..9db69f7e78791ab4b7072958b0fa1d696c2626fb 100644 (file)
--- a/webcit/paramhandling.c
+++ b/webcit/paramhandling.c
@@ -5,17 +5,11 @@
  *
  * 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.
- * 
- * 
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * 
- * 
- * 
  */
 
 #include "webcit.h"
@@ -56,18 +50,18 @@ void ParseURLParams(StrBuf *url)
                        bptr++;
                }
                keylen = aptr - up - 1; /* -1 -> '=' */
-               if(keylen > sizeof(u->url_key)) {
-                       syslog(1, "URLkey to long! [%s]", up);
-                       continue;
+               if(keylen >= sizeof(u->url_key)) {
+                       syslog(1, "invalid url_key from %s", ChrPtr(WCC->Hdr->HR.browser_host));
+                       return;
                }
 
                u = (urlcontent *) malloc(sizeof(urlcontent));
                memcpy(u->url_key, up, keylen);
                u->url_key[keylen] = '\0';
                if (keylen < 0) {
-                       syslog(1, "URLkey to long! [%s]", up);
+                       syslog(1, "invalid url_key from %s", ChrPtr(WCC->Hdr->HR.browser_host));
                        free(u);
-                       continue;
+                       return;
                }
                
                if (strncmp(u->url_key, "__", 2) != 0)
@@ -375,9 +369,10 @@ 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, "URLkey to long! [%s]", key);
+       if(keylen >= sizeof(u->url_key)) {
+               syslog(1, "invalid url_key from %s", ChrPtr(WCC->Hdr->HR.browser_host));
                FreeStrBuf(&Value);
                return;
        }
@@ -482,14 +477,88 @@ void tmplput_url_part(StrBuf *Target, WCTemplputParams *TP)
        }
 }
 
+typedef struct __BstrPair {
+       StrBuf *x;
+       StrBuf *y;
+}BstrPair;
+CtxType CTX_BSTRPAIRS = CTX_NONE;
+void HFreeBstrPair(void *pv)
+{
+       BstrPair *p = (BstrPair*) pv;
+       FreeStrBuf(&p->x);
+       FreeStrBuf(&p->y);
+       free(pv);
+}
+
+HashList *iterate_GetBstrPairs(StrBuf *Target, WCTemplputParams *TP)
+{
+       StrBuf *X, *Y;
+        const char *ch = NULL;
+        long len;
+       const StrBuf *TheBStr;
+       BstrPair *OnePair;
+        HashList *List;
+       const char *Pos = NULL;
+       int i = 0;
+
+       if (HaveTemplateTokenString(NULL, TP, 2, &ch, &len))
+        {
+                GetTemplateTokenString(Target, TP, 2, &ch, &len);
+        }
+       else 
+       {
+               return NULL;
+       }
+
+       TheBStr = SBstr(ch, len);
+       if ((TheBStr == NULL) || (StrLength(TheBStr) == 0))
+               return NULL;
+       List = NewHash(1, NULL);
+       while (Pos != StrBufNOTNULL)
+       {
+               X = NewStrBufPlain(NULL, StrLength(TheBStr));
+               StrBufExtract_NextToken(X, TheBStr, &Pos, '|');
+               if (Pos == StrBufNOTNULL) {
+                       FreeStrBuf(&X);
+                       DeleteHash(&List);
+                       return NULL;
+               }
+               Y = NewStrBufPlain(NULL, StrLength(TheBStr));
+               StrBufExtract_NextToken(Y, TheBStr, &Pos, '|');
+               OnePair = (BstrPair*)malloc(sizeof(BstrPair));
+               OnePair->x = X;
+               OnePair->y = Y;
+               Put(List, IKEY(i), OnePair, HFreeBstrPair);
+               i++;
+       }
+       return List;
+}
+
+
+void tmplput_bstr_pair(StrBuf *Target, WCTemplputParams *TP, int XY)
+{
+       BstrPair *Pair = (BstrPair*) CTX(CTX_BSTRPAIRS);
+
+       StrBufAppendTemplate(Target, TP, (XY)?Pair->y:Pair->x, 0);
+}
+
+void tmplput_bstr_pair_x(StrBuf *Target, WCTemplputParams *TP)
+{      tmplput_bstr_pair(Target, TP, 0); }
+void tmplput_bstr_pair_y(StrBuf *Target, WCTemplputParams *TP)
+{      tmplput_bstr_pair(Target, TP, 1); }
 
 void 
 InitModule_PARAMHANDLING
 (void)
 {
+       RegisterCTX(CTX_BSTRPAIRS);
        WebcitAddUrlHandler(HKEY("diagnostics"), "", 0, diagnostics, NEED_URL);
 
-       RegisterConditional(HKEY("COND:BSTR"), 1, ConditionalBstr, CTX_NONE);
+       RegisterIterator("ITERATE:BSTR:PAIR", 1, NULL, iterate_GetBstrPairs, NULL, DeleteHash, CTX_BSTRPAIRS, CTX_NONE, IT_NOFLAG);
+       RegisterNamespace("BSTR:PAIR:X", 1, 2, tmplput_bstr_pair_x, NULL, CTX_BSTRPAIRS);
+       RegisterNamespace("BSTR:PAIR:Y", 1, 2, tmplput_bstr_pair_y, NULL, CTX_BSTRPAIRS);
+
+       RegisterConditional("COND:BSTR", 1, ConditionalBstr, CTX_NONE);
        RegisterNamespace("BSTR", 1, 2, tmplput_bstr, NULL, CTX_NONE);
        RegisterNamespace("BSTR:FORWARD", 1, 2, tmplput_bstrforward, NULL, CTX_NONE);
        RegisterNamespace("URLPART", 1, 2, tmplput_url_part, NULL, CTX_NONE);