X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fparamhandling.c;h=8b36c277e39d2463049a6ddb35a276e19a7da85f;hb=06189cea8146e80cbb594c3ee0facb462c8953c1;hp=2a9848e36adec1e6e59f6aee8c86f12a3fe9f6a9;hpb=8e165dd308679f195af8614d62dbdb4e43238495;p=citadel.git

diff --git a/webcit/paramhandling.c b/webcit/paramhandling.c
index 2a9848e36..8b36c277e 100644
--- a/webcit/paramhandling.c
+++ b/webcit/paramhandling.c
@@ -1,6 +1,4 @@
 /*
- * $Id: paramhandling.c 6808 2008-12-11 00:00:36Z dothebart $
- *
  * parse urlparts and post data
  */
 
@@ -55,20 +53,33 @@ void ParseURLParams(StrBuf *url)
 			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)); 
+			lprintf(9, "%s = [%ld]  %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);
+			lprintf(1, "REJECTED because of __ is internal only: %s = [%ld]  %s\n", 
+				u->url_key, 
+				StrLength(u->url_data), 
+				ChrPtr(u->url_data)); 
+			
+			free_url(u);
+		}
+		up = bptr;
+		++up;
 	}
 }
 
@@ -294,8 +305,10 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp,
 {
 	wcsession *WCC = WC;
 	urlcontent *u;
+	long keylen;
+
 #ifdef DEBUG_URLSTRINGS
-	lprintf(9, "upload_handler() name=%s, type=%s, len=%d\n", name, cbtype, length);
+	lprintf(9, "\033[31mupload_handler() name=%s, type=%s, len=%d\033[0m\n", name, cbtype, length);
 #endif
 	if (WCC->Hdr->urlstrings == NULL)
 		WCC->Hdr->urlstrings = NewHash(1, NULL);
@@ -304,10 +317,21 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp,
 	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 {
+			lprintf(1, "REJECTED because of __ is internal only: %s = [%ld]  %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", 
 			u->url_key, 
@@ -316,14 +340,15 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp,
 #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
+		lprintf(9, "File: <%s> len: [%ld]\n", filename, length);
+#endif
 		
 	}
 
@@ -353,11 +378,21 @@ int ConditionalBstr(StrBuf *Target, WCTemplputParams *TP)
 	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;
+		}
 	}
 }
 
@@ -368,6 +403,18 @@ void tmplput_bstr(StrBuf *Target, WCTemplputParams *TP)
 		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);
@@ -395,11 +442,14 @@ void tmplput_url_part(StrBuf *Target, WCTemplputParams *TP)
 	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, '/');
 		}
@@ -425,6 +475,7 @@ InitModule_PARAMHANDLING
 
 	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);
 }
 
@@ -441,4 +492,5 @@ SessionDetachModule_PARAMHANDLING
 (wcsession *sess)
 {
 	DeleteHash(&sess->Hdr->urlstrings);
+	FreeStrBuf(&sess->upload_filename);
 }