--- parser3/src/main/untaint.C	2001/03/25 10:29:40	1.20
+++ parser3/src/main/untaint.C	2001/04/09 11:04:12	1.37
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
 
-	$Id: untaint.C,v 1.20 2001/03/25 10:29:40 paf Exp $
+	$Id: untaint.C,v 1.37 2001/04/09 11:04:12 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -15,6 +15,8 @@
 #include "pa_hash.h"
 #include "pa_exception.h"
 #include "pa_table.h"
+#include "pa_globals.h"
+#include "pa_sql_connection.h"
 
 #define escape(action) \
 	{ \
@@ -43,7 +45,11 @@ inline bool need_file_encode(unsigned ch
     if((c>='0') &&(c<='9') ||(c>='A') &&(c<='Z') ||(c>='a') &&(c<='z')) 
 		return false;
 
-    return !strchr("./", c);
+    return !strchr(
+#ifdef WIN32
+		":\\~"
+#endif
+		"./", c);
 }
 inline bool need_uri_encode(unsigned char c){
     if((c>='0') &&(c<='9') ||(c>='A') &&(c<='Z') ||(c>='a') &&(c<='z')) 
@@ -51,7 +57,7 @@ inline bool need_uri_encode(unsigned cha
 
     return !strchr("_-./", c);
 }
-inline bool need_header_encode(unsigned char c){
+inline bool need_http_header_encode(unsigned char c){
     if(strchr(" , :", c))
 		return false;
 
@@ -65,14 +71,18 @@ static bool typo_present(Array::Item *va
 	const char *src=static_cast<const char *>(info);
 
 	int partial;
-	row->get_string(0)->cmp(src, partial);
+	row->get_string(0)->cmp(partial, src);
 	return 
 		partial==0 || // full match
 		partial==1; // typo left column starts 'src'
 }
 
-/// @todo optimize whitespaces for all but 'html'
-char *String::store_to(char *dest) const {
+/**
+	@test optimize whitespaces for all but 'html'
+	@todo fix theoretical \n mem overrun in TYPO replacements
+	@test mail-header
+*/
+char *String::store_to(char *dest, Untaint_lang lang, SQL_Connection *connection) const {
 	// $MAIN:html-typo table
 	Table *user_typo_table=static_cast<Table *>(pool().tag());
 	Table *typo_table=user_typo_table?user_typo_table:default_typo_table;
@@ -80,18 +90,18 @@ char *String::store_to(char *dest) const
 	const Chunk *chunk=&head; 
 	do {
 		const Chunk::Row *row=chunk->rows;
-		for(int i=0; i<chunk->count; i++) {
+		for(size_t i=0; i<chunk->count; i++, row++) {
 			if(row==append_here)
 				goto break2;
 
 			// WARNING:
 			//	string can grow only UNTAINT_TIMES_BIGGER
-			switch(row->item.lang) {
-			case UL_NO:
+			switch(lang==UL_UNSPECIFIED?row->item.lang:lang) {
+			case UL_CLEAN:
 				// clean piece
-			case UL_YES:
+			case UL_TAINTED:
 				// tainted piece, but undefined untaint language
-				// for VString.get_double of tainted values
+				// for VString.as_double of tainted values
 				// for ^process{body} evaluation
 			case UL_AS_IS:
 				// tainted, untaint language: as-is
@@ -112,12 +122,17 @@ char *String::store_to(char *dest) const
 					encode(need_uri_encode, '%');
 				});
 				break;
-			case UL_HEADER:
-				// tainted, untaint language: header
+			case UL_HTTP_HEADER:
+				// tainted, untaint language: http-header
 				escape(switch(*src) {
-					encode(need_header_encode, '%');
+					encode(need_http_header_encode, '%');
 				});
 				break;
+			case UL_MAIL_HEADER:
+				// tainted, untaint language: mail-header
+				memcpy(dest, row->item.ptr, row->item.size); 
+				dest+=row->item.size;
+				break;
 			case UL_TABLE: 
 				// tainted, untaint language: table
 				escape(switch(*src) {
@@ -128,9 +143,12 @@ char *String::store_to(char *dest) const
 				break;
 			case UL_SQL:
 				// tainted, untaint language: sql
-				// TODO: зависимость от sql сервера
-				memset(dest, '?', row->item.size); 
-				dest+=row->item.size;
+				if(connection)
+					dest+=connection->quote(dest, row->item.ptr, row->item.size);
+				else
+					THROW(0, 0,
+						this,
+						"untaint in SQL language failed - no connection specified");
 				break;
 			case UL_JS:
 				escape(switch(*src) {
@@ -161,7 +179,6 @@ char *String::store_to(char *dest) const
 				//   and rather replace \ and n into huge strings
 				//   thus causing memory overrun
 				//   this can be dealed by allocating *2 memory, but that's too expensive
-				// todo parser4: fix that
 				size_t html_for_typo_size;
 				{ // local dest
 					char *dest=html_for_typo;
@@ -170,8 +187,9 @@ char *String::store_to(char *dest) const
 						case '\r': 
 							if(typo_table) {
 								*dest++='\\';  *dest++='n'; // \r -> \n
-								if(src[1]=='\n') // \r\n -> remove \n
-									src++;
+								if(src[1]=='\n') { // \r\n -> remove \n
+									size--; src++;
+								}
 							}
 							break;
 						case '\n': 
@@ -185,46 +203,41 @@ char *String::store_to(char *dest) const
 					html_for_typo_size=dest-html_for_typo;
 				}
 				// typo table replacements
-				if(typo_table) {
-					const char *src=html_for_typo;
-					do {
-						// there is a row where first column starts 'src'
-						if(Table::Item *item=typo_table->first_that(typo_present, src)) {
-							// get a=>b values
-							const String& a=*static_cast<Array *>(item)->get_string(0);
-							const String& b=*static_cast<Array *>(item)->get_string(1);
-							// empty 'a' | 'b' checks
-							if(a.size()==0 || b.size()==0) {
-								pool().set_tag(default_typo_table); // avoid recursion
-								THROW(0, 0, 
-									typo_table->origin_string(), 
-									"typo table column elements must not be empty");
-							}
-							// overflow check:
-							//   b allowed to be max UNTAINT_TIMES_BIGGER then a
-							if(b.size()>UNTAINT_TIMES_BIGGER*a.size()) {
-								pool().set_tag(default_typo_table); // avoid recursion
-								THROW(0, 0, 
-									&b, 
-									"is %g times longer then '%s', "
-									"while maximum, handled by Parser, is %d", 
-										((double)b.size())/a.size(), 
-										a.cstr(), 
-										UNTAINT_TIMES_BIGGER);
-							}
-
-							// skip 'a' in 'src'
-							src+=a.size();
-							// write 'b' to 'dest'
-							b.store_to(dest);
-							dest+=b.size();
-						} else
-							*dest++=*src++;
-					} while(*src);
-				} else {
-					memcpy(dest, html_for_typo, html_for_typo_size);
-					dest+=html_for_typo_size;
-				}
+				const char *src=html_for_typo;
+				do {
+					// there is a row where first column starts 'src'
+					if(Table::Item *item=typo_table->first_that(typo_present, src)) {
+						// get a=>b values
+						const String& a=*static_cast<Array *>(item)->get_string(0);
+						const String& b=*static_cast<Array *>(item)->get_string(1);
+						// empty 'a' | 'b' checks
+						if(a.size()==0 || b.size()==0) {
+							pool().set_tag(default_typo_table); // avoid recursion
+							THROW(0, 0, 
+								typo_table->origin_string(), 
+								"typo table column elements must not be empty");
+						}
+						// overflow check:
+						//   b allowed to be max UNTAINT_TIMES_BIGGER then a
+						if(b.size()>UNTAINT_TIMES_BIGGER*a.size()) {
+							pool().set_tag(default_typo_table); // avoid recursion
+							THROW(0, 0, 
+								&b, 
+								"is %g times longer then '%s', "
+								"while maximum, handled by Parser, is %d", 
+								((double)b.size())/a.size(), 
+								a.cstr(), 
+								UNTAINT_TIMES_BIGGER);
+						}
+						
+						// skip 'a' in 'src'
+						src+=a.size();
+						// write 'b' to 'dest'
+						b.store_to(dest);
+						dest+=b.size();
+					} else
+						*dest++=*src++;
+				} while(*src);
 				break;
 				}
 			default:
@@ -234,7 +247,6 @@ char *String::store_to(char *dest) const
 						static_cast<int>(row->item.lang), 
 						i);
 			}
-			row++;
 		}
 		chunk=row->link;
 	} while(chunk);