/*
- * $Id: paramhandling.c 6808 2008-12-11 00:00:36Z dothebart $
- *
* parse urlparts and post data
+ *
+ * Copyright (c) 1996-2011 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 as
+ * published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "webcit.h"
}
keylen = aptr - up - 1; /* -1 -> '=' */
if(keylen > sizeof(u->url_key)) {
- lprintf(1, "URLkey to long! [%s]", up);
+ syslog(1, "URLkey to long! [%s]", up);
continue;
}
memcpy(u->url_key, up, keylen);
u->url_key[keylen] = '\0';
if (keylen < 0) {
- lprintf(1, "URLkey to long! [%s]", up);
+ syslog(1, "URLkey to long! [%s]", up);
free(u);
continue;
}
-
- Put(WCC->Hdr->urlstrings, u->url_key, keylen, u, free_url);
- len = bptr - aptr;
- u->url_data = NewStrBufPlain(aptr, len);
- StrBufUnescape(u->url_data, 1);
-
- up = bptr;
- ++up;
+
+ if (strncmp(u->url_key, "__", 2) != 0)
+ {
+ Put(WCC->Hdr->urlstrings, u->url_key, keylen, u, free_url);
+ len = bptr - aptr;
+ u->url_data = NewStrBufPlain(aptr, len);
+ StrBufUnescape(u->url_data, 1);
#ifdef DEBUG_URLSTRINGS
- lprintf(9, "%s = [%ld] %s\n",
- u->url_key,
- StrLength(u->url_data),
- ChrPtr(u->url_data));
+ syslog(9, "%s = [%d] %s\n",
+ u->url_key,
+ StrLength(u->url_data),
+ ChrPtr(u->url_data));
#endif
+ }
+ else {
+ 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",
+ u->url_key,
+ StrLength(u->url_data),
+ ChrPtr(u->url_data));
+
+ free_url(u);
+ }
+ up = bptr;
+ ++up;
}
}
{
wcsession *WCC = WC;
urlcontent *u;
+ long keylen;
+
#ifdef DEBUG_URLSTRINGS
- lprintf(9, "upload_handler() name=%s, type=%s, len=%d\n", name, cbtype, length);
+ syslog(9, "upload_handler() name=%s, type=%s, len=%d", name, cbtype, length);
#endif
if (WCC->Hdr->urlstrings == NULL)
WCC->Hdr->urlstrings = NewHash(1, NULL);
if ( (length > 0) && (IsEmptyStr(cbtype)) ) {
u = (urlcontent *) malloc(sizeof(urlcontent));
- safestrncpy(u->url_key, name, sizeof(u->url_key));
+ keylen = safestrncpy(u->url_key, name, sizeof(u->url_key));
u->url_data = NewStrBufPlain(content, length);
- Put(WCC->Hdr->urlstrings, u->url_key, strlen(u->url_key), u, free_url);
+ if (strncmp(u->url_key, "__", 2) != 0)
+ {
+ Put(WCC->Hdr->urlstrings, u->url_key, keylen, u, free_url);
+ }
+ else {
+ syslog(1, "REJECTED because of __ is internal only: %s = [%d] %s\n",
+ u->url_key,
+ StrLength(u->url_data),
+ ChrPtr(u->url_data));
+
+ free_url(u);
+ }
#ifdef DEBUG_URLSTRINGS
- lprintf(9, "Key: <%s> len: [%ld] Data: <%s>\n",
+ syslog(9, "Key: <%s> len: [%d] Data: <%s>",
u->url_key,
StrLength(u->url_data),
ChrPtr(u->url_data));
#endif
}
- /** Uploaded files */
+ /* Uploaded files */
if ( (length > 0) && (!IsEmptyStr(cbtype)) ) {
WCC->upload = NewStrBufPlain(content, length);
WCC->upload_length = length;
- safestrncpy(WCC->upload_filename, filename,
- sizeof(WC->upload_filename));
- safestrncpy(WCC->upload_content_type, cbtype,
- sizeof(WC->upload_content_type));
+ 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);
+#endif
}
urlcontent *u;
if(keylen > sizeof(u->url_key)) {
- lprintf(1, "URLkey to long! [%s]", key);
+ syslog(1, "URLkey to long! [%s]", key);
FreeStrBuf(&Value);
return;
}
if(TP->Tokens->nParameters == 3)
return HaveBstr(TKEY(2));
else {
- if (TP->Tokens->Params[3]->Type == TYPE_LONG)
- return LBstr(TKEY(2)) == TP->Tokens->Params[3]->lvalue;
- else
- return strcmp(Bstr(TKEY(2)),
- TP->Tokens->Params[3]->Start) == 0;
+ if (IS_NUMBER(TP->Tokens->Params[3]->Type))
+ {
+ return LBstr(TKEY(2)) ==
+ GetTemplateTokenNumber(Target,
+ TP,
+ 3,
+ 0);
+ }
+ else {
+ const char *pch;
+ long len;
+
+ GetTemplateTokenString (Target, TP, 3, &pch, &len);
+ return strcmp(Bstr(TKEY(2)), pch) == 0;
+ }
}
}
StrBufAppendTemplate(Target, TP, Buf, 1);
}
+
+void tmplput_bstrforward(StrBuf *Target, WCTemplputParams *TP)
+{
+ const StrBuf *Buf = SBstr(TKEY(0));
+ if (Buf != NULL) {
+ StrBufAppendBufPlain(Target, HKEY("?"), 0);
+ StrBufAppendBufPlain(Target, TKEY(0), 0);
+ StrBufAppendBufPlain(Target, HKEY("="), 0);
+ StrBufAppendTemplate(Target, TP, Buf, 1);
+ }
+}
+
void diagnostics(void)
{
output_headers(1, 1, 1, 0, 0, 0);
wc_printf("Session: %d<hr />\n", WC->wc_session);
- wc_printf("Command: <br /><PRE>\n");
+ wc_printf("Command: <br><PRE>\n");
/*
StrEscPuts(WC->UrlFragment1);
- wc_printf("<br />\n");
+ wc_printf("<br>\n");
StrEscPuts(WC->UrlFragment2);
- wc_printf("<br />\n");
+ wc_printf("<br>\n");
StrEscPuts(WC->UrlFragment3);
*/
wc_printf("</PRE><hr />\n");
- wc_printf("Variables: <br /><PRE>\n");
+ wc_printf("Variables: <br><PRE>\n");
dump_vars();
wc_printf("</PRE><hr />\n");
wDumpContent(1);
wcsession *WCC = WC;
if (WCC != NULL) {
- if (TP->Tokens->Params[0]->lvalue == 0) {
+ long n;
+
+ n = GetTemplateTokenNumber(Target, TP, 0, 0);
+ if (n == 0) {
if (WCC->Hdr->HR.Handler != NULL)
UrlBuf = Name = WCC->Hdr->HR.Handler->Name;
}
- else if (TP->Tokens->Params[0]->lvalue == 1) {
+ else if (n == 1) {
UrlBuf = NewStrBuf();
StrBufExtract_token(UrlBuf, WCC->Hdr->HR.ReqLine, 0, '/');
}
RegisterConditional(HKEY("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);
}
(wcsession *sess)
{
DeleteHash(&sess->Hdr->urlstrings);
+ FreeStrBuf(&sess->upload_filename);
}